Mercurial > hg > forks > geeqie

changeset 2789:194f2e0719ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 30 Jun 2018 15:28:52 +0300
parents 86dad5529aed (current diff) 1d65d7ce3132 (diff)
children c79d70e18076
files configure.in src/Makefile.am
diffstat 102 files changed, 12866 insertions(+), 2765 deletions(-) [+]
line wrap: on
line diff
--- a/.github/ISSUE_TEMPLATE.md	Fri Apr 13 19:06:23 2018 +0300
+++ b/.github/ISSUE_TEMPLATE.md	Sat Jun 30 15:28:52 2018 +0300
@@ -1,6 +1,8 @@
 <!---
 Verify first that your issue/request is not already reported on GitHub.
 Also test if the latest release, and master branch are affected too.
+
+Bevore sending the report, please remove the comments.
 -->
 
 ### ISSUE TYPE
--- a/Makefile.am	Fri Apr 13 19:06:23 2018 +0300
+++ b/Makefile.am	Sat Jun 30 15:28:52 2018 +0300
@@ -35,7 +35,7 @@
 	cp $(top_builddir)/geeqie.spec $(distdir)
 
 DISTCLEANFILES = config.report
-CLEANFILES = $(desktop_DATA)
+CLEANFILES = $(desktop_DATA) ChangeLog.html
 
 .PHONY: ChangeLog
 ChangeLog.html:
--- a/README.md	Fri Apr 13 19:06:23 2018 +0300
+++ b/README.md	Sat Jun 30 15:28:52 2018 +0300
@@ -223,7 +223,7 @@
     markdown
         when compiling Geeqie, to create this file in html format
 
-    libffmpegthumbnailer 2.0.0
+    libffmpegthumbnailer 2.1.0
         https://github.com/dirkvdb/ffmpegthumbnailer
         for thumbnailing camera video clips
         disable with configure option: --disable-ffmpegthumbnailer
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ZoneDetect.md	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,10 @@
+The detection of timezone is performed by
+ [ZoneDetect](https://github.com/BertoldVdb/ZoneDetect)
+ 
+ timezone16.bin has a longitude resolution of 0.0055 degrees (~0.5km).  
+ timezone21.bin has a longitude resolution of 0.00017 degrees (~20m).
+ 
+ The safe zone result indicates how close you are to the nearest border (flat earth model using lat and lon as x and y), so you can know when to do a new lookup. If you don't need it you can ignore it, in this case you can pass a NULL parameter to save the (very small) calculation effort.
+ 
+ 
+ Note that the [underlying database](https://github.com/evansiroky/timezone-boundary-builder) will change from time-to-time.
--- a/configure.in	Fri Apr 13 19:06:23 2018 +0300
+++ b/configure.in	Sat Jun 30 15:28:52 2018 +0300
@@ -374,7 +374,7 @@
     [ffmpegthumbnailer=$enableval], [ffmpegthumbnailer=auto])
 
 if test "x${ffmpegthumbnailer}" != "xno"; then
-  PKG_CHECK_MODULES(FFMPEGTHUMBNAILER, [libffmpegthumbnailer >= 2.0.0],
+  PKG_CHECK_MODULES(FFMPEGTHUMBNAILER, [libffmpegthumbnailer >= 2.1.0],
     [
       HAVE_FFMPEGTHUMBNAILER=yes
       AC_DEFINE(HAVE_FFMPEGTHUMBNAILER, 1, [define to enable ffmpegthumbnailer support])
@@ -621,6 +621,7 @@
     plugins/ufraw/Makefile
     plugins/import/Makefile
     plugins/geocode-parameters/Makefile
+    plugins/ZoneDetect/Makefile
     geeqie.spec
 ])
 
--- a/doc/docbook/GuideImageMarks.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideImageMarks.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -11,23 +11,30 @@
     <guimenu>Select</guimenu>
     menu gives access to the marks operations of setting, filtering and intersection.
   </para>
-  <para>There are 6 individual marks, any of which can be associated with an image simply by pressing the 1 to 6 keys on the keyboard.</para>
+  <para>There are 10 individual marks, any of which can be associated with an image simply by pressing the 0 to 9 keys on the keyboard, where key 0 represents mark 10.</para>
   <para>
     If the
     <guimenu>Show Marks</guimenu>
-    menu has been selected, each image will have a set of 6 check-boxes displayed adjacent to it in the file pane in both icon and list mode. In addition a set of 6 check-boxes will be shown at the top of the files pane. Clicking any of these will filter the displayed list.
+    menu has been selected, each image will have a set of 10 check-boxes displayed adjacent to it in the file pane in both icon and list mode. In addition a set of 10 check-boxes will be shown at the top of the files pane. Clicking any of these will filter the displayed list.
   </para>
+  <para>Moving the mouse over any of the check-boxes at the top of the files pane will show mnemonic text for that mark. The text can be modified by right-clicking on the check box.</para>
   <para>
     If the
     <link linkend="InformationandhistogramOverlay" endterm="titleInformationandhistogramOverlay" />
     is being displayed, the currently set marks for the image are shown. It is not necessary to include an entry into the overlay template for this to happen.
   </para>
   <para>
-    A keyword can be associated with a single mark by right-clicking on the keyword in the sidebar panel. When a meta-data write operation for a file is triggered either <link linkend="Buttons">manually</link> or as defined in
+    A keyword can be associated with a single mark by right-clicking on the keyword in the sidebar panel. When a meta-data write operation for a file is triggered either
+    <link linkend="Buttons">manually</link>
+    or as defined in
     <link linkend="GuideOptionsMetadata" endterm="titleGuideOptionsMetadata" />
     , the keyword data indicated by the current set of mark-to-keyword links will be written.
   </para>
-  <para>Neither marks, nor the associations between keywords and marks, are preserved when Geeqie is shut down.</para>
+  <para>
+    The associations between keywords and marks is preserved when Geeqie is shut down. The current setting of marks can also be optionally saved - the setting is in the
+    <link linkend="Behaviour">Behavior tab of Preferences</link>
+    .
+  </para>
   <para />
   <para />
 </section>
--- a/doc/docbook/GuideImageSearch.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideImageSearch.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -4,8 +4,29 @@
   <para>Geeqie provides comprehensive set of search methods, including not only the standard functions such as file date or size, but also image similarity.</para>
   <para>There is a duplicate file finder, which uses search parameters such as image dimensions or checksum. Two sets of image files may be compared.</para>
   <para>Geeqie also has a set of temporary "marks" or "tags" which may be allocated to any image as an aide to file organising.</para>
+  <section id="GuideImageSearchCache">
+    <title id="titleGuideImageSearchCache">Caching Data For Searches</title>
+    <para>
+      Searching large numbers of files for similarity can take significant cpu time. Part of this is the time to compute the similarity matrix for each file.
+      <para />
+      If the
+      <link linkend="PreferencesThumbnails">Cache Thumbnails</link>
+      option is selected in Preferences/General, the similarity matrix and the checksum will also be cached. This will reduce the time needed for future searches.
+      <note>If you frequently search on similarity and your images are in a tree arrangement under a single point, initiating a one-time search on similarity from the top of the tree will generate the similarity data for all images.</note>
+      <para>Similarity data are stored in a folder hierachy that mirrors the location of the source images. The data have the same name as the original appended by the file extension .sim.</para>
+      <para>
+        The root of the hierachy is:
+        <para>
+          <programlisting>$XDG_CACHE_HOME/geeqie/thumbnails/</programlisting>
+          or, if $XDG_CACHE_HOME is not defined:
+          <programlisting>$HOME/.cache/geeqie/thumbnails/</programlisting>
+        </para>
+      </para>
+    </para>
+    <para />
+  </section>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideImageSearchSearch.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideImageSearchFindingDuplicates.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideImageMarks.xml" />
   <para />
-</chapter>
+</chapter>
--- a/doc/docbook/GuideImageSearchSearch.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideImageSearchSearch.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -177,6 +177,16 @@
           </itemizedlist>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <guilabel>Marks</guilabel>
+        </term>
+        <listitem>
+          The search will match if the file does or does not have a mark attached to it. Refer to
+          <link linkend="GuideImageMarks">Marking Images</link>
+          .
+        </listitem>
+      </varlistentry>
     </variablelist>
     <para />
     <para />
--- a/doc/docbook/GuideMainWindowFilePane.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideMainWindowFilePane.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -166,6 +166,14 @@
           <para>Toggles display of file names in the icon view display mode.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <emphasis role="bold">Show star rating</emphasis>
+        </term>
+        <listitem>
+          <para>Toggles display of the "star rating" (Xmp.xmp.Rating).</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
     <para />
   </section>
--- a/doc/docbook/GuideMainWindowMenus.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideMainWindowMenus.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -445,6 +445,19 @@
       <varlistentry>
         <term>
           <menuchoice>
+            <guimenu>Clear marks</guimenu>
+          </menuchoice>
+        </term>
+        <listitem>
+          <para>Clear all marks for all images</para>
+          <warning>
+            <para>Marks that are linked to keywords will also be cleared. This may result in a metadata write operation being triggered.</para>
+          </warning>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <menuchoice>
             <guimenu>Mark n</guimenu>
           </menuchoice>
         </term>
@@ -882,7 +895,7 @@
       <varlistentry>
         <term>
           <menuchoice>
-            <guimenu>Thumbnail maintenance</guimenu>
+            <guimenu>Cache maintenance</guimenu>
           </menuchoice>
         </term>
         <listitem>
@@ -1432,6 +1445,20 @@
       <varlistentry>
         <term>
           <menuchoice>
+            <guimenu>On-line help search</guimenu>
+          </menuchoice>
+        </term>
+        <listitem>
+          <para>
+            Use a web browser to search Geeqie's on-line help files. The search engine used is defined in
+            <link linkend="OnLineHelpSearch">Preferences General</link>
+            .
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <menuchoice>
             <guimenu>Keyboard shortcuts</guimenu>
           </menuchoice>
         </term>
--- a/doc/docbook/GuideMainWindowStatusBar.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideMainWindowStatusBar.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section id="GuideMainWindowStatusBar">
   <title id="titleGuideMainWindowStatusBar">Status Bar</title>
-  <para>The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom setting. The current sort preference is also displayed, and can be adjusted from the status bar.</para>
-  <para>The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom setting. Each section is described below.</para>
+  <para>The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom and image scroll settings. The current sort preference is also displayed, and can be adjusted from the status bar.</para>
+  <para>The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom and scroll setting. Each section is described below.</para>
   <para />
   <section id="ProgressBar">
     <title>Progress Bar</title>
-    <para>The Progress bar updates to display the current state of thumbnail generation. When this section contains no text, thumbnail generation is idle. When “Loading thumbs...†is displayed, thumbnails are currently being generated when Geeqie is idle; the progress bar will update to display the percentage of thumbnails that are completed.</para>
-    <para />
+    <para>
+      The Progress bar updates to display the current state of thumbnail generation, or the reading of metadata in the current folder.
+      <para />
+      When “Loading thumbs...†is displayed, thumbnails are currently being generated when Geeqie is idle; the progress bar will update to display the percentage of thumbnails that are completed.
+      <para />
+      When “Loading meta...†is displayed, certain metadata is being loaded when Geeqie is idle; the progress bar will update to display the percentage of files that have been read. Refer to
+      <link linkend="PreLoadMetadata">Preferences metadata.</link>
+    </para>
   </section>
   <section id="Sortmethod">
     <title>Sort method</title>
@@ -105,8 +111,8 @@
     <title>Buttons</title>
     <para>Statusbar buttons corresponds to selected menu action.</para>
     <para />
-    <section id="Zoom">
-      <title>Zoom</title>
+    <section id="ZoomAndScroll">
+      <title>Zoom and Scroll</title>
       <para>The button label displays the current zoom ratio. A ratio of 1:1 is the image's original size. When the left number is larger the image is displayed larger than original size, when the right number is larger the image is displayed smaller.</para>
       <para>A tilde (~) appears within the ratio display when the zoom is set to fit the image within the display area. In this zoom mode the ratio is automatically adjusted, and the displayed ratio may not be the actual ratio because the status bar display rounds the actual value to the nearest tenth (0.1).</para>
       <para />
--- a/doc/docbook/GuideOptionsBehavior.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideOptionsBehavior.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -126,6 +126,14 @@
       </varlistentry>
       <varlistentry>
         <term>
+          <guilabel>Save marks on exit</guilabel>
+        </term>
+        <listitem>
+          <para>Save all marks that have been set. Note that marks that are linked to a keyword will always be saved irrespective of this setting.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
           <guilabel>Recent folder list maximum size</guilabel>
         </term>
         <listitem>
--- a/doc/docbook/GuideOptionsGeneral.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideOptionsGeneral.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -140,6 +140,10 @@
       </varlistentry>
     </variablelist>
   </section>
+  <section id="StarRatingCharacters">
+    <title>Star Rating</title>
+    <para>The characters used to display the Star Rating are defined here. They are defined as a hexadecimal Unicode character. The complete list of Unicode characters can be found in many places on the Internet.</para>
+  </section>
   <section id="Slideshow">
     <title>Slide show</title>
     <variablelist>
@@ -222,4 +226,15 @@
     </note>
     <variablelist />
   </section>
+  <section id="OnLineHelpSearch">
+    <title>On-line help search</title>
+    <para>
+      An internet search engine may be used to search the help files on Geeqie's website. The string used to conduct the search is defined here. In most cases it will be in one of two formats:
+      <para />
+      <code>https://www.search-engine.com/search?q=site:geeqie.org/help</code>
+      <para />
+      <code>https://www.search-engine.com/?q=site:geeqie.org/help'</code>
+    </para>
+    <variablelist />
+  </section>
 </section>
--- a/doc/docbook/GuideOptionsMetadata.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideOptionsMetadata.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -158,4 +158,29 @@
     </itemizedlist>
     <para />
   </section>
+  <section id="PreLoadMetadata">
+    <title>Pre-load metadata</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <guilabel>Read metadata in background</guilabel>
+          <para />
+          Using the folder sorting options:
+          <para />
+          <guilabel>Exif date original</guilabel>
+          <para />
+          <guilabel>Exif date digitized</guilabel>
+          <para />
+          <guilabel>Rating</guilabel>
+          <para />
+          requires metadata to be read from all files in a folder before the sort action can be made. If a folder contains a large number of file, this can take a noticeable period of time.
+          <para />
+          If this option is checked, Geeqie will automatically read the required metatada in the background as soon as a folder is opened. This will reduce the amount of time you have to wait until the sort is completed.
+          <para />
+          If you do not use these sort otions, leave this option unchecked.
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para />
+  </section>
 </section>
--- a/doc/docbook/GuideReference.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideReference.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -11,6 +11,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceTags.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceSupportedFormats.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferencePixbufLoaders.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceUTC.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceDecodeLatLong.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceStandards.xml" />
   <para />
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/docbook/GuideReferenceFileDates.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section id="GuideReferenceFileDates">
+  <title>File date types</title>
+  <para>Geeqie understands 4 types of file dates:</para>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Standard date (mtime) - The date the file contents were last modified, or when the file was created if since unchanged.</para>
+    </listitem>
+    <listitem>
+      <para>Status changed (ctime) - The date the file status was last changed. This includes change of owner, change of read/write permission and change of contents.</para>
+    </listitem>
+    <listitem>
+      <para>Exif date original (Exif.Photo.DateTimeOriginal) -  For images from a digital camera, this is the time the photo was taken.</para>
+    </listitem>
+    <listitem>
+      <para>Exif date digitized (Exif.Photo.DateTimeDigitized) -  For scanned images, this the time the scan was made. For images from a digital camera, it may be identical to the above date.</para>
+    </listitem>
+  </itemizedlist>
+</section>
--- a/doc/docbook/GuideReferenceTags.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideReferenceTags.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -239,6 +239,77 @@
               <para>Latitude, Longitude</para>
             </entry>
           </row>
+          <row>
+            <entry>
+              <para>formatted.localtime</para>
+            </entry>
+            <entry>
+              <para>
+                Exif.GPSInfo.GPSLatitude
+                <para />
+                Exif.GPSInfo.GPSLatitudeRef
+                <para />
+                Exif.GPSInfo.GPSLongitude
+                <para />
+                Exif.GPSInfo.GPSLongitudeRef
+                <para />
+                Exif.GPSInfo.GPSDateStamp
+                <para />
+                Exif.GPSInfo.GPSTimeStamp
+              </para>
+            </entry>
+            <entry>
+              <para>
+                Local time corrected for UTC offset, DST correction
+                <footnote id='ref1'>
+                  <para>
+                    Refer to
+                    <link linkend="GuideReferenceUTC">UTC and DST</link>
+                    section.
+                  </para>
+                </footnote>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry>
+              <para>formatted.timezone</para>
+            </entry>
+            <entry>
+              <para>
+                Exif.GPSInfo.GPSLatitude
+                <para />
+                Exif.GPSInfo.GPSLatitudeRef
+                <para />
+                Exif.GPSInfo.GPSLongitude
+                <para />
+                Exif.GPSInfo.GPSLongitudeRef
+              </para>
+            </entry>
+            <entry>
+              <para>
+                Timezone indicated by lat/long
+                <footnote id='ref1'>
+                  <para>
+                    Refer to
+                    <link linkend="GuideReferenceUTC">UTC and DST</link>
+                    section.
+                  </para>
+                </footnote>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry>
+              <para>formatted.star_rating</para>
+            </entry>
+            <entry>
+              <para>Xmp.xmp.Rating</para>
+            </entry>
+            <entry>
+              <para>Rating shown as a set of 🟊  characters</para>
+            </entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
@@ -326,6 +397,14 @@
           </row>
           <row>
             <entry>
+              <para>formatted.timezone</para>
+            </entry>
+            <entry>
+              <para>Time zone</para>
+            </entry>
+          </row>
+          <row>
+            <entry>
               <para>Xmp.photoshop.Country</para>
             </entry>
             <entry>
@@ -442,6 +521,14 @@
           </row>
           <row>
             <entry>
+              <para>formatted.localtime</para>
+            </entry>
+            <entry>
+              <para>Local time</para>
+            </entry>
+          </row>
+          <row>
+            <entry>
               <para>formatted.ShutterSpeed</para>
             </entry>
             <entry>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/docbook/GuideReferenceUTC.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section id="GuideReferenceUTC">
+  <title id="titleGuideReferenceUTC">UTC and Daylight Saving Time (DST)</title>
+  <para>Geeqie can display the local time at which a photo was taken, adjusted for UTC offset and Daylight Saving Time.</para>
+  <para>
+    If the image exif data contains the required parameters (see
+    <link linkend="GuideReferenceXmpExif">Pre-formatted tags</link>
+    ), Geeqie will use the latitude and longitude to determine which timezone the image was taken in.
+    <para />
+    The UTC offset and Daylight Saving Time Correction for that timezone, combined with the GPS UTC value, will then be used to compute the correct local time.
+    <para />
+    This value may be displayed in either the Info Sidebar or Overlay Screen Display by using the parameter
+    <code>formatted.localtime</code>
+  </para>
+  <para>
+    The timezone for the image may also be displayed by using the parameter
+    <code>formatted.timezone</code>
+    .
+  </para>
+</section>
--- a/doc/docbook/GuideSidebarsInfo.xml	Fri Apr 13 19:06:23 2018 +0300
+++ b/doc/docbook/GuideSidebarsInfo.xml	Sat Jun 30 15:28:52 2018 +0300
@@ -251,6 +251,32 @@
             <entry>Latitude, Longitude</entry>
           </row>
           <row>
+            <entry>formatted.localtime</entry>
+            <entry>
+              Local time corrected for UTC offset, DST correction
+              <footnote id='ref1'>
+                <para>
+                  Refer to
+                  <link linkend="GuideReferenceUTC">UTC and DST</link>
+                  section.
+                </para>
+              </footnote>
+            </entry>
+          </row>
+          <row>
+            <entry>formatted.timezone</entry>
+            <entry>
+              Timezone indicated by GPS lat/long values
+              <footnote id='ref1'>
+                <para>
+                  Refer to
+                  <link linkend="GuideReferenceUTC">UTC and DST</link>
+                  section.
+                </para>
+              </footnote>
+            </entry>
+          </row>
+          <row>
             <entry>file.size</entry>
             <entry>file size in bytes</entry>
           </row>
@@ -262,6 +288,10 @@
             <entry>file.mode</entry>
             <entry>file mode flags</entry>
           </row>
+          <row>
+            <entry>file.ctime</entry>
+            <entry>refer to operating system documentation for the meaning of ctime</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
--- a/plugins/Makefile.am	Fri Apr 13 19:06:23 2018 +0300
+++ b/plugins/Makefile.am	Sat Jun 30 15:28:52 2018 +0300
@@ -1,6 +1,6 @@
 #FIXME enable or disable individual plugins from configure
 
-SUBDIRS = rotate symlink ufraw import geocode-parameters
+SUBDIRS = rotate symlink ufraw import geocode-parameters ZoneDetect
 qq_desktoptemplatedir = $(appdir)
 qq_desktoptemplate_DATA = template.desktop
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/ZoneDetect/Makefile.am	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,1 @@
+dist_gq_bin_SCRIPTS = timezone21.bin
Binary file plugins/ZoneDetect/timezone21.bin has changed
--- a/po/LINGUAS	Fri Apr 13 19:06:23 2018 +0300
+++ b/po/LINGUAS	Sat Jun 30 15:28:52 2018 +0300
@@ -6,6 +6,7 @@
 da
 de
 el
+en_GB
 eo
 es
 et
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/en_GB.po	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,6469 @@
+# Geeqie Britsh English translation
+# Copyright (C) 2018 The Geeqie Team
+# This file is distributed under the same license as the Geeqie package.
+# Colin Clark <colin.clark@cclark.uk>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: geeqie-1.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-24 10:14+0100\n"
+"PO-Revision-Date: 2018-06-24 11:15+0100\n"
+"Last-Translator: Colin Clark <colin.clark@cclark.uk>\n"
+"Language-Team: British English <>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#: ../geeqie.desktop.in.h:1
+msgid "Geeqie"
+msgstr ""
+
+#: ../geeqie.desktop.in.h:2
+msgid "Image Viewer"
+msgstr ""
+
+#: ../geeqie.desktop.in.h:3
+msgid "View and manage images"
+msgstr ""
+
+#: ../plugins/import/geeqie-import-geeqie.desktop.in.h:1
+msgid "Import Geeqie 1.0alphaX metadata"
+msgstr ""
+
+#: ../plugins/import/geeqie-import-gqview.desktop.in.h:1
+msgid "Import GQView metadata"
+msgstr ""
+
+#: ../plugins/rotate/rotate.desktop.in.h:1
+msgid "Apply the orientation to image content"
+msgstr ""
+
+#: ../plugins/symlink/symlink.desktop.in.h:1
+msgid "Symlink"
+msgstr ""
+
+#: ../plugins/ufraw/geeqie-ufraw.desktop.in.h:1
+msgid "UFRaw Batch"
+msgstr ""
+
+#: ../plugins/ufraw/geeqie-ufraw-id.desktop.in.h:1
+msgid "Edit UFRaw ID file"
+msgstr ""
+
+#: ../plugins/ufraw/geeqie-ufraw-recursive.desktop.in.h:1
+msgid "UFRaw Batch recursive"
+msgstr ""
+
+#: ../src/advanced_exif.c:384 ../src/cache_maint.c:1265
+#: ../src/preferences.c:111 ../src/preferences.c:2304 ../src/search.c:2103
+#: ../src/search.c:3242
+msgid "Metadata"
+msgstr ""
+
+#: ../src/advanced_exif.c:432 ../src/preferences.c:2218
+msgid "Description"
+msgstr ""
+
+#: ../src/advanced_exif.c:433
+msgid "Value"
+msgstr ""
+
+#: ../src/advanced_exif.c:434 ../src/desktop_file.c:535 ../src/dupe.c:2765
+#: ../src/dupe.c:3306 ../src/print.c:3209 ../src/search.c:3325
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:2059
+msgid "Name"
+msgstr ""
+
+#: ../src/advanced_exif.c:435
+msgid "Tag"
+msgstr ""
+
+#: ../src/advanced_exif.c:436
+msgid "Format"
+msgstr ""
+
+#: ../src/advanced_exif.c:437
+msgid "Elements"
+msgstr ""
+
+#. default sidebar
+#: ../src/bar.c:186
+msgid "Histogram"
+msgstr ""
+
+#: ../src/bar.c:187
+msgid "Title"
+msgstr ""
+
+#: ../src/bar.c:188 ../src/search.c:3163
+msgid "Keywords"
+msgstr ""
+
+#: ../src/bar.c:189 ../src/search.c:3175
+msgid "Comment"
+msgstr ""
+
+#: ../src/bar.c:190
+msgid "Rating"
+msgstr ""
+
+#: ../src/bar.c:191
+msgid "Exif"
+msgstr ""
+
+#. other pre-configured panes
+#: ../src/bar.c:193
+msgid "File info"
+msgstr ""
+
+#: ../src/bar.c:194
+msgid "Location and GPS"
+msgstr ""
+
+#: ../src/bar.c:195 ../src/exif.c:342
+msgid "Copyright"
+msgstr ""
+
+#: ../src/bar.c:198 ../src/bar_gps.c:1010
+msgid "GPS Map"
+msgstr ""
+
+#: ../src/bar.c:318 ../src/toolbar.c:191
+msgid "Move to _top"
+msgstr ""
+
+#: ../src/bar.c:319 ../src/toolbar.c:192 ../src/ui_bookmark.c:416
+msgid "Move _up"
+msgstr ""
+
+#: ../src/bar.c:320 ../src/toolbar.c:193 ../src/ui_bookmark.c:418
+msgid "Move _down"
+msgstr ""
+
+#: ../src/bar.c:321 ../src/toolbar.c:194
+msgid "Move to _bottom"
+msgstr ""
+
+#: ../src/bar.c:323 ../src/toolbar.c:196
+msgid "Remove"
+msgstr ""
+
+#: ../src/bar.c:714
+msgid "Add Pane"
+msgstr ""
+
+#: ../src/bar_comment.c:216
+msgid "Add text to selected files"
+msgstr ""
+
+#: ../src/bar_comment.c:217
+msgid "Replace existing text in selected files"
+msgstr ""
+
+#: ../src/bar_exif.c:223
+msgid "<empty label, fixme>"
+msgstr ""
+
+#: ../src/bar_exif.c:551 ../src/bar_exif.c:561
+msgid "Configure entry"
+msgstr ""
+
+#. for the pane
+#: ../src/bar_exif.c:551 ../src/bar_exif.c:561 ../src/bar_exif.c:649
+msgid "Add entry"
+msgstr ""
+
+#: ../src/bar_exif.c:567
+msgid "Key:"
+msgstr ""
+
+#: ../src/bar_exif.c:576 ../src/preferences.c:1872
+msgid "Title:"
+msgstr ""
+
+#: ../src/bar_exif.c:585
+msgid "Show only if set"
+msgstr ""
+
+#: ../src/bar_exif.c:586
+msgid "Editable (supported only for XMP)"
+msgstr ""
+
+#. for the entry
+#: ../src/bar_exif.c:635
+#, c-format
+msgid "Configure \"%s\""
+msgstr ""
+
+#: ../src/bar_exif.c:636 ../src/bar_keywords.c:1342
+#, c-format
+msgid "Remove \"%s\""
+msgstr ""
+
+#: ../src/bar_exif.c:637
+#, c-format
+msgid "Copy \"%s\""
+msgstr ""
+
+#: ../src/bar_exif.c:650
+msgid "Show hidden entries"
+msgstr ""
+
+#: ../src/bar_gps.c:187
+#, c-format
+msgid ""
+"\n"
+"Do you want to geocode image %s?"
+msgstr ""
+
+#: ../src/bar_gps.c:192
+#, c-format
+msgid ""
+"\n"
+"Do you want to geocode %i images?"
+msgstr ""
+
+#: ../src/bar_gps.c:197
+#, c-format
+msgid ""
+"\n"
+"This image is already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:202
+#, c-format
+msgid ""
+"\n"
+"One image is already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:207
+#, c-format
+msgid ""
+"\n"
+"%i Images are already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:212
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Position: %s \n"
+msgstr ""
+
+#: ../src/bar_gps.c:214
+msgid "Geocode images"
+msgstr ""
+
+#: ../src/bar_gps.c:218
+msgid "Write lat/long to meta-data?"
+msgstr ""
+
+#: ../src/bar_gps.c:721
+#, c-format
+msgid "Zoom %i"
+msgstr ""
+
+#: ../src/bar_gps.c:739
+#, c-format
+msgid "Zoom level %i"
+msgstr ""
+
+#: ../src/bar_gps.c:744
+msgid "Loading map"
+msgstr ""
+
+#: ../src/bar_gps.c:810
+msgid "Enable markers"
+msgstr ""
+
+#: ../src/bar_gps.c:812
+msgid "Centre map on marker"
+msgstr ""
+
+#: ../src/bar_gps.c:834
+msgid ""
+"Move map centre to marker\n"
+" is disabled"
+msgstr ""
+
+#: ../src/bar_gps.c:839
+msgid ""
+"Move map centre to marker\n"
+" is enabled"
+msgstr ""
+
+#: ../src/bar_gps.c:843
+msgid "Map centering"
+msgstr ""
+
+#. use the same strings as in layout_util.c
+#: ../src/bar_histogram.c:257 ../src/layout_util.c:1961
+msgid "Histogram on _Red"
+msgstr ""
+
+#: ../src/bar_histogram.c:258 ../src/layout_util.c:1962
+msgid "Histogram on _Green"
+msgstr ""
+
+#: ../src/bar_histogram.c:259 ../src/layout_util.c:1963
+msgid "Histogram on _Blue"
+msgstr ""
+
+#: ../src/bar_histogram.c:260 ../src/layout_util.c:1964
+msgid "_Histogram on RGB"
+msgstr ""
+
+#: ../src/bar_histogram.c:261 ../src/layout_util.c:1965
+msgid "Histogram on _Value"
+msgstr ""
+
+#: ../src/bar_histogram.c:265 ../src/layout_util.c:1969
+msgid "Li_near Histogram"
+msgstr ""
+
+#: ../src/bar_histogram.c:266
+msgid "L_og Histogram"
+msgstr ""
+
+#: ../src/bar_keywords.c:463
+msgid "Add keywords to selected files"
+msgstr ""
+
+#: ../src/bar_keywords.c:464
+msgid "Replace existing keywords in selected files"
+msgstr ""
+
+#: ../src/bar_keywords.c:935
+msgid "Edit keyword"
+msgstr ""
+
+#: ../src/bar_keywords.c:935 ../src/bar_keywords.c:942
+#: ../src/bar_keywords.c:1287
+msgid "New keyword"
+msgstr ""
+
+#: ../src/bar_keywords.c:942
+msgid "Configure keyword"
+msgstr ""
+
+#: ../src/bar_keywords.c:948
+msgid "Keyword:"
+msgstr ""
+
+#: ../src/bar_keywords.c:957
+msgid "Keyword type:"
+msgstr ""
+
+#: ../src/bar_keywords.c:959
+msgid "Active keyword"
+msgstr ""
+
+#: ../src/bar_keywords.c:962
+msgid "Helper"
+msgstr ""
+
+#: ../src/bar_keywords.c:1036
+msgid "This will disconnect all Marks Keywords connections"
+msgstr ""
+
+#: ../src/bar_keywords.c:1038
+msgid "Marks Keywords"
+msgstr ""
+
+#: ../src/bar_keywords.c:1311
+#, c-format
+msgid "Add \"%s\" to all selected images"
+msgstr ""
+
+#: ../src/bar_keywords.c:1317
+#, c-format
+msgid "Hide \"%s\""
+msgstr ""
+
+#: ../src/bar_keywords.c:1324
+#, c-format
+msgid "Mark %d"
+msgstr ""
+
+#: ../src/bar_keywords.c:1332
+#, c-format
+msgid "Connect \"%s\" to mark"
+msgstr ""
+
+#: ../src/bar_keywords.c:1339
+#, c-format
+msgid "Edit \"%s\""
+msgstr ""
+
+#: ../src/bar_keywords.c:1349
+#, c-format
+msgid "Disconnect \"%s\" from mark %s"
+msgstr ""
+
+#: ../src/bar_keywords.c:1356
+#, c-format
+msgid "Disconnect all Mark Keyword connections"
+msgstr ""
+
+#. for the pane
+#: ../src/bar_keywords.c:1367 ../src/bar_keywords.c:1381
+msgid "Expand checked"
+msgstr ""
+
+#: ../src/bar_keywords.c:1368 ../src/bar_keywords.c:1382
+msgid "Collapse unchecked"
+msgstr ""
+
+#: ../src/bar_keywords.c:1369 ../src/bar_keywords.c:1383
+msgid "Hide unchecked"
+msgstr ""
+
+#: ../src/bar_keywords.c:1370
+msgid "Revert all hidden"
+msgstr ""
+
+#: ../src/bar_keywords.c:1372
+msgid "Show all"
+msgstr ""
+
+#: ../src/bar_keywords.c:1373
+msgid "Collapse all"
+msgstr ""
+
+#: ../src/bar_keywords.c:1374
+msgid "Revert"
+msgstr ""
+
+#: ../src/bar_keywords.c:1378
+msgid "On any change"
+msgstr ""
+
+#: ../src/bar_sort.c:500
+#, c-format
+msgid ""
+"The collection:\n"
+"%s\n"
+"already exists."
+msgstr ""
+
+#: ../src/bar_sort.c:501
+msgid "Collection exists"
+msgstr ""
+
+#: ../src/bar_sort.c:515 ../src/collect.c:1146 ../src/collect-dlg.c:93
+#, c-format
+msgid ""
+"Failed to save the collection:\n"
+"%s"
+msgstr ""
+
+#: ../src/bar_sort.c:516 ../src/collect.c:1147 ../src/collect-dlg.c:94
+msgid "Save Failed"
+msgstr ""
+
+#: ../src/bar_sort.c:551 ../src/bar_sort.c:723
+msgid "Add Bookmark"
+msgstr ""
+
+#: ../src/bar_sort.c:555
+msgid "Add Collection"
+msgstr ""
+
+#: ../src/bar_sort.c:572 ../src/shortcuts.c:118 ../src/ui_bookmark.c:297
+msgid "Name:"
+msgstr ""
+
+#: ../src/bar_sort.c:650
+msgid "Sort Manager"
+msgstr ""
+
+#: ../src/bar_sort.c:659 ../src/pan-view/pan-view.c:1832
+#: ../src/ui_pathsel.c:1108
+msgid "Folders"
+msgstr ""
+
+#: ../src/bar_sort.c:660 ../src/options.c:207
+msgid "Collections"
+msgstr ""
+
+#: ../src/bar_sort.c:668 ../src/utilops.c:2321
+msgid "Copy"
+msgstr ""
+
+#: ../src/bar_sort.c:671 ../src/utilops.c:2271
+msgid "Move"
+msgstr ""
+
+#: ../src/bar_sort.c:710
+msgid "Add image"
+msgstr ""
+
+#: ../src/bar_sort.c:713
+msgid "Add selection"
+msgstr ""
+
+#: ../src/bar_sort.c:726
+msgid "Undo last image"
+msgstr ""
+
+#: ../src/cache.c:173
+#, c-format
+msgid ""
+"error saving sim cache data: %s\n"
+"error: %s\n"
+msgstr ""
+
+#: ../src/cache_maint.c:123 ../src/cache_maint.c:612 ../src/cache_maint.c:880
+#: ../src/editors.c:1205
+msgid "done"
+msgstr ""
+
+#: ../src/cache_maint.c:313
+msgid "Removing old metadata..."
+msgstr ""
+
+#: ../src/cache_maint.c:317
+msgid "Clearing cached thumbnails..."
+msgstr ""
+
+#: ../src/cache_maint.c:321 ../src/cache_maint.c:1053
+msgid "Removing old thumbnails..."
+msgstr ""
+
+#: ../src/cache_maint.c:324 ../src/cache_maint.c:1056
+msgid "Maintenance"
+msgstr ""
+
+#: ../src/cache_maint.c:732
+msgid "Invalid folder"
+msgstr ""
+
+#: ../src/cache_maint.c:733
+msgid "The specified folder can not be found."
+msgstr ""
+
+#: ../src/cache_maint.c:796 ../src/cache_maint.c:810 ../src/cache_maint.c:1256
+msgid "Create thumbnails"
+msgstr ""
+
+#: ../src/cache_maint.c:804 ../src/cache_maint.c:1063
+msgid "S_tart"
+msgstr ""
+
+#: ../src/cache_maint.c:817 ../src/preferences.c:2564
+msgid "Folder:"
+msgstr ""
+
+#: ../src/cache_maint.c:820
+msgid "Select folder"
+msgstr ""
+
+#: ../src/cache_maint.c:824
+msgid "Include subfolders"
+msgstr ""
+
+#: ../src/cache_maint.c:825
+msgid "Store thumbnails local to source images"
+msgstr ""
+
+#: ../src/cache_maint.c:834 ../src/cache_maint.c:1072
+msgid "click start to begin"
+msgstr ""
+
+#: ../src/cache_maint.c:992 ../src/editors.c:1131
+msgid "running..."
+msgstr ""
+
+#: ../src/cache_maint.c:1048
+msgid "Clearing thumbnails..."
+msgstr ""
+
+#: ../src/cache_maint.c:1131 ../src/cache_maint.c:1134
+#: ../src/cache_maint.c:1232 ../src/cache_maint.c:1251
+msgid "Clear cache"
+msgstr ""
+
+#: ../src/cache_maint.c:1135
+msgid ""
+"This will remove all thumbnails that have\n"
+"been saved to disk, continue?"
+msgstr ""
+
+#: ../src/cache_maint.c:1180
+#, c-format
+msgid "Location: %s"
+msgstr ""
+
+#: ../src/cache_maint.c:1205
+msgid "Cache Maintenance"
+msgstr ""
+
+#: ../src/cache_maint.c:1217
+msgid "Cache and Data Maintenance"
+msgstr ""
+
+#: ../src/cache_maint.c:1221
+msgid "Geeqie thumbnail cache"
+msgstr ""
+
+#: ../src/cache_maint.c:1227 ../src/cache_maint.c:1246
+#: ../src/cache_maint.c:1271
+msgid "Clean up"
+msgstr ""
+
+#: ../src/cache_maint.c:1230 ../src/cache_maint.c:1249
+msgid "Remove orphaned or outdated thumbnails."
+msgstr ""
+
+#: ../src/cache_maint.c:1235
+msgid "Delete all cached data."
+msgstr ""
+
+#: ../src/cache_maint.c:1238
+msgid "Shared thumbnail cache"
+msgstr ""
+
+#: ../src/cache_maint.c:1254
+msgid "Delete all cached thumbnails."
+msgstr ""
+
+#: ../src/cache_maint.c:1260
+msgid "Render"
+msgstr ""
+
+#: ../src/cache_maint.c:1263
+msgid "Render thumbnails for a specific folder."
+msgstr ""
+
+#: ../src/cache_maint.c:1274
+msgid "Remove orphaned keywords and comments."
+msgstr ""
+
+#. When does this occur ??
+#: ../src/collect.c:422 ../src/image.c:189 ../src/image-overlay.c:549
+#: ../src/image-overlay.c:626
+msgid "Untitled"
+msgstr ""
+
+#: ../src/collect.c:426
+#, c-format
+msgid "Untitled (%d)"
+msgstr ""
+
+#: ../src/collect.c:1071
+#, c-format
+msgid "%s - Collection - %s"
+msgstr ""
+
+#: ../src/collect.c:1183 ../src/collect.c:1187
+msgid "Close collection"
+msgstr ""
+
+#: ../src/collect.c:1188
+msgid ""
+"Collection has been modified.\n"
+"Save first?"
+msgstr ""
+
+#: ../src/collect.c:1191
+msgid "_Discard"
+msgstr ""
+
+#: ../src/collect-dlg.c:67
+#, c-format
+msgid ""
+"Specified path:\n"
+"%s\n"
+"is a folder, collections are files"
+msgstr ""
+
+#: ../src/collect-dlg.c:68
+msgid "Invalid filename"
+msgstr ""
+
+#: ../src/collect-dlg.c:77
+msgid "Overwrite File"
+msgstr ""
+
+#: ../src/collect-dlg.c:82
+msgid "Overwrite existing file?"
+msgstr ""
+
+#: ../src/collect-dlg.c:84
+msgid "_Overwrite"
+msgstr ""
+
+#: ../src/collect-dlg.c:135
+#, c-format
+msgid "No such file '%s'."
+msgstr ""
+
+#: ../src/collect-dlg.c:140
+#, c-format
+msgid "'%s' is a directory, not a collection file."
+msgstr ""
+
+#: ../src/collect-dlg.c:145
+#, c-format
+msgid "You do not have read permissions on the file '%s'."
+msgstr ""
+
+#: ../src/collect-dlg.c:151
+msgid "Can not open collection file"
+msgstr ""
+
+#: ../src/collect-dlg.c:203
+msgid "Save collection"
+msgstr ""
+
+#: ../src/collect-dlg.c:210 ../src/toolbar.c:84
+msgid "Open collection"
+msgstr ""
+
+#: ../src/collect-dlg.c:218
+msgid "Append collection"
+msgstr ""
+
+#: ../src/collect-dlg.c:219
+msgid "_Append"
+msgstr ""
+
+#: ../src/collect-dlg.c:236
+msgid "Collection Files"
+msgstr ""
+
+#: ../src/collect-io.c:356
+#, c-format
+msgid "failed to open collection (write) \"%s\"\n"
+msgstr ""
+
+#: ../src/collect-io.c:381
+#, c-format
+msgid ""
+"error saving collection file: %s\n"
+"error: %s\n"
+msgstr ""
+
+#: ../src/collect-table.c:212
+#, c-format
+msgid "%s, %d images (%s, %d)"
+msgstr ""
+
+#: ../src/collect-table.c:219
+#, c-format
+msgid "%s, %d images"
+msgstr ""
+
+#: ../src/collect-table.c:224 ../src/layout_util.c:1736
+#: ../src/layout_util.c:2880
+msgid "Empty"
+msgstr ""
+
+#: ../src/collect-table.c:238 ../src/dupe.c:1363 ../src/search.c:386
+#: ../src/view_file/view_file.c:1004 ../src/view_file/view_file.c:1113
+msgid "Loading thumbs..."
+msgstr ""
+
+#: ../src/collect-table.c:933 ../src/dupe.c:2344 ../src/dupe.c:2662
+#: ../src/layout_util.c:1783 ../src/search.c:1095
+msgid "_View"
+msgstr ""
+
+#: ../src/collect-table.c:935 ../src/dupe.c:2346 ../src/dupe.c:2664
+#: ../src/img-view.c:1328 ../src/layout_image.c:691
+#: ../src/pan-view/pan-view.c:2290 ../src/search.c:1097
+#: ../src/view_file/view_file.c:622
+msgid "View in _new window"
+msgstr ""
+
+#: ../src/collect-table.c:937 ../src/pan-view/pan-view.c:2292
+msgid "Go to original"
+msgstr ""
+
+#: ../src/collect-table.c:940 ../src/dupe.c:2385 ../src/dupe.c:2672
+#: ../src/search.c:1132
+msgid "Rem_ove"
+msgstr ""
+
+#: ../src/collect-table.c:943
+msgid "Append from file selection"
+msgstr ""
+
+#: ../src/collect-table.c:945
+msgid "Append from collection..."
+msgstr ""
+
+#: ../src/collect-table.c:949
+msgid "_Selection"
+msgstr ""
+
+#: ../src/collect-table.c:951 ../src/dupe.c:2349 ../src/dupe.c:2667
+#: ../src/layout_util.c:1841 ../src/search.c:1100
+msgid "Select all"
+msgstr ""
+
+#: ../src/collect-table.c:953 ../src/dupe.c:2351 ../src/dupe.c:2669
+#: ../src/layout_util.c:1842 ../src/search.c:1102
+msgid "Select none"
+msgstr ""
+
+#: ../src/collect-table.c:955
+msgid "Invert selection"
+msgstr ""
+
+#: ../src/collect-table.c:957
+msgid "Rectangular selection"
+msgstr ""
+
+#: ../src/collect-table.c:969 ../src/dupe.c:2372 ../src/img-view.c:1332
+#: ../src/layout_image.c:699 ../src/layout_util.c:1816
+#: ../src/pan-view/pan-view.c:2296 ../src/search.c:1119
+#: ../src/view_file/view_file.c:626
+msgid "_Copy..."
+msgstr ""
+
+#: ../src/collect-table.c:971 ../src/dupe.c:2374 ../src/img-view.c:1333
+#: ../src/layout_image.c:701 ../src/layout_util.c:1817
+#: ../src/pan-view/pan-view.c:2298 ../src/search.c:1121
+#: ../src/view_file/view_file.c:628
+msgid "_Move..."
+msgstr ""
+
+#: ../src/collect-table.c:973 ../src/dupe.c:2376 ../src/img-view.c:1334
+#: ../src/layout_image.c:703 ../src/layout_util.c:1818
+#: ../src/pan-view/pan-view.c:2300 ../src/search.c:1123 ../src/view_dir.c:683
+#: ../src/view_file/view_file.c:630
+msgid "_Rename..."
+msgstr ""
+
+#: ../src/collect-table.c:975 ../src/dupe.c:2378 ../src/img-view.c:1335
+#: ../src/layout_image.c:705 ../src/pan-view/pan-view.c:2302
+#: ../src/search.c:1125 ../src/view_dir.c:686 ../src/view_file/view_file.c:632
+msgid "_Copy path"
+msgstr ""
+
+#: ../src/collect-table.c:977 ../src/dupe.c:2380 ../src/img-view.c:1336
+#: ../src/layout_image.c:706 ../src/pan-view/pan-view.c:2304
+#: ../src/search.c:1127 ../src/view_dir.c:689 ../src/view_file/view_file.c:634
+msgid "_Copy path unquoted"
+msgstr ""
+
+#: ../src/collect-table.c:979 ../src/dupe.c:2382 ../src/img-view.c:1337
+#: ../src/layout_image.c:708 ../src/layout_util.c:1819
+#: ../src/layout_util.c:1820 ../src/layout_util.c:1821
+#: ../src/pan-view/pan-view.c:2306 ../src/search.c:1129 ../src/view_dir.c:692
+#: ../src/view_file/view_file.c:636
+msgid "_Delete..."
+msgstr ""
+
+#: ../src/collect-table.c:985
+msgid "Randomize"
+msgstr "Randomise"
+
+#: ../src/collect-table.c:987 ../src/view_file/view_file.c:661
+msgid "_Sort"
+msgstr ""
+
+#: ../src/collect-table.c:990 ../src/view_file/view_file.c:677
+msgid "Show filename _text"
+msgstr ""
+
+#: ../src/collect-table.c:993
+msgid "_Save collection"
+msgstr ""
+
+#: ../src/collect-table.c:995
+msgid "Save collection _as..."
+msgstr ""
+
+#: ../src/collect-table.c:998 ../src/layout_util.c:1812
+#: ../src/view_file/view_file.c:646
+msgid "_Find duplicates..."
+msgstr ""
+
+#: ../src/collect-table.c:1000 ../src/dupe.c:2369 ../src/layout_util.c:1814
+#: ../src/search.c:1116
+msgid "Print..."
+msgstr ""
+
+#: ../src/collect-table.c:2189 ../src/dupe.c:3528 ../src/img-view.c:1496
+msgid "Dropped list includes folders."
+msgstr ""
+
+#: ../src/collect-table.c:2191 ../src/dupe.c:3530 ../src/img-view.c:1498
+msgid "_Add contents"
+msgstr ""
+
+#: ../src/collect-table.c:2193 ../src/dupe.c:3531 ../src/img-view.c:1499
+msgid "Add contents _recursive"
+msgstr ""
+
+#: ../src/collect-table.c:2195 ../src/dupe.c:3532 ../src/img-view.c:1500
+msgid "_Skip folders"
+msgstr ""
+
+#: ../src/collect-table.c:2198 ../src/dupe.c:3534 ../src/img-view.c:1502
+#: ../src/view_dir.c:426
+msgid "Cancel"
+msgstr ""
+
+#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:503
+msgid "sRGB"
+msgstr ""
+
+#: ../src/color-man.c:436
+msgid "Adobe RGB compatible"
+msgstr ""
+
+#: ../src/color-man.c:453
+msgid "Custom profile"
+msgstr ""
+
+#: ../src/debug.c:55
+msgid "error"
+msgstr ""
+
+#: ../src/debug.c:56
+msgid "warning"
+msgstr ""
+
+#: ../src/desktop_file.c:83 ../src/desktop_file.c:95 ../src/desktop_file.c:101
+msgid "Can't save"
+msgstr ""
+
+#: ../src/desktop_file.c:83
+msgid "Please specify file name."
+msgstr ""
+
+#: ../src/desktop_file.c:95
+msgid "Could not create directory"
+msgstr ""
+
+#: ../src/desktop_file.c:191 ../src/desktop_file.c:554
+msgid "Desktop file"
+msgstr ""
+
+#: ../src/desktop_file.c:300 ../src/ui_pathsel.c:494
+#, c-format
+msgid ""
+"Unable to delete file:\n"
+"%s"
+msgstr ""
+
+#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2157
+#: ../src/utilops.c:2184 ../src/utilops.c:2706
+msgid "File deletion failed"
+msgstr ""
+
+#: ../src/desktop_file.c:345 ../src/desktop_file.c:353 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
+msgid "Delete file"
+msgstr ""
+
+#: ../src/desktop_file.c:351 ../src/ui_pathsel.c:543
+#, c-format
+msgid ""
+"About to delete the file:\n"
+" %s"
+msgstr ""
+
+#: ../src/desktop_file.c:383
+msgid "new.desktop"
+msgstr ""
+
+#: ../src/desktop_file.c:467
+msgid "Plugins"
+msgstr ""
+
+#: ../src/desktop_file.c:544
+msgid "Hidden"
+msgstr ""
+
+#: ../src/desktop_file.c:563 ../src/dupe.c:2771 ../src/dupe.c:3310
+#: ../src/print.c:3211 ../src/search.c:3329 ../src/ui_pathsel.c:1120
+#: ../src/utilops.c:501
+msgid "Path"
+msgstr ""
+
+#: ../src/dupe.c:109
+msgid "Drop files to compare them."
+msgstr ""
+
+#: ../src/dupe.c:113
+#, c-format
+msgid "%d files"
+msgstr ""
+
+#: ../src/dupe.c:117
+#, c-format
+msgid "%d matches found in %d files"
+msgstr ""
+
+#: ../src/dupe.c:122
+msgid "[set 1]"
+msgstr ""
+
+#: ../src/dupe.c:1489
+msgid "Reading checksums..."
+msgstr ""
+
+#: ../src/dupe.c:1522
+msgid "Reading dimensions..."
+msgstr ""
+
+#: ../src/dupe.c:1556
+msgid "Reading similarity data..."
+msgstr ""
+
+#: ../src/dupe.c:1592 ../src/dupe.c:1623
+msgid "Comparing..."
+msgstr ""
+
+#: ../src/dupe.c:1603 ../src/pan-view/pan-view.c:1012
+msgid "Sorting..."
+msgstr ""
+
+#: ../src/dupe.c:2353
+msgid "Select group _1 duplicates"
+msgstr ""
+
+#: ../src/dupe.c:2355
+msgid "Select group _2 duplicates"
+msgstr ""
+
+#: ../src/dupe.c:2387 ../src/dupe.c:2674 ../src/search.c:1134
+msgid "C_lear"
+msgstr ""
+
+#: ../src/dupe.c:2390 ../src/dupe.c:2677
+msgid "Close _window"
+msgstr ""
+
+#: ../src/dupe.c:2550
+#, c-format
+msgid "%d files (set 2)"
+msgstr ""
+
+#: ../src/dupe.c:2766
+msgid "Name case-insensitive"
+msgstr ""
+
+#: ../src/dupe.c:2767 ../src/dupe.c:3307 ../src/preferences.c:2017
+#: ../src/print.c:3215 ../src/search.c:3326
+#: ../src/view_file/view_file_list.c:2071
+msgid "Size"
+msgstr ""
+
+#: ../src/dupe.c:2768 ../src/dupe.c:3308 ../src/exif.c:336
+#: ../src/exif-common.c:870 ../src/print.c:3213 ../src/search.c:3327
+#: ../src/view_file/view_file_list.c:2075
+msgid "Date"
+msgstr ""
+
+#: ../src/dupe.c:2769 ../src/dupe.c:3309 ../src/print.c:3217
+#: ../src/search.c:3328
+msgid "Dimensions"
+msgstr ""
+
+#: ../src/dupe.c:2770
+msgid "Checksum"
+msgstr ""
+
+#: ../src/dupe.c:2772
+msgid "Similarity (high)"
+msgstr ""
+
+#: ../src/dupe.c:2773
+msgid "Similarity"
+msgstr ""
+
+#: ../src/dupe.c:2774
+msgid "Similarity (low)"
+msgstr ""
+
+#: ../src/dupe.c:2775
+msgid "Similarity (custom)"
+msgstr ""
+
+#: ../src/dupe.c:3260 ../src/toolbar.c:86
+msgid "Find duplicates"
+msgstr ""
+
+#: ../src/dupe.c:3342
+msgid "Compare to:"
+msgstr ""
+
+#: ../src/dupe.c:3355
+msgid "Compare by:"
+msgstr ""
+
+#: ../src/dupe.c:3363 ../src/preferences.c:1714 ../src/search.c:3342
+msgid "Thumbnails"
+msgstr ""
+
+#: ../src/dupe.c:3371
+msgid "Ignore Rotation"
+msgstr ""
+
+#: ../src/dupe.c:3379
+msgid "Compare two file sets"
+msgstr ""
+
+#: ../src/dupe.c:3399 ../src/menu.c:229
+msgid "Sort"
+msgstr ""
+
+#: ../src/dupe.c:3407
+msgid "Custom Threshold"
+msgstr ""
+
+#: ../src/editors.c:305
+#, c-format
+msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
+msgstr ""
+
+#. flash fired (bit 0)
+#: ../src/editors.c:359 ../src/exif.c:220 ../src/exif-common.c:429
+msgid "yes"
+msgstr ""
+
+#: ../src/editors.c:359 ../src/exif.c:219 ../src/exif-common.c:429
+msgid "no"
+msgstr ""
+
+#: ../src/editors.c:531
+msgid "stopping..."
+msgstr ""
+
+#: ../src/editors.c:552
+msgid "Edit command results"
+msgstr ""
+
+#: ../src/editors.c:555
+#, c-format
+msgid "Output of %s"
+msgstr ""
+
+#: ../src/editors.c:1082
+#, c-format
+msgid ""
+"Failed to run command:\n"
+"%s\n"
+msgstr ""
+
+#: ../src/editors.c:1209
+msgid "stopped by user"
+msgstr ""
+
+#: ../src/editors.c:1294
+#, c-format
+msgid ""
+"%s\n"
+"\"%s\""
+msgstr ""
+
+#: ../src/editors.c:1296
+msgid "Invalid editor command"
+msgstr ""
+
+#: ../src/editors.c:1383
+msgid "Editor template is empty."
+msgstr ""
+
+#: ../src/editors.c:1384
+msgid "Editor template has incorrect syntax."
+msgstr ""
+
+#: ../src/editors.c:1385
+msgid "Editor template uses incompatible macros."
+msgstr ""
+
+#: ../src/editors.c:1386
+msgid "Can't find matching file type."
+msgstr ""
+
+#: ../src/editors.c:1387
+msgid "Can't execute external editor."
+msgstr ""
+
+#: ../src/editors.c:1388
+msgid "External editor returned error status."
+msgstr ""
+
+#: ../src/editors.c:1389
+msgid "File was skipped."
+msgstr ""
+
+#: ../src/editors.c:1390
+msgid "Unknown error."
+msgstr ""
+
+#: ../src/exif.c:142 ../src/exif.c:155 ../src/exif.c:169 ../src/exif.c:194
+#: ../src/exif.c:311 ../src/exif.c:658 ../src/exif-common.c:405
+#: ../src/exif-common.c:408 ../src/exif-common.c:475
+msgid "unknown"
+msgstr ""
+
+#: ../src/exif.c:143
+msgid "top left"
+msgstr ""
+
+#: ../src/exif.c:144
+msgid "top right"
+msgstr ""
+
+#: ../src/exif.c:145
+msgid "bottom right"
+msgstr ""
+
+#: ../src/exif.c:146
+msgid "bottom left"
+msgstr ""
+
+#: ../src/exif.c:147
+msgid "left top"
+msgstr ""
+
+#: ../src/exif.c:148
+msgid "right top"
+msgstr ""
+
+#: ../src/exif.c:149
+msgid "right bottom"
+msgstr ""
+
+#: ../src/exif.c:150
+msgid "left bottom"
+msgstr ""
+
+#: ../src/exif.c:157
+msgid "inch"
+msgstr ""
+
+#: ../src/exif.c:158
+msgid "centimeter"
+msgstr "centimetre"
+
+#: ../src/exif.c:170
+msgid "average"
+msgstr ""
+
+#: ../src/exif.c:171
+msgid "center weighted"
+msgstr "centre weighted"
+
+#: ../src/exif.c:172
+msgid "spot"
+msgstr ""
+
+#: ../src/exif.c:173
+msgid "multi-spot"
+msgstr ""
+
+#: ../src/exif.c:174
+msgid "multi-segment"
+msgstr ""
+
+#: ../src/exif.c:175
+msgid "partial"
+msgstr ""
+
+#: ../src/exif.c:176 ../src/exif.c:214
+msgid "other"
+msgstr ""
+
+#: ../src/exif.c:181 ../src/exif.c:233
+msgid "not defined"
+msgstr ""
+
+#: ../src/exif.c:182 ../src/exif.c:261 ../src/exif.c:268
+msgid "manual"
+msgstr ""
+
+#: ../src/exif.c:183 ../src/exif.c:254 ../src/exif.c:290 ../src/exif.c:297
+#: ../src/exif.c:304
+msgid "normal"
+msgstr ""
+
+#: ../src/exif.c:184
+msgid "aperture"
+msgstr ""
+
+#: ../src/exif.c:185
+msgid "shutter"
+msgstr ""
+
+#: ../src/exif.c:186
+msgid "creative"
+msgstr ""
+
+#: ../src/exif.c:187
+msgid "action"
+msgstr ""
+
+#: ../src/exif.c:188 ../src/exif.c:275
+msgid "portrait"
+msgstr ""
+
+#: ../src/exif.c:189 ../src/exif.c:274
+msgid "landscape"
+msgstr ""
+
+#: ../src/exif.c:195
+msgid "daylight"
+msgstr ""
+
+#: ../src/exif.c:196
+msgid "fluorescent"
+msgstr ""
+
+#: ../src/exif.c:197
+msgid "tungsten (incandescent)"
+msgstr ""
+
+#: ../src/exif.c:198
+msgid "flash"
+msgstr ""
+
+#: ../src/exif.c:199
+msgid "fine weather"
+msgstr ""
+
+#: ../src/exif.c:200
+msgid "cloudy weather"
+msgstr ""
+
+#: ../src/exif.c:201
+msgid "shade"
+msgstr ""
+
+#: ../src/exif.c:202
+msgid "daylight fluorescent"
+msgstr ""
+
+#: ../src/exif.c:203
+msgid "day white fluorescent"
+msgstr ""
+
+#: ../src/exif.c:204
+msgid "cool white fluorescent"
+msgstr ""
+
+#: ../src/exif.c:205
+msgid "white fluorescent"
+msgstr ""
+
+#: ../src/exif.c:206
+msgid "standard light A"
+msgstr ""
+
+#: ../src/exif.c:207
+msgid "standard light B"
+msgstr ""
+
+#: ../src/exif.c:208
+msgid "standard light C"
+msgstr ""
+
+#: ../src/exif.c:209
+msgid "D55"
+msgstr ""
+
+#: ../src/exif.c:210
+msgid "D65"
+msgstr ""
+
+#: ../src/exif.c:211
+msgid "D75"
+msgstr ""
+
+#: ../src/exif.c:212
+msgid "D50"
+msgstr ""
+
+#: ../src/exif.c:213
+msgid "ISO studio tungsten"
+msgstr ""
+
+#: ../src/exif.c:221
+msgid "yes, not detected by strobe"
+msgstr ""
+
+#: ../src/exif.c:222
+msgid "yes, detected by strobe"
+msgstr ""
+
+#: ../src/exif.c:228
+msgid "uncalibrated"
+msgstr ""
+
+#: ../src/exif.c:234
+msgid "1 chip color area"
+msgstr "1 chip colour area"
+
+#: ../src/exif.c:235
+msgid "2 chip color area"
+msgstr "2 chip colour area"
+
+#: ../src/exif.c:236
+msgid "3 chip color area"
+msgstr "3 chip colour area"
+
+#: ../src/exif.c:237
+msgid "color sequential area"
+msgstr "colour sequential area"
+
+#: ../src/exif.c:238
+msgid "trilinear"
+msgstr ""
+
+#: ../src/exif.c:239
+msgid "color sequential linear"
+msgstr "colour sequential linear"
+
+#: ../src/exif.c:244
+msgid "digital still camera"
+msgstr ""
+
+#: ../src/exif.c:249
+msgid "direct photo"
+msgstr ""
+
+#: ../src/exif.c:255
+msgid "custom"
+msgstr ""
+
+#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:443
+msgid "auto"
+msgstr ""
+
+#: ../src/exif.c:262
+msgid "auto bracket"
+msgstr ""
+
+#: ../src/exif.c:273
+msgid "standard"
+msgstr ""
+
+#: ../src/exif.c:276
+msgid "night scene"
+msgstr ""
+
+#: ../src/exif.c:281
+msgid "none"
+msgstr ""
+
+#: ../src/exif.c:282
+msgid "low gain up"
+msgstr ""
+
+#: ../src/exif.c:283
+msgid "high gain up"
+msgstr ""
+
+#: ../src/exif.c:284
+msgid "low gain down"
+msgstr ""
+
+#: ../src/exif.c:285
+msgid "high gain down"
+msgstr ""
+
+#: ../src/exif.c:291 ../src/exif.c:305
+msgid "soft"
+msgstr ""
+
+#: ../src/exif.c:292 ../src/exif.c:306
+msgid "hard"
+msgstr ""
+
+#: ../src/exif.c:298
+msgid "low"
+msgstr ""
+
+#: ../src/exif.c:299
+msgid "high"
+msgstr ""
+
+#: ../src/exif.c:312
+msgid "macro"
+msgstr ""
+
+#: ../src/exif.c:313
+msgid "close"
+msgstr ""
+
+#: ../src/exif.c:314
+msgid "distant"
+msgstr ""
+
+#: ../src/exif.c:324
+msgid "Image Width"
+msgstr ""
+
+#: ../src/exif.c:325
+msgid "Image Height"
+msgstr ""
+
+#: ../src/exif.c:326
+msgid "Bits per Sample/Pixel"
+msgstr ""
+
+#: ../src/exif.c:327
+msgid "Compression"
+msgstr ""
+
+#: ../src/exif.c:328
+msgid "Image description"
+msgstr ""
+
+#: ../src/exif.c:329
+msgid "Camera make"
+msgstr ""
+
+#: ../src/exif.c:330
+msgid "Camera model"
+msgstr ""
+
+#: ../src/exif.c:331
+msgid "Orientation"
+msgstr ""
+
+#: ../src/exif.c:332
+msgid "X resolution"
+msgstr ""
+
+#: ../src/exif.c:333
+msgid "Y Resolution"
+msgstr ""
+
+#: ../src/exif.c:334
+msgid "Resolution units"
+msgstr ""
+
+#: ../src/exif.c:335
+msgid "Firmware"
+msgstr ""
+
+#: ../src/exif.c:337
+msgid "White point"
+msgstr ""
+
+#: ../src/exif.c:338
+msgid "Primary chromaticities"
+msgstr ""
+
+#: ../src/exif.c:339
+msgid "YCbCy coefficients"
+msgstr ""
+
+#: ../src/exif.c:340
+msgid "YCbCr positioning"
+msgstr ""
+
+#: ../src/exif.c:341
+msgid "Black white reference"
+msgstr ""
+
+#: ../src/exif.c:343
+msgid "SubIFD Exif offset"
+msgstr ""
+
+#. subIFD follows
+#: ../src/exif.c:345
+msgid "Exposure time (seconds)"
+msgstr ""
+
+#: ../src/exif.c:346
+msgid "FNumber"
+msgstr ""
+
+#: ../src/exif.c:347
+msgid "Exposure program"
+msgstr ""
+
+#: ../src/exif.c:348
+msgid "Spectral Sensitivity"
+msgstr ""
+
+#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:875
+msgid "ISO sensitivity"
+msgstr ""
+
+#: ../src/exif.c:350
+msgid "Optoelectric conversion factor"
+msgstr ""
+
+#: ../src/exif.c:351
+msgid "Exif version"
+msgstr ""
+
+#: ../src/exif.c:352
+msgid "Date original"
+msgstr ""
+
+#: ../src/exif.c:353
+msgid "Date digitized"
+msgstr "Date digitised"
+
+#: ../src/exif.c:354
+msgid "Pixel format"
+msgstr ""
+
+#: ../src/exif.c:355
+msgid "Compression ratio"
+msgstr ""
+
+#: ../src/exif.c:356 ../src/exif-common.c:872
+msgid "Shutter speed"
+msgstr ""
+
+#: ../src/exif.c:357 ../src/exif-common.c:873
+msgid "Aperture"
+msgstr ""
+
+#: ../src/exif.c:358
+msgid "Brightness"
+msgstr ""
+
+#: ../src/exif.c:359 ../src/exif-common.c:874
+msgid "Exposure bias"
+msgstr ""
+
+#: ../src/exif.c:360
+msgid "Maximum aperture"
+msgstr ""
+
+#: ../src/exif.c:361 ../src/exif-common.c:878
+msgid "Subject distance"
+msgstr ""
+
+#: ../src/exif.c:362
+msgid "Metering mode"
+msgstr ""
+
+#: ../src/exif.c:363
+msgid "Light source"
+msgstr ""
+
+#: ../src/exif.c:364 ../src/exif-common.c:879
+msgid "Flash"
+msgstr ""
+
+#: ../src/exif.c:365 ../src/exif-common.c:876
+msgid "Focal length"
+msgstr ""
+
+#: ../src/exif.c:366
+msgid "Subject area"
+msgstr ""
+
+#: ../src/exif.c:367
+msgid "MakerNote"
+msgstr ""
+
+#: ../src/exif.c:368
+msgid "UserComment"
+msgstr ""
+
+#: ../src/exif.c:369
+msgid "Subsecond time"
+msgstr ""
+
+#: ../src/exif.c:370
+msgid "Subsecond time original"
+msgstr ""
+
+#: ../src/exif.c:371
+msgid "Subsecond time digitized"
+msgstr "Subsecond time digitised"
+
+#: ../src/exif.c:372
+msgid "FlashPix version"
+msgstr ""
+
+#: ../src/exif.c:373
+msgid "Colorspace"
+msgstr "Colourspace"
+
+#. ExifImageWidth, ExifImageHeight can also be unsigned short
+#: ../src/exif.c:375 ../src/preferences.c:2829
+msgid "Width"
+msgstr ""
+
+#: ../src/exif.c:376 ../src/preferences.c:2831
+msgid "Height"
+msgstr ""
+
+#: ../src/exif.c:377
+msgid "Audio data"
+msgstr ""
+
+#: ../src/exif.c:378
+msgid "ExifR98 extension"
+msgstr ""
+
+#: ../src/exif.c:379
+msgid "Flash strength"
+msgstr ""
+
+#: ../src/exif.c:380
+msgid "Spatial frequency response"
+msgstr ""
+
+#: ../src/exif.c:381
+msgid "X Pixel density"
+msgstr ""
+
+#: ../src/exif.c:382
+msgid "Y Pixel density"
+msgstr ""
+
+#: ../src/exif.c:383
+msgid "Pixel density units"
+msgstr ""
+
+#: ../src/exif.c:384
+msgid "Subject location"
+msgstr ""
+
+#: ../src/exif.c:386
+msgid "Sensor type"
+msgstr ""
+
+#: ../src/exif.c:387
+msgid "Source type"
+msgstr ""
+
+#: ../src/exif.c:388
+msgid "Scene type"
+msgstr ""
+
+#: ../src/exif.c:389
+msgid "Color filter array pattern"
+msgstr "Colour filter array pattern"
+
+#. tags a4xx were added for Exif 2.2 (not just these - some above, as well)
+#: ../src/exif.c:391
+msgid "Render process"
+msgstr ""
+
+#: ../src/exif.c:392
+msgid "Exposure mode"
+msgstr ""
+
+#: ../src/exif.c:393
+msgid "White balance"
+msgstr ""
+
+#: ../src/exif.c:394
+msgid "Digital zoom ratio"
+msgstr ""
+
+#: ../src/exif.c:395
+msgid "Focal length (35mm)"
+msgstr ""
+
+#: ../src/exif.c:396
+msgid "Scene capture type"
+msgstr ""
+
+#: ../src/exif.c:397
+msgid "Gain control"
+msgstr ""
+
+#: ../src/exif.c:398
+msgid "Contrast"
+msgstr ""
+
+#: ../src/exif.c:399 ../src/preferences.c:2435
+msgid "Saturation"
+msgstr ""
+
+#: ../src/exif.c:400
+msgid "Sharpness"
+msgstr ""
+
+#: ../src/exif.c:401
+msgid "Device setting"
+msgstr ""
+
+#: ../src/exif.c:402
+msgid "Subject range"
+msgstr ""
+
+#: ../src/exif.c:403
+msgid "Image serial number"
+msgstr ""
+
+#: ../src/exif.c:1110
+msgid "Can't get image comment: not compiled with Exiv2.\n"
+msgstr ""
+
+#: ../src/exif.c:1116
+msgid "Can't set image comment: not compiled with Exiv2.\n"
+msgstr ""
+
+#: ../src/exif-common.c:404
+msgid "infinity"
+msgstr ""
+
+#: ../src/exif-common.c:433
+msgid "mode:"
+msgstr ""
+
+#: ../src/exif-common.c:437 ../src/trash.c:213
+msgid "on"
+msgstr ""
+
+#: ../src/exif-common.c:440 ../src/trash.c:218
+msgid "off"
+msgstr ""
+
+#: ../src/exif-common.c:449
+msgid "not detected by strobe"
+msgstr ""
+
+#: ../src/exif-common.c:450
+msgid "detected by strobe"
+msgstr ""
+
+#. we ignore flash function (bit 5)
+#. red-eye (bit 6)
+#: ../src/exif-common.c:455
+msgid "red-eye reduction"
+msgstr ""
+
+#: ../src/exif-common.c:475
+msgid "dot"
+msgstr ""
+
+#: ../src/exif-common.c:508
+msgid "AdobeRGB"
+msgstr ""
+
+#: ../src/exif-common.c:516
+msgid "embedded"
+msgstr ""
+
+#: ../src/exif-common.c:611
+msgid "Above Sea Level"
+msgstr ""
+
+#: ../src/exif-common.c:611
+msgid "Below Sea Level"
+msgstr ""
+
+#: ../src/exif-common.c:869
+msgid "Camera"
+msgstr ""
+
+#: ../src/exif-common.c:871
+msgid "DateDigitized"
+msgstr "DateDigitised"
+
+#: ../src/exif-common.c:877
+msgid "Focal length 35mm"
+msgstr ""
+
+#: ../src/exif-common.c:880
+msgid "Resolution"
+msgstr ""
+
+#: ../src/exif-common.c:881
+msgid "Color profile"
+msgstr "Colour profile"
+
+#: ../src/exif-common.c:882
+msgid "GPS position"
+msgstr ""
+
+#: ../src/exif-common.c:883
+msgid "GPS altitude"
+msgstr ""
+
+#: ../src/exif-common.c:884
+msgid "Local time"
+msgstr ""
+
+#: ../src/exif-common.c:885
+msgid "Time zone"
+msgstr ""
+
+#: ../src/exif-common.c:886
+msgid "Star rating"
+msgstr ""
+
+#: ../src/exif-common.c:887
+msgid "File size"
+msgstr ""
+
+#: ../src/exif-common.c:888
+msgid "File date"
+msgstr ""
+
+#: ../src/exif-common.c:889
+msgid "File mode"
+msgstr ""
+
+#: ../src/exif-common.c:890
+msgid "File ctime"
+msgstr ""
+
+#: ../src/filedata.c:110
+#, c-format
+msgid "%d bytes"
+msgstr ""
+
+#: ../src/filedata.c:114
+#, c-format
+msgid "%.1f K"
+msgstr ""
+
+#: ../src/filedata.c:118
+#, c-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../src/filedata.c:123
+#, c-format
+msgid "%.1f GB"
+msgstr ""
+
+#: ../src/filedata.c:2625
+msgid "file or directory does not exist"
+msgstr ""
+
+#: ../src/filedata.c:2631
+msgid "destination already exists"
+msgstr ""
+
+#: ../src/filedata.c:2637
+msgid "destination can't be overwritten"
+msgstr ""
+
+#: ../src/filedata.c:2643
+msgid "destination directory is not writable"
+msgstr ""
+
+#: ../src/filedata.c:2649
+msgid "destination directory does not exist"
+msgstr ""
+
+#: ../src/filedata.c:2655
+msgid "source directory is not writable"
+msgstr ""
+
+#: ../src/filedata.c:2661
+msgid "no read permission"
+msgstr ""
+
+#: ../src/filedata.c:2667
+msgid "file is readonly"
+msgstr ""
+
+#: ../src/filedata.c:2673
+msgid "destination already exists and will be overwritten"
+msgstr ""
+
+#: ../src/filedata.c:2679
+msgid "source and destination are the same"
+msgstr ""
+
+#: ../src/filedata.c:2685
+msgid "source and destination have different extension"
+msgstr ""
+
+#: ../src/filedata.c:2691
+msgid "there are unsaved metadata changes for the file"
+msgstr ""
+
+#: ../src/filedata.c:2697
+msgid "another destination file has the same filename"
+msgstr ""
+
+#: ../src/filedata.c:3251
+#, c-format
+msgid "Error: Unable to write marks lists to: %s\n"
+msgstr ""
+
+#: ../src/fullscreen.c:242 ../src/layout_util.c:1883 ../src/layout_util.c:1884
+#: ../src/layout_util.c:1885 ../src/preferences.c:2030
+msgid "Full screen"
+msgstr ""
+
+#: ../src/fullscreen.c:413
+msgid "Full size"
+msgstr ""
+
+#: ../src/fullscreen.c:421
+msgid "Monitor"
+msgstr ""
+
+#: ../src/fullscreen.c:427
+msgid "Screen"
+msgstr ""
+
+#: ../src/fullscreen.c:661
+msgid "Determined by Window Manager"
+msgstr ""
+
+#: ../src/fullscreen.c:662
+msgid "Active screen"
+msgstr ""
+
+#: ../src/fullscreen.c:664
+msgid "Active monitor"
+msgstr ""
+
+#: ../src/histogram.c:121
+msgid "Log Histogram on Red"
+msgstr ""
+
+#: ../src/histogram.c:122
+msgid "Log Histogram on Green"
+msgstr ""
+
+#: ../src/histogram.c:123
+msgid "Log Histogram on Blue"
+msgstr ""
+
+#: ../src/histogram.c:124
+msgid "Log Histogram on RGB"
+msgstr ""
+
+#: ../src/histogram.c:125
+msgid "Log Histogram on value"
+msgstr ""
+
+#: ../src/histogram.c:130
+msgid "Linear Histogram on Red"
+msgstr ""
+
+#: ../src/histogram.c:131
+msgid "Linear Histogram on Green"
+msgstr ""
+
+#: ../src/histogram.c:132
+msgid "Linear Histogram on Blue"
+msgstr ""
+
+#: ../src/histogram.c:133
+msgid "Linear Histogram on RGB"
+msgstr ""
+
+#: ../src/histogram.c:134
+msgid "Linear Histogram on value"
+msgstr ""
+
+#: ../src/history_list.c:214
+#, c-format
+msgid "Unable to write history lists to: %s\n"
+msgstr ""
+
+#: ../src/image.c:190
+#, c-format
+msgid " (Collection %s)"
+msgstr ""
+
+#: ../src/image_load_jpeg.c:163
+#, c-format
+msgid "Error interpreting JPEG image file (%s)"
+msgstr ""
+
+#: ../src/img-view.c:1312 ../src/layout_image.c:674 ../src/layout_util.c:1850
+#: ../src/layout_util.c:1851 ../src/layout_util.c:1866
+#: ../src/layout_util.c:1867 ../src/pan-view/pan-view.c:2275
+msgid "Zoom _in"
+msgstr ""
+
+#: ../src/img-view.c:1313 ../src/layout_image.c:675 ../src/layout_util.c:1852
+#: ../src/layout_util.c:1853 ../src/layout_util.c:1868
+#: ../src/layout_util.c:1869 ../src/pan-view/pan-view.c:2277
+msgid "Zoom _out"
+msgstr ""
+
+#: ../src/img-view.c:1314 ../src/layout_image.c:676 ../src/layout_util.c:1854
+#: ../src/layout_util.c:1855 ../src/layout_util.c:1870
+#: ../src/layout_util.c:1871 ../src/pan-view/pan-view.c:2279
+msgid "Zoom _1:1"
+msgstr ""
+
+#: ../src/img-view.c:1315 ../src/layout_image.c:677
+msgid "Fit image to _window"
+msgstr ""
+
+#: ../src/img-view.c:1324 ../src/layout_image.c:687 ../src/layout_util.c:1848
+msgid "Set as _wallpaper"
+msgstr ""
+
+#: ../src/img-view.c:1329 ../src/layout_image.c:694
+msgid "_Go to directory view"
+msgstr ""
+
+#: ../src/img-view.c:1348 ../src/layout_image.c:719
+msgid "_Stop slideshow"
+msgstr ""
+
+#: ../src/img-view.c:1351 ../src/layout_image.c:722
+msgid "Continue slides_how"
+msgstr ""
+
+#: ../src/img-view.c:1356 ../src/img-view.c:1364 ../src/layout_image.c:727
+#: ../src/layout_image.c:734
+msgid "Pause slides_how"
+msgstr ""
+
+#: ../src/img-view.c:1362 ../src/layout_image.c:733
+msgid "_Start slideshow"
+msgstr ""
+
+#: ../src/img-view.c:1370 ../src/layout_image.c:744
+#: ../src/pan-view/pan-view.c:2359
+msgid "Exit _full screen"
+msgstr ""
+
+#: ../src/img-view.c:1374 ../src/layout_image.c:740
+#: ../src/pan-view/pan-view.c:2363
+msgid "_Full screen"
+msgstr ""
+
+#: ../src/img-view.c:1378 ../src/layout_util.c:1826
+#: ../src/pan-view/pan-view.c:2367
+msgid "C_lose window"
+msgstr ""
+
+#: ../src/layout.c:407 ../src/view_file/view_file.c:658
+msgid "Ascending"
+msgstr ""
+
+#: ../src/layout.c:487
+msgid "Scroll to top left corner"
+msgstr ""
+
+#: ../src/layout.c:492
+msgid "Scroll to image center"
+msgstr ""
+
+#: ../src/layout.c:497
+msgid "Keep the region from previous image"
+msgstr ""
+
+#: ../src/layout.c:603
+msgid " Slideshow"
+msgstr ""
+
+#: ../src/layout.c:607
+msgid " Paused"
+msgstr ""
+
+#: ../src/layout.c:623
+#, c-format
+msgid "%s, %d files (%s, %d)%s"
+msgstr ""
+
+#: ../src/layout.c:630
+#, c-format
+msgid "%s, %d files%s"
+msgstr ""
+
+#: ../src/layout.c:635
+#, c-format
+msgid "%d files%s"
+msgstr ""
+
+#: ../src/layout.c:681
+#, c-format
+msgid "(no read permission) %s bytes"
+msgstr ""
+
+#: ../src/layout.c:685
+#, c-format
+msgid "( ? x ? ) %s bytes"
+msgstr ""
+
+#: ../src/layout.c:693
+#, c-format
+msgid "( %d x %d ) %s bytes"
+msgstr ""
+
+#: ../src/layout.c:779
+msgid "Select sort order"
+msgstr ""
+
+#: ../src/layout.c:784
+msgid "Folder contents (files selected)"
+msgstr ""
+
+#: ../src/layout.c:793
+msgid "(Image dimensions) Image size"
+msgstr ""
+
+#: ../src/layout.c:803
+msgid "Select zoom and scroll mode"
+msgstr ""
+
+#. expand only in small format
+#: ../src/layout.c:813
+msgid "[Pixel x,y coord]: (Pixel R,G,B value)"
+msgstr ""
+
+#: ../src/layout.c:1458 ../src/layout_config.c:67
+msgid "Tools"
+msgstr ""
+
+#: ../src/layout.c:2085
+msgid "Window options and layout"
+msgstr ""
+
+#: ../src/layout.c:2150
+msgid "General options"
+msgstr ""
+
+#: ../src/layout.c:2152
+msgid "Home path (empty to use your home directory)"
+msgstr ""
+
+#: ../src/layout.c:2160
+msgid "Use current"
+msgstr ""
+
+#: ../src/layout.c:2163
+msgid "Show date in directories list view"
+msgstr ""
+
+#: ../src/layout.c:2166
+msgid "Exit program when this window is closed"
+msgstr ""
+
+#: ../src/layout.c:2169
+msgid "Start-up directory:"
+msgstr ""
+
+#: ../src/layout.c:2171
+msgid "No change"
+msgstr ""
+
+#: ../src/layout.c:2174
+msgid "Restore last path"
+msgstr ""
+
+#: ../src/layout.c:2177
+msgid "Home path"
+msgstr ""
+
+#: ../src/layout.c:2181 ../src/print.c:3375 ../src/print.c:3382
+msgid "Layout"
+msgstr ""
+
+#: ../src/layout.c:2428
+msgid "Invalid geometry\n"
+msgstr ""
+
+#: ../src/layout_config.c:67 ../src/preferences.c:2150 ../src/ui_pathsel.c:1187
+msgid "Files"
+msgstr ""
+
+#: ../src/layout_config.c:67 ../src/preferences.c:109 ../src/preferences.c:1915
+#: ../src/print.c:133 ../src/search.c:2088 ../src/search.c:3239
+msgid "Image"
+msgstr ""
+
+#: ../src/layout_config.c:358
+msgid "(drag to change order)"
+msgstr ""
+
+#: ../src/layout_image.c:747
+msgid "_Animate"
+msgstr ""
+
+#: ../src/layout_image.c:751
+msgid "Hide file _list"
+msgstr ""
+
+#: ../src/layout_image.c:1942
+#, c-format
+msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
+msgstr ""
+
+#: ../src/layout_image.c:1950
+#, c-format
+msgid "[%*s,%*s]: RGB(---,---,---)"
+msgstr ""
+
+#: ../src/layout_util.c:255 ../src/layout_util.c:1912
+msgid "Clear Marks"
+msgstr ""
+
+#: ../src/layout_util.c:569
+msgid "Operation failed:\n"
+msgstr ""
+
+#: ../src/layout_util.c:572
+msgid "No file extension\n"
+msgstr ""
+
+#: ../src/layout_util.c:574
+msgid "Cannot create tmp file\n"
+msgstr ""
+
+#: ../src/layout_util.c:576
+msgid "Operation not supported for filetype\n"
+msgstr ""
+
+#: ../src/layout_util.c:578
+msgid "File is not writable\n"
+msgstr ""
+
+#: ../src/layout_util.c:580
+msgid "Exiftran error\n"
+msgstr ""
+
+#: ../src/layout_util.c:582
+msgid "Mogrify error\n"
+msgstr ""
+
+#: ../src/layout_util.c:586
+msgid "Image orientation"
+msgstr ""
+
+#: ../src/layout_util.c:1776
+msgid "_File"
+msgstr ""
+
+#: ../src/layout_util.c:1777
+msgid "_Go"
+msgstr ""
+
+#: ../src/layout_util.c:1778 ../src/menu.c:119
+msgid "_Edit"
+msgstr ""
+
+#: ../src/layout_util.c:1779
+msgid "_Select"
+msgstr ""
+
+#: ../src/layout_util.c:1780 ../src/menu.c:380
+msgid "_Orientation"
+msgstr ""
+
+#: ../src/layout_util.c:1781
+msgid "_Rating"
+msgstr ""
+
+#: ../src/layout_util.c:1782
+msgid "P_references"
+msgstr ""
+
+#: ../src/layout_util.c:1784
+msgid "_Files and Folders"
+msgstr ""
+
+#: ../src/layout_util.c:1785
+msgid "_Zoom"
+msgstr ""
+
+#: ../src/layout_util.c:1786
+msgid "_Color Management"
+msgstr "_Colour Management"
+
+#: ../src/layout_util.c:1787
+msgid "_Connected Zoom"
+msgstr ""
+
+#: ../src/layout_util.c:1788
+msgid "Spli_t"
+msgstr ""
+
+#: ../src/layout_util.c:1789
+msgid "Stere_o"
+msgstr ""
+
+#: ../src/layout_util.c:1790 ../src/layout_util.c:1928
+msgid "Image _Overlay"
+msgstr ""
+
+#: ../src/layout_util.c:1791
+msgid "_Plugins"
+msgstr ""
+
+#: ../src/layout_util.c:1792
+msgid "_Help"
+msgstr ""
+
+#: ../src/layout_util.c:1794
+msgid "_First Image"
+msgstr ""
+
+#: ../src/layout_util.c:1794 ../src/toolbar.c:74
+msgid "First Image"
+msgstr ""
+
+#: ../src/layout_util.c:1795 ../src/layout_util.c:1796
+#: ../src/layout_util.c:1797
+msgid "_Previous Image"
+msgstr ""
+
+#: ../src/layout_util.c:1795 ../src/layout_util.c:1796
+#: ../src/layout_util.c:1797 ../src/toolbar.c:75
+msgid "Previous Image"
+msgstr ""
+
+#: ../src/layout_util.c:1798 ../src/layout_util.c:1799
+#: ../src/layout_util.c:1800
+msgid "_Next Image"
+msgstr ""
+
+#: ../src/layout_util.c:1798 ../src/layout_util.c:1799
+#: ../src/layout_util.c:1800 ../src/toolbar.c:76
+msgid "Next Image"
+msgstr ""
+
+#: ../src/layout_util.c:1801
+msgid "_Last Image"
+msgstr ""
+
+#: ../src/layout_util.c:1801 ../src/toolbar.c:77
+msgid "Last Image"
+msgstr ""
+
+#: ../src/layout_util.c:1802
+msgid "_Back"
+msgstr ""
+
+#: ../src/layout_util.c:1802 ../src/toolbar.c:78
+msgid "Back"
+msgstr ""
+
+#: ../src/layout_util.c:1803
+msgid "_Forward"
+msgstr ""
+
+#: ../src/layout_util.c:1803 ../src/toolbar.c:79
+msgid "Forward"
+msgstr ""
+
+#: ../src/layout_util.c:1804
+msgid "_Home"
+msgstr ""
+
+#: ../src/layout_util.c:1804 ../src/options.c:203 ../src/toolbar.c:80
+#: ../src/ui_bookmark.c:567 ../src/ui_pathsel.c:1056
+msgid "Home"
+msgstr ""
+
+#: ../src/layout_util.c:1805
+msgid "_Up"
+msgstr ""
+
+#: ../src/layout_util.c:1805 ../src/toolbar.c:81
+msgid "Up"
+msgstr ""
+
+#: ../src/layout_util.c:1807 ../src/toolbar.c:82
+msgid "New _window"
+msgstr ""
+
+#: ../src/layout_util.c:1807
+msgid "New window"
+msgstr ""
+
+#: ../src/layout_util.c:1808
+msgid "_New collection"
+msgstr ""
+
+#: ../src/layout_util.c:1808 ../src/menu.c:439 ../src/toolbar.c:83
+msgid "New collection"
+msgstr ""
+
+#: ../src/layout_util.c:1809
+msgid "_Open collection..."
+msgstr ""
+
+#: ../src/layout_util.c:1809
+msgid "Open collection..."
+msgstr ""
+
+#: ../src/layout_util.c:1810
+msgid "Open recen_t"
+msgstr ""
+
+#: ../src/layout_util.c:1810
+msgid "Open recent"
+msgstr ""
+
+#: ../src/layout_util.c:1811
+msgid "_Search..."
+msgstr ""
+
+#: ../src/layout_util.c:1811
+msgid "Search..."
+msgstr ""
+
+#: ../src/layout_util.c:1812
+msgid "Find duplicates..."
+msgstr ""
+
+#: ../src/layout_util.c:1813
+msgid "Pa_n view"
+msgstr ""
+
+#: ../src/layout_util.c:1813 ../src/toolbar.c:87
+msgid "Pan view"
+msgstr ""
+
+#: ../src/layout_util.c:1814
+msgid "_Print..."
+msgstr ""
+
+#: ../src/layout_util.c:1815
+msgid "N_ew folder..."
+msgstr ""
+
+#: ../src/layout_util.c:1815
+msgid "New folder..."
+msgstr ""
+
+#: ../src/layout_util.c:1816
+msgid "Copy..."
+msgstr ""
+
+#: ../src/layout_util.c:1817
+msgid "Move..."
+msgstr ""
+
+#: ../src/layout_util.c:1818
+msgid "Rename..."
+msgstr ""
+
+#: ../src/layout_util.c:1819 ../src/layout_util.c:1820
+#: ../src/layout_util.c:1821
+msgid "Delete..."
+msgstr ""
+
+#: ../src/layout_util.c:1822 ../src/view_file/view_file.c:640
+msgid "Enable file _grouping"
+msgstr ""
+
+#: ../src/layout_util.c:1822
+msgid "Enable file grouping"
+msgstr ""
+
+#: ../src/layout_util.c:1823 ../src/view_file/view_file.c:642
+msgid "Disable file groupi_ng"
+msgstr ""
+
+#: ../src/layout_util.c:1823
+msgid "Disable file grouping"
+msgstr ""
+
+#: ../src/layout_util.c:1824
+msgid "_Copy path to clipboard"
+msgstr ""
+
+#: ../src/layout_util.c:1824
+msgid "Copy path to clipboard"
+msgstr ""
+
+#: ../src/layout_util.c:1825
+msgid "_Copy path unquoted to clipboard"
+msgstr ""
+
+#: ../src/layout_util.c:1825
+msgid "Copy path unquoted to clipboard"
+msgstr ""
+
+#: ../src/layout_util.c:1826
+msgid "Close window"
+msgstr ""
+
+#: ../src/layout_util.c:1827
+msgid "_Quit"
+msgstr ""
+
+#: ../src/layout_util.c:1827 ../src/toolbar.c:117
+msgid "Quit"
+msgstr ""
+
+#: ../src/layout_util.c:1828 ../src/menu.c:322
+msgid "_Rotate clockwise"
+msgstr ""
+
+#: ../src/layout_util.c:1828
+msgid "Rotate clockwise"
+msgstr ""
+
+#: ../src/layout_util.c:1829
+msgid "_Rating 0"
+msgstr ""
+
+#: ../src/layout_util.c:1829
+msgid "Rating 0"
+msgstr ""
+
+#: ../src/layout_util.c:1830
+msgid "_Rating 1"
+msgstr ""
+
+#: ../src/layout_util.c:1830
+msgid "Rating 1"
+msgstr ""
+
+#: ../src/layout_util.c:1831
+msgid "_Rating 2"
+msgstr ""
+
+#: ../src/layout_util.c:1831
+msgid "Rating 2"
+msgstr ""
+
+#: ../src/layout_util.c:1832
+msgid "_Rating 3"
+msgstr ""
+
+#: ../src/layout_util.c:1832
+msgid "Rating 3"
+msgstr ""
+
+#: ../src/layout_util.c:1833
+msgid "_Rating 4"
+msgstr ""
+
+#: ../src/layout_util.c:1833
+msgid "Rating 4"
+msgstr ""
+
+#: ../src/layout_util.c:1834
+msgid "_Rating 5"
+msgstr ""
+
+#: ../src/layout_util.c:1834
+msgid "Rating 5"
+msgstr ""
+
+#: ../src/layout_util.c:1835
+msgid "_Rating -1"
+msgstr ""
+
+#: ../src/layout_util.c:1835
+msgid "Rating -1"
+msgstr ""
+
+#: ../src/layout_util.c:1836 ../src/menu.c:325
+msgid "Rotate _counterclockwise"
+msgstr ""
+
+#: ../src/layout_util.c:1836
+msgid "Rotate counterclockwise"
+msgstr ""
+
+#: ../src/layout_util.c:1837
+msgid "Rotate 1_80"
+msgstr ""
+
+#: ../src/layout_util.c:1837
+msgid "Rotate 180"
+msgstr ""
+
+#: ../src/layout_util.c:1838 ../src/menu.c:331
+msgid "_Mirror"
+msgstr ""
+
+#: ../src/layout_util.c:1838
+msgid "Mirror"
+msgstr ""
+
+#: ../src/layout_util.c:1839 ../src/menu.c:334
+msgid "_Flip"
+msgstr ""
+
+#: ../src/layout_util.c:1839
+msgid "Flip"
+msgstr ""
+
+#: ../src/layout_util.c:1840 ../src/menu.c:337
+msgid "_Original state"
+msgstr ""
+
+#: ../src/layout_util.c:1840
+msgid "Original state"
+msgstr ""
+
+#: ../src/layout_util.c:1841
+msgid "Select _all"
+msgstr ""
+
+#: ../src/layout_util.c:1842
+msgid "Select _none"
+msgstr ""
+
+#: ../src/layout_util.c:1843
+msgid "_Invert Selection"
+msgstr ""
+
+#: ../src/layout_util.c:1843
+msgid "Invert Selection"
+msgstr ""
+
+#: ../src/layout_util.c:1844
+msgid "P_references..."
+msgstr ""
+
+#: ../src/layout_util.c:1844
+msgid "Preferences..."
+msgstr ""
+
+#: ../src/layout_util.c:1845
+msgid "Configure _Plugins..."
+msgstr ""
+
+#: ../src/layout_util.c:1845
+msgid "Configure Plugins..."
+msgstr ""
+
+#: ../src/layout_util.c:1846
+msgid "_Configure this window..."
+msgstr ""
+
+#: ../src/layout_util.c:1846
+msgid "Configure this window..."
+msgstr ""
+
+#: ../src/layout_util.c:1847
+msgid "_Cache maintenance..."
+msgstr ""
+
+#: ../src/layout_util.c:1847
+msgid "Cache maintenance..."
+msgstr ""
+
+#: ../src/layout_util.c:1848
+msgid "Set as wallpaper"
+msgstr ""
+
+#: ../src/layout_util.c:1849
+msgid "_Save metadata"
+msgstr ""
+
+#: ../src/layout_util.c:1849
+msgid "Save metadata"
+msgstr ""
+
+#: ../src/layout_util.c:1850 ../src/layout_util.c:1851 ../src/toolbar.c:92
+msgid "Zoom in"
+msgstr ""
+
+#: ../src/layout_util.c:1852 ../src/layout_util.c:1853 ../src/toolbar.c:93
+msgid "Zoom out"
+msgstr ""
+
+#: ../src/layout_util.c:1854 ../src/layout_util.c:1855 ../src/toolbar.c:94
+msgid "Zoom 1:1"
+msgstr ""
+
+#: ../src/layout_util.c:1856 ../src/layout_util.c:1857
+#: ../src/layout_util.c:1872 ../src/layout_util.c:1873
+msgid "_Zoom to fit"
+msgstr ""
+
+#: ../src/layout_util.c:1856 ../src/layout_util.c:1857 ../src/toolbar.c:95
+msgid "Zoom to fit"
+msgstr ""
+
+#: ../src/layout_util.c:1858 ../src/layout_util.c:1874
+msgid "Fit _Horizontally"
+msgstr ""
+
+#: ../src/layout_util.c:1858
+msgid "Fit Horizontally"
+msgstr ""
+
+#: ../src/layout_util.c:1859 ../src/layout_util.c:1875
+msgid "Fit _Vertically"
+msgstr ""
+
+#: ../src/layout_util.c:1859
+msgid "Fit Vertically"
+msgstr ""
+
+#: ../src/layout_util.c:1860 ../src/layout_util.c:1876
+msgid "Zoom _2:1"
+msgstr ""
+
+#: ../src/layout_util.c:1860 ../src/toolbar.c:98
+msgid "Zoom 2:1"
+msgstr ""
+
+#: ../src/layout_util.c:1861 ../src/layout_util.c:1877
+msgid "Zoom _3:1"
+msgstr ""
+
+#: ../src/layout_util.c:1861 ../src/toolbar.c:99
+msgid "Zoom 3:1"
+msgstr ""
+
+#: ../src/layout_util.c:1862 ../src/layout_util.c:1878
+msgid "Zoom _4:1"
+msgstr ""
+
+#: ../src/layout_util.c:1862 ../src/toolbar.c:100
+msgid "Zoom 4:1"
+msgstr ""
+
+#: ../src/layout_util.c:1863 ../src/layout_util.c:1879 ../src/toolbar.c:101
+msgid "Zoom 1:2"
+msgstr ""
+
+#: ../src/layout_util.c:1864 ../src/layout_util.c:1880
+msgid "Zoom 1:3"
+msgstr ""
+
+#: ../src/layout_util.c:1865 ../src/layout_util.c:1881 ../src/toolbar.c:103
+msgid "Zoom 1:4"
+msgstr ""
+
+#: ../src/layout_util.c:1866 ../src/layout_util.c:1867 ../src/toolbar.c:104
+msgid "Connected Zoom in"
+msgstr ""
+
+#: ../src/layout_util.c:1868 ../src/layout_util.c:1869
+msgid "Connected Zoom out"
+msgstr ""
+
+#: ../src/layout_util.c:1870 ../src/layout_util.c:1871
+msgid "Connected Zoom 1:1"
+msgstr ""
+
+#: ../src/layout_util.c:1872 ../src/layout_util.c:1873
+msgid "Connected Zoom to fit"
+msgstr ""
+
+#: ../src/layout_util.c:1874
+msgid "Connected Fit Horizontally"
+msgstr ""
+
+#: ../src/layout_util.c:1875
+msgid "Connected Fit Vertically"
+msgstr ""
+
+#: ../src/layout_util.c:1876
+msgid "Connected Zoom 2:1"
+msgstr ""
+
+#: ../src/layout_util.c:1877
+msgid "Connected Zoom 3:1"
+msgstr ""
+
+#: ../src/layout_util.c:1878
+msgid "Connected Zoom 4:1"
+msgstr ""
+
+#: ../src/layout_util.c:1879
+msgid "Connected Zoom 1:2"
+msgstr ""
+
+#: ../src/layout_util.c:1880
+msgid "Connected Zoom 1:3"
+msgstr ""
+
+#: ../src/layout_util.c:1881
+msgid "Connected Zoom 1:4"
+msgstr ""
+
+#: ../src/layout_util.c:1882
+msgid "_View in new window"
+msgstr ""
+
+#: ../src/layout_util.c:1882
+msgid "View in new window"
+msgstr ""
+
+#: ../src/layout_util.c:1883 ../src/layout_util.c:1884
+#: ../src/layout_util.c:1885
+msgid "F_ull screen"
+msgstr ""
+
+#: ../src/layout_util.c:1886 ../src/layout_util.c:1887
+msgid "_Leave full screen"
+msgstr ""
+
+#: ../src/layout_util.c:1886 ../src/layout_util.c:1887
+msgid "Leave full screen"
+msgstr ""
+
+#: ../src/layout_util.c:1888
+msgid "_Cycle through overlay modes"
+msgstr ""
+
+#: ../src/layout_util.c:1888
+msgid "Cycle through Overlay modes"
+msgstr ""
+
+#: ../src/layout_util.c:1889
+msgid "Cycle through histogram ch_annels"
+msgstr ""
+
+#: ../src/layout_util.c:1889
+msgid "Cycle through histogram channels"
+msgstr ""
+
+#: ../src/layout_util.c:1890
+msgid "Cycle through histogram mo_des"
+msgstr ""
+
+#: ../src/layout_util.c:1890
+msgid "Cycle through histogram modes"
+msgstr ""
+
+#: ../src/layout_util.c:1891
+msgid "_Hide file list"
+msgstr ""
+
+#: ../src/layout_util.c:1891 ../src/toolbar.c:105
+msgid "Hide file list"
+msgstr ""
+
+#: ../src/layout_util.c:1892
+msgid "_Pause slideshow"
+msgstr ""
+
+#: ../src/layout_util.c:1892 ../src/toolbar.c:106
+msgid "Pause slideshow"
+msgstr ""
+
+#: ../src/layout_util.c:1893
+msgid "Faster"
+msgstr ""
+
+#: ../src/layout_util.c:1894
+msgid "Slower"
+msgstr ""
+
+#: ../src/layout_util.c:1895
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/layout_util.c:1895 ../src/toolbar.c:109
+msgid "Refresh"
+msgstr ""
+
+#: ../src/layout_util.c:1896
+msgid "_Contents"
+msgstr ""
+
+#: ../src/layout_util.c:1896
+msgid "Contents"
+msgstr ""
+
+#: ../src/layout_util.c:1897 ../src/window.c:371
+msgid "On-line help search"
+msgstr ""
+
+#: ../src/layout_util.c:1898
+msgid "_Keyboard shortcuts"
+msgstr ""
+
+#: ../src/layout_util.c:1898
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: ../src/layout_util.c:1899
+msgid "_Keyboard map"
+msgstr ""
+
+#: ../src/layout_util.c:1899
+msgid "Keyboard map"
+msgstr ""
+
+#: ../src/layout_util.c:1900
+msgid "_Release notes"
+msgstr ""
+
+#: ../src/layout_util.c:1900
+msgid "Release notes"
+msgstr ""
+
+#: ../src/layout_util.c:1901
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../src/layout_util.c:1901
+msgid "ChangeLog notes"
+msgstr ""
+
+#: ../src/layout_util.c:1902
+msgid "_About"
+msgstr ""
+
+#: ../src/layout_util.c:1902
+msgid "About"
+msgstr ""
+
+#: ../src/layout_util.c:1903
+msgid "_Log Window"
+msgstr ""
+
+#: ../src/layout_util.c:1903
+msgid "Log Window"
+msgstr ""
+
+#: ../src/layout_util.c:1904
+msgid "_Exif window"
+msgstr ""
+
+#: ../src/layout_util.c:1904 ../src/toolbar.c:111
+msgid "Exif window"
+msgstr ""
+
+#: ../src/layout_util.c:1905
+msgid "_Cycle through stereo modes"
+msgstr ""
+
+#: ../src/layout_util.c:1905
+msgid "Cycle through stereo modes"
+msgstr ""
+
+#: ../src/layout_util.c:1906
+msgid "_Next Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1906
+msgid "Next Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1907
+msgid "_Previous Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1907
+msgid "Previous Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1908
+msgid "_Up Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1908
+msgid "Up Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1909
+msgid "_Down Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1909
+msgid "Down Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1910
+msgid "_Write orientation to file"
+msgstr ""
+
+#: ../src/layout_util.c:1910
+msgid "Write orientation to file"
+msgstr ""
+
+#: ../src/layout_util.c:1911
+msgid "_Write orientation to file (preserve timestamp)"
+msgstr ""
+
+#: ../src/layout_util.c:1911
+msgid "Write orientation to file (preserve timestamp)"
+msgstr ""
+
+#: ../src/layout_util.c:1912
+msgid "Clear Marks..."
+msgstr ""
+
+#: ../src/layout_util.c:1916
+msgid "Show _Thumbnails"
+msgstr ""
+
+#: ../src/layout_util.c:1916
+msgid "Show Thumbnails"
+msgstr ""
+
+#: ../src/layout_util.c:1917
+msgid "Show _Marks"
+msgstr ""
+
+#: ../src/layout_util.c:1917
+msgid "Show Marks"
+msgstr ""
+
+#: ../src/layout_util.c:1918
+msgid "Pi_xel Info"
+msgstr ""
+
+#: ../src/layout_util.c:1918
+msgid "Show Pixel Info"
+msgstr ""
+
+#: ../src/layout_util.c:1919
+msgid "_Float file list"
+msgstr ""
+
+#: ../src/layout_util.c:1919 ../src/toolbar.c:114
+msgid "Float file list"
+msgstr ""
+
+#: ../src/layout_util.c:1920
+msgid "Hide tool_bar"
+msgstr ""
+
+#: ../src/layout_util.c:1920
+msgid "Hide toolbar"
+msgstr ""
+
+#: ../src/layout_util.c:1921
+msgid "_Info sidebar"
+msgstr ""
+
+#: ../src/layout_util.c:1921 ../src/toolbar.c:115
+msgid "Info sidebar"
+msgstr ""
+
+#: ../src/layout_util.c:1922
+msgid "Sort _manager"
+msgstr ""
+
+#: ../src/layout_util.c:1922 ../src/toolbar.c:116
+msgid "Sort manager"
+msgstr ""
+
+#: ../src/layout_util.c:1923
+msgid "Hide Bars"
+msgstr ""
+
+#: ../src/layout_util.c:1924
+msgid "Toggle _slideshow"
+msgstr ""
+
+#: ../src/layout_util.c:1924
+msgid "Toggle slideshow"
+msgstr ""
+
+#: ../src/layout_util.c:1925
+msgid "Use _color profiles"
+msgstr "Use _colour profiles"
+
+#: ../src/layout_util.c:1925
+msgid "Use color profiles"
+msgstr "Use colour profiles"
+
+#: ../src/layout_util.c:1926
+msgid "Use profile from _image"
+msgstr ""
+
+#: ../src/layout_util.c:1926
+msgid "Use profile from image"
+msgstr ""
+
+#: ../src/layout_util.c:1927
+msgid "Toggle _grayscale"
+msgstr ""
+
+#: ../src/layout_util.c:1927
+msgid "Toggle grayscale"
+msgstr ""
+
+#: ../src/layout_util.c:1928
+msgid "Image Overlay"
+msgstr ""
+
+#: ../src/layout_util.c:1929
+msgid "_Show Histogram"
+msgstr ""
+
+#: ../src/layout_util.c:1929
+msgid "Show Histogram"
+msgstr ""
+
+#: ../src/layout_util.c:1930
+msgid "Rectangular Selection"
+msgstr ""
+
+#: ../src/layout_util.c:1931
+msgid "GIF _animation"
+msgstr ""
+
+#: ../src/layout_util.c:1931
+msgid "Toggle GIF animation"
+msgstr ""
+
+#: ../src/layout_util.c:1932
+msgid "_Exif rotate"
+msgstr ""
+
+#: ../src/layout_util.c:1932
+msgid "Exif rotate"
+msgstr ""
+
+#: ../src/layout_util.c:1936
+msgid "Image _List"
+msgstr ""
+
+#: ../src/layout_util.c:1936
+msgid "View Images as List"
+msgstr ""
+
+#: ../src/layout_util.c:1937
+msgid "I_cons"
+msgstr ""
+
+#: ../src/layout_util.c:1937
+msgid "View Images as Icons"
+msgstr ""
+
+#: ../src/layout_util.c:1941
+msgid "T_oggle Folder View"
+msgstr ""
+
+#: ../src/layout_util.c:1941
+msgid "Toggle Folders View"
+msgstr ""
+
+#: ../src/layout_util.c:1945
+msgid "_Horizontal"
+msgstr ""
+
+#: ../src/layout_util.c:1945
+msgid "Split Horizontal"
+msgstr ""
+
+#: ../src/layout_util.c:1946
+msgid "_Vertical"
+msgstr ""
+
+#: ../src/layout_util.c:1946
+msgid "Split Vertical"
+msgstr ""
+
+#: ../src/layout_util.c:1947
+msgid "_Quad"
+msgstr ""
+
+#: ../src/layout_util.c:1947
+msgid "Split Quad"
+msgstr ""
+
+#: ../src/layout_util.c:1948
+msgid "_Single"
+msgstr ""
+
+#: ../src/layout_util.c:1948
+msgid "Split Single"
+msgstr ""
+
+#: ../src/layout_util.c:1952
+msgid "Input _0: sRGB"
+msgstr ""
+
+#: ../src/layout_util.c:1952
+msgid "Input 0: sRGB"
+msgstr ""
+
+#: ../src/layout_util.c:1953
+msgid "Input _1: AdobeRGB compatible"
+msgstr ""
+
+#: ../src/layout_util.c:1953
+msgid "Input 1: AdobeRGB compatible"
+msgstr ""
+
+#: ../src/layout_util.c:1954
+msgid "Input _2"
+msgstr ""
+
+#: ../src/layout_util.c:1954
+msgid "Input 2"
+msgstr ""
+
+#: ../src/layout_util.c:1955
+msgid "Input _3"
+msgstr ""
+
+#: ../src/layout_util.c:1955
+msgid "Input 3"
+msgstr ""
+
+#: ../src/layout_util.c:1956
+msgid "Input _4"
+msgstr ""
+
+#: ../src/layout_util.c:1956
+msgid "Input 4"
+msgstr ""
+
+#: ../src/layout_util.c:1957
+msgid "Input _5"
+msgstr ""
+
+#: ../src/layout_util.c:1957
+msgid "Input 5"
+msgstr ""
+
+#: ../src/layout_util.c:1961
+msgid "Histogram on Red"
+msgstr ""
+
+#: ../src/layout_util.c:1962
+msgid "Histogram on Green"
+msgstr ""
+
+#: ../src/layout_util.c:1963
+msgid "Histogram on Blue"
+msgstr ""
+
+#: ../src/layout_util.c:1964
+msgid "Histogram on RGB"
+msgstr ""
+
+#: ../src/layout_util.c:1965
+msgid "Histogram on Value"
+msgstr ""
+
+#: ../src/layout_util.c:1969
+msgid "Linear Histogram"
+msgstr ""
+
+#: ../src/layout_util.c:1970
+msgid "_Log Histogram"
+msgstr ""
+
+#: ../src/layout_util.c:1970
+msgid "Log Histogram"
+msgstr ""
+
+#: ../src/layout_util.c:1974
+msgid "_Auto"
+msgstr ""
+
+#: ../src/layout_util.c:1974
+msgid "Stereo Auto"
+msgstr ""
+
+#: ../src/layout_util.c:1975
+msgid "_Side by Side"
+msgstr ""
+
+#: ../src/layout_util.c:1975
+msgid "Stereo Side by Side"
+msgstr ""
+
+#: ../src/layout_util.c:1976
+msgid "_Cross"
+msgstr ""
+
+#: ../src/layout_util.c:1976
+msgid "Stereo Cross"
+msgstr ""
+
+#: ../src/layout_util.c:1977
+msgid "_Off"
+msgstr ""
+
+#: ../src/layout_util.c:1977
+msgid "Stereo Off"
+msgstr ""
+
+#: ../src/layout_util.c:2290
+#, c-format
+msgid "Mark _%d"
+msgstr ""
+
+#: ../src/layout_util.c:2291 ../src/view_file/view_file.c:574
+#, c-format
+msgid "_Set mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2291
+#, c-format
+msgid "Set mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2292 ../src/view_file/view_file.c:575
+#, c-format
+msgid "_Reset mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2292
+#, c-format
+msgid "Reset mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2293 ../src/layout_util.c:2294
+#: ../src/view_file/view_file.c:576
+#, c-format
+msgid "_Toggle mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2293 ../src/layout_util.c:2294
+#, c-format
+msgid "Toggle mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2295
+#, c-format
+msgid "Se_lect mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2295 ../src/layout_util.c:2296
+#, c-format
+msgid "Select mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2296 ../src/view_file/view_file.c:577
+#, c-format
+msgid "_Select mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2297 ../src/view_file/view_file.c:578
+#, c-format
+msgid "_Add mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2297
+#, c-format
+msgid "Add mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2298 ../src/view_file/view_file.c:579
+#, c-format
+msgid "_Intersection with mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2298
+#, c-format
+msgid "Intersection with mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2299 ../src/view_file/view_file.c:580
+#, c-format
+msgid "_Unselect mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2299
+#, c-format
+msgid "Unselect mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2300
+#, c-format
+msgid "_Filter mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2300
+#, c-format
+msgid "Filter mark %d"
+msgstr ""
+
+#: ../src/layout_util.c:2854
+#, c-format
+msgid "Number of files with unsaved metadata: %d"
+msgstr ""
+
+#: ../src/layout_util.c:2860
+msgid "No unsaved metadata"
+msgstr ""
+
+#: ../src/layout_util.c:2907
+#, c-format
+msgid ""
+"Image profile: %s\n"
+"Screen profile: %s"
+msgstr ""
+
+#: ../src/layout_util.c:2915
+msgid "Click to enable color management"
+msgstr "Click to enable colour management"
+
+#: ../src/layout_util.c:2920
+msgid "Color profiles not supported"
+msgstr "Colour profiles not supported"
+
+#: ../src/layout_util.c:2942
+#, c-format
+msgid "Input _%d: %s"
+msgstr ""
+
+#. something went badly wrong
+#: ../src/lirc.c:209
+#, c-format
+msgid "disconnected from LIRC\n"
+msgstr ""
+
+#: ../src/lirc.c:234
+#, c-format
+msgid ""
+"could not read LIRC config file\n"
+"please read the documentation of LIRC to \n"
+"know how to create a proper config file\n"
+msgstr ""
+
+#: ../src/logwindow.c:142
+msgid "Log"
+msgstr ""
+
+#: ../src/logwindow.c:172 ../src/preferences.c:2636
+msgid "Debug level:"
+msgstr ""
+
+#: ../src/main.c:362
+#, c-format
+msgid ""
+"Usage: %s [options] [path]\n"
+"\n"
+msgstr ""
+
+#: ../src/main.c:363
+msgid "valid options are:\n"
+msgstr ""
+
+#: ../src/main.c:364
+msgid "  +t, --with-tools                 force show of tools\n"
+msgstr ""
+
+#: ../src/main.c:365
+msgid "  -t, --without-tools              force hide of tools\n"
+msgstr ""
+
+#: ../src/main.c:366
+msgid "  -f, --fullscreen                 start in full screen mode\n"
+msgstr ""
+
+#: ../src/main.c:367
+msgid "  -s, --slideshow                  start in slideshow mode\n"
+msgstr ""
+
+#: ../src/main.c:368
+msgid ""
+"  -l, --list [files] [collections] open collection window for command line\n"
+msgstr ""
+
+#: ../src/main.c:369
+msgid "      --blank                      start with blank file list\n"
+msgstr ""
+
+#: ../src/main.c:370
+msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
+msgstr ""
+
+#: ../src/main.c:371
+msgid ""
+"  -r, --remote                     send following commands to open window\n"
+msgstr ""
+
+#: ../src/main.c:372
+msgid "  -rh,--remote-help                print remote command list\n"
+msgstr ""
+
+#: ../src/main.c:374
+msgid "      --debug[=level]              turn on debug output\n"
+msgstr ""
+
+#: ../src/main.c:375
+msgid "  -g:<regexp>, --grep:<regexp>     filter debug output\n"
+msgstr ""
+
+#: ../src/main.c:377
+msgid "  +w, --show-log-window            show log window\n"
+msgstr ""
+
+#: ../src/main.c:378
+msgid "  -o:<file>, --log-file:<file>     save log data to file\n"
+msgstr ""
+
+#: ../src/main.c:379
+msgid "  -v, --version                    print version info\n"
+msgstr ""
+
+#: ../src/main.c:380
+msgid ""
+"  -h, --help                       show this message\n"
+"\n"
+msgstr ""
+
+#: ../src/main.c:393
+#, c-format
+msgid ""
+"invalid or ignored: %s\n"
+"Use --help for options\n"
+msgstr ""
+
+#: ../src/main.c:433
+msgid "Invalid or ignored remote options: "
+msgstr ""
+
+#: ../src/main.c:442
+msgid ""
+"\n"
+"Use --remote-help for valid remote options.\n"
+msgstr ""
+
+#: ../src/main.c:563
+#, c-format
+msgid "Creating %s dir:%s\n"
+msgstr ""
+
+#: ../src/main.c:567
+#, c-format
+msgid "Could not create dir:%s\n"
+msgstr ""
+
+#: ../src/main.c:619
+#, c-format
+msgid "error saving file: %s\n"
+msgstr ""
+
+#: ../src/main.c:638
+#, c-format
+msgid ""
+"error saving file: %s\n"
+"error: %s\n"
+msgstr ""
+
+#: ../src/main.c:748
+msgid "exit"
+msgstr ""
+
+#: ../src/main.c:753
+#, c-format
+msgid "Quit %s"
+msgstr ""
+
+#: ../src/main.c:755
+msgid "Collections have been modified. Quit anyway?"
+msgstr ""
+
+#: ../src/main.c:973 ../src/remote.c:790
+msgid "Command line"
+msgstr ""
+
+#: ../src/menu.c:143
+msgid "Sort by size"
+msgstr ""
+
+#: ../src/menu.c:146
+msgid "Sort by date"
+msgstr ""
+
+#: ../src/menu.c:149
+msgid "Sort by file creation date"
+msgstr ""
+
+#: ../src/menu.c:152
+msgid "Sort by Exif date original"
+msgstr ""
+
+#: ../src/menu.c:155
+msgid "Sort by Exif date digitized"
+msgstr "Sort by Exif date digitised"
+
+#: ../src/menu.c:158
+msgid "Unsorted"
+msgstr ""
+
+#: ../src/menu.c:161
+msgid "Sort by path"
+msgstr ""
+
+#: ../src/menu.c:164
+msgid "Sort by number"
+msgstr ""
+
+#: ../src/menu.c:167
+msgid "Sort by rating"
+msgstr ""
+
+#: ../src/menu.c:170
+msgid "Sort by class"
+msgstr ""
+
+#: ../src/menu.c:174
+msgid "Sort by name"
+msgstr ""
+
+#: ../src/menu.c:242 ../src/menu.c:251
+msgid "Zoom to original size"
+msgstr ""
+
+#: ../src/menu.c:245 ../src/preferences.c:1936
+msgid "Fit image to window"
+msgstr ""
+
+#: ../src/menu.c:248
+msgid "Leave Zoom at previous setting"
+msgstr ""
+
+#: ../src/menu.c:303 ../src/preferences.c:1917
+msgid "Zoom"
+msgstr ""
+
+#: ../src/menu.c:328
+msgid "Rotate _180"
+msgstr ""
+
+#: ../src/menu.c:434
+msgid "_Add to Collection"
+msgstr ""
+
+#: ../src/metadata.c:1712
+msgid "People"
+msgstr ""
+
+#: ../src/metadata.c:1713
+msgid "Family"
+msgstr ""
+
+#: ../src/metadata.c:1714
+msgid "Free time"
+msgstr ""
+
+#: ../src/metadata.c:1715
+msgid "Children"
+msgstr ""
+
+#: ../src/metadata.c:1716
+msgid "Sport"
+msgstr ""
+
+#: ../src/metadata.c:1717
+msgid "Culture"
+msgstr ""
+
+#: ../src/metadata.c:1718
+msgid "Festival"
+msgstr ""
+
+#: ../src/metadata.c:1719
+msgid "Nature"
+msgstr ""
+
+#: ../src/metadata.c:1720
+msgid "Animal"
+msgstr ""
+
+#: ../src/metadata.c:1721
+msgid "Bird"
+msgstr ""
+
+#: ../src/metadata.c:1722
+msgid "Insect"
+msgstr ""
+
+#: ../src/metadata.c:1723
+msgid "Pets"
+msgstr ""
+
+#: ../src/metadata.c:1724
+msgid "Wildlife"
+msgstr ""
+
+#: ../src/metadata.c:1725
+msgid "Zoo"
+msgstr ""
+
+#: ../src/metadata.c:1726
+msgid "Plant"
+msgstr ""
+
+#: ../src/metadata.c:1727
+msgid "Tree"
+msgstr ""
+
+#: ../src/metadata.c:1728
+msgid "Flower"
+msgstr ""
+
+#: ../src/metadata.c:1729
+msgid "Water"
+msgstr ""
+
+#: ../src/metadata.c:1730
+msgid "River"
+msgstr ""
+
+#: ../src/metadata.c:1731
+msgid "Lake"
+msgstr ""
+
+#: ../src/metadata.c:1732
+msgid "Sea"
+msgstr ""
+
+#: ../src/metadata.c:1733 ../src/print.c:385
+msgid "Landscape"
+msgstr ""
+
+#: ../src/metadata.c:1734
+msgid "Art"
+msgstr ""
+
+#: ../src/metadata.c:1735
+msgid "Statue"
+msgstr ""
+
+#: ../src/metadata.c:1736
+msgid "Painting"
+msgstr ""
+
+#: ../src/metadata.c:1737 ../src/metadata.c:1751
+msgid "Historic"
+msgstr ""
+
+#: ../src/metadata.c:1738 ../src/metadata.c:1752
+msgid "Modern"
+msgstr ""
+
+#: ../src/metadata.c:1739
+msgid "City"
+msgstr ""
+
+#: ../src/metadata.c:1740
+msgid "Park"
+msgstr ""
+
+#: ../src/metadata.c:1741
+msgid "Street"
+msgstr ""
+
+#: ../src/metadata.c:1742
+msgid "Square"
+msgstr ""
+
+#: ../src/metadata.c:1743
+msgid "Architecture"
+msgstr ""
+
+#: ../src/metadata.c:1744
+msgid "Buildings"
+msgstr ""
+
+#: ../src/metadata.c:1745
+msgid "House"
+msgstr ""
+
+#: ../src/metadata.c:1746
+msgid "Cathedral"
+msgstr ""
+
+#: ../src/metadata.c:1747
+msgid "Palace"
+msgstr ""
+
+#: ../src/metadata.c:1748
+msgid "Castle"
+msgstr ""
+
+#: ../src/metadata.c:1749
+msgid "Bridge"
+msgstr ""
+
+#: ../src/metadata.c:1750
+msgid "Interior"
+msgstr ""
+
+#: ../src/metadata.c:1753
+msgid "Places"
+msgstr ""
+
+#: ../src/metadata.c:1754
+msgid "Conditions"
+msgstr ""
+
+#: ../src/metadata.c:1755
+msgid "Night"
+msgstr ""
+
+#: ../src/metadata.c:1756
+msgid "Lights"
+msgstr ""
+
+#: ../src/metadata.c:1757
+msgid "Reflections"
+msgstr ""
+
+#: ../src/metadata.c:1758
+msgid "Sun"
+msgstr ""
+
+#: ../src/metadata.c:1759
+msgid "Weather"
+msgstr ""
+
+#: ../src/metadata.c:1760
+msgid "Fog"
+msgstr ""
+
+#: ../src/metadata.c:1761
+msgid "Rain"
+msgstr ""
+
+#: ../src/metadata.c:1762
+msgid "Clouds"
+msgstr ""
+
+#: ../src/metadata.c:1763
+msgid "Snow"
+msgstr ""
+
+#: ../src/metadata.c:1764
+msgid "Sunny weather"
+msgstr ""
+
+#: ../src/metadata.c:1765
+msgid "Photo"
+msgstr ""
+
+#: ../src/metadata.c:1766
+msgid "Edited"
+msgstr ""
+
+#: ../src/metadata.c:1767
+msgid "Detail"
+msgstr ""
+
+#: ../src/metadata.c:1768
+msgid "Macro"
+msgstr ""
+
+#: ../src/metadata.c:1769 ../src/print.c:384
+msgid "Portrait"
+msgstr ""
+
+#: ../src/metadata.c:1770
+msgid "Black and White"
+msgstr ""
+
+#: ../src/metadata.c:1771
+msgid "Perspective"
+msgstr ""
+
+#: ../src/options.c:205 ../src/ui_bookmark.c:578
+msgid "Desktop"
+msgstr ""
+
+#: ../src/options.c:226 ../src/search.c:2140 ../src/search.c:2144
+#: ../src/search.c:3258 ../src/search.c:3262 ../src/view_file/view_file.c:820
+msgid "Mark "
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:439
+#, c-format
+msgid "%d images, %s"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:449
+#, c-format
+msgid "The pan view does not support the folder \"%s\"."
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:450
+msgid "Folder not supported"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1002 ../src/pan-view/pan-view.c:1018
+msgid "Reading image data..."
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1077
+msgid "Sorting images..."
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1408 ../src/print.c:2609
+msgid "Filename:"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1410 ../src/pan-view/pan-view.c:1823
+#: ../src/preferences.c:2034
+msgid "Location:"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1412 ../src/pan-view/pan-view-search.c:377
+msgid "Date:"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1414 ../src/preferences.c:1717
+#: ../src/print.c:3222 ../src/print.c:3427
+msgid "Size:"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1721 ../src/search.c:2560
+msgid "Folder not found"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1722
+msgid "The entered path is not a folder"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1807
+msgid "Pan View"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1830
+msgid "Timeline"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1831
+msgid "Calendar"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1833
+msgid "Folders (flower)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1834
+msgid "Grid"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1843
+msgid "Dots"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1844
+msgid "No Images"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1845
+msgid "Small Thumbnails"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1846
+msgid "Normal Thumbnails"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1847
+msgid "Large Thumbnails"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1848 ../src/pan-view/pan-view.c:2349
+msgid "1:10 (10%)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1849 ../src/pan-view/pan-view.c:2345
+msgid "1:4 (25%)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1850 ../src/pan-view/pan-view.c:2341
+msgid "1:3 (33%)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1851 ../src/pan-view/pan-view.c:2337
+msgid "1:2 (50%)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1852
+msgid "1:1 (100%)"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:1998
+msgid "Pan View Performance"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2005
+msgid "Pan view performance may be poor."
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2006
+msgid ""
+"To improve performance of thumbnails in the pan view the following options "
+"can be enabled. Note that both options must be enabled to notice a change in "
+"performance."
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2014 ../src/preferences.c:1720
+msgid "Cache thumbnails"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2016
+msgid "Use shared thumbnail cache"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2022
+msgid "Do not show this dialog again"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2271 ../src/search.c:1091
+msgid "_Play"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2317
+msgid "Sort by E_xif date"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2323
+msgid "_Show Exif information"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2325
+msgid "Show im_age"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2329
+msgid "_None"
+msgstr ""
+
+#: ../src/pan-view/pan-view.c:2333
+msgid "_Full size"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:49
+msgid "Require"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:49
+msgid "R"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:52
+msgid "Exclude"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:52
+msgid "E"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:55
+msgid "Include"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:55
+msgid "I"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:58
+msgid "Group"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:58
+msgid "G"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:72
+msgid "Keyword Filter:"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:105 ../src/preferences.c:2198
+msgid "Filter"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:157
+msgid "Removed keyword…"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:41
+msgid "Find:"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:66
+msgid "Find"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:115
+msgid "path found"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:115
+msgid "filename found"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:163
+msgid "partial match"
+msgstr ""
+
+#: ../src/pan-view/pan-view-search.c:374 ../src/pan-view/pan-view-search.c:407
+msgid "no match"
+msgstr ""
+
+#: ../src/preferences.c:108 ../src/search.c:3243
+msgid "Unknown"
+msgstr ""
+
+#: ../src/preferences.c:110
+msgid "RAW Image"
+msgstr ""
+
+#: ../src/preferences.c:112 ../src/search.c:2098 ../src/search.c:3241
+msgid "Video"
+msgstr ""
+
+#: ../src/preferences.c:570
+msgid "Nearest (worst, but fastest)"
+msgstr ""
+
+#: ../src/preferences.c:572
+msgid "Tiles"
+msgstr ""
+
+#: ../src/preferences.c:574
+msgid "Bilinear"
+msgstr ""
+
+#: ../src/preferences.c:576
+msgid "Hyper (best, but slowest)"
+msgstr ""
+
+#: ../src/preferences.c:601
+msgid "PRIMARY"
+msgstr ""
+
+#: ../src/preferences.c:603
+msgid "CLIPBOARD"
+msgstr ""
+
+#: ../src/preferences.c:668 ../src/print.c:390
+msgid "Custom"
+msgstr ""
+
+#: ../src/preferences.c:751
+msgid "Single image"
+msgstr ""
+
+#: ../src/preferences.c:753
+msgid "Anaglyph Red-Cyan"
+msgstr ""
+
+#: ../src/preferences.c:755
+msgid "Anaglyph Green-Magenta"
+msgstr ""
+
+#: ../src/preferences.c:757
+msgid "Anaglyph Yellow-Blue"
+msgstr ""
+
+#: ../src/preferences.c:759
+msgid "Anaglyph Gray Red-Cyan"
+msgstr ""
+
+#: ../src/preferences.c:761
+msgid "Anaglyph Gray Green-Magenta"
+msgstr ""
+
+#: ../src/preferences.c:763
+msgid "Anaglyph Gray Yellow-Blue"
+msgstr ""
+
+#: ../src/preferences.c:765
+msgid "Anaglyph Dubois Red-Cyan"
+msgstr ""
+
+#: ../src/preferences.c:767
+msgid "Anaglyph Dubois Green-Magenta"
+msgstr ""
+
+#: ../src/preferences.c:769
+msgid "Anaglyph Dubois Yellow-Blue"
+msgstr ""
+
+#: ../src/preferences.c:772
+msgid "Side by Side"
+msgstr ""
+
+#: ../src/preferences.c:773
+msgid "Side by Side Half size"
+msgstr ""
+
+#: ../src/preferences.c:780
+msgid "Top - Bottom"
+msgstr ""
+
+#: ../src/preferences.c:781
+msgid "Top - Bottom Half size"
+msgstr ""
+
+#: ../src/preferences.c:790 ../src/preferences.c:2827
+msgid "Fixed position"
+msgstr ""
+
+#: ../src/preferences.c:1129 ../src/preferences.c:1132
+msgid "Reset filters"
+msgstr ""
+
+#: ../src/preferences.c:1133
+msgid ""
+"This will reset the file filters to the defaults.\n"
+"Continue?"
+msgstr ""
+
+#: ../src/preferences.c:1160 ../src/preferences.c:1163
+msgid "Clear trash"
+msgstr "Clear Rubbish Bin"
+
+#: ../src/preferences.c:1164
+msgid "This will remove the trash contents."
+msgstr "This will remove the Rubbish Bin contents."
+
+#: ../src/preferences.c:1208 ../src/preferences.c:1211
+msgid "Reset image overlay template string"
+msgstr ""
+
+#: ../src/preferences.c:1212
+msgid ""
+"This will reset the image overlay template string to the default.\n"
+"Continue?"
+msgstr ""
+
+#: ../src/preferences.c:1712
+msgid "General"
+msgstr ""
+
+#: ../src/preferences.c:1718 ../src/preferences.c:1920
+msgid "Quality:"
+msgstr ""
+
+#: ../src/preferences.c:1726
+msgid "Use Geeqie thumbnail style and cache"
+msgstr ""
+
+#: ../src/preferences.c:1733
+msgid "Store thumbnails local to image folder (non-standard)"
+msgstr ""
+
+#: ../src/preferences.c:1740
+msgid "Use standard thumbnail style and cache, shared with other applications"
+msgstr ""
+
+#: ../src/preferences.c:1746
+msgid "Use EXIF thumbnails when available (EXIF thumbnails may be outdated)"
+msgstr ""
+
+#: ../src/preferences.c:1750
+msgid "Use embedded metadata in video files as thumbnails when available"
+msgstr ""
+
+#: ../src/preferences.c:1757
+msgid "Star Rating"
+msgstr ""
+
+#: ../src/preferences.c:1773 ../src/preferences.c:1805
+msgid "Set"
+msgstr ""
+
+#: ../src/preferences.c:1775 ../src/preferences.c:1807
+msgid "Display selected character"
+msgstr ""
+
+#: ../src/preferences.c:1778 ../src/preferences.c:1810
+msgid ""
+"Hexadecimal representation of a Unicode character. A list of all Unicode "
+"characters may be found on the Internet."
+msgstr ""
+
+#: ../src/preferences.c:1782 ../src/preferences.c:1814
+#: ../src/preferences.c:1894 ../src/window.c:397
+msgid "Clear"
+msgstr ""
+
+#: ../src/preferences.c:1786 ../src/preferences.c:1818
+#: ../src/preferences.c:1898
+msgid "Default"
+msgstr ""
+
+#: ../src/preferences.c:1826
+msgid "Slide show"
+msgstr ""
+
+#: ../src/preferences.c:1837
+msgid "Delay between image change hrs:mins:secs.dec"
+msgstr ""
+
+#: ../src/preferences.c:1853
+msgid "Random"
+msgstr ""
+
+#: ../src/preferences.c:1854
+msgid "Repeat"
+msgstr ""
+
+#: ../src/preferences.c:1856
+msgid "Image loading and caching"
+msgstr ""
+
+#: ../src/preferences.c:1858
+msgid "Decoded image cache size (Mb):"
+msgstr ""
+
+#: ../src/preferences.c:1860
+msgid "Preload next image"
+msgstr ""
+
+#: ../src/preferences.c:1863
+msgid "Refresh on file change"
+msgstr ""
+
+#: ../src/preferences.c:1866
+msgid "Info sidebar heights"
+msgstr ""
+
+#: ../src/preferences.c:1867
+msgid "NOTE! Geeqie must be restarted for changes to take effect"
+msgstr ""
+
+#: ../src/preferences.c:1869
+msgid "Keywords:"
+msgstr ""
+
+#: ../src/preferences.c:1875
+msgid "Comment:"
+msgstr ""
+
+#: ../src/preferences.c:1878
+msgid "Rating:"
+msgstr ""
+
+#: ../src/preferences.c:1882
+msgid "On-line help search engine"
+msgstr ""
+
+#: ../src/preferences.c:1889
+msgid ""
+"The format varies between search engines, e.g the format may be:\n"
+"https://www.search_engine.com/search?q=site:geeqie.org/help\n"
+"https://www.search_engine.com/?q=site:geeqie.org/help"
+msgstr ""
+
+#: ../src/preferences.c:1923
+msgid "Use GPU acceleration via Clutter library"
+msgstr ""
+
+#: ../src/preferences.c:1927
+msgid "Two pass rendering (apply HQ zoom and color correction in second pass)"
+msgstr ""
+"Two pass rendering (apply HQ zoom and colour correction in second pass)"
+
+#: ../src/preferences.c:1931
+msgid "Zoom increment:"
+msgstr ""
+
+#: ../src/preferences.c:1939
+msgid "Allow enlargement of image (max. size in %)"
+msgstr ""
+
+#: ../src/preferences.c:1945
+#, c-format
+msgid ""
+"Enable this to allow Geeqie to increase the image size for images that are "
+"smaller than the current view area when the zoom is set to \"Fit image to "
+"window\". This value sets the maximum expansion permitted in percent i.e. "
+"100% is full-size."
+msgstr ""
+
+#: ../src/preferences.c:1948
+#, c-format
+msgid "Virtual window size (% of actual window):"
+msgstr ""
+
+#: ../src/preferences.c:1954
+msgid ""
+"This value will set the virtual size of the window when \"Fit image to window"
+"\" is set. Instead of using the actual size of the window, the specified "
+"percentage of the window will be used. It allows one to keep a border around "
+"the image (values lower than 100%) or to auto zoom the image (values greater "
+"than 100%). It affects fullscreen mode too."
+msgstr ""
+
+#: ../src/preferences.c:1956
+msgid "Appearance"
+msgstr ""
+
+#: ../src/preferences.c:1958
+msgid "Use custom border color in window mode"
+msgstr "Use custom border colour in window mode"
+
+#: ../src/preferences.c:1961
+msgid "Use custom border color in fullscreen mode"
+msgstr "Use custom border colour in fullscreen mode"
+
+#: ../src/preferences.c:1964
+msgid "Border color"
+msgstr "Border colour"
+
+#: ../src/preferences.c:1969
+msgid "Alpha channel color 1"
+msgstr "Alpha channel colour 1"
+
+#: ../src/preferences.c:1972
+msgid "Alpha channel color 2"
+msgstr "Alpha channel colour 2"
+
+#: ../src/preferences.c:1978
+msgid "Convenience"
+msgstr ""
+
+#: ../src/preferences.c:1980
+msgid "Auto rotate proofs using Exif information"
+msgstr ""
+
+#: ../src/preferences.c:1997
+msgid "Windows"
+msgstr ""
+
+#: ../src/preferences.c:1999
+msgid "State"
+msgstr ""
+
+#: ../src/preferences.c:2001
+msgid "Remember window positions"
+msgstr ""
+
+#: ../src/preferences.c:2004
+msgid "Use saved window positions also for new windows"
+msgstr ""
+
+#: ../src/preferences.c:2008
+msgid "Remember tool state (float/hidden)"
+msgstr ""
+
+#: ../src/preferences.c:2011
+msgid "Remember dialog window positions"
+msgstr ""
+
+#: ../src/preferences.c:2014
+msgid "Show window IDs"
+msgstr ""
+
+#: ../src/preferences.c:2019
+msgid "Fit window to image when tools are hidden/floating"
+msgstr ""
+
+#: ../src/preferences.c:2023
+msgid "Limit size when auto-sizing window (%):"
+msgstr ""
+
+#: ../src/preferences.c:2038
+msgid "Smooth image flip"
+msgstr ""
+
+#: ../src/preferences.c:2040
+msgid "Disable screen saver"
+msgstr ""
+
+#: ../src/preferences.c:2044
+msgid "Overlay Screen Display"
+msgstr ""
+
+#: ../src/preferences.c:2046
+msgid "Image overlay template"
+msgstr ""
+
+#: ../src/preferences.c:2059
+msgid ""
+"<i>%name%</i> results in the filename of the picture.\n"
+"Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>"
+"%date%</i>,\n"
+"<i>%size%</i> (filesize), <i>%width%</i>, <i>%height%</i>, <i>%res%</i> "
+"(resolution),\n"
+"<i>%rating%</i>, <i>%keywords%</i>, <i>%comment%</i> (XMP), <i>%imagecomment"
+"%</i> (JPEG)\n"
+"To access exif data use the exif name, e. g. <i>%formatted.Camera%</i> is "
+"the formatted camera name,\n"
+"<i>%Exif.Photo.DateTimeOriginal%</i> the date of the original shot.\n"
+"<i>%formatted.Camera:20</i> notation will truncate the displayed data to 20 "
+"characters and will add 3 dots at the end to denote the truncation.\n"
+"If two or more variables are connected with the |-sign, it prints available "
+"variables with a separator.\n"
+"<i>%formatted.ShutterSpeed%</i>|<i>%formatted.ISOSpeedRating%</i>|<i>"
+"%formatted.FocalLength%</i> could show \"1/20s - 400 - 80 mm\" or \"1/200 - "
+"80 mm\",\n"
+"if there's no ISO information in the Exif data.\n"
+"If a line is empty, it is removed. This allows one to add lines that totally "
+"disappear when no data is available.\n"
+msgstr ""
+
+#: ../src/preferences.c:2077 ../src/print.c:3220
+msgid "Font"
+msgstr ""
+
+#: ../src/preferences.c:2089 ../src/print.c:3410
+msgid "Text"
+msgstr ""
+
+#: ../src/preferences.c:2094
+msgid "Background"
+msgstr ""
+
+#: ../src/preferences.c:2100 ../src/preferences.c:2278
+#: ../src/preferences.c:2740
+msgid "Defaults"
+msgstr ""
+
+#: ../src/preferences.c:2154
+msgid "Show hidden files or folders"
+msgstr ""
+
+#: ../src/preferences.c:2156
+msgid "Show parent folder (..)"
+msgstr ""
+
+#: ../src/preferences.c:2158
+msgid "Case sensitive sort"
+msgstr ""
+
+#: ../src/preferences.c:2160
+msgid "Natural sort order"
+msgstr ""
+
+#: ../src/preferences.c:2162
+msgid "Disable file extension checks"
+msgstr ""
+
+#: ../src/preferences.c:2165
+msgid "Disable File Filtering"
+msgstr ""
+
+#: ../src/preferences.c:2169
+msgid "Grouping sidecar extensions"
+msgstr ""
+
+#: ../src/preferences.c:2176
+msgid "File types"
+msgstr ""
+
+#: ../src/preferences.c:2233
+msgid "Class"
+msgstr ""
+
+#: ../src/preferences.c:2250
+msgid "Writable"
+msgstr ""
+
+#: ../src/preferences.c:2261
+msgid "Sidecar is allowed"
+msgstr ""
+
+#: ../src/preferences.c:2307
+msgid "Metadata writing process"
+msgstr ""
+
+#: ../src/preferences.c:2309
+msgid "Warning: Geeqie is built without Exiv2. Some options are disabled."
+msgstr ""
+
+#: ../src/preferences.c:2311
+msgid ""
+"Metadata are written in the following order. The process ends after first "
+"success."
+msgstr ""
+
+#: ../src/preferences.c:2314
+msgid ""
+"1) Save metadata in image files, or sidecar files, according to the XMP "
+"standard"
+msgstr ""
+
+#: ../src/preferences.c:2320
+msgid ""
+"2) Save metadata in '.metadata' folder, local to image folder (non-standard)"
+msgstr ""
+
+#: ../src/preferences.c:2323
+#, c-format
+msgid "3) Save metadata in Geeqie private directory '%s'"
+msgstr ""
+
+#: ../src/preferences.c:2329
+msgid "Step 1: Write to image files"
+msgstr ""
+
+#: ../src/preferences.c:2337
+msgid ""
+"Store metadata also in legacy IPTC tags (converted according to IPTC4XMP "
+"standard)"
+msgstr ""
+
+#: ../src/preferences.c:2340
+msgid "Warn if the image files are unwritable"
+msgstr ""
+
+#: ../src/preferences.c:2343
+msgid "Ask before writing to image files"
+msgstr ""
+
+#: ../src/preferences.c:2346
+msgid "Create sidecar files named image.ext.xmp (as opposed to image.xmp)"
+msgstr ""
+
+#: ../src/preferences.c:2349
+msgid "Step 2 and 3: write to Geeqie private files"
+msgstr ""
+
+#: ../src/preferences.c:2354
+msgid ""
+"Use GQview legacy metadata format (supports only keywords and comments) "
+"instead of XMP"
+msgstr ""
+
+#: ../src/preferences.c:2358
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../src/preferences.c:2359
+msgid ""
+"Write the same description tags (keywords, comment, etc.) to all grouped "
+"sidecars"
+msgstr ""
+
+#: ../src/preferences.c:2362
+msgid "Allow keywords to differ only in case"
+msgstr ""
+
+#: ../src/preferences.c:2365
+msgid "Write altered image orientation to the metadata"
+msgstr ""
+
+#: ../src/preferences.c:2371
+msgid "Auto-save options"
+msgstr ""
+
+#: ../src/preferences.c:2373
+msgid "Write metadata after timeout"
+msgstr ""
+
+#: ../src/preferences.c:2379
+msgid "Timeout (seconds):"
+msgstr ""
+
+#: ../src/preferences.c:2382
+msgid "Write metadata on image change"
+msgstr ""
+
+#: ../src/preferences.c:2385
+msgid "Write metadata on directory change"
+msgstr ""
+
+#: ../src/preferences.c:2388
+msgid "Pre-load metadata"
+msgstr ""
+
+#: ../src/preferences.c:2390
+msgid "Read metadata in background"
+msgstr ""
+
+#: ../src/preferences.c:2431
+msgid "Perceptual"
+msgstr ""
+
+#: ../src/preferences.c:2433
+msgid "Relative Colorimetric"
+msgstr "Relative Colourimetric"
+
+#: ../src/preferences.c:2437
+msgid "Absolute Colorimetric"
+msgstr "Absolute Colourimetric"
+
+#: ../src/preferences.c:2462
+msgid "Color management"
+msgstr "Colour management"
+
+#: ../src/preferences.c:2464
+msgid "Input profiles"
+msgstr ""
+
+#: ../src/preferences.c:2472
+msgid "Type"
+msgstr ""
+
+#: ../src/preferences.c:2475
+msgid "Menu name"
+msgstr ""
+
+#: ../src/preferences.c:2478
+msgid "File"
+msgstr ""
+
+#: ../src/preferences.c:2486
+#, c-format
+msgid "Input %d:"
+msgstr ""
+
+#: ../src/preferences.c:2502 ../src/preferences.c:2522
+msgid "Select color profile"
+msgstr "Select colour profile"
+
+#: ../src/preferences.c:2510
+msgid "Screen profile"
+msgstr ""
+
+#: ../src/preferences.c:2514
+msgid "Use system screen profile if available"
+msgstr ""
+
+#: ../src/preferences.c:2519
+msgid "Screen:"
+msgstr ""
+
+#: ../src/preferences.c:2525
+msgid "Render Intent:"
+msgstr ""
+
+#: ../src/preferences.c:2548 ../src/preferences.c:2589
+msgid "Behavior"
+msgstr "Behaviour"
+
+#: ../src/preferences.c:2550 ../src/utilops.c:2180
+msgid "Delete"
+msgstr ""
+
+#: ../src/preferences.c:2552
+msgid "Confirm file delete"
+msgstr ""
+
+#: ../src/preferences.c:2554
+msgid "Enable Delete key"
+msgstr ""
+
+#: ../src/preferences.c:2557
+msgid "Safe delete"
+msgstr ""
+
+#: ../src/preferences.c:2575
+msgid "Maximum size:"
+msgstr ""
+
+#: ../src/preferences.c:2575
+msgid "MB"
+msgstr ""
+
+#: ../src/preferences.c:2577
+msgid "Set to 0 for unlimited size"
+msgstr ""
+
+#: ../src/preferences.c:2578
+msgid "View"
+msgstr ""
+
+#: ../src/preferences.c:2591
+msgid "Descend folders in tree view"
+msgstr ""
+
+#: ../src/preferences.c:2594
+msgid "In place renaming"
+msgstr ""
+
+#: ../src/preferences.c:2597
+msgid "List directory view uses single click to enter"
+msgstr ""
+
+#: ../src/preferences.c:2600
+msgid "Save marks on exit"
+msgstr ""
+
+#: ../src/preferences.c:2604
+msgid "Use \"With Rename\" as default for Copy/Move dialogs"
+msgstr ""
+
+#: ../src/preferences.c:2608
+msgid "Recent folder list maximum size"
+msgstr ""
+
+#: ../src/preferences.c:2611
+msgid "Drag'n drop icon size"
+msgstr ""
+
+#: ../src/preferences.c:2615
+msgid "Copy path clipboard selection:"
+msgstr ""
+
+#: ../src/preferences.c:2617
+msgid "Navigation"
+msgstr ""
+
+#: ../src/preferences.c:2619
+msgid "Progressive keyboard scrolling"
+msgstr ""
+
+#: ../src/preferences.c:2621
+msgid "Keyboard scrolling step multiplier:"
+msgstr ""
+
+#: ../src/preferences.c:2623
+msgid "Mouse wheel scrolls image"
+msgstr ""
+
+#: ../src/preferences.c:2625
+msgid "Navigation by left or middle click on image"
+msgstr ""
+
+#: ../src/preferences.c:2627
+msgid "Play video by left click on image"
+msgstr ""
+
+#: ../src/preferences.c:2630
+msgid "Play with:"
+msgstr ""
+
+#: ../src/preferences.c:2634
+msgid "Debugging"
+msgstr ""
+
+#: ../src/preferences.c:2639
+msgid "Timer data"
+msgstr ""
+
+#: ../src/preferences.c:2642
+msgid "Log Window max. lines:"
+msgstr ""
+
+#: ../src/preferences.c:2660
+msgid "Keyboard"
+msgstr ""
+
+#: ../src/preferences.c:2662
+msgid "Accelerators"
+msgstr ""
+
+#: ../src/preferences.c:2681
+msgid "Action"
+msgstr ""
+
+#: ../src/preferences.c:2703
+msgid "KEY"
+msgstr ""
+
+#: ../src/preferences.c:2714
+msgid "Tooltip"
+msgstr ""
+
+#: ../src/preferences.c:2745
+msgid "Reset selected"
+msgstr ""
+
+#: ../src/preferences.c:2760
+msgid "Toolbar"
+msgstr ""
+
+#: ../src/preferences.c:2777
+msgid "Stereo"
+msgstr ""
+
+#: ../src/preferences.c:2779 ../src/preferences.c:2782
+msgid "Windowed stereo mode"
+msgstr ""
+
+#: ../src/preferences.c:2786 ../src/preferences.c:2811
+msgid "Mirror left image"
+msgstr ""
+
+#: ../src/preferences.c:2789 ../src/preferences.c:2814
+msgid "Flip left image"
+msgstr ""
+
+#: ../src/preferences.c:2792 ../src/preferences.c:2817
+msgid "Mirror right image"
+msgstr ""
+
+#: ../src/preferences.c:2795 ../src/preferences.c:2820
+msgid "Flip right image"
+msgstr ""
+
+#: ../src/preferences.c:2797 ../src/preferences.c:2822
+msgid "Swap left and right images"
+msgstr ""
+
+#: ../src/preferences.c:2799 ../src/preferences.c:2824
+msgid "Disable stereo mode on single image source"
+msgstr ""
+
+#: ../src/preferences.c:2802 ../src/preferences.c:2808
+msgid "Fullscreen stereo mode"
+msgstr ""
+
+#: ../src/preferences.c:2803
+msgid "Use different settings for fullscreen"
+msgstr ""
+
+#: ../src/preferences.c:2833
+msgid "Left X"
+msgstr ""
+
+#: ../src/preferences.c:2835
+msgid "Left Y"
+msgstr ""
+
+#: ../src/preferences.c:2837
+msgid "Right X"
+msgstr ""
+
+#: ../src/preferences.c:2839
+msgid "Right Y"
+msgstr ""
+
+#: ../src/preferences.c:2855 ../src/toolbar.c:89
+msgid "Preferences"
+msgstr ""
+
+#: ../src/preferences.c:3004
+msgid "About Geeqie"
+msgstr ""
+
+#: ../src/preferences.c:3014
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/print.c:134
+msgid "Selection"
+msgstr ""
+
+#: ../src/print.c:135
+msgid "All"
+msgstr ""
+
+#: ../src/print.c:146
+msgid "One image per page"
+msgstr ""
+
+#: ../src/print.c:147
+msgid "Proof sheet"
+msgstr ""
+
+#: ../src/print.c:160
+msgid "Default printer"
+msgstr ""
+
+#: ../src/print.c:161
+msgid "Custom printer"
+msgstr ""
+
+#: ../src/print.c:162
+msgid "PostScript file"
+msgstr ""
+
+#: ../src/print.c:163
+msgid "Image file"
+msgstr ""
+
+#: ../src/print.c:177
+msgid "jpeg, low quality"
+msgstr ""
+
+#: ../src/print.c:178
+msgid "jpeg, normal quality"
+msgstr ""
+
+#: ../src/print.c:179
+msgid "jpeg, high quality"
+msgstr ""
+
+#: ../src/print.c:375 ../src/print.c:3222
+msgid "points"
+msgstr ""
+
+#: ../src/print.c:376
+msgid "millimeters"
+msgstr "millimetres"
+
+#: ../src/print.c:377
+msgid "centimeters"
+msgstr "centimetres"
+
+#: ../src/print.c:378
+msgid "inches"
+msgstr ""
+
+#: ../src/print.c:379
+msgid "picas"
+msgstr ""
+
+#: ../src/print.c:391
+msgid "Letter"
+msgstr ""
+
+#. in 8.5 x 11
+#: ../src/print.c:392
+msgid "Legal"
+msgstr ""
+
+#. in 8.5 x 14
+#: ../src/print.c:393
+msgid "Executive"
+msgstr ""
+
+#. in 7.25x 10.5
+#. mm 841 x 1189
+#. mm 594 x 841
+#. mm 420 x 594
+#. mm 297 x 420
+#. mm 210 x 297
+#. mm 148 x 210
+#. mm 105 x 148
+#. mm 353 x 500
+#. mm 250 x 353
+#. mm 176 x 250
+#. mm 125 x 176
+#: ../src/print.c:405
+msgid "Envelope #10"
+msgstr ""
+
+#. in 4.125 x 9.5
+#: ../src/print.c:406
+msgid "Envelope #9"
+msgstr ""
+
+#. in 3.875 x 8.875
+#: ../src/print.c:407
+msgid "Envelope C4"
+msgstr ""
+
+#. mm 229 x 324
+#: ../src/print.c:408
+msgid "Envelope C5"
+msgstr ""
+
+#. mm 162 x 229
+#: ../src/print.c:409
+msgid "Envelope C6"
+msgstr ""
+
+#. mm 114 x 162
+#: ../src/print.c:410
+msgid "Photo 6x4"
+msgstr ""
+
+#. in 6   x 4
+#: ../src/print.c:411
+msgid "Photo 8x10"
+msgstr ""
+
+#. in 8   x 10
+#: ../src/print.c:412
+msgid "Postcard"
+msgstr ""
+
+#. mm 100 x 148
+#: ../src/print.c:413
+msgid "Tabloid"
+msgstr ""
+
+#: ../src/print.c:569
+#, c-format
+msgid "page %d of %d"
+msgstr ""
+
+#: ../src/print.c:761
+msgid "Preview"
+msgstr ""
+
+#: ../src/print.c:1069
+#, c-format
+msgid ""
+"Unable to open pipe for writing.\n"
+"\"%s\""
+msgstr ""
+
+#: ../src/print.c:1084 ../src/print.c:1476 ../src/ui_pathsel.c:432
+#, c-format
+msgid "A file with name %s already exists."
+msgstr ""
+
+#: ../src/print.c:1099 ../src/print.c:1531
+#, c-format
+msgid "Failure writing to file %s"
+msgstr ""
+
+#: ../src/print.c:1154 ../src/print.c:1191 ../src/print.c:1227
+#: ../src/print.c:1344 ../src/print.c:1417
+msgid "SIGPIPE error writing to printer."
+msgstr ""
+
+#: ../src/print.c:1952
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../src/print.c:1974 ../src/print.c:1979
+msgid "Printing error"
+msgstr ""
+
+#: ../src/print.c:1978
+#, c-format
+msgid "An error occurred printing to %s."
+msgstr ""
+
+#: ../src/print.c:1982
+msgid "Details"
+msgstr ""
+
+#: ../src/print.c:2597 ../src/print.c:3351 ../src/toolbar.c:88
+msgid "Print"
+msgstr ""
+
+#: ../src/print.c:2601
+#, c-format
+msgid "Printing %d pages to %s."
+msgstr ""
+
+#: ../src/print.c:2701
+msgid "Format:"
+msgstr ""
+
+#: ../src/print.c:2776
+msgid "Units:"
+msgstr ""
+
+#: ../src/print.c:2820
+msgid "Orientation:"
+msgstr ""
+
+#: ../src/print.c:2952
+msgid "Destination:"
+msgstr ""
+
+#: ../src/print.c:3000
+msgid "<printer name>"
+msgstr ""
+
+#: ../src/print.c:3089
+msgid "Unlimited"
+msgstr ""
+
+#: ../src/print.c:3207
+msgid "Show"
+msgstr ""
+
+#: ../src/print.c:3378
+msgid "Source"
+msgstr ""
+
+#: ../src/print.c:3390
+msgid "Image size:"
+msgstr ""
+
+#: ../src/print.c:3394
+msgid "Proof size:"
+msgstr ""
+
+#: ../src/print.c:3420
+msgid "Paper"
+msgstr ""
+
+#: ../src/print.c:3443
+msgid "Margins"
+msgstr ""
+
+#: ../src/print.c:3445
+msgid "Left:"
+msgstr ""
+
+#: ../src/print.c:3448
+msgid "Right:"
+msgstr ""
+
+#: ../src/print.c:3451
+msgid "Top:"
+msgstr ""
+
+#: ../src/print.c:3454
+msgid "Bottom:"
+msgstr ""
+
+#: ../src/print.c:3463
+msgid "Printer"
+msgstr ""
+
+#: ../src/print.c:3469
+msgid "Custom printer:"
+msgstr ""
+
+#: ../src/print.c:3478
+msgid "File:"
+msgstr ""
+
+#: ../src/print.c:3487
+msgid "File format:"
+msgstr ""
+
+#: ../src/print.c:3492
+msgid "DPI:"
+msgstr ""
+
+#: ../src/print.c:3500
+msgid "Remember print settings"
+msgstr ""
+
+#: ../src/rcfile.c:91
+#, c-format
+msgid "Option %s ignored: %s\n"
+msgstr ""
+
+#: ../src/rcfile.c:560
+#, c-format
+msgid "error saving config file: %s\n"
+msgstr ""
+
+#: ../src/rcfile.c:621
+#, c-format
+msgid ""
+"error saving config file: %s\n"
+"error: %s\n"
+msgstr ""
+
+#: ../src/remote.c:673
+#, c-format
+msgid "[%d,%d]: RGB(%3d,%3d,%3d)"
+msgstr ""
+
+#: ../src/remote.c:834 ../src/remote.c:839
+msgid "lua error: no data"
+msgstr ""
+
+#. short, long                  callback,               extra, prefer, parameter, description
+#: ../src/remote.c:862
+msgid "next image"
+msgstr ""
+
+#: ../src/remote.c:863
+msgid "previous image"
+msgstr ""
+
+#: ../src/remote.c:864
+msgid "first image"
+msgstr ""
+
+#: ../src/remote.c:865
+msgid "last image"
+msgstr ""
+
+#: ../src/remote.c:866
+msgid "toggle full screen"
+msgstr ""
+
+#: ../src/remote.c:867
+msgid "start full screen"
+msgstr ""
+
+#: ../src/remote.c:868
+msgid "stop full screen"
+msgstr ""
+
+#: ../src/remote.c:869
+msgid "toggle slide show"
+msgstr ""
+
+#: ../src/remote.c:870
+msgid "start slide show"
+msgstr ""
+
+#: ../src/remote.c:871
+msgid "stop slide show"
+msgstr ""
+
+#: ../src/remote.c:872
+msgid "<FOLDER>"
+msgstr ""
+
+#: ../src/remote.c:872
+msgid "start recursive slide show in FOLDER"
+msgstr ""
+
+#: ../src/remote.c:873
+msgid "<[H:][M:][N][.M]>"
+msgstr ""
+
+#: ../src/remote.c:873
+msgid "set slide show delay to Hrs Mins N.M seconds"
+msgstr ""
+
+#: ../src/remote.c:874
+msgid "show tools"
+msgstr ""
+
+#: ../src/remote.c:875
+msgid "hide tools"
+msgstr ""
+
+#: ../src/remote.c:876
+msgid "quit"
+msgstr ""
+
+#: ../src/remote.c:877 ../src/remote.c:878 ../src/remote.c:879
+#: ../src/remote.c:880 ../src/remote.c:881 ../src/remote.c:884
+#: ../src/remote.c:886
+msgid "<FILE>"
+msgstr ""
+
+#: ../src/remote.c:877
+msgid "load configuration from FILE"
+msgstr ""
+
+#: ../src/remote.c:878
+msgid "get list of sidecars of FILE"
+msgstr ""
+
+#: ../src/remote.c:879
+msgid "get destination path of FILE"
+msgstr ""
+
+#: ../src/remote.c:880
+msgid "open FILE, bring Geeqie window to the top"
+msgstr ""
+
+#: ../src/remote.c:881
+msgid "open FILE, do not bring Geeqie window to the top"
+msgstr ""
+
+#: ../src/remote.c:882
+msgid "print filename of current image"
+msgstr ""
+
+#: ../src/remote.c:883
+msgid "print pixel info of mouse pointer on current image"
+msgstr ""
+
+#: ../src/remote.c:884
+msgid "open FILE in new window"
+msgstr ""
+
+#: ../src/remote.c:885
+msgid "clear command line collection list"
+msgstr ""
+
+#: ../src/remote.c:886
+msgid "add FILE to command line collection list"
+msgstr ""
+
+#: ../src/remote.c:887
+msgid "bring the Geeqie window to the top"
+msgstr ""
+
+#: ../src/remote.c:888
+msgid "<ID>"
+msgstr ""
+
+#: ../src/remote.c:888
+msgid "window id for following commands"
+msgstr ""
+
+#: ../src/remote.c:889
+msgid "new window"
+msgstr ""
+
+#: ../src/remote.c:890
+msgid "close window"
+msgstr ""
+
+#: ../src/remote.c:891 ../src/remote.c:892
+msgid "clear|clean"
+msgstr ""
+
+#: ../src/remote.c:891
+msgid "clear or clean thumbnail cache"
+msgstr ""
+
+#: ../src/remote.c:892
+msgid "clear or clean shared thumbnail cache"
+msgstr ""
+
+#: ../src/remote.c:893
+msgid "    clean the metadata cache"
+msgstr ""
+
+#: ../src/remote.c:894
+msgid "<folder>  "
+msgstr ""
+
+#: ../src/remote.c:894
+msgid " render thumbnails"
+msgstr ""
+
+#: ../src/remote.c:895 ../src/remote.c:896
+msgid "<folder> "
+msgstr ""
+
+#: ../src/remote.c:895
+msgid "render thumbnails recursively"
+msgstr ""
+
+#: ../src/remote.c:896
+msgid " render thumbnails (see Help)"
+msgstr ""
+
+#: ../src/remote.c:897
+msgid "<folder>"
+msgstr ""
+
+#: ../src/remote.c:897
+msgid " render thumbnails recursively (see Help)"
+msgstr ""
+
+#: ../src/remote.c:899
+msgid "<FILE>,<lua script>"
+msgstr ""
+
+#: ../src/remote.c:899
+msgid "run lua script on FILE"
+msgstr ""
+
+#: ../src/remote.c:965
+msgid "Remote command list:\n"
+msgstr ""
+
+#: ../src/remote.c:984
+msgid ""
+"\n"
+"  All other command line parameters are used as plain files if they exists.\n"
+msgstr ""
+
+#: ../src/remote.c:1034
+#, c-format
+msgid "Remote %s not running, starting..."
+msgstr ""
+
+#: ../src/remote.c:1170
+msgid "Remote not available\n"
+msgstr ""
+
+#: ../src/search.c:254
+msgid "folder"
+msgstr ""
+
+#: ../src/search.c:255
+msgid "comments"
+msgstr ""
+
+#: ../src/search.c:256
+msgid "results"
+msgstr ""
+
+#: ../src/search.c:260 ../src/search.c:285
+msgid "contains"
+msgstr ""
+
+#: ../src/search.c:261 ../src/search.c:304 ../src/search.c:309
+msgid "is"
+msgstr ""
+
+#: ../src/search.c:265 ../src/search.c:272 ../src/search.c:291
+msgid "equal to"
+msgstr ""
+
+#: ../src/search.c:266 ../src/search.c:292 ../src/search.c:299
+msgid "less than"
+msgstr ""
+
+#: ../src/search.c:267 ../src/search.c:293 ../src/search.c:300
+msgid "greater than"
+msgstr ""
+
+#: ../src/search.c:268 ../src/search.c:275 ../src/search.c:294
+msgid "between"
+msgstr ""
+
+#: ../src/search.c:273
+msgid "before"
+msgstr ""
+
+#: ../src/search.c:274
+msgid "after"
+msgstr ""
+
+#: ../src/search.c:279
+msgid "match all"
+msgstr ""
+
+#: ../src/search.c:280
+msgid "match any"
+msgstr ""
+
+#: ../src/search.c:281
+msgid "exclude"
+msgstr ""
+
+#: ../src/search.c:286
+msgid "miss"
+msgstr ""
+
+#: ../src/search.c:298
+msgid "not geocoded"
+msgstr ""
+
+#: ../src/search.c:305 ../src/search.c:310
+msgid "is not"
+msgstr ""
+
+#: ../src/search.c:361
+#, c-format
+msgid "%s, %d files (%s, %d)"
+msgstr ""
+
+#: ../src/search.c:366
+#, c-format
+msgid "%s, %d files"
+msgstr ""
+
+#: ../src/search.c:384
+msgid "Searching..."
+msgstr ""
+
+#: ../src/search.c:1885
+msgid "Changed"
+msgstr ""
+
+#: ../src/search.c:1890 ../src/search.c:3114
+msgid "Original"
+msgstr ""
+
+#: ../src/search.c:1896 ../src/search.c:3115
+msgid "Digitized"
+msgstr "Digitised"
+
+#: ../src/search.c:2093 ../src/search.c:3240
+msgid "Raw Image"
+msgstr ""
+
+#: ../src/search.c:2132 ../src/search.c:3255
+msgid "Any mark"
+msgstr ""
+
+#: ../src/search.c:2188 ../src/search.c:3213
+msgid "km"
+msgstr ""
+
+#: ../src/search.c:2193 ../src/search.c:3214
+msgid "miles"
+msgstr ""
+
+#: ../src/search.c:2485
+msgid "File not found"
+msgstr ""
+
+#: ../src/search.c:2486
+msgid "Please enter an existing file for image content."
+msgstr ""
+
+#: ../src/search.c:2511
+msgid "Entry does not contain a valid lat/long value"
+msgstr ""
+
+#: ../src/search.c:2561
+msgid "Please enter an existing folder to search."
+msgstr ""
+
+#: ../src/search.c:3021
+msgid "Image search"
+msgstr ""
+
+#: ../src/search.c:3051
+msgid "Search:"
+msgstr ""
+
+#: ../src/search.c:3065
+msgid "Recurse"
+msgstr ""
+
+#: ../src/search.c:3070
+msgid "File name"
+msgstr ""
+
+#: ../src/search.c:3076 ../src/search.c:3184
+msgid "Match case"
+msgstr ""
+
+#: ../src/search.c:3081
+msgid "File size is"
+msgstr ""
+
+#: ../src/search.c:3088 ../src/search.c:3105 ../src/search.c:3134
+#: ../src/search.c:3196
+msgid "and"
+msgstr ""
+
+#: ../src/search.c:3094
+msgid "File date is"
+msgstr ""
+
+#: ../src/search.c:3112
+msgid "Modified"
+msgstr ""
+
+#: ../src/search.c:3113
+msgid "Status Changed"
+msgstr ""
+
+#: ../src/search.c:3123
+msgid "Image dimensions are"
+msgstr ""
+
+#: ../src/search.c:3144
+msgid "Image content is"
+msgstr ""
+
+#: ../src/search.c:3150
+#, no-c-format
+msgid "% similar to"
+msgstr ""
+
+#: ../src/search.c:3158
+msgid "Ignore rotation"
+msgstr ""
+
+#: ../src/search.c:3189
+msgid "Image rating is"
+msgstr ""
+
+#: ../src/search.c:3203
+msgid "Image is"
+msgstr ""
+
+#: ../src/search.c:3215
+msgid "n.m."
+msgstr ""
+
+#: ../src/search.c:3221
+msgid "from"
+msgstr ""
+
+#: ../src/search.c:3226
+msgid ""
+"Enter a coordinate in the form:\n"
+"89.123 179.456\n"
+"or drag-and-drop a geo-coded image\n"
+"or left-click on the map and paste\n"
+"or cut-and-paste or drag-and-drop\n"
+"an internet search URL\n"
+"See the Help file"
+msgstr ""
+
+#: ../src/search.c:3234
+msgid "Image class"
+msgstr ""
+
+#: ../src/search.c:3250
+msgid "Marks"
+msgstr ""
+
+#: ../src/search.c:3323
+msgid "Rank"
+msgstr ""
+
+#: ../src/secure_save.c:405
+msgid "Cannot read the file"
+msgstr ""
+
+#: ../src/secure_save.c:407
+msgid "Cannot get file status"
+msgstr ""
+
+#: ../src/secure_save.c:409
+msgid "Cannot access the file"
+msgstr ""
+
+#: ../src/secure_save.c:411
+msgid "Cannot create temp file"
+msgstr ""
+
+#: ../src/secure_save.c:413
+msgid "Cannot rename the file"
+msgstr ""
+
+#: ../src/secure_save.c:415
+msgid "File saving disabled by option"
+msgstr ""
+
+#: ../src/secure_save.c:417
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/secure_save.c:419
+msgid "Cannot write the file"
+msgstr ""
+
+#: ../src/secure_save.c:423
+msgid "Secure file saving error"
+msgstr ""
+
+#: ../src/shortcuts.c:106 ../src/shortcuts.c:160
+msgid "Add Shortcut"
+msgstr ""
+
+#: ../src/thumb.c:405
+msgid "Thumbnail image in cache failed to load, trying to recreate.\n"
+msgstr ""
+
+#: ../src/toolbar.c:85
+msgid "Search"
+msgstr ""
+
+#: ../src/toolbar.c:90
+msgid "Configure this window"
+msgstr ""
+
+#: ../src/toolbar.c:91
+msgid "Cache maintenance"
+msgstr ""
+
+#: ../src/toolbar.c:96
+msgid "Fit Horizontaly"
+msgstr ""
+
+#: ../src/toolbar.c:97
+msgid "Fit vertically"
+msgstr ""
+
+#: ../src/toolbar.c:102
+msgid "Zoom1:3"
+msgstr ""
+
+#: ../src/toolbar.c:107
+msgid "Slideshow Faster"
+msgstr ""
+
+#: ../src/toolbar.c:108
+msgid "Slideshow Slower"
+msgstr ""
+
+#: ../src/toolbar.c:110 ../src/window.c:287 ../src/window.c:308
+msgid "Help"
+msgstr ""
+
+#: ../src/toolbar.c:112
+msgid "Show thumbnails"
+msgstr ""
+
+#: ../src/toolbar.c:113
+msgid "Show marks"
+msgstr ""
+
+#: ../src/toolbar.c:503
+msgid "Add Toolbar Item"
+msgstr ""
+
+#: ../src/trash.c:88 ../src/utilops.c:2645 ../src/utilops.c:2656
+#: ../src/utilops.c:2713
+msgid "Delete failed"
+msgstr ""
+
+#: ../src/trash.c:89
+msgid "Unable to remove old file from trash folder"
+msgstr "Unable to remove old file from Rubbish Bin folder"
+
+#: ../src/trash.c:146
+msgid "Could not create folder"
+msgstr ""
+
+#: ../src/trash.c:168
+msgid "Permission denied"
+msgstr ""
+
+#: ../src/trash.c:178
+#, c-format
+msgid ""
+"Unable to access or create the trash folder.\n"
+"\"%s\""
+msgstr ""
+"Unable to access or create the Rubbish Bin folder.\n"
+"\"%s\""
+
+#: ../src/trash.c:182
+msgid "Turn off safe delete"
+msgstr ""
+
+#: ../src/trash.c:201
+msgid "Deletion by external command"
+msgstr ""
+
+#: ../src/trash.c:209
+#, c-format
+msgid " (max. %d MB)"
+msgstr ""
+
+#: ../src/trash.c:213
+#, c-format
+msgid ""
+"Safe delete: %s%s\n"
+"Trash: %s"
+msgstr ""
+"Safe delete: %s%s\n"
+"Rubbish Bin: %s"
+
+#: ../src/trash.c:218
+#, c-format
+msgid "Safe delete: %s"
+msgstr ""
+
+#: ../src/ui_bookmark.c:139 ../src/ui_bookmark.c:202
+msgid "New Bookmark"
+msgstr ""
+
+#: ../src/ui_bookmark.c:285 ../src/ui_bookmark.c:291
+msgid "Edit Bookmark"
+msgstr ""
+
+#: ../src/ui_bookmark.c:306
+msgid "Path:"
+msgstr ""
+
+#: ../src/ui_bookmark.c:315
+msgid "Icon:"
+msgstr ""
+
+#: ../src/ui_bookmark.c:321
+msgid "Select icon"
+msgstr ""
+
+#: ../src/ui_bookmark.c:414
+msgid "_Properties..."
+msgstr ""
+
+#: ../src/ui_bookmark.c:420
+msgid "_Remove"
+msgstr ""
+
+#: ../src/ui_fileops.c:88
+msgid ""
+"One or more filenames are not encoded with the preferred locale character "
+"set.\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:89
+#, c-format
+msgid "Operations on, and display of these files with %s may not succeed.\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:91
+msgid ""
+"If your filenames are not encoded in utf-8, try setting the environment "
+"variable G_BROKEN_FILENAMES=1\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:93
+#, c-format
+msgid "It appears G_BROKEN_FILENAMES is set to %s\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:95
+msgid "It appears G_BROKEN_FILENAMES is not set\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:97
+#, c-format
+msgid ""
+"The locale appears to be set to \"%s\"\n"
+"(set by the LANG environment variable)\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:102
+msgid ""
+"\n"
+"Preferred encoding appears to be UTF-8, however the file:\n"
+msgstr ""
+
+#: ../src/ui_fileops.c:103 ../src/ui_fileops.c:106 ../src/ui_fileops.c:108
+msgid "[name not displayable]"
+msgstr ""
+
+#: ../src/ui_fileops.c:106
+#, c-format
+msgid "\"%s\" is encoded in valid UTF-8."
+msgstr ""
+
+#: ../src/ui_fileops.c:108
+#, c-format
+msgid "\"%s\" is not encoded in valid UTF-8."
+msgstr ""
+
+#: ../src/ui_fileops.c:113 ../src/ui_fileops.c:118
+msgid "Filename encoding locale mismatch"
+msgstr ""
+
+#: ../src/ui_help.c:119
+#, c-format
+msgid ""
+"Unable to load:\n"
+"%s"
+msgstr ""
+
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2344
+#: ../src/utilops.c:2371 ../src/utilops.c:2837
+msgid "Rename failed"
+msgstr ""
+
+#: ../src/ui_pathsel.c:438
+#, c-format
+msgid "Failed to rename %s to %s."
+msgstr ""
+
+#: ../src/ui_pathsel.c:634 ../src/ui_pathsel.c:642
+msgid "_Rename"
+msgstr ""
+
+#: ../src/ui_pathsel.c:636 ../src/ui_pathsel.c:646
+msgid "Add _Bookmark"
+msgstr ""
+
+#: ../src/ui_pathsel.c:644
+msgid "_Delete"
+msgstr ""
+
+#: ../src/ui_pathsel.c:752 ../src/ui_pathsel.c:1058 ../src/utilops.c:2871
+msgid "New folder"
+msgstr ""
+
+#: ../src/ui_pathsel.c:762
+#, c-format
+msgid ""
+"Unable to create folder:\n"
+"%s"
+msgstr ""
+
+#: ../src/ui_pathsel.c:763
+msgid "Error creating folder"
+msgstr ""
+
+#: ../src/ui_pathsel.c:989
+msgid "All Files"
+msgstr ""
+
+#: ../src/ui_pathsel.c:1061
+msgid "Show hidden"
+msgstr ""
+
+#: ../src/ui_pathsel.c:1145
+msgid "Filter:"
+msgstr ""
+
+#: ../src/ui_tabcomp.c:941
+msgid "Select path"
+msgstr ""
+
+#: ../src/ui_tabcomp.c:963
+msgid "All files"
+msgstr ""
+
+#: ../src/uri_utils.c:43
+msgid "Drag and Drop failed"
+msgstr ""
+
+#: ../src/utilops.c:590
+msgid ""
+"\n"
+" Continue multiple file operation?"
+msgstr ""
+
+#: ../src/utilops.c:597 ../src/utilops.c:1034
+msgid "Co_ntinue"
+msgstr ""
+
+#: ../src/utilops.c:774
+#, c-format
+msgid ""
+"Removal of folder contents failed at this file:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/utilops.c:918
+#, c-format
+msgid ""
+"%s\n"
+"Unable to start external command.\n"
+msgstr ""
+
+#. During copy/move operations it is necessary to ensure that the
+#. * target directory exists before continuing with the next step.
+#. * If not revert to the select directory dialog
+#.
+#: ../src/utilops.c:1002 ../src/utilops.c:1155
+#, c-format
+msgid "%s is not a directory"
+msgstr ""
+
+#: ../src/utilops.c:1032
+msgid "Really continue?"
+msgstr ""
+
+#: ../src/utilops.c:1046 ../src/utilops.c:1160
+msgid "This operation can't continue:"
+msgstr ""
+
+#: ../src/utilops.c:1518 ../src/utilops.c:1641 ../src/utilops.c:2056
+msgid "Discard changes"
+msgstr ""
+
+#: ../src/utilops.c:1519 ../src/utilops.c:1642 ../src/utilops.c:2006
+#: ../src/utilops.c:2022
+msgid "File details"
+msgstr ""
+
+#: ../src/utilops.c:1541 ../src/utilops.c:1659
+msgid "Sidecars"
+msgstr ""
+
+#: ../src/utilops.c:1543
+msgid "Write to file"
+msgstr ""
+
+#: ../src/utilops.c:1583
+msgid "Choose the destination folder."
+msgstr ""
+
+#: ../src/utilops.c:1661
+msgid "New name"
+msgstr ""
+
+#: ../src/utilops.c:1698
+msgid "Manual rename"
+msgstr ""
+
+#: ../src/utilops.c:1703
+msgid "Original name:"
+msgstr ""
+
+#: ../src/utilops.c:1706
+msgid "New name:"
+msgstr ""
+
+#: ../src/utilops.c:1719
+msgid "Auto rename"
+msgstr ""
+
+#: ../src/utilops.c:1725
+msgid "Begin text"
+msgstr ""
+
+#: ../src/utilops.c:1733 ../src/utilops.c:1765
+msgid "Start #"
+msgstr ""
+
+#: ../src/utilops.c:1739
+msgid "End text"
+msgstr ""
+
+#: ../src/utilops.c:1747
+msgid "Padding:"
+msgstr ""
+
+#: ../src/utilops.c:1752
+msgid "Formatted rename"
+msgstr ""
+
+#: ../src/utilops.c:1757
+msgid "Format (* = original name, ## = numbers)"
+msgstr ""
+
+#: ../src/utilops.c:1909
+msgid "Another operation in progress.\n"
+msgstr ""
+
+#: ../src/utilops.c:1965
+#, c-format
+msgid "File: '%s'\n"
+msgstr ""
+
+#: ../src/utilops.c:1970
+msgid "with sidecar files:\n"
+msgstr ""
+
+#: ../src/utilops.c:1976
+#, c-format
+msgid " '%s'\n"
+msgstr ""
+
+#: ../src/utilops.c:1980
+msgid ""
+"\n"
+"Status: "
+msgstr ""
+
+#: ../src/utilops.c:1992
+msgid "no problem detected"
+msgstr ""
+
+#: ../src/utilops.c:2008 ../src/utilops.c:2055
+msgid "Exclude file"
+msgstr ""
+
+#: ../src/utilops.c:2053 ../src/utilops.c:2078
+msgid "Overview of changed metadata"
+msgstr ""
+
+#: ../src/utilops.c:2071
+#, c-format
+msgid ""
+"The following metadata tags will be written to\n"
+"'%s'."
+msgstr ""
+
+#: ../src/utilops.c:2075
+#, c-format
+msgid "The following metadata tags will be written to the image file itself."
+msgstr ""
+
+#: ../src/utilops.c:2181
+msgid "Delete files?"
+msgstr ""
+
+#: ../src/utilops.c:2182
+msgid "This will delete the following files"
+msgstr ""
+
+#: ../src/utilops.c:2201
+msgid "Can't write metadata"
+msgstr ""
+
+#: ../src/utilops.c:2224
+msgid "Write metadata"
+msgstr ""
+
+#: ../src/utilops.c:2225
+msgid "Write metadata?"
+msgstr ""
+
+#: ../src/utilops.c:2226
+msgid "This will write the changed metadata into the following files"
+msgstr ""
+
+#: ../src/utilops.c:2228
+msgid "Metadata writing failed"
+msgstr ""
+
+#: ../src/utilops.c:2247 ../src/utilops.c:2275
+msgid "Move failed"
+msgstr ""
+
+#: ../src/utilops.c:2272
+msgid "Move files?"
+msgstr ""
+
+#: ../src/utilops.c:2273
+msgid "This will move the following files"
+msgstr ""
+
+#: ../src/utilops.c:2297 ../src/utilops.c:2325
+msgid "Copy failed"
+msgstr ""
+
+#: ../src/utilops.c:2322
+msgid "Copy files?"
+msgstr ""
+
+#: ../src/utilops.c:2323 ../src/utilops.c:2457
+msgid "This will copy the following files"
+msgstr ""
+
+#: ../src/utilops.c:2367 ../src/utilops.c:2833
+msgid "Rename"
+msgstr ""
+
+#: ../src/utilops.c:2368
+msgid "Rename files?"
+msgstr ""
+
+#: ../src/utilops.c:2369
+msgid "This will rename the following files"
+msgstr ""
+
+#: ../src/utilops.c:2421
+msgid "Can't run external editor"
+msgstr ""
+
+#: ../src/utilops.c:2455
+msgid "Editor"
+msgstr ""
+
+#: ../src/utilops.c:2456
+msgid "Run editor?"
+msgstr ""
+
+#: ../src/utilops.c:2459
+msgid "External command failed"
+msgstr ""
+
+#: ../src/utilops.c:2628 ../src/utilops.c:2701
+msgid "Delete folder"
+msgstr ""
+
+#: ../src/utilops.c:2629
+msgid "Delete symbolic link?"
+msgstr ""
+
+#: ../src/utilops.c:2631
+msgid ""
+"This will delete the symbolic link.\n"
+"The folder this link points to will not be deleted."
+msgstr ""
+
+#: ../src/utilops.c:2633
+msgid "Link deletion failed"
+msgstr ""
+
+#: ../src/utilops.c:2643
+#, c-format
+msgid ""
+"Unable to remove folder %s\n"
+"Permissions do not allow writing to the folder."
+msgstr ""
+
+#: ../src/utilops.c:2655 ../src/utilops.c:2712
+#, c-format
+msgid "Unable to list contents of folder %s"
+msgstr ""
+
+#: ../src/utilops.c:2669 ../src/utilops.c:2677
+msgid "Folder contains subfolders"
+msgstr ""
+
+#: ../src/utilops.c:2673
+#, c-format
+msgid ""
+"Unable to delete the folder:\n"
+"\n"
+"%s\n"
+"\n"
+"This folder contains subfolders which must be moved before it can be deleted."
+msgstr ""
+
+#: ../src/utilops.c:2681
+msgid "Subfolders:"
+msgstr ""
+
+#: ../src/utilops.c:2702
+msgid "Delete folder?"
+msgstr ""
+
+#: ../src/utilops.c:2703
+msgid "The folder contains these files:"
+msgstr ""
+
+#: ../src/utilops.c:2704
+msgid ""
+"This will delete the folder.\n"
+"The contents of this folder will also be deleted."
+msgstr ""
+
+#: ../src/utilops.c:2834
+msgid "Rename folder?"
+msgstr ""
+
+#: ../src/utilops.c:2835
+msgid "The folder contains the following files"
+msgstr ""
+
+#: ../src/utilops.c:2881
+msgid "Create Folder"
+msgstr ""
+
+#: ../src/utilops.c:2882
+msgid "Create folder?"
+msgstr ""
+
+#: ../src/utilops.c:2885
+msgid "Can't create folder"
+msgstr ""
+
+#: ../src/view_dir.c:406
+msgid "_Copy"
+msgstr ""
+
+#: ../src/view_dir.c:408
+msgid "_Move"
+msgstr ""
+
+#: ../src/view_dir.c:662
+msgid "_Up to parent"
+msgstr ""
+
+#: ../src/view_dir.c:667
+msgid "_Slideshow"
+msgstr ""
+
+#: ../src/view_dir.c:669
+msgid "Slideshow recursive"
+msgstr ""
+
+#: ../src/view_dir.c:673
+msgid "Find _duplicates..."
+msgstr ""
+
+#: ../src/view_dir.c:675
+msgid "Find duplicates recursive..."
+msgstr ""
+
+#: ../src/view_dir.c:680
+msgid "_New folder..."
+msgstr ""
+
+#: ../src/view_dir.c:697 ../src/view_file/view_file.c:664
+msgid "View as _List"
+msgstr ""
+
+#: ../src/view_dir.c:700
+msgid "View as _Tree"
+msgstr ""
+
+#: ../src/view_dir.c:705
+msgid "Show _hidden files"
+msgstr ""
+
+#: ../src/view_dir.c:708 ../src/view_file/view_file.c:694
+msgid "Re_fresh"
+msgstr ""
+
+#: ../src/view_file/view_file.c:667
+msgid "View as _Icons"
+msgstr ""
+
+#: ../src/view_file/view_file.c:673
+msgid "Show _thumbnails"
+msgstr ""
+
+#: ../src/view_file/view_file.c:685 ../src/view_file/view_file.c:689
+msgid "Show star rating"
+msgstr ""
+
+#: ../src/view_file/view_file.c:809
+msgid "Mark text"
+msgstr ""
+
+#: ../src/view_file/view_file.c:812
+msgid "Set mark text"
+msgstr ""
+
+#: ../src/view_file/view_file.c:813
+msgid "This will set or clear the mark text."
+msgstr ""
+
+#: ../src/view_file/view_file.c:1273
+msgid "Loading meta..."
+msgstr ""
+
+#: ../src/view_file/view_file_icon.c:2022 ../src/view_file/view_file_list.c:910
+msgid " [NO GROUPING]"
+msgstr ""
+
+#: ../src/view_file/view_file_list.c:511
+#, c-format
+msgid ""
+"Invalid file name:\n"
+"%s"
+msgstr ""
+
+#: ../src/view_file/view_file_list.c:512
+msgid "Error renaming file"
+msgstr ""
+
+#: ../src/view_file/view_file_list.c:2063
+msgid "NameStars"
+msgstr ""
+
+#: ../src/view_file/view_file_list.c:2067
+msgid "Stars"
+msgstr ""
+
+#: ../src/window.c:374
+msgid "Search the on-line help files.\n"
+msgstr ""
+
+#: ../src/window.c:379
+msgid "Search engine:"
+msgstr ""
+
+#: ../src/window.c:387
+msgid "Search terms:"
+msgstr ""
--- a/po/es.po	Fri Apr 13 19:06:23 2018 +0300
+++ b/po/es.po	Sat Jun 30 15:28:52 2018 +0300
@@ -12,26 +12,27 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-28 19:44+0100\n"
-"PO-Revision-Date: 2009-11-03 00:36+0100\n"
-"Last-Translator: Redy Rodríguez <redy@users.sf.net>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2018-06-23 09:10+0200\n"
+"PO-Revision-Date: 2018-06-23 18:33+0100\n"
+"Last-Translator: micrococo\n"
+"Language-Team: Spanish\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../geeqie.desktop.in.h:1
 msgid "Geeqie"
-msgstr "Geeqie"
+msgstr ""
 
 #: ../geeqie.desktop.in.h:2
 msgid "Image Viewer"
-msgstr "Visor de imagenes"
+msgstr "Visor de imágenes"
 
 #: ../geeqie.desktop.in.h:3
 msgid "View and manage images"
-msgstr "Visualizar y gestionar imágenes"
+msgstr "Vea y gestione imágenes"
 
 #: ../plugins/import/geeqie-import-geeqie.desktop.in.h:1
 msgid "Import Geeqie 1.0alphaX metadata"
@@ -43,7 +44,7 @@
 
 #: ../plugins/rotate/rotate.desktop.in.h:1
 msgid "Apply the orientation to image content"
-msgstr "Aplicar-orientación de la imagen al archivo"
+msgstr "Aplicar la orientación de la imagen al archivo"
 
 #: ../plugins/symlink/symlink.desktop.in.h:1
 msgid "Symlink"
@@ -51,7 +52,7 @@
 
 #: ../plugins/ufraw/geeqie-ufraw.desktop.in.h:1
 msgid "UFRaw Batch"
-msgstr "UFRaw Batch"
+msgstr "Lote UFRaw"
 
 #: ../plugins/ufraw/geeqie-ufraw-id.desktop.in.h:1
 msgid "Edit UFRaw ID file"
@@ -59,106 +60,105 @@
 
 #: ../plugins/ufraw/geeqie-ufraw-recursive.desktop.in.h:1
 msgid "UFRaw Batch recursive"
-msgstr "UFRaw Batch recursivo"
-
-#: ../src/advanced_exif.c:378 ../src/cache_maint.c:1265
-#: ../src/preferences.c:110 ../src/preferences.c:2095
+msgstr "Lote UFRaw recursivo"
+
+#: ../src/advanced_exif.c:384 ../src/cache_maint.c:1265
+#: ../src/preferences.c:111 ../src/preferences.c:2139 ../src/search.c:2090
+#: ../src/search.c:3229
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../src/advanced_exif.c:426 ../src/preferences.c:2009
+#: ../src/advanced_exif.c:432 ../src/preferences.c:2053
 msgid "Description"
 msgstr "Descripción"
 
-#: ../src/advanced_exif.c:427
+#: ../src/advanced_exif.c:433
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_exif.c:428 ../src/desktop_file.c:535 ../src/dupe.c:2764
-#: ../src/dupe.c:3303 ../src/print.c:3209 ../src/search.c:3111
+#: ../src/advanced_exif.c:434 ../src/desktop_file.c:535 ../src/dupe.c:2765
+#: ../src/dupe.c:3306 ../src/print.c:3209 ../src/search.c:3312
 #: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1935
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/advanced_exif.c:429
+#: ../src/advanced_exif.c:435
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ../src/advanced_exif.c:430
+#: ../src/advanced_exif.c:436
 msgid "Format"
 msgstr "Formato"
 
-#: ../src/advanced_exif.c:431
+#: ../src/advanced_exif.c:437
 msgid "Elements"
 msgstr "Elementos"
 
 #. default sidebar
-#: ../src/bar.c:183
+#: ../src/bar.c:185
 msgid "Histogram"
 msgstr "Histograma"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:186
 msgid "Title"
 msgstr "Título"
 
-#: ../src/bar.c:185 ../src/search.c:2993
+#: ../src/bar.c:187 ../src/search.c:3150
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../src/bar.c:186 ../src/search.c:3005
+#: ../src/bar.c:188 ../src/search.c:3162
 msgid "Comment"
-msgstr "Comentario:"
-
-#: ../src/bar.c:187
-#, fuzzy
+msgstr "Comentario"
+
+#: ../src/bar.c:189
 msgid "Rating"
-msgstr "Pintando"
-
-#: ../src/bar.c:188
+msgstr "Valoración"
+
+#: ../src/bar.c:190
 msgid "Exif"
 msgstr "Exif"
 
 #. other pre-configured panes
-#: ../src/bar.c:190
+#: ../src/bar.c:192
 msgid "File info"
-msgstr "Información de archivo"
-
-#: ../src/bar.c:191
+msgstr "Información del archivo"
+
+#: ../src/bar.c:193
 msgid "Location and GPS"
-msgstr "Ubicación y GPS:"
-
-#: ../src/bar.c:192 ../src/exif.c:342
+msgstr "Ubicación y GPS"
+
+#: ../src/bar.c:194 ../src/exif.c:342
 msgid "Copyright"
-msgstr "Copyright"
-
-#: ../src/bar.c:195 ../src/bar_gps.c:1010
+msgstr ""
+
+#: ../src/bar.c:197 ../src/bar_gps.c:1010
 msgid "GPS Map"
 msgstr "Mapa GPS"
 
-#: ../src/bar.c:315 ../src/toolbar.c:191
+#: ../src/bar.c:317 ../src/toolbar.c:191
 msgid "Move to _top"
-msgstr "Subir a la _cima"
-
-#: ../src/bar.c:316 ../src/toolbar.c:192 ../src/ui_bookmark.c:416
+msgstr "Mover al principio"
+
+#: ../src/bar.c:318 ../src/toolbar.c:192 ../src/ui_bookmark.c:416
 msgid "Move _up"
 msgstr "_Subir"
 
-#: ../src/bar.c:317 ../src/toolbar.c:193 ../src/ui_bookmark.c:418
+#: ../src/bar.c:319 ../src/toolbar.c:193 ../src/ui_bookmark.c:418
 msgid "Move _down"
 msgstr "_Bajar"
 
-#: ../src/bar.c:318 ../src/toolbar.c:194
+#: ../src/bar.c:320 ../src/toolbar.c:194
 msgid "Move to _bottom"
-msgstr "Mover al _fondo"
-
-#: ../src/bar.c:320 ../src/toolbar.c:196
+msgstr "Mover al final"
+
+#: ../src/bar.c:322 ../src/toolbar.c:196
 msgid "Remove"
-msgstr "_Quitar"
-
-#: ../src/bar.c:711
-#, fuzzy
+msgstr "Eliminar"
+
+#: ../src/bar.c:713
 msgid "Add Pane"
-msgstr "Añadir imagen"
+msgstr "Añadir panel"
 
 #: ../src/bar_comment.c:216
 msgid "Add text to selected files"
@@ -166,56 +166,56 @@
 
 #: ../src/bar_comment.c:217
 msgid "Replace existing text in selected files"
-msgstr "Reemplazar texto en archivos seleccionados."
-
-#: ../src/bar_exif.c:222
+msgstr "Sustituir texto en los archivos seleccionados"
+
+#: ../src/bar_exif.c:223
 msgid "<empty label, fixme>"
 msgstr "<etiqueta vacía, arréglame>"
 
-#: ../src/bar_exif.c:550 ../src/bar_exif.c:560
+#: ../src/bar_exif.c:551 ../src/bar_exif.c:561
 msgid "Configure entry"
-msgstr "Configurar entrada"
+msgstr "Configurar la entrada"
 
 #. for the pane
-#: ../src/bar_exif.c:550 ../src/bar_exif.c:560 ../src/bar_exif.c:648
+#: ../src/bar_exif.c:551 ../src/bar_exif.c:561 ../src/bar_exif.c:649
 msgid "Add entry"
 msgstr "_Añadir entrada"
 
-#: ../src/bar_exif.c:566
+#: ../src/bar_exif.c:567
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../src/bar_exif.c:575 ../src/preferences.c:1688
+#: ../src/bar_exif.c:576 ../src/preferences.c:1707
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/bar_exif.c:584
+#: ../src/bar_exif.c:585
 msgid "Show only if set"
 msgstr "Mostrar solo si está activa"
 
-#: ../src/bar_exif.c:585
+#: ../src/bar_exif.c:586
 msgid "Editable (supported only for XMP)"
-msgstr "Editable (soportado solo para XMP)"
+msgstr "Editable (solo lo admite XMP)"
 
 #. for the entry
-#: ../src/bar_exif.c:634
+#: ../src/bar_exif.c:635
 #, c-format
 msgid "Configure \"%s\""
-msgstr "Configurar \"%s\""
-
-#: ../src/bar_exif.c:635 ../src/bar_keywords.c:1342
+msgstr "Configurar «%s»"
+
+#: ../src/bar_exif.c:636 ../src/bar_keywords.c:1342
 #, c-format
 msgid "Remove \"%s\""
-msgstr "Quitar \"%s\""
-
-#: ../src/bar_exif.c:636
-#, fuzzy, c-format
+msgstr "Eliminar «%s»"
+
+#: ../src/bar_exif.c:637
+#, c-format
 msgid "Copy \"%s\""
-msgstr "Copiar"
-
-#: ../src/bar_exif.c:649
+msgstr "Copiar «%s»"
+
+#: ../src/bar_exif.c:650
 msgid "Show hidden entries"
-msgstr "Mostrar ocultos"
+msgstr "Mostrar los elementos ocultos"
 
 #: ../src/bar_gps.c:187
 #, c-format
@@ -223,6 +223,8 @@
 "\n"
 "Do you want to geocode image %s?"
 msgstr ""
+"\n"
+"¿Quiere geocodificar la imagen %s?"
 
 #: ../src/bar_gps.c:192
 #, c-format
@@ -230,6 +232,8 @@
 "\n"
 "Do you want to geocode %i images?"
 msgstr ""
+"\n"
+"¿Quiere geocodificar %i imágenes?"
 
 #: ../src/bar_gps.c:197
 #, c-format
@@ -237,6 +241,8 @@
 "\n"
 "This image is already geocoded!"
 msgstr ""
+"\n"
+"¡La imagen ya está geocodificada!"
 
 #: ../src/bar_gps.c:202
 #, c-format
@@ -244,6 +250,8 @@
 "\n"
 "One image is already geocoded!"
 msgstr ""
+"\n"
+"¡Una imagen ya está geocodificada!"
 
 #: ../src/bar_gps.c:207
 #, c-format
@@ -251,34 +259,37 @@
 "\n"
 "%i Images are already geocoded!"
 msgstr ""
+"\n"
+"¡%i imágenes ya están geocodificadas!"
 
 #: ../src/bar_gps.c:212
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Position: %s \n"
-msgstr "Ubicación:%s"
+msgstr ""
+"\n"
+"\n"
+"Posición: %s \n"
 
 #: ../src/bar_gps.c:214
-#, fuzzy
 msgid "Geocode images"
-msgstr "Precargar siguiente imagen"
+msgstr "Geocodificar imágenes"
 
 #: ../src/bar_gps.c:218
-#, fuzzy
 msgid "Write lat/long to meta-data?"
-msgstr "¿Escribir Metadatos?"
+msgstr "¿Quiere escribir la latitud/longitud en los metadatos?"
 
 #: ../src/bar_gps.c:721
 #, c-format
 msgid "Zoom %i"
-msgstr "Zoom %i"
+msgstr "Zum %i"
 
 #: ../src/bar_gps.c:739
 #, c-format
 msgid "Zoom level %i"
-msgstr "Zoom level %i"
+msgstr "Nivel de zum %i"
 
 #: ../src/bar_gps.c:744
 msgid "Loading map"
@@ -290,57 +301,56 @@
 
 #: ../src/bar_gps.c:812
 msgid "Centre map on marker"
-msgstr "Centrar mapa en marcador"
+msgstr "Centrar el mapa en el marcador"
 
 #: ../src/bar_gps.c:834
 msgid ""
 "Move map centre to marker\n"
 " is disabled"
 msgstr ""
-"Mover-centro de mapa al marcador\n"
-"deshabilitado"
+"Mover el centro del mapa al marcador\n"
+"está deshabilitado"
 
 #: ../src/bar_gps.c:839
 msgid ""
 "Move map centre to marker\n"
 " is enabled"
 msgstr ""
-"Mover centro de mapa al marcador\n"
-"habilitado"
+"Mover el centro del mapa al marcador\n"
+"está habilitado"
 
 #: ../src/bar_gps.c:843
-#, fuzzy
 msgid "Map centering"
-msgstr "Centrando mapa"
+msgstr "Centrado del mapa"
 
 #. use the same strings as in layout_util.c
-#: ../src/bar_histogram.c:257 ../src/layout_util.c:1899
+#: ../src/bar_histogram.c:257 ../src/layout_util.c:1961
 msgid "Histogram on _Red"
 msgstr "Histograma sobre _Rojo"
 
-#: ../src/bar_histogram.c:258 ../src/layout_util.c:1900
+#: ../src/bar_histogram.c:258 ../src/layout_util.c:1962
 msgid "Histogram on _Green"
 msgstr "Histograma sobre (_G) Verde"
 
-#: ../src/bar_histogram.c:259 ../src/layout_util.c:1901
+#: ../src/bar_histogram.c:259 ../src/layout_util.c:1963
 msgid "Histogram on _Blue"
 msgstr "Histograma sobre (_B) Azul"
 
-#: ../src/bar_histogram.c:260 ../src/layout_util.c:1902
+#: ../src/bar_histogram.c:260 ../src/layout_util.c:1964
 msgid "_Histogram on RGB"
 msgstr "_Histograma sobre RGB"
 
-#: ../src/bar_histogram.c:261 ../src/layout_util.c:1903
+#: ../src/bar_histogram.c:261 ../src/layout_util.c:1965
 msgid "Histogram on _Value"
 msgstr "Histograma sobre _Valor"
 
-#: ../src/bar_histogram.c:265 ../src/layout_util.c:1907
+#: ../src/bar_histogram.c:265 ../src/layout_util.c:1969
 msgid "Li_near Histogram"
-msgstr "Histograma Li_neal"
+msgstr "Histograma li_neal"
 
 #: ../src/bar_histogram.c:266
 msgid "L_og Histogram"
-msgstr "Histograma L_ogarítmico"
+msgstr "Histograma l_ogarítmico"
 
 #: ../src/bar_keywords.c:463
 msgid "Add keywords to selected files"
@@ -348,7 +358,7 @@
 
 #: ../src/bar_keywords.c:464
 msgid "Replace existing keywords in selected files"
-msgstr "Reemplazar palabras clave existentes en los archivos seleccionados"
+msgstr "Sustituir palabras clave existentes en los archivos seleccionados"
 
 #: ../src/bar_keywords.c:935
 msgid "Edit keyword"
@@ -356,13 +366,12 @@
 
 #: ../src/bar_keywords.c:935 ../src/bar_keywords.c:942
 #: ../src/bar_keywords.c:1287
-#, fuzzy
 msgid "New keyword"
-msgstr "Añadir palabra clave"
+msgstr "Nueva palabra clave"
 
 #: ../src/bar_keywords.c:942
 msgid "Configure keyword"
-msgstr "Configurar teclado"
+msgstr "Configurar palabra clave"
 
 #: ../src/bar_keywords.c:948
 msgid "Keyword:"
@@ -382,77 +391,75 @@
 
 #: ../src/bar_keywords.c:1036
 msgid "This will disconnect all Marks Keywords connections"
-msgstr ""
+msgstr "Esto desconecta todas las conexiones de palabras clave de marca"
 
 #: ../src/bar_keywords.c:1038
-#, fuzzy
 msgid "Marks Keywords"
-msgstr "Palabras clave"
+msgstr "Palabras clave de marcas"
 
 #: ../src/bar_keywords.c:1311
-#, fuzzy, c-format
+#, c-format
 msgid "Add \"%s\" to all selected images"
-msgstr "Añadir palabras clave a los archivos seleccionados"
+msgstr "Añadir «%s» a todas las imágenes seleccionadas"
 
 #: ../src/bar_keywords.c:1317
 #, c-format
 msgid "Hide \"%s\""
-msgstr "Ocultar %s"
+msgstr "Ocultar «%s»"
 
 #: ../src/bar_keywords.c:1324
 #, c-format
 msgid "Mark %d"
-msgstr "Marcador %d"
+msgstr "Marca %d"
 
 #: ../src/bar_keywords.c:1332
 #, c-format
 msgid "Connect \"%s\" to mark"
-msgstr "Conectar \"%s\" a marca"
+msgstr "Conectar «%s» a la marca"
 
 #: ../src/bar_keywords.c:1339
 #, c-format
 msgid "Edit \"%s\""
-msgstr "Editar \"%s\""
+msgstr "Editar «%s»"
 
 #: ../src/bar_keywords.c:1349
 #, c-format
 msgid "Disconnect \"%s\" from mark %s"
-msgstr "Desconectar \"%s\" de marca \"%s\""
+msgstr "Desconectar «%s» de la marca «%s»"
 
 #: ../src/bar_keywords.c:1356
 #, c-format
 msgid "Disconnect all Mark Keyword connections"
-msgstr ""
+msgstr "Desconectar todas las conexiones de palabras clave de marca"
 
 #. for the pane
 #: ../src/bar_keywords.c:1367 ../src/bar_keywords.c:1381
 msgid "Expand checked"
-msgstr "Expandir marcado"
+msgstr "Expandir lo marcado"
 
 #: ../src/bar_keywords.c:1368 ../src/bar_keywords.c:1382
 msgid "Collapse unchecked"
-msgstr "Contraer desmarcado"
+msgstr "Contraer lo desmarcado"
 
 #: ../src/bar_keywords.c:1369 ../src/bar_keywords.c:1383
 msgid "Hide unchecked"
-msgstr "Ocultar desmarcado"
+msgstr "Ocultar lo desmarcado"
 
 #: ../src/bar_keywords.c:1370
 msgid "Revert all hidden"
-msgstr ""
+msgstr "Revertir todo lo ocultado"
 
 #: ../src/bar_keywords.c:1372
 msgid "Show all"
 msgstr "Mostrar todo"
 
 #: ../src/bar_keywords.c:1373
-#, fuzzy
 msgid "Collapse all"
-msgstr "Contraer desmarcado"
+msgstr "Contraer todo"
 
 #: ../src/bar_keywords.c:1374
 msgid "Revert"
-msgstr ""
+msgstr "Revertir"
 
 #: ../src/bar_keywords.c:1378
 msgid "On any change"
@@ -473,18 +480,18 @@
 msgid "Collection exists"
 msgstr "La colección existe"
 
-#: ../src/bar_sort.c:515 ../src/collect.c:1126 ../src/collect-dlg.c:93
+#: ../src/bar_sort.c:515 ../src/collect.c:1146 ../src/collect-dlg.c:93
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
 "%s"
 msgstr ""
-"Fallo al guardar la colección:\n"
+"Error al guardar la colección:\n"
 "%s"
 
-#: ../src/bar_sort.c:516 ../src/collect.c:1127 ../src/collect-dlg.c:94
+#: ../src/bar_sort.c:516 ../src/collect.c:1147 ../src/collect-dlg.c:94
 msgid "Save Failed"
-msgstr "Fallo al guardar"
+msgstr "Error al guardar"
 
 #: ../src/bar_sort.c:551 ../src/bar_sort.c:723
 msgid "Add Bookmark"
@@ -502,20 +509,20 @@
 msgid "Sort Manager"
 msgstr "Clasificador"
 
-#: ../src/bar_sort.c:659 ../src/pan-view/pan-view.c:1823
+#: ../src/bar_sort.c:659 ../src/pan-view/pan-view.c:1832
 #: ../src/ui_pathsel.c:1108
 msgid "Folders"
 msgstr "Carpetas"
 
-#: ../src/bar_sort.c:660 ../src/options.c:197
+#: ../src/bar_sort.c:660 ../src/options.c:202
 msgid "Collections"
 msgstr "Colecciones"
 
-#: ../src/bar_sort.c:668 ../src/utilops.c:2297
+#: ../src/bar_sort.c:668 ../src/utilops.c:2313
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/bar_sort.c:671 ../src/utilops.c:2247
+#: ../src/bar_sort.c:671 ../src/utilops.c:2263
 msgid "Move"
 msgstr "Mover"
 
@@ -537,11 +544,11 @@
 "error saving sim cache data: %s\n"
 "error: %s\n"
 msgstr ""
-"error al guardar datos de cache sim: %s\n"
+"error al guardar datos de caché sim: %s\n"
 "error: %s\n"
 
 #: ../src/cache_maint.c:123 ../src/cache_maint.c:612 ../src/cache_maint.c:880
-#: ../src/editors.c:1195
+#: ../src/editors.c:1205
 msgid "done"
 msgstr "listo"
 
@@ -577,7 +584,7 @@
 msgid "S_tart"
 msgstr "_Iniciar"
 
-#: ../src/cache_maint.c:817 ../src/preferences.c:2347
+#: ../src/cache_maint.c:817 ../src/preferences.c:2392
 msgid "Folder:"
 msgstr "Carpeta:"
 
@@ -591,13 +598,13 @@
 
 #: ../src/cache_maint.c:825
 msgid "Store thumbnails local to source images"
-msgstr "Almacenar miniaturas donde se encuentran las imágenes de origen"
+msgstr "Almacenar miniaturas junto a las imágenes de origen"
 
 #: ../src/cache_maint.c:834 ../src/cache_maint.c:1072
 msgid "click start to begin"
 msgstr "haga clic en Iniciar para comenzar"
 
-#: ../src/cache_maint.c:992 ../src/editors.c:1121
+#: ../src/cache_maint.c:992 ../src/editors.c:1131
 msgid "running..."
 msgstr "ejecutándose..."
 
@@ -608,33 +615,32 @@
 #: ../src/cache_maint.c:1131 ../src/cache_maint.c:1134
 #: ../src/cache_maint.c:1232 ../src/cache_maint.c:1251
 msgid "Clear cache"
-msgstr "Borrar caché"
+msgstr "Borrar la caché"
 
 #: ../src/cache_maint.c:1135
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
 msgstr ""
-"Esto borrará todas las miniaturas que\n"
-"fueron guardadas en el disco; ¿continuar?"
+"Esto borrará todas las miniaturas que fueron\n"
+"guardadas en el disco; ¿quiere continuar?"
 
 #: ../src/cache_maint.c:1180
 #, c-format
 msgid "Location: %s"
-msgstr "Ubicación:%s"
+msgstr "Ubicación: %s"
 
 #: ../src/cache_maint.c:1205
 msgid "Cache Maintenance"
-msgstr "Mantenimiento de caché"
+msgstr "Mantenimiento de la caché"
 
 #: ../src/cache_maint.c:1217
 msgid "Cache and Data Maintenance"
 msgstr "Mantenimiento de caché y datos"
 
 #: ../src/cache_maint.c:1221
-#, fuzzy
 msgid "Geeqie thumbnail cache"
-msgstr "Caché de miniaturas compartido"
+msgstr "Caché de miniaturas de Geeqie"
 
 #: ../src/cache_maint.c:1227 ../src/cache_maint.c:1246
 #: ../src/cache_maint.c:1271
@@ -646,9 +652,8 @@
 msgstr "Borrar miniaturas huérfanas o desactualizadas."
 
 #: ../src/cache_maint.c:1235
-#, fuzzy
 msgid "Delete all cached data."
-msgstr "Borrar todas las miniaturas en caché."
+msgstr "Borrar todos los datos en caché."
 
 #: ../src/cache_maint.c:1238
 msgid "Shared thumbnail cache"
@@ -671,34 +676,34 @@
 msgstr "Borrar palabras clave y comentarios huérfanos."
 
 #. When does this occur ??
-#: ../src/collect.c:405 ../src/image.c:186 ../src/image-overlay.c:545
-#: ../src/image-overlay.c:622
+#: ../src/collect.c:422 ../src/image.c:189 ../src/image-overlay.c:549
+#: ../src/image-overlay.c:626
 msgid "Untitled"
-msgstr "Sin_nombre"
-
-#: ../src/collect.c:409
+msgstr "Sin nombre"
+
+#: ../src/collect.c:426
 #, c-format
 msgid "Untitled (%d)"
-msgstr "Sin_nombre (%d)"
-
-#: ../src/collect.c:1051
+msgstr "Sin nombre (%d)"
+
+#: ../src/collect.c:1071
 #, c-format
 msgid "%s - Collection - %s"
 msgstr "%s - Colección - %s"
 
-#: ../src/collect.c:1163 ../src/collect.c:1167
+#: ../src/collect.c:1183 ../src/collect.c:1187
 msgid "Close collection"
 msgstr "Cerrar colección"
 
-#: ../src/collect.c:1168
+#: ../src/collect.c:1188
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
 msgstr ""
 "La colección ha sido modificada.\n"
-"¿Guardar primero?"
-
-#: ../src/collect.c:1171
+"¿Quiere guardarla antes?"
+
+#: ../src/collect.c:1191
 msgid "_Discard"
 msgstr "_Desechar"
 
@@ -709,9 +714,9 @@
 "%s\n"
 "is a folder, collections are files"
 msgstr ""
-"Ruta especificada:\n"
+"La ruta especificada:\n"
 "%s\n"
-"es una carpeta, las colecciones son archivos."
+"es de una carpeta, las colecciones son archivos"
 
 #: ../src/collect-dlg.c:68
 msgid "Invalid filename"
@@ -719,34 +724,34 @@
 
 #: ../src/collect-dlg.c:77
 msgid "Overwrite File"
-msgstr "Sobreescribir archivo"
+msgstr "Sobrescribir archivo"
 
 #: ../src/collect-dlg.c:82
 msgid "Overwrite existing file?"
-msgstr "¿Sobreescribir archivo existente?"
+msgstr "¿Quiere sobrescribir el archivo existente?"
 
 #: ../src/collect-dlg.c:84
 msgid "_Overwrite"
-msgstr "_Sobreescribir"
+msgstr "_Sobrescribir"
 
 #: ../src/collect-dlg.c:135
 #, c-format
 msgid "No such file '%s'."
-msgstr "No existe el archivo '%s'."
+msgstr "No existe el archivo «%s»."
 
 #: ../src/collect-dlg.c:140
 #, c-format
 msgid "'%s' is a directory, not a collection file."
-msgstr "'%s' es un directorio, no un archivo de colección."
+msgstr "«%s» es un directorio, no un archivo de colección."
 
 #: ../src/collect-dlg.c:145
 #, c-format
 msgid "You do not have read permissions on the file '%s'."
-msgstr "No tienes permiso de lectura sobre el archivo '%s'."
+msgstr "No tiene permiso de lectura sobre el archivo «%s»."
 
 #: ../src/collect-dlg.c:151
 msgid "Can not open collection file"
-msgstr "No puedo abrir archivo de colección"
+msgstr "No se puede abrir el archivo de colección"
 
 #: ../src/collect-dlg.c:203
 msgid "Save collection"
@@ -771,7 +776,7 @@
 #: ../src/collect-io.c:356
 #, c-format
 msgid "failed to open collection (write) \"%s\"\n"
-msgstr "Fallo al guardar la colección \"%s\":\n"
+msgstr "error al abrir la colección (escribir) «%s»\n"
 
 #: ../src/collect-io.c:381
 #, c-format
@@ -779,7 +784,7 @@
 "error saving collection file: %s\n"
 "error: %s\n"
 msgstr ""
-"error al guardar archivo de colección: %s\n"
+"error al guardar el archivo de colección: %s\n"
 "error: %s\n"
 
 #: ../src/collect-table.c:212
@@ -790,192 +795,192 @@
 #: ../src/collect-table.c:219
 #, c-format
 msgid "%s, %d images"
-msgstr "%s,%d imágenes"
-
-#: ../src/collect-table.c:224 ../src/layout_util.c:1675
-#: ../src/layout_util.c:2816
+msgstr "%s, %d imágenes"
+
+#: ../src/collect-table.c:224 ../src/layout_util.c:1736
+#: ../src/layout_util.c:2880
 msgid "Empty"
 msgstr "Vacía"
 
-#: ../src/collect-table.c:238 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file/view_file.c:848 ../src/view_file/view_file.c:957
+#: ../src/collect-table.c:238 ../src/dupe.c:1363 ../src/search.c:386
+#: ../src/view_file/view_file.c:951 ../src/view_file/view_file.c:1060
 msgid "Loading thumbs..."
 msgstr "Cargando miniaturas..."
 
-#: ../src/collect-table.c:913 ../src/dupe.c:2343 ../src/dupe.c:2661
-#: ../src/layout_util.c:1722 ../src/search.c:1061
+#: ../src/collect-table.c:933 ../src/dupe.c:2344 ../src/dupe.c:2662
+#: ../src/layout_util.c:1783 ../src/search.c:1082
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/collect-table.c:915 ../src/dupe.c:2345 ../src/dupe.c:2663
-#: ../src/img-view.c:1319 ../src/layout_image.c:691
-#: ../src/pan-view/pan-view.c:2254 ../src/search.c:1063
-#: ../src/view_file/view_file.c:598
+#: ../src/collect-table.c:935 ../src/dupe.c:2346 ../src/dupe.c:2664
+#: ../src/img-view.c:1328 ../src/layout_image.c:691
+#: ../src/pan-view/pan-view.c:2263 ../src/search.c:1084
+#: ../src/view_file/view_file.c:600
 msgid "View in _new window"
 msgstr "Ver en una ventana _nueva"
 
-#: ../src/collect-table.c:918 ../src/dupe.c:2384 ../src/dupe.c:2671
-#: ../src/search.c:1098
+#: ../src/collect-table.c:937
+msgid "Go to original"
+msgstr "Ir al original"
+
+#: ../src/collect-table.c:940 ../src/dupe.c:2385 ../src/dupe.c:2672
+#: ../src/search.c:1119
 msgid "Rem_ove"
-msgstr "_Quitar"
-
-#: ../src/collect-table.c:921
-#, fuzzy
+msgstr "Eliminar"
+
+#: ../src/collect-table.c:943
 msgid "Append from file selection"
-msgstr "Añadir desde lista de archivos"
-
-#: ../src/collect-table.c:923
+msgstr "Añadir desde la selección de archivos"
+
+#: ../src/collect-table.c:945
 msgid "Append from collection..."
 msgstr "Añadir desde colección..."
 
-#: ../src/collect-table.c:927
+#: ../src/collect-table.c:949
 msgid "_Selection"
 msgstr "_Selección"
 
-#: ../src/collect-table.c:929 ../src/dupe.c:2348 ../src/dupe.c:2666
-#: ../src/layout_util.c:1780 ../src/search.c:1066
+#: ../src/collect-table.c:951 ../src/dupe.c:2349 ../src/dupe.c:2667
+#: ../src/layout_util.c:1841 ../src/search.c:1087
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../src/collect-table.c:931 ../src/dupe.c:2350 ../src/dupe.c:2668
-#: ../src/layout_util.c:1781 ../src/search.c:1068
+#: ../src/collect-table.c:953 ../src/dupe.c:2351 ../src/dupe.c:2669
+#: ../src/layout_util.c:1842 ../src/search.c:1089
 msgid "Select none"
-msgstr "Seleccionar nada"
-
-#: ../src/collect-table.c:933
+msgstr "No seleccionar nada"
+
+#: ../src/collect-table.c:955
 msgid "Invert selection"
-msgstr "Invertir-selección"
-
-#: ../src/collect-table.c:935
-#, fuzzy
+msgstr "Invertir la selección"
+
+#: ../src/collect-table.c:957
 msgid "Rectangular selection"
-msgstr "Selección rectangular en vista de íconos"
-
-#: ../src/collect-table.c:947 ../src/dupe.c:2371 ../src/img-view.c:1323
-#: ../src/layout_image.c:699 ../src/layout_util.c:1755
-#: ../src/pan-view/pan-view.c:2258 ../src/search.c:1085
-#: ../src/view_file/view_file.c:602
+msgstr "Selección rectangular"
+
+#: ../src/collect-table.c:969 ../src/dupe.c:2372 ../src/img-view.c:1332
+#: ../src/layout_image.c:699 ../src/layout_util.c:1816
+#: ../src/pan-view/pan-view.c:2267 ../src/search.c:1106
+#: ../src/view_file/view_file.c:604
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../src/collect-table.c:949 ../src/dupe.c:2373 ../src/img-view.c:1324
-#: ../src/layout_image.c:701 ../src/layout_util.c:1756
-#: ../src/pan-view/pan-view.c:2260 ../src/search.c:1087
-#: ../src/view_file/view_file.c:604
+#: ../src/collect-table.c:971 ../src/dupe.c:2374 ../src/img-view.c:1333
+#: ../src/layout_image.c:701 ../src/layout_util.c:1817
+#: ../src/pan-view/pan-view.c:2269 ../src/search.c:1108
+#: ../src/view_file/view_file.c:606
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../src/collect-table.c:951 ../src/dupe.c:2375 ../src/img-view.c:1325
-#: ../src/layout_image.c:703 ../src/layout_util.c:1757
-#: ../src/pan-view/pan-view.c:2262 ../src/search.c:1089 ../src/view_dir.c:683
-#: ../src/view_file/view_file.c:606
+#: ../src/collect-table.c:973 ../src/dupe.c:2376 ../src/img-view.c:1334
+#: ../src/layout_image.c:703 ../src/layout_util.c:1818
+#: ../src/pan-view/pan-view.c:2271 ../src/search.c:1110 ../src/view_dir.c:683
+#: ../src/view_file/view_file.c:608
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ../src/collect-table.c:953 ../src/dupe.c:2377 ../src/img-view.c:1326
-#: ../src/layout_image.c:705 ../src/pan-view/pan-view.c:2264
-#: ../src/search.c:1091 ../src/view_dir.c:686 ../src/view_file/view_file.c:608
+#: ../src/collect-table.c:975 ../src/dupe.c:2378 ../src/img-view.c:1335
+#: ../src/layout_image.c:705 ../src/pan-view/pan-view.c:2273
+#: ../src/search.c:1112 ../src/view_dir.c:686 ../src/view_file/view_file.c:610
 msgid "_Copy path"
-msgstr "_Path de copia"
-
-#: ../src/collect-table.c:955 ../src/dupe.c:2379 ../src/img-view.c:1327
-#: ../src/layout_image.c:706 ../src/pan-view/pan-view.c:2266
-#: ../src/search.c:1093 ../src/view_dir.c:689 ../src/view_file/view_file.c:610
-#, fuzzy
+msgstr "_Copiar la ruta"
+
+#: ../src/collect-table.c:977 ../src/dupe.c:2380 ../src/img-view.c:1336
+#: ../src/layout_image.c:706 ../src/pan-view/pan-view.c:2275
+#: ../src/search.c:1114 ../src/view_dir.c:689 ../src/view_file/view_file.c:612
 msgid "_Copy path unquoted"
-msgstr "_Path de copia"
-
-#: ../src/collect-table.c:957 ../src/dupe.c:2381 ../src/img-view.c:1328
-#: ../src/layout_image.c:708 ../src/layout_util.c:1758
-#: ../src/layout_util.c:1759 ../src/layout_util.c:1760
-#: ../src/pan-view/pan-view.c:2268 ../src/search.c:1095 ../src/view_dir.c:692
-#: ../src/view_file/view_file.c:612
+msgstr "Copiar la ruta sin entrecomillarla"
+
+#: ../src/collect-table.c:979 ../src/dupe.c:2382 ../src/img-view.c:1337
+#: ../src/layout_image.c:708 ../src/layout_util.c:1819
+#: ../src/layout_util.c:1820 ../src/layout_util.c:1821
+#: ../src/pan-view/pan-view.c:2277 ../src/search.c:1116 ../src/view_dir.c:692
+#: ../src/view_file/view_file.c:614
 msgid "_Delete..."
 msgstr "Borrar..."
 
-#: ../src/collect-table.c:963
+#: ../src/collect-table.c:985
 msgid "Randomize"
 msgstr "Aleatorio"
 
-#: ../src/collect-table.c:965 ../src/view_file/view_file.c:637
+#: ../src/collect-table.c:987 ../src/view_file/view_file.c:639
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: ../src/collect-table.c:968 ../src/view_file/view_file.c:653
+#: ../src/collect-table.c:990 ../src/view_file/view_file.c:655
 msgid "Show filename _text"
-msgstr "M_ostrar nombres de archivos"
-
-#: ../src/collect-table.c:971
+msgstr "M_ostrar los nombres de archivos"
+
+#: ../src/collect-table.c:993
 msgid "_Save collection"
 msgstr "_Guardar colección"
 
-#: ../src/collect-table.c:973
+#: ../src/collect-table.c:995
 msgid "Save collection _as..."
 msgstr "G_uardar colección como..."
 
-#: ../src/collect-table.c:976 ../src/layout_util.c:1751
-#: ../src/view_file/view_file.c:622
+#: ../src/collect-table.c:998 ../src/layout_util.c:1812
+#: ../src/view_file/view_file.c:624
 msgid "_Find duplicates..."
 msgstr "Buscar _duplicados..."
 
-#: ../src/collect-table.c:978 ../src/dupe.c:2368 ../src/layout_util.c:1753
-#: ../src/search.c:1082
+#: ../src/collect-table.c:1000 ../src/dupe.c:2369 ../src/layout_util.c:1814
+#: ../src/search.c:1103
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/collect-table.c:2167 ../src/dupe.c:3525 ../src/img-view.c:1487
+#: ../src/collect-table.c:2189 ../src/dupe.c:3528 ../src/img-view.c:1496
 msgid "Dropped list includes folders."
-msgstr "La lista soltada incluye carpetas"
-
-#: ../src/collect-table.c:2169 ../src/dupe.c:3527 ../src/img-view.c:1489
+msgstr "La lista soltada incluye carpetas."
+
+#: ../src/collect-table.c:2191 ../src/dupe.c:3530 ../src/img-view.c:1498
 msgid "_Add contents"
 msgstr "_Añadir contenido"
 
-#: ../src/collect-table.c:2171 ../src/dupe.c:3528 ../src/img-view.c:1490
+#: ../src/collect-table.c:2193 ../src/dupe.c:3531 ../src/img-view.c:1499
 msgid "Add contents _recursive"
 msgstr "Añadir contenido _recursivamente"
 
-#: ../src/collect-table.c:2173 ../src/dupe.c:3529 ../src/img-view.c:1491
+#: ../src/collect-table.c:2195 ../src/dupe.c:3532 ../src/img-view.c:1500
 msgid "_Skip folders"
-msgstr "_Ignorar carpetas"
-
-#: ../src/collect-table.c:2176 ../src/dupe.c:3531 ../src/img-view.c:1493
+msgstr "_Omitir carpetas"
+
+#: ../src/collect-table.c:2198 ../src/dupe.c:3534 ../src/img-view.c:1502
 #: ../src/view_dir.c:426
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:448
+#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:502
 msgid "sRGB"
 msgstr "sRGB"
 
 #: ../src/color-man.c:436
 msgid "Adobe RGB compatible"
-msgstr "Compatible Adobe RGB"
+msgstr "Compatible con Adobe RGB"
 
 #: ../src/color-man.c:453
 msgid "Custom profile"
 msgstr "Perfil personalizado"
 
 #: ../src/debug.c:55
-#, fuzzy
 msgid "error"
-msgstr "Reflejar horizontalmente"
+msgstr "error"
 
 #: ../src/debug.c:56
 msgid "warning"
-msgstr ""
+msgstr "aviso"
 
 #: ../src/desktop_file.c:83 ../src/desktop_file.c:95 ../src/desktop_file.c:101
 msgid "Can't save"
-msgstr "No puedo grabar"
+msgstr "No se puede guardar"
 
 #: ../src/desktop_file.c:83
 msgid "Please specify file name."
-msgstr "Por favor indique el nombre del archivo"
+msgstr "Indique el nombre del archivo."
 
 #: ../src/desktop_file.c:95
 msgid "Could not create directory"
-msgstr "No se puede crear la carpeta"
+msgstr "No se puede crear el directorio"
 
 #: ../src/desktop_file.c:191 ../src/desktop_file.c:554
 msgid "Desktop file"
@@ -987,13 +992,13 @@
 "Unable to delete file:\n"
 "%s"
 msgstr ""
-"No se pudo borrar archivo:\n"
+"No se puede borrar el archivo:\n"
 "%s"
 
-#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2133
-#: ../src/utilops.c:2160 ../src/utilops.c:2682
+#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2149
+#: ../src/utilops.c:2176 ../src/utilops.c:2698
 msgid "File deletion failed"
-msgstr "Falló el borrado de archivo"
+msgstr "Error al borrar el archivo"
 
 #: ../src/desktop_file.c:345 ../src/desktop_file.c:353 ../src/ui_pathsel.c:537
 #: ../src/ui_pathsel.c:545
@@ -1011,264 +1016,262 @@
 
 #: ../src/desktop_file.c:383
 msgid "new.desktop"
-msgstr "Nuevo escritorio"
+msgstr "nuevo.desktop"
 
 #: ../src/desktop_file.c:467
 msgid "Plugins"
-msgstr ""
+msgstr "Complementos"
 
 #: ../src/desktop_file.c:544
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../src/desktop_file.c:563 ../src/dupe.c:2770 ../src/dupe.c:3307
-#: ../src/print.c:3211 ../src/search.c:3115 ../src/ui_pathsel.c:1120
+#: ../src/desktop_file.c:563 ../src/dupe.c:2771 ../src/dupe.c:3310
+#: ../src/print.c:3211 ../src/search.c:3316 ../src/ui_pathsel.c:1120
 #: ../src/utilops.c:501
 msgid "Path"
 msgstr "Ruta"
 
-#: ../src/dupe.c:108
+#: ../src/dupe.c:109
 msgid "Drop files to compare them."
 msgstr "Arrastre y suelte archivos para compararlos."
 
-#: ../src/dupe.c:112
+#: ../src/dupe.c:113
 #, c-format
 msgid "%d files"
 msgstr "%d archivos"
 
-#: ../src/dupe.c:116
+#: ../src/dupe.c:117
 #, c-format
 msgid "%d matches found in %d files"
-msgstr "%d aciertos encontrados en %d archivos"
-
-#: ../src/dupe.c:121
+msgstr "%d coincidencias encontradas en %d archivos"
+
+#: ../src/dupe.c:122
 msgid "[set 1]"
 msgstr "[conjunto 1]"
 
-#: ../src/dupe.c:1488
+#: ../src/dupe.c:1489
 msgid "Reading checksums..."
 msgstr "Leyendo sumas de verificación..."
 
-#: ../src/dupe.c:1521
+#: ../src/dupe.c:1522
 msgid "Reading dimensions..."
 msgstr "Leyendo dimensiones..."
 
-#: ../src/dupe.c:1555
+#: ../src/dupe.c:1556
 msgid "Reading similarity data..."
 msgstr "Leyendo datos de similitud..."
 
-#: ../src/dupe.c:1591 ../src/dupe.c:1622
+#: ../src/dupe.c:1592 ../src/dupe.c:1623
 msgid "Comparing..."
 msgstr "Comparando..."
 
-#: ../src/dupe.c:1602 ../src/pan-view/pan-view.c:1011
+#: ../src/dupe.c:1603 ../src/pan-view/pan-view.c:1012
 msgid "Sorting..."
 msgstr "Ordenando..."
 
-#: ../src/dupe.c:2352
+#: ../src/dupe.c:2353
 msgid "Select group _1 duplicates"
 msgstr "Seleccionar duplicados del grupo _1"
 
-#: ../src/dupe.c:2354
+#: ../src/dupe.c:2355
 msgid "Select group _2 duplicates"
 msgstr "Seleccionar duplicados del grupo _2"
 
-#: ../src/dupe.c:2386 ../src/dupe.c:2673 ../src/search.c:1100
+#: ../src/dupe.c:2387 ../src/dupe.c:2674 ../src/search.c:1121
 msgid "C_lear"
 msgstr "_Vaciar"
 
-#: ../src/dupe.c:2389 ../src/dupe.c:2676
+#: ../src/dupe.c:2390 ../src/dupe.c:2677
 msgid "Close _window"
-msgstr "_Cerrar ventana"
-
-#: ../src/dupe.c:2549
+msgstr "_Cerrar la ventana"
+
+#: ../src/dupe.c:2550
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d archivos (conjunto 2)"
 
-#: ../src/dupe.c:2765
+#: ../src/dupe.c:2766
 msgid "Name case-insensitive"
-msgstr "Nombre teniendo en cuenta mayúsculas y minúsculas"
-
-#: ../src/dupe.c:2766 ../src/dupe.c:3304 ../src/preferences.c:1809
-#: ../src/print.c:3215 ../src/search.c:3112
+msgstr "Nombre sin distinguir mayúsculas de minúsculas"
+
+#: ../src/dupe.c:2767 ../src/dupe.c:3307 ../src/preferences.c:1852
+#: ../src/print.c:3215 ../src/search.c:3313
 #: ../src/view_file/view_file_list.c:1939
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../src/dupe.c:2767 ../src/dupe.c:3305 ../src/exif.c:336
-#: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3113
+#: ../src/dupe.c:2768 ../src/dupe.c:3308 ../src/exif.c:336
+#: ../src/exif-common.c:860 ../src/print.c:3213 ../src/search.c:3314
 #: ../src/view_file/view_file_list.c:1943
 msgid "Date"
 msgstr "Fecha"
 
-#: ../src/dupe.c:2768 ../src/dupe.c:3306 ../src/print.c:3217
-#: ../src/search.c:3114
+#: ../src/dupe.c:2769 ../src/dupe.c:3309 ../src/print.c:3217
+#: ../src/search.c:3315
 msgid "Dimensions"
 msgstr "Dimensiones"
 
-#: ../src/dupe.c:2769
+#: ../src/dupe.c:2770
 msgid "Checksum"
 msgstr "Suma de verificación"
 
-#: ../src/dupe.c:2771
+#: ../src/dupe.c:2772
 msgid "Similarity (high)"
 msgstr "Similitud (alta)"
 
-#: ../src/dupe.c:2772
+#: ../src/dupe.c:2773
 msgid "Similarity"
 msgstr "Similitud"
 
-#: ../src/dupe.c:2773
+#: ../src/dupe.c:2774
 msgid "Similarity (low)"
 msgstr "Similitud (baja)"
 
-#: ../src/dupe.c:2774
+#: ../src/dupe.c:2775
 msgid "Similarity (custom)"
 msgstr "Similitud (personalizada)"
 
-#: ../src/dupe.c:3257 ../src/toolbar.c:86
+#: ../src/dupe.c:3260 ../src/toolbar.c:86
 msgid "Find duplicates"
 msgstr "Buscar duplicados"
 
-#: ../src/dupe.c:3339
+#: ../src/dupe.c:3342
 msgid "Compare to:"
 msgstr "Comparar con:"
 
-#: ../src/dupe.c:3352
+#: ../src/dupe.c:3355
 msgid "Compare by:"
 msgstr "Comparar por:"
 
-#: ../src/dupe.c:3360 ../src/preferences.c:1599 ../src/search.c:3128
+#: ../src/dupe.c:3363 ../src/preferences.c:1618 ../src/search.c:3329
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../src/dupe.c:3368
-#, fuzzy
+#: ../src/dupe.c:3371
 msgid "Ignore Rotation"
-msgstr "Orientación"
-
-#: ../src/dupe.c:3376
+msgstr "Ignorar la rotación"
+
+#: ../src/dupe.c:3379
 msgid "Compare two file sets"
 msgstr "Comparar dos conjuntos de archivos"
 
-#: ../src/dupe.c:3396 ../src/menu.c:221
+#: ../src/dupe.c:3399 ../src/menu.c:229
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../src/dupe.c:3404
-#, fuzzy
+#: ../src/dupe.c:3407
 msgid "Custom Threshold"
-msgstr "Umbral de similitud personalizado:"
-
-#: ../src/editors.c:295
+msgstr "Umbral personalizado"
+
+#: ../src/editors.c:305
 #, c-format
 msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
 msgstr ""
-"Archivo Desktop '%s'. En la clave 'Icon': no se debe incluir la extensión: "
-"'%s'\n"
+"El archivo desktop «%s» no debe incluir la extensión en la clave «Icon»: "
+"«%s»\n"
 
 #. flash fired (bit 0)
-#: ../src/editors.c:349 ../src/exif.c:220 ../src/exif-common.c:374
+#: ../src/editors.c:359 ../src/exif.c:220 ../src/exif-common.c:428
 msgid "yes"
 msgstr "sí"
 
-#: ../src/editors.c:349 ../src/exif.c:219 ../src/exif-common.c:374
+#: ../src/editors.c:359 ../src/exif.c:219 ../src/exif-common.c:428
 msgid "no"
 msgstr "no"
 
-#: ../src/editors.c:521
+#: ../src/editors.c:531
 msgid "stopping..."
 msgstr "deteniendo..."
 
-#: ../src/editors.c:542
+#: ../src/editors.c:552
 msgid "Edit command results"
 msgstr "Resultados del comando de edición"
 
-#: ../src/editors.c:545
+#: ../src/editors.c:555
 #, c-format
 msgid "Output of %s"
 msgstr "Salida de %s"
 
-#: ../src/editors.c:1072
+#: ../src/editors.c:1082
 #, c-format
 msgid ""
 "Failed to run command:\n"
 "%s\n"
 msgstr ""
-"Fallo al ejecutar comando:\n"
+"Error al ejecutar comando:\n"
 "%s\n"
 
-#: ../src/editors.c:1199
+#: ../src/editors.c:1209
 msgid "stopped by user"
 msgstr "detenido por el usuario"
 
-#: ../src/editors.c:1284
+#: ../src/editors.c:1294
 #, c-format
 msgid ""
 "%s\n"
 "\"%s\""
 msgstr ""
 "%s\n"
-"\"%s\""
-
-#: ../src/editors.c:1286
+"«%s»"
+
+#: ../src/editors.c:1296
 msgid "Invalid editor command"
 msgstr "Comando de editor no válido"
 
-#: ../src/editors.c:1373
+#: ../src/editors.c:1383
 msgid "Editor template is empty."
-msgstr "Plantilla de Editor vacía."
-
-#: ../src/editors.c:1374
+msgstr "La plantilla del editor está vacía."
+
+#: ../src/editors.c:1384
 msgid "Editor template has incorrect syntax."
-msgstr "Plantilla de Editor sintácticamente incorrecta.‎"
-
-#: ../src/editors.c:1375
+msgstr "La plantilla del editor es sintácticamente incorrecta.‎"
+
+#: ../src/editors.c:1385
 msgid "Editor template uses incompatible macros."
-msgstr "Plantilla de Editor usa macros incompatibles."
-
-#: ../src/editors.c:1376
+msgstr "La plantilla del editor usa macros incompatibles."
+
+#: ../src/editors.c:1386
 msgid "Can't find matching file type."
-msgstr "No encuentro tipo de archivo coincidente."
-
-#: ../src/editors.c:1377
+msgstr "No se encuentra ningún tipo de archivo coincidente."
+
+#: ../src/editors.c:1387
 msgid "Can't execute external editor."
-msgstr "No puedo ejecutar editor externo."
-
-#: ../src/editors.c:1378
+msgstr "No se puede ejecutar el editor externo."
+
+#: ../src/editors.c:1388
 msgid "External editor returned error status."
-msgstr "El editor externo devolvió estado de error."
-
-#: ../src/editors.c:1379
+msgstr "El editor externo devolvió un estado de error."
+
+#: ../src/editors.c:1389
 msgid "File was skipped."
-msgstr "Archivo omitido"
-
-#: ../src/editors.c:1380
+msgstr "Archivo omitido."
+
+#: ../src/editors.c:1390
 msgid "Unknown error."
-msgstr "Error desconocido"
+msgstr "Error desconocido."
 
 #: ../src/exif.c:142 ../src/exif.c:155 ../src/exif.c:169 ../src/exif.c:194
-#: ../src/exif.c:311 ../src/exif.c:658 ../src/exif-common.c:350
-#: ../src/exif-common.c:353 ../src/exif-common.c:420
+#: ../src/exif.c:311 ../src/exif.c:658 ../src/exif-common.c:404
+#: ../src/exif-common.c:407 ../src/exif-common.c:474
 msgid "unknown"
-msgstr "desconocido -da"
+msgstr "desconocido"
 
 #: ../src/exif.c:143
 msgid "top left"
-msgstr "izquierda superior"
+msgstr "superior izquierda"
 
 #: ../src/exif.c:144
 msgid "top right"
-msgstr "derecha superior"
+msgstr "superior derecha"
 
 #: ../src/exif.c:145
 msgid "bottom right"
-msgstr "derecha inferior"
+msgstr "inferior derecha"
 
 #: ../src/exif.c:146
 msgid "bottom left"
-msgstr "izquierda inferior"
+msgstr "inferior izquierda"
 
 #: ../src/exif.c:147
 msgid "left top"
@@ -1361,7 +1364,7 @@
 
 #: ../src/exif.c:195
 msgid "daylight"
-msgstr "luz de día"
+msgstr "luz diurna"
 
 #: ../src/exif.c:196
 msgid "fluorescent"
@@ -1377,27 +1380,27 @@
 
 #: ../src/exif.c:199
 msgid "fine weather"
-msgstr "Buen tiempo"
+msgstr "buen tiempo"
 
 #: ../src/exif.c:200
 msgid "cloudy weather"
-msgstr "Nublado"
+msgstr "tiempo nublado"
 
 #: ../src/exif.c:201
 msgid "shade"
-msgstr "Sombra"
+msgstr "sombra"
 
 #: ../src/exif.c:202
 msgid "daylight fluorescent"
-msgstr "fluorescente-luz día"
+msgstr "fluorescente luz diurna"
 
 #: ../src/exif.c:203
 msgid "day white fluorescent"
-msgstr "fluorescente-blanco-día"
+msgstr "fluorescente blanco diurno"
 
 #: ../src/exif.c:204
 msgid "cool white fluorescent"
-msgstr "fluorescente-blanco-frío"
+msgstr "fluorescente blanco frío"
 
 #: ../src/exif.c:205
 msgid "white fluorescent"
@@ -1405,15 +1408,15 @@
 
 #: ../src/exif.c:206
 msgid "standard light A"
-msgstr "Luz estándar A"
+msgstr "luz estándar A"
 
 #: ../src/exif.c:207
 msgid "standard light B"
-msgstr "Luz estándar B"
+msgstr "luz estándar B"
 
 #: ../src/exif.c:208
 msgid "standard light C"
-msgstr "Luz estándar C"
+msgstr "luz estándar C"
 
 #: ../src/exif.c:209
 msgid "D55"
@@ -1436,10 +1439,12 @@
 msgstr "ISO estudio tungsteno"
 
 #: ../src/exif.c:221
+#, fuzzy
 msgid "yes, not detected by strobe"
 msgstr "sí, no detectado"
 
 #: ../src/exif.c:222
+#, fuzzy
 msgid "yes, detected by strobe"
 msgstr "sí, detectado"
 
@@ -1449,15 +1454,15 @@
 
 #: ../src/exif.c:234
 msgid "1 chip color area"
-msgstr "1 chip color area"
+msgstr ""
 
 #: ../src/exif.c:235
 msgid "2 chip color area"
-msgstr "2 chip color area"
+msgstr ""
 
 #: ../src/exif.c:236
 msgid "3 chip color area"
-msgstr "3 chip color area"
+msgstr ""
 
 #: ../src/exif.c:237
 msgid "color sequential area"
@@ -1473,27 +1478,27 @@
 
 #: ../src/exif.c:244
 msgid "digital still camera"
-msgstr "Cámara digital"
+msgstr "cámara digital"
 
 #: ../src/exif.c:249
 msgid "direct photo"
-msgstr "Foto directa"
+msgstr "foto directa"
 
 #: ../src/exif.c:255
 msgid "custom"
-msgstr "Personalizado"
-
-#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:388
+msgstr "personalizado"
+
+#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:442
 msgid "auto"
-msgstr "auto"
+msgstr "automático"
 
 #: ../src/exif.c:262
 msgid "auto bracket"
-msgstr "Auto-bracket"
+msgstr ""
 
 #: ../src/exif.c:273
 msgid "standard"
-msgstr "estandar"
+msgstr "estándar"
 
 #: ../src/exif.c:276
 msgid "night scene"
@@ -1509,7 +1514,7 @@
 
 #: ../src/exif.c:283
 msgid "high gain up"
-msgstr "Subir alta ganancia"
+msgstr "subir alta ganancia"
 
 #: ../src/exif.c:284
 msgid "low gain down"
@@ -1517,7 +1522,7 @@
 
 #: ../src/exif.c:285
 msgid "high gain down"
-msgstr "Bajar alta ganancia"
+msgstr "bajar alta ganancia"
 
 #: ../src/exif.c:291 ../src/exif.c:305
 msgid "soft"
@@ -1549,19 +1554,19 @@
 
 #: ../src/exif.c:324
 msgid "Image Width"
-msgstr "Ancho de imagen"
+msgstr "Anchura de la imagen"
 
 #: ../src/exif.c:325
 msgid "Image Height"
-msgstr "Alto de imagen"
+msgstr "Altura de la imagen"
 
 #: ../src/exif.c:326
 msgid "Bits per Sample/Pixel"
-msgstr "Bits per Sample/Pixel"
+msgstr "Bits por muestra/píxel"
 
 #: ../src/exif.c:327
 msgid "Compression"
-msgstr "Compresión:"
+msgstr "Compresión"
 
 #: ../src/exif.c:328
 msgid "Image description"
@@ -1569,7 +1574,7 @@
 
 #: ../src/exif.c:329
 msgid "Camera make"
-msgstr "Cámara"
+msgstr "Marca de la cámara"
 
 #: ../src/exif.c:330
 msgid "Camera model"
@@ -1593,11 +1598,11 @@
 
 #: ../src/exif.c:335
 msgid "Firmware"
-msgstr "Firmware"
+msgstr ""
 
 #: ../src/exif.c:337
 msgid "White point"
-msgstr "punto blanco"
+msgstr "Punto blanco"
 
 #: ../src/exif.c:338
 msgid "Primary chromaticities"
@@ -1605,19 +1610,20 @@
 
 #: ../src/exif.c:339
 msgid "YCbCy coefficients"
-msgstr "coeficientes YCbCy"
+msgstr "Coeficientes YCbCy"
 
 #: ../src/exif.c:340
 msgid "YCbCr positioning"
-msgstr "posicionamiento YCbCy"
+msgstr "Posicionamiento YCbCy"
 
 #: ../src/exif.c:341
 msgid "Black white reference"
 msgstr "Referencia blanco y negro"
 
 #: ../src/exif.c:343
+#, fuzzy
 msgid "SubIFD Exif offset"
-msgstr "SubIFD Exif offset"
+msgstr "Desplazamiento Exif de SubIFD"
 
 #. subIFD follows
 #: ../src/exif.c:345
@@ -1636,17 +1642,17 @@
 msgid "Spectral Sensitivity"
 msgstr "Sensibilidad espectral"
 
-#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:569
+#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:865
 msgid "ISO sensitivity"
 msgstr "Sensibilidad ISO"
 
 #: ../src/exif.c:350
 msgid "Optoelectric conversion factor"
-msgstr "Factor de conversión optoelectríca"
+msgstr "Factor de conversión optoeléctrica"
 
 #: ../src/exif.c:351
 msgid "Exif version"
-msgstr "Exif version"
+msgstr "Versión de Exif"
 
 #: ../src/exif.c:352
 msgid "Date original"
@@ -1658,17 +1664,17 @@
 
 #: ../src/exif.c:354
 msgid "Pixel format"
-msgstr "Formato de pixel:"
+msgstr "Formato de píxel"
 
 #: ../src/exif.c:355
 msgid "Compression ratio"
 msgstr "Ratio de compresión"
 
-#: ../src/exif.c:356 ../src/exif-common.c:566
+#: ../src/exif.c:356 ../src/exif-common.c:862
 msgid "Shutter speed"
 msgstr "Velocidad de exposición"
 
-#: ../src/exif.c:357 ../src/exif-common.c:567
+#: ../src/exif.c:357 ../src/exif-common.c:863
 msgid "Aperture"
 msgstr "Apertura"
 
@@ -1676,7 +1682,7 @@
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/exif.c:359 ../src/exif-common.c:568
+#: ../src/exif.c:359 ../src/exif-common.c:864
 msgid "Exposure bias"
 msgstr "Margen de exposición"
 
@@ -1684,7 +1690,7 @@
 msgid "Maximum aperture"
 msgstr "Apertura máxima"
 
-#: ../src/exif.c:361 ../src/exif-common.c:572
+#: ../src/exif.c:361 ../src/exif-common.c:868
 msgid "Subject distance"
 msgstr "Distancia al sujeto"
 
@@ -1696,62 +1702,62 @@
 msgid "Light source"
 msgstr "Fuente de luz"
 
-#: ../src/exif.c:364 ../src/exif-common.c:573
+#: ../src/exif.c:364 ../src/exif-common.c:869
 msgid "Flash"
 msgstr "Flash"
 
-#: ../src/exif.c:365 ../src/exif-common.c:570
+#: ../src/exif.c:365 ../src/exif-common.c:866
 msgid "Focal length"
 msgstr "Longitud focal"
 
 #: ../src/exif.c:366
 msgid "Subject area"
-msgstr "Ãrea del sujeto"
+msgstr "Ãrea temática"
 
 #: ../src/exif.c:367
 msgid "MakerNote"
-msgstr "Nota de autor"
+msgstr "Nota del autor"
 
 #: ../src/exif.c:368
 msgid "UserComment"
-msgstr "Comentario"
+msgstr "Comentario del usuario"
 
 #: ../src/exif.c:369
 msgid "Subsecond time"
-msgstr "Subsecond time"
+msgstr ""
 
 #: ../src/exif.c:370
 msgid "Subsecond time original"
-msgstr "Subsecond time original"
+msgstr ""
 
 #: ../src/exif.c:371
 msgid "Subsecond time digitized"
-msgstr "Subsecond time digitized"
+msgstr ""
 
 #: ../src/exif.c:372
 msgid "FlashPix version"
-msgstr "FlashPix version"
+msgstr "Versión de FlashPix"
 
 #: ../src/exif.c:373
 msgid "Colorspace"
 msgstr "Espacio de color"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: ../src/exif.c:375 ../src/preferences.c:2604
+#: ../src/exif.c:375 ../src/preferences.c:2653
 msgid "Width"
-msgstr "Ancho"
-
-#: ../src/exif.c:376 ../src/preferences.c:2606
+msgstr "Anchura"
+
+#: ../src/exif.c:376 ../src/preferences.c:2655
 msgid "Height"
-msgstr "Alto"
+msgstr "Altura"
 
 #: ../src/exif.c:377
 msgid "Audio data"
-msgstr "Datos de Audio"
+msgstr "Datos de audio"
 
 #: ../src/exif.c:378
 msgid "ExifR98 extension"
-msgstr "ExifR98 extension"
+msgstr "Extensión ExifR98"
 
 #: ../src/exif.c:379
 msgid "Flash strength"
@@ -1759,19 +1765,19 @@
 
 #: ../src/exif.c:380
 msgid "Spatial frequency response"
-msgstr "Spatial frequency response"
+msgstr "Respuesta de frecuencia espacial"
 
 #: ../src/exif.c:381
 msgid "X Pixel density"
-msgstr "Densidad de pixel X"
+msgstr "Densidad de píxeles en X"
 
 #: ../src/exif.c:382
 msgid "Y Pixel density"
-msgstr "Densidad de pixel Y"
+msgstr "Densidad de píxeles en Y"
 
 #: ../src/exif.c:383
 msgid "Pixel density units"
-msgstr "Unidades de densidad de pixel"
+msgstr "Unidades de densidad de píxeles"
 
 #: ../src/exif.c:384
 msgid "Subject location"
@@ -1796,7 +1802,7 @@
 #. tags a4xx were added for Exif 2.2 (not just these - some above, as well)
 #: ../src/exif.c:391
 msgid "Render process"
-msgstr "Proceso de Render"
+msgstr "Proceso de representación"
 
 #: ../src/exif.c:392
 msgid "Exposure mode"
@@ -1808,7 +1814,7 @@
 
 #: ../src/exif.c:394
 msgid "Digital zoom ratio"
-msgstr "Rango de zoom digital"
+msgstr "Ratio de zum digital"
 
 #: ../src/exif.c:395
 msgid "Focal length (35mm)"
@@ -1816,7 +1822,7 @@
 
 #: ../src/exif.c:396
 msgid "Scene capture type"
-msgstr "Tipo de escena"
+msgstr "Tipo de captura de escena"
 
 #: ../src/exif.c:397
 msgid "Gain control"
@@ -1826,21 +1832,21 @@
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/exif.c:399 ../src/preferences.c:2220
+#: ../src/exif.c:399 ../src/preferences.c:2264
 msgid "Saturation"
 msgstr "Saturación"
 
 #: ../src/exif.c:400
 msgid "Sharpness"
-msgstr "Dureza"
+msgstr "Enfoque"
 
 #: ../src/exif.c:401
 msgid "Device setting"
-msgstr "Ajuste de dispositivo"
+msgstr "Ajuste del dispositivo"
 
 #: ../src/exif.c:402
 msgid "Subject range"
-msgstr "Rango del sujeto"
+msgstr "Rango del materias"
 
 #: ../src/exif.c:403
 msgid "Image serial number"
@@ -1849,178 +1855,200 @@
 #: ../src/exif.c:1110
 msgid "Can't get image comment: not compiled with Exiv2.\n"
 msgstr ""
+"No se puede obtener el comentario de la imagen: no se ha compilado con "
+"Exiv2.\n"
 
 #: ../src/exif.c:1116
 msgid "Can't set image comment: not compiled with Exiv2.\n"
 msgstr ""
-
-#: ../src/exif-common.c:349
+"No se puede establecer el comentario de la imagen: no se ha compilado con "
+"Exiv2.\n"
+
+#: ../src/exif-common.c:403
 msgid "infinity"
 msgstr "infinito"
 
-#: ../src/exif-common.c:378
+#: ../src/exif-common.c:432
 msgid "mode:"
 msgstr "modo:"
 
-#: ../src/exif-common.c:382 ../src/trash.c:213
+#: ../src/exif-common.c:436 ../src/trash.c:213
 msgid "on"
 msgstr "activado"
 
-#: ../src/exif-common.c:385 ../src/trash.c:218
+#: ../src/exif-common.c:439 ../src/trash.c:218
 msgid "off"
 msgstr "desactivado"
 
-#: ../src/exif-common.c:394
+#: ../src/exif-common.c:448
+#, fuzzy
 msgid "not detected by strobe"
 msgstr "no detectado"
 
-#: ../src/exif-common.c:395
+#: ../src/exif-common.c:449
+#, fuzzy
 msgid "detected by strobe"
 msgstr "detectado"
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: ../src/exif-common.c:400
+#: ../src/exif-common.c:454
 msgid "red-eye reduction"
 msgstr "reducción de ojos rojos"
 
-#: ../src/exif-common.c:420
+#: ../src/exif-common.c:474
 msgid "dot"
-msgstr "puntos"
-
-#: ../src/exif-common.c:453
+msgstr "punto"
+
+#: ../src/exif-common.c:507
 msgid "AdobeRGB"
-msgstr "AdobeRGB"
-
-#: ../src/exif-common.c:461
+msgstr ""
+
+#: ../src/exif-common.c:515
 msgid "embedded"
 msgstr "empotrado"
 
-#: ../src/exif-common.c:556
+#: ../src/exif-common.c:610
 msgid "Above Sea Level"
 msgstr "Sobre el nivel del mar"
 
-#: ../src/exif-common.c:556
+#: ../src/exif-common.c:610
 msgid "Below Sea Level"
 msgstr "Bajo el nivel del mar"
 
-#: ../src/exif-common.c:564
+#: ../src/exif-common.c:859
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../src/exif-common.c:571
+#: ../src/exif-common.c:861
+msgid "DateDigitized"
+msgstr "Fecha de la digitalización"
+
+#: ../src/exif-common.c:867
 msgid "Focal length 35mm"
 msgstr "Longitud focal 35mm"
 
-#: ../src/exif-common.c:574
+#: ../src/exif-common.c:870
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../src/exif-common.c:575
+#: ../src/exif-common.c:871
 msgid "Color profile"
 msgstr "Perfil de color"
 
-#: ../src/exif-common.c:576
+#: ../src/exif-common.c:872
 msgid "GPS position"
 msgstr "Posición GPS"
 
-#: ../src/exif-common.c:577
+#: ../src/exif-common.c:873
 msgid "GPS altitude"
 msgstr "Altitud GPS"
 
-#: ../src/exif-common.c:578
+#: ../src/exif-common.c:874
+msgid "Local time"
+msgstr "Hora local"
+
+#: ../src/exif-common.c:875
+msgid "Time zone"
+msgstr "Zona horaria"
+
+#: ../src/exif-common.c:876
 msgid "File size"
-msgstr "Tamaño del archivo:"
-
-#: ../src/exif-common.c:579
+msgstr "Tamaño del archivo"
+
+#: ../src/exif-common.c:877
 msgid "File date"
 msgstr "Fecha del archivo"
 
-#: ../src/exif-common.c:580
+#: ../src/exif-common.c:878
 msgid "File mode"
 msgstr "Modo del archivo"
 
-#: ../src/filedata.c:109
+#: ../src/filedata.c:110
 #, c-format
 msgid "%d bytes"
-msgstr "%d bytes"
-
-#: ../src/filedata.c:113
+msgstr ""
+
+#: ../src/filedata.c:114
 #, c-format
 msgid "%.1f K"
-msgstr "%.1f KB"
-
-#: ../src/filedata.c:117
+msgstr ""
+
+#: ../src/filedata.c:118
 #, c-format
 msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../src/filedata.c:122
+msgstr ""
+
+#: ../src/filedata.c:123
 #, c-format
 msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../src/filedata.c:2556
+msgstr ""
+
+#: ../src/filedata.c:2619
 msgid "file or directory does not exist"
-msgstr "archivo o directorio no existe"
-
-#: ../src/filedata.c:2562
+msgstr "el archivo o directorio no existe"
+
+#: ../src/filedata.c:2625
 msgid "destination already exists"
 msgstr "el destino ya existe"
 
-#: ../src/filedata.c:2568
+#: ../src/filedata.c:2631
 msgid "destination can't be overwritten"
-msgstr "el destino no puede ser sobreescrito"
-
-#: ../src/filedata.c:2574
+msgstr "el destino no puede ser sobrescrito"
+
+#: ../src/filedata.c:2637
 msgid "destination directory is not writable"
-msgstr "el destino no es escribible"
-
-#: ../src/filedata.c:2580
+msgstr "no se puede escribir en el directorio de destino"
+
+#: ../src/filedata.c:2643
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
-#: ../src/filedata.c:2586
+#: ../src/filedata.c:2649
 msgid "source directory is not writable"
-msgstr "el directorio origen no es excribible"
-
-#: ../src/filedata.c:2592
+msgstr "no se puede escribir en el directorio de origen"
+
+#: ../src/filedata.c:2655
 msgid "no read permission"
 msgstr "sin permiso de lectura"
 
-#: ../src/filedata.c:2598
+#: ../src/filedata.c:2661
 msgid "file is readonly"
 msgstr "archivo de sólo lectura"
 
-#: ../src/filedata.c:2604
+#: ../src/filedata.c:2667
 msgid "destination already exists and will be overwritten"
-msgstr "el destino ya existe y será sobreescrito"
-
-#: ../src/filedata.c:2610
+msgstr "el destino ya existe y será sobrescrito"
+
+#: ../src/filedata.c:2673
 msgid "source and destination are the same"
 msgstr "origen y destino son iguales"
 
-#: ../src/filedata.c:2616
+#: ../src/filedata.c:2679
 msgid "source and destination have different extension"
 msgstr "origen y destino tienen diferente extensión"
 
-#: ../src/filedata.c:2622
+#: ../src/filedata.c:2685
 msgid "there are unsaved metadata changes for the file"
 msgstr "hay cambios de metadatos sin guardar para el archivo"
 
-#: ../src/filedata.c:2628
-#, fuzzy
+#: ../src/filedata.c:2691
 msgid "another destination file has the same filename"
-msgstr "origen y destino son iguales"
-
-#: ../src/fullscreen.c:242 ../src/layout_util.c:1822 ../src/layout_util.c:1823
-#: ../src/layout_util.c:1824 ../src/preferences.c:1822
+msgstr "otro archivo tiene el mismo nombre en el destino"
+
+#: ../src/filedata.c:3245
+#, c-format
+msgid "Error: Unable to write marks lists to: %s\n"
+msgstr "Error: no se pueden escribir listas de historial en: %s\n"
+
+#: ../src/fullscreen.c:242 ../src/layout_util.c:1883 ../src/layout_util.c:1884
+#: ../src/layout_util.c:1885 ../src/preferences.c:1865
 msgid "Full screen"
 msgstr "Pantalla completa"
 
 #: ../src/fullscreen.c:413
 msgid "Full size"
-msgstr "de tamaño natural"
+msgstr "Tamaño real"
 
 #: ../src/fullscreen.c:421
 msgid "Monitor"
@@ -2085,217 +2113,213 @@
 #: ../src/history_list.c:214
 #, c-format
 msgid "Unable to write history lists to: %s\n"
-msgstr "No se pudo escribir listas de historia a: %s\n"
-
-#: ../src/image.c:187
+msgstr "No se pueden escribir listas de historial en: %s\n"
+
+#: ../src/image.c:190
 #, c-format
 msgid " (Collection %s)"
-msgstr " (Coleccion %s)"
+msgstr " (Colección %s)"
 
 #: ../src/image_load_jpeg.c:163
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
-msgstr ""
-
-#: ../src/img-view.c:1303 ../src/layout_image.c:674 ../src/layout_util.c:1789
-#: ../src/layout_util.c:1790 ../src/layout_util.c:1805
-#: ../src/layout_util.c:1806 ../src/pan-view/pan-view.c:2239
+msgstr "Error al interpretar el archivo de imagen JPEG (%s)"
+
+#: ../src/img-view.c:1312 ../src/layout_image.c:674 ../src/layout_util.c:1850
+#: ../src/layout_util.c:1851 ../src/layout_util.c:1866
+#: ../src/layout_util.c:1867 ../src/pan-view/pan-view.c:2248
 msgid "Zoom _in"
-msgstr "_Zoom acercar"
-
-#: ../src/img-view.c:1304 ../src/layout_image.c:675 ../src/layout_util.c:1791
-#: ../src/layout_util.c:1792 ../src/layout_util.c:1807
-#: ../src/layout_util.c:1808 ../src/pan-view/pan-view.c:2241
+msgstr "Ampl_iar"
+
+#: ../src/img-view.c:1313 ../src/layout_image.c:675 ../src/layout_util.c:1852
+#: ../src/layout_util.c:1853 ../src/layout_util.c:1868
+#: ../src/layout_util.c:1869 ../src/pan-view/pan-view.c:2250
 msgid "Zoom _out"
-msgstr "Z_oom alejar"
-
-#: ../src/img-view.c:1305 ../src/layout_image.c:676 ../src/layout_util.c:1793
-#: ../src/layout_util.c:1794 ../src/layout_util.c:1809
-#: ../src/layout_util.c:1810 ../src/pan-view/pan-view.c:2243
+msgstr "Reducir"
+
+#: ../src/img-view.c:1314 ../src/layout_image.c:676 ../src/layout_util.c:1854
+#: ../src/layout_util.c:1855 ../src/layout_util.c:1870
+#: ../src/layout_util.c:1871 ../src/pan-view/pan-view.c:2252
 msgid "Zoom _1:1"
-msgstr "Zoom _1:1"
-
-#: ../src/img-view.c:1306 ../src/layout_image.c:677
+msgstr "Zum _1:1"
+
+#: ../src/img-view.c:1315 ../src/layout_image.c:677
 msgid "Fit image to _window"
-msgstr "A_justar imagen a la ventana"
-
-#: ../src/img-view.c:1315 ../src/layout_image.c:687 ../src/layout_util.c:1787
+msgstr "A_justar la imagen a la ventana"
+
+#: ../src/img-view.c:1324 ../src/layout_image.c:687 ../src/layout_util.c:1848
 msgid "Set as _wallpaper"
 msgstr "_Establecer como fondo de escritorio"
 
-#: ../src/img-view.c:1320 ../src/layout_image.c:694
+#: ../src/img-view.c:1329 ../src/layout_image.c:694
 msgid "_Go to directory view"
 msgstr "_Ir a la vista de directorio"
 
-#: ../src/img-view.c:1339 ../src/layout_image.c:719
+#: ../src/img-view.c:1348 ../src/layout_image.c:719
 msgid "_Stop slideshow"
-msgstr "_Detener diapositivas"
-
-#: ../src/img-view.c:1342 ../src/layout_image.c:722
+msgstr "_Detener el pase de diapositivas"
+
+#: ../src/img-view.c:1351 ../src/layout_image.c:722
 msgid "Continue slides_how"
-msgstr "Contin_uar diapositivas"
-
-#: ../src/img-view.c:1347 ../src/img-view.c:1355 ../src/layout_image.c:727
+msgstr "Contin_uar el pase de diapositivas"
+
+#: ../src/img-view.c:1356 ../src/img-view.c:1364 ../src/layout_image.c:727
 #: ../src/layout_image.c:734
 msgid "Pause slides_how"
-msgstr "Pa_usar diapositivas"
-
-#: ../src/img-view.c:1353 ../src/layout_image.c:733
+msgstr "Pa_usar el pase diapositivas"
+
+#: ../src/img-view.c:1362 ../src/layout_image.c:733
 msgid "_Start slideshow"
-msgstr "_Iniciar diapositivas"
-
-#: ../src/img-view.c:1361 ../src/layout_image.c:744
-#: ../src/pan-view/pan-view.c:2321
+msgstr "_Iniciar el pase de diapositivas"
+
+#: ../src/img-view.c:1370 ../src/layout_image.c:744
+#: ../src/pan-view/pan-view.c:2330
 msgid "Exit _full screen"
 msgstr "_Salir de pantalla completa"
 
-#: ../src/img-view.c:1365 ../src/layout_image.c:740
-#: ../src/pan-view/pan-view.c:2325
+#: ../src/img-view.c:1374 ../src/layout_image.c:740
+#: ../src/pan-view/pan-view.c:2334
 msgid "_Full screen"
 msgstr "Pan_talla completa"
 
-#: ../src/img-view.c:1369 ../src/layout_util.c:1765
-#: ../src/pan-view/pan-view.c:2329
+#: ../src/img-view.c:1378 ../src/layout_util.c:1826
+#: ../src/pan-view/pan-view.c:2338
 msgid "C_lose window"
-msgstr "Cerrar _ventana"
-
-#: ../src/layout.c:402 ../src/view_file/view_file.c:634
+msgstr "Cerrar la _ventana"
+
+#: ../src/layout.c:403 ../src/view_file/view_file.c:636
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../src/layout.c:482
+#: ../src/layout.c:483
 msgid "Scroll to top left corner"
 msgstr "Deslizar a la esquina superior izquierda"
 
-#: ../src/layout.c:487
+#: ../src/layout.c:488
 msgid "Scroll to image center"
 msgstr "Deslizar al centro de la imagen"
 
-#: ../src/layout.c:492
+#: ../src/layout.c:493
 msgid "Keep the region from previous image"
-msgstr "Mantener la zona de la anterior imagen"
-
-#: ../src/layout.c:579
+msgstr "Mantener la zona de la imagen anterior"
+
+#: ../src/layout.c:580
 msgid " Slideshow"
-msgstr " Diapositivas"
-
-#: ../src/layout.c:583
+msgstr " Pase de diapositivas"
+
+#: ../src/layout.c:584
 msgid " Paused"
 msgstr " Pausado"
 
-#: ../src/layout.c:599
+#: ../src/layout.c:600
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
 msgstr "%s, %d archivos (%s, %d)%s"
 
-#: ../src/layout.c:606
+#: ../src/layout.c:607
 #, c-format
 msgid "%s, %d files%s"
 msgstr "%s, %d archivos%s"
 
-#: ../src/layout.c:611
+#: ../src/layout.c:612
 #, c-format
 msgid "%d files%s"
 msgstr "%d archivos%s"
 
-#: ../src/layout.c:657
+#: ../src/layout.c:658
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(sin permiso de lectura) %s bytes"
 
-#: ../src/layout.c:661
+#: ../src/layout.c:662
 #, c-format
 msgid "( ? x ? ) %s bytes"
-msgstr "( ? x ? ) %s bytes"
-
-#: ../src/layout.c:669
+msgstr ""
+
+#: ../src/layout.c:670
 #, c-format
 msgid "( %d x %d ) %s bytes"
-msgstr "( %d x %d ) %s bytes"
-
-#: ../src/layout.c:755
-#, fuzzy
+msgstr ""
+
+#: ../src/layout.c:756
 msgid "Select sort order"
-msgstr "Seleccionar carpeta"
-
-#: ../src/layout.c:760
-#, fuzzy
+msgstr "Seleccionar el tipo de ordenación"
+
+#: ../src/layout.c:761
 msgid "Folder contents (files selected)"
-msgstr "La carpeta contiene subcarpetas"
-
-#: ../src/layout.c:769
-#, fuzzy
+msgstr "Contenido de la carpeta (archivos seleccionados)"
+
+#: ../src/layout.c:770
 msgid "(Image dimensions) Image size"
-msgstr "Dimensiones de la imagen"
-
-#: ../src/layout.c:779
-#, fuzzy
+msgstr "(Dimensiones de la imagen) Tamaño de imagen"
+
+#: ../src/layout.c:780
 msgid "Select zoom mode"
-msgstr "Seleccionar carpeta"
+msgstr "Seleccionar el modo de zum"
 
 #. expand only in small format
-#: ../src/layout.c:789
+#: ../src/layout.c:790
 msgid "[Pixel x,y coord]: (Pixel R,G,B value)"
-msgstr ""
-
-#: ../src/layout.c:1429 ../src/layout_config.c:67
+msgstr "[Píxel x,y coord]: (Valor R,G,B del píxel)"
+
+#: ../src/layout.c:1430 ../src/layout_config.c:67
 msgid "Tools"
 msgstr "Herramientas"
 
-#: ../src/layout.c:2056
+#: ../src/layout.c:2057
 msgid "Window options and layout"
 msgstr "Opciones de ventana y disposición"
 
-#: ../src/layout.c:2121
+#: ../src/layout.c:2122
 msgid "General options"
 msgstr "Opciones generales"
 
-#: ../src/layout.c:2123
+#: ../src/layout.c:2124
 msgid "Home path (empty to use your home directory)"
-msgstr "Carpeta inicial (vacío para usar tu directorio Home)"
-
-#: ../src/layout.c:2131
+msgstr "Carpeta inicial (vacío para usar su directorio personal)"
+
+#: ../src/layout.c:2132
 msgid "Use current"
 msgstr "Utilizar la actual"
 
-#: ../src/layout.c:2134
+#: ../src/layout.c:2135
 msgid "Show date in directories list view"
 msgstr "Mostrar fechas en la vista de directorios"
 
-#: ../src/layout.c:2137
+#: ../src/layout.c:2138
 msgid "Exit program when this window is closed"
 msgstr "Salir del programa al cerrar la ventana"
 
-#: ../src/layout.c:2140
+#: ../src/layout.c:2141
 msgid "Start-up directory:"
 msgstr "Directorio de inicio:"
 
-#: ../src/layout.c:2142
+#: ../src/layout.c:2143
 msgid "No change"
 msgstr "Sin cambios"
 
-#: ../src/layout.c:2145
+#: ../src/layout.c:2146
 msgid "Restore last path"
-msgstr "Restaura último path"
-
-#: ../src/layout.c:2148
+msgstr "Restaurar la última ruta"
+
+#: ../src/layout.c:2149
 msgid "Home path"
-msgstr "Carpeta Inicial"
-
-#: ../src/layout.c:2152 ../src/print.c:3375 ../src/print.c:3382
+msgstr "Carpeta personal"
+
+#: ../src/layout.c:2153 ../src/print.c:3375 ../src/print.c:3382
 msgid "Layout"
 msgstr "Disposición"
 
-#: ../src/layout.c:2399
+#: ../src/layout.c:2400
 msgid "Invalid geometry\n"
 msgstr "Geometría inválida\n"
 
-#: ../src/layout_config.c:67 ../src/preferences.c:1941 ../src/ui_pathsel.c:1187
+#: ../src/layout_config.c:67 ../src/preferences.c:1985 ../src/ui_pathsel.c:1187
 msgid "Files"
 msgstr "Archivos"
 
-#: ../src/layout_config.c:67 ../src/preferences.c:108 ../src/preferences.c:1710
-#: ../src/print.c:133
+#: ../src/layout_config.c:67 ../src/preferences.c:109 ../src/preferences.c:1750
+#: ../src/print.c:133 ../src/search.c:2075 ../src/search.c:3226
 msgid "Image"
 msgstr "Imagen"
 
@@ -2304,13 +2328,12 @@
 msgstr "(arrastre para cambiar el orden)"
 
 #: ../src/layout_image.c:747
-#, fuzzy
 msgid "_Animate"
-msgstr "Animal"
+msgstr "_Animar"
 
 #: ../src/layout_image.c:751
 msgid "Hide file _list"
-msgstr "Esconder _lista de archivos"
+msgstr "Ocultar la _lista de archivos"
 
 #: ../src/layout_image.c:1941
 #, c-format
@@ -2322,1188 +2345,1185 @@
 msgid "[%*s,%*s]: RGB(---,---,---)"
 msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: ../src/layout_util.c:523
-#, fuzzy
+#: ../src/layout_util.c:255 ../src/layout_util.c:1912
+msgid "Clear Marks"
+msgstr "Borrar las marcas"
+
+#: ../src/layout_util.c:569
 msgid "Operation failed:\n"
-msgstr "Falló el borrado de archivo"
-
-#: ../src/layout_util.c:526
-#, fuzzy
-msgid "Cannot create tmp file"
-msgstr "No se puede crear archivo temporal"
-
-#: ../src/layout_util.c:529
-#, fuzzy
-msgid "File: "
-msgstr "Archivo:"
-
-#: ../src/layout_util.c:533
-#, fuzzy
+msgstr "La operación ha fallado:\n"
+
+#: ../src/layout_util.c:572
+msgid "No file extension\n"
+msgstr "Sin extensión de archivo\n"
+
+#: ../src/layout_util.c:574
+msgid "Cannot create tmp file\n"
+msgstr "No se puede crear archivo temporal\n"
+
+#: ../src/layout_util.c:576
+msgid "Operation not supported for filetype\n"
+msgstr "Operación no permitida para el tipo de archivo\n"
+
+#: ../src/layout_util.c:578
+msgid "File is not writable\n"
+msgstr "No se puede escribir en el archivo\n"
+
+#: ../src/layout_util.c:580
+msgid "Exiftran error\n"
+msgstr "Error de Exiftran\n"
+
+#: ../src/layout_util.c:582
+msgid "Mogrify error\n"
+msgstr "Error de Mogrify\n"
+
+#: ../src/layout_util.c:586
 msgid "Image orientation"
-msgstr "Orientación"
-
-#: ../src/layout_util.c:1715
+msgstr "Orientación de la imagen"
+
+#: ../src/layout_util.c:1776
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/layout_util.c:1716
+#: ../src/layout_util.c:1777
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/layout_util.c:1717 ../src/menu.c:119
+#: ../src/layout_util.c:1778 ../src/menu.c:119
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/layout_util.c:1718
+#: ../src/layout_util.c:1779
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../src/layout_util.c:1719 ../src/menu.c:372
+#: ../src/layout_util.c:1780 ../src/menu.c:380
 msgid "_Orientation"
 msgstr "_Orientación"
 
-#: ../src/layout_util.c:1720
-#, fuzzy
+#: ../src/layout_util.c:1781
 msgid "_Rating"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1721
+msgstr "_Valoración"
+
+#: ../src/layout_util.c:1782
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/layout_util.c:1723
+#: ../src/layout_util.c:1784
 msgid "_Files and Folders"
-msgstr "_Archivos y Carpetas"
-
-#: ../src/layout_util.c:1724
+msgstr "_Archivos y carpetas"
+
+#: ../src/layout_util.c:1785
 msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../src/layout_util.c:1725
+msgstr "_Zum"
+
+#: ../src/layout_util.c:1786
 msgid "_Color Management"
-msgstr "Gestión de _Color"
-
-#: ../src/layout_util.c:1726
+msgstr "Gestión de _color"
+
+#: ../src/layout_util.c:1787
 msgid "_Connected Zoom"
-msgstr "Zoom _Conectado"
-
-#: ../src/layout_util.c:1727
+msgstr "Zum _conectado"
+
+#: ../src/layout_util.c:1788
 msgid "Spli_t"
-msgstr "Par_tir"
-
-#: ../src/layout_util.c:1728
+msgstr "Dividir"
+
+#: ../src/layout_util.c:1789
 msgid "Stere_o"
-msgstr ""
-
-#: ../src/layout_util.c:1729 ../src/layout_util.c:1866
+msgstr "Estéreo"
+
+#: ../src/layout_util.c:1790 ../src/layout_util.c:1928
 msgid "Image _Overlay"
 msgstr "Inf_ormación superpuesta"
 
-#: ../src/layout_util.c:1730
+#: ../src/layout_util.c:1791
 msgid "_Plugins"
-msgstr ""
-
-#: ../src/layout_util.c:1731
+msgstr "Complementos"
+
+#: ../src/layout_util.c:1792
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../src/layout_util.c:1733
+#: ../src/layout_util.c:1794
 msgid "_First Image"
 msgstr "_Primera imagen"
 
-#: ../src/layout_util.c:1733 ../src/toolbar.c:74
+#: ../src/layout_util.c:1794 ../src/toolbar.c:74
 msgid "First Image"
 msgstr "Primera imagen"
 
-#: ../src/layout_util.c:1734 ../src/layout_util.c:1735
-#: ../src/layout_util.c:1736
+#: ../src/layout_util.c:1795 ../src/layout_util.c:1796
+#: ../src/layout_util.c:1797
 msgid "_Previous Image"
-msgstr "Anterior imagen"
-
-#: ../src/layout_util.c:1734 ../src/layout_util.c:1735
-#: ../src/layout_util.c:1736 ../src/toolbar.c:75
+msgstr "Imagen anterior"
+
+#: ../src/layout_util.c:1795 ../src/layout_util.c:1796
+#: ../src/layout_util.c:1797 ../src/toolbar.c:75
 msgid "Previous Image"
-msgstr "Anterior imagen"
-
-#: ../src/layout_util.c:1737 ../src/layout_util.c:1738
-#: ../src/layout_util.c:1739
+msgstr "Imagen siguiente"
+
+#: ../src/layout_util.c:1798 ../src/layout_util.c:1799
+#: ../src/layout_util.c:1800
 msgid "_Next Image"
-msgstr "Siguiente imagen"
-
-#: ../src/layout_util.c:1737 ../src/layout_util.c:1738
-#: ../src/layout_util.c:1739 ../src/toolbar.c:76
+msgstr "Imagen siguiente"
+
+#: ../src/layout_util.c:1798 ../src/layout_util.c:1799
+#: ../src/layout_util.c:1800 ../src/toolbar.c:76
 msgid "Next Image"
-msgstr "Siguiente imagen"
-
-#: ../src/layout_util.c:1740
+msgstr "Imagen siguiente"
+
+#: ../src/layout_util.c:1801
 msgid "_Last Image"
 msgstr "Última imagen"
 
-#: ../src/layout_util.c:1740 ../src/toolbar.c:77
+#: ../src/layout_util.c:1801 ../src/toolbar.c:77
 msgid "Last Image"
 msgstr "Última imagen"
 
-#: ../src/layout_util.c:1741
+# Cambia al un directorio anteriormente seleccionado si existe. No es la orden para ver la imagen anterior de la lista.
+#: ../src/layout_util.c:1802
 msgid "_Back"
-msgstr "_Atrás"
-
-#: ../src/layout_util.c:1741 ../src/toolbar.c:78
+msgstr "U_bicación anterior"
+
+#: ../src/layout_util.c:1802 ../src/toolbar.c:78
 msgid "Back"
-msgstr "Atrás"
-
-#: ../src/layout_util.c:1742
+msgstr "Ubicación anterior"
+
+# Cambia al directorio siguiente de los que se han ido visitando, si existe. No es la orden para ver la imagen siguiente de la lista.
+#: ../src/layout_util.c:1803
 msgid "_Forward"
-msgstr ""
-
-#: ../src/layout_util.c:1742 ../src/toolbar.c:79
+msgstr "Ubicación siguiente"
+
+#: ../src/layout_util.c:1803 ../src/toolbar.c:79
 msgid "Forward"
-msgstr ""
-
-#: ../src/layout_util.c:1743
+msgstr "Ubicación siguiente"
+
+#: ../src/layout_util.c:1804
 msgid "_Home"
 msgstr "Carpeta de inicio"
 
-#: ../src/layout_util.c:1743 ../src/options.c:193 ../src/toolbar.c:80
+#: ../src/layout_util.c:1804 ../src/options.c:198 ../src/toolbar.c:80
 #: ../src/ui_bookmark.c:567 ../src/ui_pathsel.c:1056
 msgid "Home"
 msgstr "Carpeta de inicio"
 
-#: ../src/layout_util.c:1744
+#: ../src/layout_util.c:1805
 msgid "_Up"
-msgstr ""
-
-#: ../src/layout_util.c:1744 ../src/toolbar.c:81
+msgstr "Arriba"
+
+#: ../src/layout_util.c:1805 ../src/toolbar.c:81
 msgid "Up"
-msgstr ""
-
-#: ../src/layout_util.c:1746 ../src/toolbar.c:82
+msgstr "Arriba"
+
+#: ../src/layout_util.c:1807 ../src/toolbar.c:82
 msgid "New _window"
 msgstr "_Nueva ventana"
 
-#: ../src/layout_util.c:1746
+#: ../src/layout_util.c:1807
 msgid "New window"
 msgstr "Nueva ventana"
 
-#: ../src/layout_util.c:1747
+#: ../src/layout_util.c:1808
 msgid "_New collection"
 msgstr "Nueva co_lección"
 
-#: ../src/layout_util.c:1747 ../src/menu.c:431 ../src/toolbar.c:83
+#: ../src/layout_util.c:1808 ../src/menu.c:439 ../src/toolbar.c:83
 msgid "New collection"
 msgstr "Nueva _colección"
 
-#: ../src/layout_util.c:1748
+#: ../src/layout_util.c:1809
 msgid "_Open collection..."
 msgstr "Abrir c_olección..."
 
-#: ../src/layout_util.c:1748
+#: ../src/layout_util.c:1809
 msgid "Open collection..."
 msgstr "Abrir colección..."
 
-#: ../src/layout_util.c:1749
+#: ../src/layout_util.c:1810
 msgid "Open recen_t"
 msgstr "Abrir recien_te"
 
-#: ../src/layout_util.c:1749
+#: ../src/layout_util.c:1810
 msgid "Open recent"
 msgstr "Abrir reciente"
 
-#: ../src/layout_util.c:1750
+#: ../src/layout_util.c:1811
 msgid "_Search..."
 msgstr "_Buscar..."
 
-#: ../src/layout_util.c:1750
+#: ../src/layout_util.c:1811
 msgid "Search..."
 msgstr "Bu_scar..."
 
-#: ../src/layout_util.c:1751
+#: ../src/layout_util.c:1812
 msgid "Find duplicates..."
 msgstr "Buscar duplicados..."
 
-#: ../src/layout_util.c:1752
+#: ../src/layout_util.c:1813
 msgid "Pa_n view"
-msgstr "Vista ava_nzada"
-
-#: ../src/layout_util.c:1752 ../src/toolbar.c:87
+msgstr "Vista panorámica"
+
+#: ../src/layout_util.c:1813 ../src/toolbar.c:87
 msgid "Pan view"
-msgstr "Vista avanzada"
-
-#: ../src/layout_util.c:1753
+msgstr "Vista panorámica"
+
+#: ../src/layout_util.c:1814
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../src/layout_util.c:1754
+#: ../src/layout_util.c:1815
 msgid "N_ew folder..."
 msgstr "N_ueva carpeta..."
 
-#: ../src/layout_util.c:1754
+#: ../src/layout_util.c:1815
 msgid "New folder..."
 msgstr "Nueva carpeta..."
 
-#: ../src/layout_util.c:1755
+#: ../src/layout_util.c:1816
 msgid "Copy..."
 msgstr "Copiar..."
 
-#: ../src/layout_util.c:1756
+#: ../src/layout_util.c:1817
 msgid "Move..."
 msgstr "Mover..."
 
-#: ../src/layout_util.c:1757
+#: ../src/layout_util.c:1818
 msgid "Rename..."
 msgstr "Renombrar..."
 
-#: ../src/layout_util.c:1758 ../src/layout_util.c:1759
-#: ../src/layout_util.c:1760
+#: ../src/layout_util.c:1819 ../src/layout_util.c:1820
+#: ../src/layout_util.c:1821
 msgid "Delete..."
 msgstr "Borrar..."
 
-#: ../src/layout_util.c:1761 ../src/view_file/view_file.c:616
+#: ../src/layout_util.c:1822 ../src/view_file/view_file.c:618
 msgid "Enable file _grouping"
-msgstr "Activar a_grupar archivos"
-
-#: ../src/layout_util.c:1761
+msgstr "Activar la a_grupación de archivos"
+
+#: ../src/layout_util.c:1822
 msgid "Enable file grouping"
-msgstr "Activar agrupar archivos"
-
-#: ../src/layout_util.c:1762 ../src/view_file/view_file.c:618
+msgstr "Activar la agrupación de archivos"
+
+#: ../src/layout_util.c:1823 ../src/view_file/view_file.c:620
 msgid "Disable file groupi_ng"
-msgstr "Desactivar agrupar archivos"
-
-#: ../src/layout_util.c:1762
+msgstr "Desactivar la agrupación de archivos"
+
+#: ../src/layout_util.c:1823
 msgid "Disable file grouping"
-msgstr "Desactivar agrupar archivos"
-
-#: ../src/layout_util.c:1763
+msgstr "Desactivar la agrupación de archivos"
+
+#: ../src/layout_util.c:1824
 msgid "_Copy path to clipboard"
-msgstr "_Copiar path al portapapeles"
-
-#: ../src/layout_util.c:1763
+msgstr "_Copiar la ruta al portapapeles"
+
+#: ../src/layout_util.c:1824
 msgid "Copy path to clipboard"
-msgstr "Copiar path al portapapeles"
-
-#: ../src/layout_util.c:1764
-#, fuzzy
+msgstr "Copiar la ruta al portapapeles"
+
+#: ../src/layout_util.c:1825
 msgid "_Copy path unquoted to clipboard"
-msgstr "_Copiar path al portapapeles"
-
-#: ../src/layout_util.c:1764
-#, fuzzy
+msgstr "_Copiar la ruta sin entrecomillar al portapapeles"
+
+#: ../src/layout_util.c:1825
 msgid "Copy path unquoted to clipboard"
-msgstr "Copiar path al portapapeles"
-
-#: ../src/layout_util.c:1765
+msgstr "Copiar la ruta sin entrecomillar al portapapeles"
+
+#: ../src/layout_util.c:1826
 msgid "Close window"
-msgstr "Cerrar ventana"
-
-#: ../src/layout_util.c:1766
+msgstr "Cerrar la ventana"
+
+#: ../src/layout_util.c:1827
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/layout_util.c:1766 ../src/toolbar.c:117
+#: ../src/layout_util.c:1827 ../src/toolbar.c:117
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/layout_util.c:1767 ../src/menu.c:314
+#: ../src/layout_util.c:1828 ../src/menu.c:322
 msgid "_Rotate clockwise"
 msgstr "_Rotar en sentido horario"
 
-#: ../src/layout_util.c:1767
+#: ../src/layout_util.c:1828
 msgid "Rotate clockwise"
 msgstr "Rotar en sentido horario"
 
-#: ../src/layout_util.c:1768
+#: ../src/layout_util.c:1829
 msgid "_Rating 0"
-msgstr ""
-
-#: ../src/layout_util.c:1768
-#, fuzzy
-msgid "Rating 0"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1769
-msgid "_Rating 1"
-msgstr ""
-
-#: ../src/layout_util.c:1769
-#, fuzzy
-msgid "Rating 1"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1770
-msgid "_Rating 2"
-msgstr ""
-
-#: ../src/layout_util.c:1770
-#, fuzzy
-msgid "Rating 2"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1771
-msgid "_Rating 3"
-msgstr ""
-
-#: ../src/layout_util.c:1771
-#, fuzzy
-msgid "Rating 3"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1772
-msgid "_Rating 4"
-msgstr ""
-
-#: ../src/layout_util.c:1772
-#, fuzzy
-msgid "Rating 4"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1773
-msgid "_Rating 5"
-msgstr ""
-
-#: ../src/layout_util.c:1773
-#, fuzzy
-msgid "Rating 5"
-msgstr "Pintando"
-
-#: ../src/layout_util.c:1774
-msgid "_Rating -1"
-msgstr ""
-
-#: ../src/layout_util.c:1774
-msgid "Rating -1"
-msgstr ""
-
-#: ../src/layout_util.c:1775 ../src/menu.c:317
-msgid "Rotate _counterclockwise"
-msgstr "Rotar en sentido _antihorario"
-
-#: ../src/layout_util.c:1775
-msgid "Rotate counterclockwise"
-msgstr "Rotar en sentido antihorario"
-
-#: ../src/layout_util.c:1776
-msgid "Rotate 1_80"
-msgstr "Rotar _180°"
-
-#: ../src/layout_util.c:1776
-msgid "Rotate 180"
-msgstr "Rotar 180°"
-
-#: ../src/layout_util.c:1777 ../src/menu.c:323
-msgid "_Mirror"
-msgstr "Reflejar _horizontalmente"
-
-#: ../src/layout_util.c:1777
-msgid "Mirror"
-msgstr "Reflejar horizontalmente"
-
-#: ../src/layout_util.c:1778 ../src/menu.c:326
-msgid "_Flip"
-msgstr "Reflejar _verticalmente"
-
-#: ../src/layout_util.c:1778
-msgid "Flip"
-msgstr "Reflejar verticalmente"
-
-#: ../src/layout_util.c:1779 ../src/menu.c:329
-msgid "_Original state"
-msgstr "Estado _original"
-
-#: ../src/layout_util.c:1779
-msgid "Original state"
-msgstr "Estado original"
-
-#: ../src/layout_util.c:1780
-msgid "Select _all"
-msgstr "Seleccionar _todo"
-
-#: ../src/layout_util.c:1781
-msgid "Select _none"
-msgstr "Seleccionar _nada"
-
-#: ../src/layout_util.c:1782
-msgid "_Invert Selection"
-msgstr "_Invertir Selección"
-
-#: ../src/layout_util.c:1782
-msgid "Invert Selection"
-msgstr "Invertir Selección"
-
-#: ../src/layout_util.c:1783
-msgid "P_references..."
-msgstr "P_referencias..."
-
-#: ../src/layout_util.c:1783
-msgid "Preferences..."
-msgstr "P_referencias..."
-
-#: ../src/layout_util.c:1784
-#, fuzzy
-msgid "Configure _Plugins..."
-msgstr "Configurar _Editores"
-
-#: ../src/layout_util.c:1784
-#, fuzzy
-msgid "Configure Plugins..."
-msgstr "Configurar Editores"
-
-#: ../src/layout_util.c:1785
-msgid "_Configure this window..."
-msgstr "_Configurar esta ventana"
-
-#: ../src/layout_util.c:1785
-msgid "Configure this window..."
-msgstr "Configurar esta ventana"
-
-#: ../src/layout_util.c:1786
-msgid "_Thumbnail maintenance..."
-msgstr "_Mantenimiento de miniaturas..."
-
-#: ../src/layout_util.c:1786
-msgid "Thumbnail maintenance..."
-msgstr "Mantenimiento de miniaturas..."
-
-#: ../src/layout_util.c:1787
-msgid "Set as wallpaper"
-msgstr "Establecer como fondo de escritorio"
-
-#: ../src/layout_util.c:1788
-msgid "_Save metadata"
-msgstr "_Guardar Metadatos"
-
-#: ../src/layout_util.c:1788
-msgid "Save metadata"
-msgstr "Guradar Metadatos"
-
-#: ../src/layout_util.c:1789 ../src/layout_util.c:1790 ../src/toolbar.c:92
-msgid "Zoom in"
-msgstr "Zoom acercar"
-
-#: ../src/layout_util.c:1791 ../src/layout_util.c:1792 ../src/toolbar.c:93
-msgid "Zoom out"
-msgstr "Zoom alejar"
-
-#: ../src/layout_util.c:1793 ../src/layout_util.c:1794 ../src/toolbar.c:94
-msgid "Zoom 1:1"
-msgstr "Zoom 1:1"
-
-#: ../src/layout_util.c:1795 ../src/layout_util.c:1796
-#: ../src/layout_util.c:1811 ../src/layout_util.c:1812
-msgid "_Zoom to fit"
-msgstr "Zoom a_justado"
-
-#: ../src/layout_util.c:1795 ../src/layout_util.c:1796 ../src/toolbar.c:95
-msgid "Zoom to fit"
-msgstr "Zoom ajustado"
-
-#: ../src/layout_util.c:1797 ../src/layout_util.c:1813
-msgid "Fit _Horizontally"
-msgstr "Encajar _Horizontalmente"
-
-#: ../src/layout_util.c:1797
-msgid "Fit Horizontally"
-msgstr "Encajar horizontalmente"
-
-#: ../src/layout_util.c:1798 ../src/layout_util.c:1814
-msgid "Fit _Vertically"
-msgstr "Encajar _Verticalmente"
-
-#: ../src/layout_util.c:1798
-msgid "Fit Vertically"
-msgstr "Encajar Verticalmente"
-
-#: ../src/layout_util.c:1799 ../src/layout_util.c:1815
-msgid "Zoom _2:1"
-msgstr "Zoom _2:1"
-
-#: ../src/layout_util.c:1799 ../src/toolbar.c:98
-msgid "Zoom 2:1"
-msgstr "Zoom 2:1"
-
-#: ../src/layout_util.c:1800 ../src/layout_util.c:1816
-msgid "Zoom _3:1"
-msgstr "Zoom _3:1"
-
-#: ../src/layout_util.c:1800 ../src/toolbar.c:99
-msgid "Zoom 3:1"
-msgstr "Zoom 3:1"
-
-#: ../src/layout_util.c:1801 ../src/layout_util.c:1817
-msgid "Zoom _4:1"
-msgstr "Zoom _4:1"
-
-#: ../src/layout_util.c:1801 ../src/toolbar.c:100
-msgid "Zoom 4:1"
-msgstr "Zoom 4:1"
-
-#: ../src/layout_util.c:1802 ../src/layout_util.c:1818 ../src/toolbar.c:101
-msgid "Zoom 1:2"
-msgstr "Zoom 1:2"
-
-#: ../src/layout_util.c:1803 ../src/layout_util.c:1819
-msgid "Zoom 1:3"
-msgstr "Zoom 1:3"
-
-#: ../src/layout_util.c:1804 ../src/layout_util.c:1820 ../src/toolbar.c:103
-msgid "Zoom 1:4"
-msgstr "Zoom 1:4"
-
-#: ../src/layout_util.c:1805 ../src/layout_util.c:1806 ../src/toolbar.c:104
-msgid "Connected Zoom in"
-msgstr "Zoom agrandar conectado"
-
-#: ../src/layout_util.c:1807 ../src/layout_util.c:1808
-msgid "Connected Zoom out"
-msgstr "Zoom alejar-conectado"
-
-#: ../src/layout_util.c:1809 ../src/layout_util.c:1810
-msgid "Connected Zoom 1:1"
-msgstr "Zoom a 1:1 conectado"
-
-#: ../src/layout_util.c:1811 ../src/layout_util.c:1812
-msgid "Connected Zoom to fit"
-msgstr "Zoom a_justado conectado"
-
-#: ../src/layout_util.c:1813
-msgid "Connected Fit Horizontally"
-msgstr "Zoom encajar horizontalmente conectado"
-
-#: ../src/layout_util.c:1814
-msgid "Connected Fit Vertically"
-msgstr "Encajar verticalmente conectado"
-
-#: ../src/layout_util.c:1815
-msgid "Connected Zoom 2:1"
-msgstr "Zoom 2:1 conectado"
-
-#: ../src/layout_util.c:1816
-msgid "Connected Zoom 3:1"
-msgstr "Zoom 3:1 conectado"
-
-#: ../src/layout_util.c:1817
-msgid "Connected Zoom 4:1"
-msgstr "Zoom 1:1 conectado"
-
-#: ../src/layout_util.c:1818
-msgid "Connected Zoom 1:2"
-msgstr "Zoom _1:2 conectado"
-
-#: ../src/layout_util.c:1819
-msgid "Connected Zoom 1:3"
-msgstr "Zoom _1:3 conectado"
-
-#: ../src/layout_util.c:1820
-msgid "Connected Zoom 1:4"
-msgstr "Zoom _1:4 conectado"
-
-#: ../src/layout_util.c:1821
-msgid "_View in new window"
-msgstr "_Ver en una ventana nueva"
-
-#: ../src/layout_util.c:1821
-msgid "View in new window"
-msgstr "Ver en una ventana nueva"
-
-#: ../src/layout_util.c:1822 ../src/layout_util.c:1823
-#: ../src/layout_util.c:1824
-msgid "F_ull screen"
-msgstr "_Pantalla completa"
-
-#: ../src/layout_util.c:1825 ../src/layout_util.c:1826
-msgid "_Leave full screen"
-msgstr "Sa_lir de pantalla completa"
-
-#: ../src/layout_util.c:1825 ../src/layout_util.c:1826
-msgid "Leave full screen"
-msgstr "Salir de pantalla completa"
-
-#: ../src/layout_util.c:1827
-msgid "_Cycle through overlay modes"
-msgstr "_Cambiar la información superpuesta"
-
-#: ../src/layout_util.c:1827
-msgid "Cycle through Overlay modes"
-msgstr "Cambiar la información superpuesta"
-
-#: ../src/layout_util.c:1828
-msgid "Cycle through histogram ch_annels"
-msgstr "Cambiar c_anales de histograma"
-
-#: ../src/layout_util.c:1828
-msgid "Cycle through histogram channels"
-msgstr "Cambiar canales de histograma"
+msgstr "Valoración 0"
 
 #: ../src/layout_util.c:1829
-msgid "Cycle through histogram mo_des"
-msgstr "Cambiar mo_dos de histograma"
-
-#: ../src/layout_util.c:1829
-msgid "Cycle through histogram modes"
-msgstr "Cambiar modos de histograma"
+msgid "Rating 0"
+msgstr "Valoración 0"
+
+#: ../src/layout_util.c:1830
+msgid "_Rating 1"
+msgstr "Valoración 1"
 
 #: ../src/layout_util.c:1830
-msgid "_Hide file list"
-msgstr "Esconder lista de arc_hivos"
-
-#: ../src/layout_util.c:1830 ../src/toolbar.c:105
-msgid "Hide file list"
-msgstr "Esconder lista de archivos"
+msgid "Rating 1"
+msgstr "Valoración 1"
 
 #: ../src/layout_util.c:1831
-msgid "_Pause slideshow"
-msgstr "_Pausar diapositivas"
-
-#: ../src/layout_util.c:1831 ../src/toolbar.c:106
-msgid "Pause slideshow"
-msgstr "Pausar diapositivas"
+msgid "_Rating 2"
+msgstr "Valoración 2"
+
+#: ../src/layout_util.c:1831
+msgid "Rating 2"
+msgstr "Valoración 2"
+
+#: ../src/layout_util.c:1832
+msgid "_Rating 3"
+msgstr "Valoración 3"
 
 #: ../src/layout_util.c:1832
-msgid "Faster"
-msgstr ""
+msgid "Rating 3"
+msgstr "Valoración 3"
 
 #: ../src/layout_util.c:1833
-#, fuzzy
-msgid "Slower"
-msgstr "Flor"
+msgid "_Rating 4"
+msgstr "Valoración 4"
+
+#: ../src/layout_util.c:1833
+msgid "Rating 4"
+msgstr "Valoración 4"
 
 #: ../src/layout_util.c:1834
-msgid "_Refresh"
-msgstr "Actualiza_r"
-
-#: ../src/layout_util.c:1834 ../src/toolbar.c:109
-msgid "Refresh"
-msgstr "Actualizar"
+msgid "_Rating 5"
+msgstr "Valoración 5"
+
+#: ../src/layout_util.c:1834
+msgid "Rating 5"
+msgstr "Valoración 5"
 
 #: ../src/layout_util.c:1835
-msgid "_Contents"
-msgstr "_Contenidos"
+msgid "_Rating -1"
+msgstr "Valoración -1"
 
 #: ../src/layout_util.c:1835
-msgid "Contents"
-msgstr "_Contenidos"
-
-#: ../src/layout_util.c:1836
-msgid "_Keyboard shortcuts"
-msgstr "Atajos de _teclado"
+msgid "Rating -1"
+msgstr "Valoración -1"
+
+#: ../src/layout_util.c:1836 ../src/menu.c:325
+msgid "Rotate _counterclockwise"
+msgstr "Rotar en sentido _antihorario"
 
 #: ../src/layout_util.c:1836
-msgid "Keyboard shortcuts"
-msgstr "Atajos de teclado"
+msgid "Rotate counterclockwise"
+msgstr "Rotar en sentido antihorario"
 
 #: ../src/layout_util.c:1837
-#, fuzzy
-msgid "_Keyboard map"
-msgstr "Teclado"
+msgid "Rotate 1_80"
+msgstr "Rotar _180°"
 
 #: ../src/layout_util.c:1837
-#, fuzzy
-msgid "Keyboard map"
-msgstr "Teclado"
+msgid "Rotate 180"
+msgstr "Rotar 180°"
+
+#: ../src/layout_util.c:1838 ../src/menu.c:331
+msgid "_Mirror"
+msgstr "Reflejar _horizontalmente"
 
 #: ../src/layout_util.c:1838
-msgid "_Release notes"
-msgstr "Notas de esta _versión"
-
-#: ../src/layout_util.c:1838
-msgid "Release notes"
-msgstr "Notas de esta versión"
-
-#: ../src/layout_util.c:1839
-msgid "_ChangeLog"
-msgstr ""
+msgid "Mirror"
+msgstr "Reflejar horizontalmente"
+
+#: ../src/layout_util.c:1839 ../src/menu.c:334
+msgid "_Flip"
+msgstr "Reflejar _verticalmente"
 
 #: ../src/layout_util.c:1839
-#, fuzzy
-msgid "ChangeLog notes"
-msgstr "Cambiar a la carpeta:"
+msgid "Flip"
+msgstr "Reflejar verticalmente"
+
+#: ../src/layout_util.c:1840 ../src/menu.c:337
+msgid "_Original state"
+msgstr "Estado _original"
 
 #: ../src/layout_util.c:1840
-msgid "_About"
-msgstr "_Acerca de..."
-
-#: ../src/layout_util.c:1840
-msgid "About"
-msgstr "Acerca de..."
+msgid "Original state"
+msgstr "Estado original"
 
 #: ../src/layout_util.c:1841
-msgid "_Log Window"
-msgstr "Ventana de _Log"
-
-#: ../src/layout_util.c:1841
-msgid "Log Window"
-msgstr "Ventana de Log"
+msgid "Select _all"
+msgstr "Seleccionar _todo"
 
 #: ../src/layout_util.c:1842
-msgid "_Exif window"
-msgstr "Ventana _Exif"
-
-#: ../src/layout_util.c:1842 ../src/toolbar.c:111
-msgid "Exif window"
-msgstr "Ventana Exif"
+msgid "Select _none"
+msgstr "No seleccionar _nada"
+
+#: ../src/layout_util.c:1843
+msgid "_Invert Selection"
+msgstr "_Invertir la selección"
 
 #: ../src/layout_util.c:1843
-#, fuzzy
-msgid "_Cycle through stereo modes"
-msgstr "_Cambiar la información superpuesta"
-
-#: ../src/layout_util.c:1843
-#, fuzzy
-msgid "Cycle through stereo modes"
-msgstr "Cambiar modos de histograma"
+msgid "Invert Selection"
+msgstr "Invertir la selección"
 
 #: ../src/layout_util.c:1844
-#, fuzzy
-msgid "_Next Pane"
-msgstr "Siguiente imagen"
+msgid "P_references..."
+msgstr "P_referencias..."
 
 #: ../src/layout_util.c:1844
-#, fuzzy
-msgid "Next Pane"
-msgstr "Siguiente imagen"
+msgid "Preferences..."
+msgstr "Preferencias..."
 
 #: ../src/layout_util.c:1845
-#, fuzzy
-msgid "_Previous Pane"
-msgstr "Anterior imagen"
+msgid "Configure _Plugins..."
+msgstr "Configurar los com_plementos..."
 
 #: ../src/layout_util.c:1845
-#, fuzzy
-msgid "Previous Pane"
-msgstr "Anterior imagen"
+msgid "Configure Plugins..."
+msgstr "Configurar los complementos..."
 
 #: ../src/layout_util.c:1846
-msgid "_Up Pane"
-msgstr ""
+msgid "_Configure this window..."
+msgstr "_Configurar esta ventana..."
 
 #: ../src/layout_util.c:1846
-msgid "Up Pane"
-msgstr ""
+msgid "Configure this window..."
+msgstr "Configurar esta ventana..."
 
 #: ../src/layout_util.c:1847
-msgid "_Down Pane"
-msgstr ""
+msgid "_Cache maintenance..."
+msgstr "Mantenimiento de la _caché..."
 
 #: ../src/layout_util.c:1847
-msgid "Down Pane"
-msgstr ""
+msgid "Cache maintenance..."
+msgstr "Mantenimiento de la caché..."
 
 #: ../src/layout_util.c:1848
-#, fuzzy
-msgid "_Write orientation to file"
-msgstr "Escribir en archivo"
-
-#: ../src/layout_util.c:1848
-#, fuzzy
-msgid "Write orientation to file"
-msgstr "Escribir en archivo"
+msgid "Set as wallpaper"
+msgstr "Establecer como fondo de escritorio"
+
+#: ../src/layout_util.c:1849
+msgid "_Save metadata"
+msgstr "_Guardar metadatos"
 
 #: ../src/layout_util.c:1849
+msgid "Save metadata"
+msgstr "Guardar metadatos"
+
+#: ../src/layout_util.c:1850 ../src/layout_util.c:1851 ../src/toolbar.c:92
+msgid "Zoom in"
+msgstr "Ampliar"
+
+#: ../src/layout_util.c:1852 ../src/layout_util.c:1853 ../src/toolbar.c:93
+msgid "Zoom out"
+msgstr "Reducir"
+
+#: ../src/layout_util.c:1854 ../src/layout_util.c:1855 ../src/toolbar.c:94
+msgid "Zoom 1:1"
+msgstr "Zum 1:1"
+
+#: ../src/layout_util.c:1856 ../src/layout_util.c:1857
+#: ../src/layout_util.c:1872 ../src/layout_util.c:1873
+msgid "_Zoom to fit"
+msgstr "Zum para a_justar"
+
+#: ../src/layout_util.c:1856 ../src/layout_util.c:1857 ../src/toolbar.c:95
+msgid "Zoom to fit"
+msgstr "Zum para ajustar"
+
+#: ../src/layout_util.c:1858 ../src/layout_util.c:1874
+msgid "Fit _Horizontally"
+msgstr "Encajar _horizontalmente"
+
+#: ../src/layout_util.c:1858
+msgid "Fit Horizontally"
+msgstr "Encajar horizontalmente"
+
+#: ../src/layout_util.c:1859 ../src/layout_util.c:1875
+msgid "Fit _Vertically"
+msgstr "Encajar _verticalmente"
+
+#: ../src/layout_util.c:1859
+msgid "Fit Vertically"
+msgstr "Encajar verticalmente"
+
+#: ../src/layout_util.c:1860 ../src/layout_util.c:1876
+msgid "Zoom _2:1"
+msgstr "Zum _2:1"
+
+#: ../src/layout_util.c:1860 ../src/toolbar.c:98
+msgid "Zoom 2:1"
+msgstr "Zum 2:1"
+
+#: ../src/layout_util.c:1861 ../src/layout_util.c:1877
+msgid "Zoom _3:1"
+msgstr "Zum _3:1"
+
+#: ../src/layout_util.c:1861 ../src/toolbar.c:99
+msgid "Zoom 3:1"
+msgstr "Zum 3:1"
+
+#: ../src/layout_util.c:1862 ../src/layout_util.c:1878
+msgid "Zoom _4:1"
+msgstr "Zum _4:1"
+
+#: ../src/layout_util.c:1862 ../src/toolbar.c:100
+msgid "Zoom 4:1"
+msgstr "Zum 4:1"
+
+#: ../src/layout_util.c:1863 ../src/layout_util.c:1879 ../src/toolbar.c:101
+msgid "Zoom 1:2"
+msgstr "Zum 1:2"
+
+#: ../src/layout_util.c:1864 ../src/layout_util.c:1880
+msgid "Zoom 1:3"
+msgstr "Zum 1:3"
+
+#: ../src/layout_util.c:1865 ../src/layout_util.c:1881 ../src/toolbar.c:103
+msgid "Zoom 1:4"
+msgstr "Zum 1:4"
+
+#: ../src/layout_util.c:1866 ../src/layout_util.c:1867 ../src/toolbar.c:104
+msgid "Connected Zoom in"
+msgstr "Ampliar el zum conectado"
+
+#: ../src/layout_util.c:1868 ../src/layout_util.c:1869
+msgid "Connected Zoom out"
+msgstr "Reducir el zum conectado"
+
+#: ../src/layout_util.c:1870 ../src/layout_util.c:1871
+msgid "Connected Zoom 1:1"
+msgstr "Zum a 1:1 conectado"
+
+#: ../src/layout_util.c:1872 ../src/layout_util.c:1873
+msgid "Connected Zoom to fit"
+msgstr "Zum para ajustar conectado"
+
+#: ../src/layout_util.c:1874
+msgid "Connected Fit Horizontally"
+msgstr "Encajar horizontalmente conectado"
+
+#: ../src/layout_util.c:1875
+msgid "Connected Fit Vertically"
+msgstr "Encajar verticalmente conectado"
+
+#: ../src/layout_util.c:1876
+msgid "Connected Zoom 2:1"
+msgstr "Zum 2:1 conectado"
+
+#: ../src/layout_util.c:1877
+msgid "Connected Zoom 3:1"
+msgstr "Zum 3:1 conectado"
+
+#: ../src/layout_util.c:1878
+msgid "Connected Zoom 4:1"
+msgstr "Zum 4:1 conectado"
+
+#: ../src/layout_util.c:1879
+msgid "Connected Zoom 1:2"
+msgstr "Zum 1:2 conectado"
+
+#: ../src/layout_util.c:1880
+msgid "Connected Zoom 1:3"
+msgstr "Zum 1:3 conectado"
+
+#: ../src/layout_util.c:1881
+msgid "Connected Zoom 1:4"
+msgstr "Zum 1:4 conectado"
+
+#: ../src/layout_util.c:1882
+msgid "_View in new window"
+msgstr "_Ver en una ventana nueva"
+
+#: ../src/layout_util.c:1882
+msgid "View in new window"
+msgstr "Ver en una ventana nueva"
+
+#: ../src/layout_util.c:1883 ../src/layout_util.c:1884
+#: ../src/layout_util.c:1885
+msgid "F_ull screen"
+msgstr "_Pantalla completa"
+
+#: ../src/layout_util.c:1886 ../src/layout_util.c:1887
+msgid "_Leave full screen"
+msgstr "Sa_lir de pantalla completa"
+
+#: ../src/layout_util.c:1886 ../src/layout_util.c:1887
+msgid "Leave full screen"
+msgstr "Salir de pantalla completa"
+
+#: ../src/layout_util.c:1888
+msgid "_Cycle through overlay modes"
+msgstr "Alternar ente los modos de superposi_ción"
+
+#: ../src/layout_util.c:1888
+msgid "Cycle through Overlay modes"
+msgstr "Alternar entre los modos de superposición"
+
+#: ../src/layout_util.c:1889
+msgid "Cycle through histogram ch_annels"
+msgstr "Alternar entre los c_anales del histograma"
+
+#: ../src/layout_util.c:1889
+msgid "Cycle through histogram channels"
+msgstr "Alternar entre los canales del histograma"
+
+#: ../src/layout_util.c:1890
+msgid "Cycle through histogram mo_des"
+msgstr "Alternar ente los mo_dos del histograma"
+
+#: ../src/layout_util.c:1890
+msgid "Cycle through histogram modes"
+msgstr "Alternar entre los modos del histograma"
+
+#: ../src/layout_util.c:1891
+msgid "_Hide file list"
+msgstr "Ocultar la lista de arc_hivos"
+
+#: ../src/layout_util.c:1891 ../src/toolbar.c:105
+msgid "Hide file list"
+msgstr "Ocultar la lista de archivos"
+
+#: ../src/layout_util.c:1892
+msgid "_Pause slideshow"
+msgstr "_Pausar el pase de diapositivas"
+
+#: ../src/layout_util.c:1892 ../src/toolbar.c:106
+msgid "Pause slideshow"
+msgstr "Pausar el pase de diapositivas"
+
+#: ../src/layout_util.c:1893
+msgid "Faster"
+msgstr "Más rápido"
+
+#: ../src/layout_util.c:1894
+msgid "Slower"
+msgstr "Más lento"
+
+#: ../src/layout_util.c:1895
+msgid "_Refresh"
+msgstr "Actualiza_r"
+
+#: ../src/layout_util.c:1895 ../src/toolbar.c:109
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: ../src/layout_util.c:1896
+msgid "_Contents"
+msgstr "_Contenidos"
+
+#: ../src/layout_util.c:1896
+msgid "Contents"
+msgstr "_Contenidos"
+
+#: ../src/layout_util.c:1897 ../src/window.c:371
+msgid "On-line help search"
+msgstr "Búsqueda de ayuda en línea"
+
+#: ../src/layout_util.c:1898
+msgid "_Keyboard shortcuts"
+msgstr "Atajos de _teclado"
+
+#: ../src/layout_util.c:1898
+msgid "Keyboard shortcuts"
+msgstr "Atajos de teclado"
+
+#: ../src/layout_util.c:1899
+msgid "_Keyboard map"
+msgstr "Mapa de teclado"
+
+#: ../src/layout_util.c:1899
+msgid "Keyboard map"
+msgstr "Mapa de teclado"
+
+#: ../src/layout_util.c:1900
+msgid "_Release notes"
+msgstr "Notas de esta _versión"
+
+#: ../src/layout_util.c:1900
+msgid "Release notes"
+msgstr "Notas de esta versión"
+
+#: ../src/layout_util.c:1901
+msgid "_ChangeLog"
+msgstr "Registro de _cambios"
+
+#: ../src/layout_util.c:1901
+msgid "ChangeLog notes"
+msgstr "Notas del registro de cambios"
+
+#: ../src/layout_util.c:1902
+msgid "_About"
+msgstr "_Acerca de"
+
+#: ../src/layout_util.c:1902
+msgid "About"
+msgstr "Acerca de"
+
+#: ../src/layout_util.c:1903
+msgid "_Log Window"
+msgstr "Ventana del registro"
+
+#: ../src/layout_util.c:1903
+msgid "Log Window"
+msgstr "Ventana del registro"
+
+#: ../src/layout_util.c:1904
+msgid "_Exif window"
+msgstr "Ventana _Exif"
+
+#: ../src/layout_util.c:1904 ../src/toolbar.c:111
+msgid "Exif window"
+msgstr "Ventana Exif"
+
+#: ../src/layout_util.c:1905
+msgid "_Cycle through stereo modes"
+msgstr "Alternar entre los modos estéreo"
+
+#: ../src/layout_util.c:1905
+msgid "Cycle through stereo modes"
+msgstr "Alternar entre los modos estéreo"
+
+#: ../src/layout_util.c:1906
+msgid "_Next Pane"
+msgstr "Pa_nel siguiente"
+
+#: ../src/layout_util.c:1906
+msgid "Next Pane"
+msgstr "Panel siguiente"
+
+#: ../src/layout_util.c:1907
+msgid "_Previous Pane"
+msgstr "_Panel anterior"
+
+#: ../src/layout_util.c:1907
+msgid "Previous Pane"
+msgstr "Panel anterior"
+
+#: ../src/layout_util.c:1908
+msgid "_Up Pane"
+msgstr "S_ubir el panel"
+
+#: ../src/layout_util.c:1908
+msgid "Up Pane"
+msgstr "Subir el panel"
+
+#: ../src/layout_util.c:1909
+msgid "_Down Pane"
+msgstr "Bajar el panel"
+
+#: ../src/layout_util.c:1909
+msgid "Down Pane"
+msgstr "Bajar el panel"
+
+#: ../src/layout_util.c:1910
+msgid "_Write orientation to file"
+msgstr "Escribir la orientación en un archivo"
+
+#: ../src/layout_util.c:1910
+msgid "Write orientation to file"
+msgstr "Escribir la orientación en un archivo"
+
+#: ../src/layout_util.c:1911
 msgid "_Write orientation to file (preserve timestamp)"
-msgstr ""
-
-#: ../src/layout_util.c:1849
+msgstr "Escribir la orientación en un archivo (mantener la marca de tiempo)"
+
+#: ../src/layout_util.c:1911
 msgid "Write orientation to file (preserve timestamp)"
-msgstr ""
-
-#: ../src/layout_util.c:1854
+msgstr "Escribir la orientación en un archivo (mantener la marca de tiempo)"
+
+#: ../src/layout_util.c:1912
+msgid "Clear Marks..."
+msgstr "Borrar las marcas..."
+
+#: ../src/layout_util.c:1916
 msgid "Show _Thumbnails"
-msgstr "Mostrar minia_turas"
-
-#: ../src/layout_util.c:1854
+msgstr "Mostrar las minia_turas"
+
+#: ../src/layout_util.c:1916
 msgid "Show Thumbnails"
-msgstr "Mostrar miniaturas"
-
-#: ../src/layout_util.c:1855
+msgstr "Mostrar las miniaturas"
+
+#: ../src/layout_util.c:1917
 msgid "Show _Marks"
-msgstr "Mostrar _Marcas"
-
-#: ../src/layout_util.c:1855
+msgstr "Mostrar las _marcas"
+
+#: ../src/layout_util.c:1917
 msgid "Show Marks"
-msgstr "Mostrar Marcas"
-
-#: ../src/layout_util.c:1856
+msgstr "Mostrar las marcas"
+
+#: ../src/layout_util.c:1918
 msgid "Pi_xel Info"
-msgstr "Pi_xel Info:"
-
-#: ../src/layout_util.c:1856
+msgstr "Informac_ión del píxel"
+
+#: ../src/layout_util.c:1918
 msgid "Show Pixel Info"
-msgstr "Mostrar Pixel Info"
-
-#: ../src/layout_util.c:1857
+msgstr "Mostrar información del píxel"
+
+#: ../src/layout_util.c:1919
 msgid "_Float file list"
 msgstr "_Lista de archivos flotante"
 
-#: ../src/layout_util.c:1857 ../src/toolbar.c:114
+#: ../src/layout_util.c:1919 ../src/toolbar.c:114
 msgid "Float file list"
 msgstr "Lista de archivos flotante"
 
-#: ../src/layout_util.c:1858
+#: ../src/layout_util.c:1920
 msgid "Hide tool_bar"
-msgstr "Esconder _barra de herramientas"
-
-#: ../src/layout_util.c:1858
+msgstr "Ocultar la _barra de herramientas"
+
+#: ../src/layout_util.c:1920
 msgid "Hide toolbar"
-msgstr "Esconder barra de herramientas"
-
-#: ../src/layout_util.c:1859
+msgstr "Ocultar la barra de herramientas"
+
+#: ../src/layout_util.c:1921
 msgid "_Info sidebar"
-msgstr "Barra lateral de _Info"
-
-#: ../src/layout_util.c:1859 ../src/toolbar.c:115
+msgstr "Barra lateral de _información"
+
+#: ../src/layout_util.c:1921 ../src/toolbar.c:115
 msgid "Info sidebar"
-msgstr "Barra lateral de Info"
-
-#: ../src/layout_util.c:1860
+msgstr "Barra lateral de información"
+
+#: ../src/layout_util.c:1922
 msgid "Sort _manager"
 msgstr "Clas_ificador"
 
-#: ../src/layout_util.c:1860 ../src/toolbar.c:116
+#: ../src/layout_util.c:1922 ../src/toolbar.c:116
 msgid "Sort manager"
 msgstr "Clasificador"
 
-#: ../src/layout_util.c:1861
-#, fuzzy
+#: ../src/layout_util.c:1923
 msgid "Hide Bars"
-msgstr "Ocultar %s"
-
-#: ../src/layout_util.c:1862
+msgstr "Ocultar las barras"
+
+#: ../src/layout_util.c:1924
 msgid "Toggle _slideshow"
-msgstr "Conmutar diapo_sitivas"
-
-#: ../src/layout_util.c:1862
+msgstr "Conmutar el pase de diapo_sitivas"
+
+#: ../src/layout_util.c:1924
 msgid "Toggle slideshow"
-msgstr "Conmutar diapositivas"
-
-#: ../src/layout_util.c:1863
+msgstr "Conmutar el pase de diapositivas"
+
+#: ../src/layout_util.c:1925
 msgid "Use _color profiles"
 msgstr "Usar perfiles de color"
 
-#: ../src/layout_util.c:1863
+#: ../src/layout_util.c:1925
 msgid "Use color profiles"
 msgstr "Usar perfiles de color"
 
-#: ../src/layout_util.c:1864
+#: ../src/layout_util.c:1926
 msgid "Use profile from _image"
-msgstr "Usar perfil de la _imagen"
-
-#: ../src/layout_util.c:1864
+msgstr "Usar el perfil de la _imagen"
+
+#: ../src/layout_util.c:1926
 msgid "Use profile from image"
-msgstr "Usar perfil de la imagen"
-
-#: ../src/layout_util.c:1865
+msgstr "Usar el perfil de la imagen"
+
+#: ../src/layout_util.c:1927
 msgid "Toggle _grayscale"
 msgstr "Conmutar escala de _grises"
 
-#: ../src/layout_util.c:1865
+#: ../src/layout_util.c:1927
 msgid "Toggle grayscale"
 msgstr "Conmutar escala de grises"
 
-#: ../src/layout_util.c:1866
+#: ../src/layout_util.c:1928
 msgid "Image Overlay"
-msgstr "Información Superpuesta"
-
-#: ../src/layout_util.c:1867
+msgstr "Información superpuesta"
+
+#: ../src/layout_util.c:1929
 msgid "_Show Histogram"
-msgstr "Mostrar Hi_stograma"
-
-#: ../src/layout_util.c:1867
+msgstr "Mostrar el hi_stograma"
+
+#: ../src/layout_util.c:1929
 msgid "Show Histogram"
-msgstr "Mostrar Histograma"
-
-#: ../src/layout_util.c:1868
-#, fuzzy
+msgstr "Mostrar el histograma"
+
+#: ../src/layout_util.c:1930
 msgid "Rectangular Selection"
-msgstr "Selección rectangular en vista de íconos"
-
-#: ../src/layout_util.c:1869
+msgstr "Selección rectangular"
+
+#: ../src/layout_util.c:1931
 msgid "GIF _animation"
-msgstr ""
-
-#: ../src/layout_util.c:1869
+msgstr "_Animación GIF"
+
+#: ../src/layout_util.c:1931
 msgid "Toggle GIF animation"
-msgstr ""
-
-#: ../src/layout_util.c:1870
-#, fuzzy
+msgstr "Conmutar la animación GIF"
+
+#: ../src/layout_util.c:1932
 msgid "_Exif rotate"
-msgstr "Usar fecha Exif"
-
-#: ../src/layout_util.c:1870
-#, fuzzy
+msgstr "Rotación _Exif"
+
+#: ../src/layout_util.c:1932
 msgid "Exif rotate"
-msgstr "Usar fecha Exif"
-
-#: ../src/layout_util.c:1874
+msgstr "Rotación Exif"
+
+#: ../src/layout_util.c:1936
 msgid "Image _List"
 msgstr "_Lista de imágenes"
 
-#: ../src/layout_util.c:1874
+#: ../src/layout_util.c:1936
 msgid "View Images as List"
 msgstr "Ver imágenes como lista"
 
-#: ../src/layout_util.c:1875
+#: ../src/layout_util.c:1937
 msgid "I_cons"
-msgstr "Ãco_nos"
-
-#: ../src/layout_util.c:1875
+msgstr "Ico_nos"
+
+#: ../src/layout_util.c:1937
 msgid "View Images as Icons"
-msgstr "Ver imágenes como íconos"
-
-#: ../src/layout_util.c:1879
-#, fuzzy
+msgstr "Ver imágenes como iconos"
+
+#: ../src/layout_util.c:1941
 msgid "T_oggle Folder View"
-msgstr "Conmutar diapositivas"
-
-#: ../src/layout_util.c:1879
-#, fuzzy
+msgstr "Conmutar la vista de carpeta"
+
+#: ../src/layout_util.c:1941
 msgid "Toggle Folders View"
-msgstr "Conmutar diapositivas"
-
-#: ../src/layout_util.c:1883
+msgstr "Conmutar la vista de carpetas"
+
+#: ../src/layout_util.c:1945
 msgid "_Horizontal"
 msgstr "_Horizontal"
 
-#: ../src/layout_util.c:1883
+#: ../src/layout_util.c:1945
 msgid "Split Horizontal"
-msgstr "Partido Horizontalmente"
-
-#: ../src/layout_util.c:1884
+msgstr "Partido horizontalmente"
+
+#: ../src/layout_util.c:1946
 msgid "_Vertical"
 msgstr "_Vertical"
 
-#: ../src/layout_util.c:1884
+#: ../src/layout_util.c:1946
 msgid "Split Vertical"
 msgstr "Partir verticalmente"
 
-#: ../src/layout_util.c:1885
+#: ../src/layout_util.c:1947
 msgid "_Quad"
-msgstr "_Quad"
-
-#: ../src/layout_util.c:1885
+msgstr "_Cuádruple"
+
+#: ../src/layout_util.c:1947
 msgid "Split Quad"
 msgstr "Partido en cuatro"
 
-#: ../src/layout_util.c:1886
+#: ../src/layout_util.c:1948
 msgid "_Single"
 msgstr "_Simple"
 
-#: ../src/layout_util.c:1886
+#: ../src/layout_util.c:1948
 msgid "Split Single"
 msgstr "Simple partida"
 
-#: ../src/layout_util.c:1890
+#: ../src/layout_util.c:1952
 msgid "Input _0: sRGB"
 msgstr "Entrada _0: sRGB"
 
-#: ../src/layout_util.c:1890
+#: ../src/layout_util.c:1952
 msgid "Input 0: sRGB"
 msgstr "Entrada 0: sRGB"
 
-#: ../src/layout_util.c:1891
+#: ../src/layout_util.c:1953
 msgid "Input _1: AdobeRGB compatible"
-msgstr "Entrada _1: AdobeRGB compatible"
-
-#: ../src/layout_util.c:1891
+msgstr "Entrada _1: compatible con AdobeRGB"
+
+#: ../src/layout_util.c:1953
 msgid "Input 1: AdobeRGB compatible"
-msgstr "Entrada 1: AdobeRGB compatible"
-
-#: ../src/layout_util.c:1892
+msgstr "Entrada 1: compatible con AdobeRGB"
+
+#: ../src/layout_util.c:1954
 msgid "Input _2"
 msgstr "Entrada _2"
 
-#: ../src/layout_util.c:1892
+#: ../src/layout_util.c:1954
 msgid "Input 2"
 msgstr "Entrada 2"
 
-#: ../src/layout_util.c:1893
+#: ../src/layout_util.c:1955
 msgid "Input _3"
 msgstr "Entrada _3"
 
-#: ../src/layout_util.c:1893
+#: ../src/layout_util.c:1955
 msgid "Input 3"
 msgstr "Entrada 3"
 
-#: ../src/layout_util.c:1894
+#: ../src/layout_util.c:1956
 msgid "Input _4"
 msgstr "Entrada _4"
 
-#: ../src/layout_util.c:1894
+#: ../src/layout_util.c:1956
 msgid "Input 4"
 msgstr "Entrada 4"
 
-#: ../src/layout_util.c:1895
+#: ../src/layout_util.c:1957
 msgid "Input _5"
 msgstr "Entrada _5"
 
-#: ../src/layout_util.c:1895
+#: ../src/layout_util.c:1957
 msgid "Input 5"
 msgstr "Entrada 5"
 
-#: ../src/layout_util.c:1899
+#: ../src/layout_util.c:1961
 msgid "Histogram on Red"
 msgstr "Histograma sobre Rojo"
 
-#: ../src/layout_util.c:1900
+#: ../src/layout_util.c:1962
 msgid "Histogram on Green"
 msgstr "Histograma sobre Verde"
 
-#: ../src/layout_util.c:1901
+#: ../src/layout_util.c:1963
 msgid "Histogram on Blue"
 msgstr "Histograma sobre Azul"
 
-#: ../src/layout_util.c:1902
+#: ../src/layout_util.c:1964
 msgid "Histogram on RGB"
 msgstr "Histograma sobre RGB"
 
-#: ../src/layout_util.c:1903
+#: ../src/layout_util.c:1965
 msgid "Histogram on Value"
 msgstr "Histograma sobre Valor"
 
-#: ../src/layout_util.c:1907
+#: ../src/layout_util.c:1969
 msgid "Linear Histogram"
-msgstr "Histograma Lineal"
-
-#: ../src/layout_util.c:1908
+msgstr "Histograma lineal"
+
+#: ../src/layout_util.c:1970
 msgid "_Log Histogram"
-msgstr "Histograma _Logarítmico"
-
-#: ../src/layout_util.c:1908
+msgstr "Histograma _logarítmico"
+
+#: ../src/layout_util.c:1970
 msgid "Log Histogram"
-msgstr "Histograma Logarítmico"
-
-#: ../src/layout_util.c:1912
+msgstr "Histograma logarítmico"
+
+#: ../src/layout_util.c:1974
 msgid "_Auto"
-msgstr ""
-
-#: ../src/layout_util.c:1912
+msgstr "_Automático"
+
+#: ../src/layout_util.c:1974
 msgid "Stereo Auto"
-msgstr ""
-
-#: ../src/layout_util.c:1913
+msgstr "Estéreo automático"
+
+#: ../src/layout_util.c:1975
 msgid "_Side by Side"
-msgstr ""
-
-#: ../src/layout_util.c:1913
+msgstr "Lado a lado"
+
+#: ../src/layout_util.c:1975
 msgid "Stereo Side by Side"
-msgstr ""
-
-#: ../src/layout_util.c:1914
+msgstr "Estéreo lado a lado"
+
+#: ../src/layout_util.c:1976
 msgid "_Cross"
-msgstr ""
-
-#: ../src/layout_util.c:1914
+msgstr "_Cruz"
+
+#: ../src/layout_util.c:1976
 msgid "Stereo Cross"
-msgstr ""
-
-#: ../src/layout_util.c:1915
+msgstr "Estéreo en cruz"
+
+#: ../src/layout_util.c:1977
 msgid "_Off"
-msgstr ""
-
-#: ../src/layout_util.c:1915
+msgstr "Desactivad_o"
+
+#: ../src/layout_util.c:1977
 msgid "Stereo Off"
-msgstr ""
-
-#: ../src/layout_util.c:2226
+msgstr "Estéreo desactivado"
+
+#: ../src/layout_util.c:2290
 #, c-format
 msgid "Mark _%d"
 msgstr "Marca _%d"
 
-#: ../src/layout_util.c:2227 ../src/view_file/view_file.c:550
+#: ../src/layout_util.c:2291 ../src/view_file/view_file.c:552
 #, c-format
 msgid "_Set mark %d"
-msgstr "_Poner Marca %d"
-
-#: ../src/layout_util.c:2227
+msgstr "Poner la marca %d"
+
+#: ../src/layout_util.c:2291
 #, c-format
 msgid "Set mark %d"
-msgstr "Poner marca %d"
-
-#: ../src/layout_util.c:2228 ../src/view_file/view_file.c:551
+msgstr "Poner la marca %d"
+
+#: ../src/layout_util.c:2292 ../src/view_file/view_file.c:553
 #, c-format
 msgid "_Reset mark %d"
-msgstr "_Quitar Marca %d"
-
-#: ../src/layout_util.c:2228
+msgstr "_Quitar la marca %d"
+
+#: ../src/layout_util.c:2292
 #, c-format
 msgid "Reset mark %d"
-msgstr "Quitar marca %d"
-
-#: ../src/layout_util.c:2229 ../src/layout_util.c:2230
-#: ../src/view_file/view_file.c:552
+msgstr "Quitar la marca %d"
+
+#: ../src/layout_util.c:2293 ../src/layout_util.c:2294
+#: ../src/view_file/view_file.c:554
 #, c-format
 msgid "_Toggle mark %d"
-msgstr "_Cambiar Marca %d"
-
-#: ../src/layout_util.c:2229 ../src/layout_util.c:2230
+msgstr "_Conmutar la marca %d"
+
+#: ../src/layout_util.c:2293 ../src/layout_util.c:2294
 #, c-format
 msgid "Toggle mark %d"
-msgstr "Cambiar marca %d"
-
-#: ../src/layout_util.c:2231
+msgstr "Conmutar la marca %d"
+
+#: ../src/layout_util.c:2295
 #, c-format
 msgid "Se_lect mark %d"
 msgstr "_Seleccionar marca %d"
 
-#: ../src/layout_util.c:2231 ../src/layout_util.c:2232
+#: ../src/layout_util.c:2295 ../src/layout_util.c:2296
 #, c-format
 msgid "Select mark %d"
 msgstr "Seleccionar marca %d"
 
-#: ../src/layout_util.c:2232 ../src/view_file/view_file.c:553
+#: ../src/layout_util.c:2296 ../src/view_file/view_file.c:555
 #, c-format
 msgid "_Select mark %d"
-msgstr "_Seleccionar marca %d"
-
-#: ../src/layout_util.c:2233 ../src/view_file/view_file.c:554
+msgstr "_Seleccionar la marca %d"
+
+#: ../src/layout_util.c:2297 ../src/view_file/view_file.c:556
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Añadir marca %d"
 
-#: ../src/layout_util.c:2233
+#: ../src/layout_util.c:2297
 #, c-format
 msgid "Add mark %d"
 msgstr "Añadir marca %d"
 
-#: ../src/layout_util.c:2234 ../src/view_file/view_file.c:555
+#: ../src/layout_util.c:2298 ../src/view_file/view_file.c:557
 #, c-format
 msgid "_Intersection with mark %d"
-msgstr "_Intersección con Marca %d"
-
-#: ../src/layout_util.c:2234
+msgstr "_Intersección con la marca %d"
+
+#: ../src/layout_util.c:2298
 #, c-format
 msgid "Intersection with mark %d"
-msgstr "Intersección con marca %d"
-
-#: ../src/layout_util.c:2235 ../src/view_file/view_file.c:556
+msgstr "Intersección con la marca %d"
+
+#: ../src/layout_util.c:2299 ../src/view_file/view_file.c:558
 #, c-format
 msgid "_Unselect mark %d"
-msgstr "_Deseleccionar marca %d"
-
-#: ../src/layout_util.c:2235
+msgstr "_Deseleccionar la marca %d"
+
+#: ../src/layout_util.c:2299
 #, c-format
 msgid "Unselect mark %d"
-msgstr "Deseleccionar marca %d"
-
-#: ../src/layout_util.c:2236
+msgstr "Deseleccionar la marca %d"
+
+#: ../src/layout_util.c:2300
 #, c-format
 msgid "_Filter mark %d"
 msgstr "_Filtrar marca %d"
 
-#: ../src/layout_util.c:2236
+#: ../src/layout_util.c:2300
 #, c-format
 msgid "Filter mark %d"
 msgstr "Filtrar marca %d"
 
-#: ../src/layout_util.c:2790
+#: ../src/layout_util.c:2854
 #, c-format
 msgid "Number of files with unsaved metadata: %d"
 msgstr "Número de archivos con metadatos sin guardar: %d"
 
-#: ../src/layout_util.c:2796
+#: ../src/layout_util.c:2860
 msgid "No unsaved metadata"
-msgstr "No hay Metadatos sin guardar"
-
-#: ../src/layout_util.c:2843
+msgstr "No hay metadatos sin guardar"
+
+#: ../src/layout_util.c:2907
 #, c-format
 msgid ""
 "Image profile: %s\n"
@@ -3512,15 +3532,15 @@
 "Perfil de imagen: %s\n"
 "Perfil de pantalla: %s"
 
-#: ../src/layout_util.c:2851
+#: ../src/layout_util.c:2915
 msgid "Click to enable color management"
-msgstr "Click para activar la gestión de color"
-
-#: ../src/layout_util.c:2856
+msgstr "Clic para activar la gestión de color"
+
+#: ../src/layout_util.c:2920
 msgid "Color profiles not supported"
 msgstr "Perfiles de color no soportados"
 
-#: ../src/layout_util.c:2878
+#: ../src/layout_util.c:2942
 #, c-format
 msgid "Input _%d: %s"
 msgstr "Entrada _%d: %s"
@@ -3538,19 +3558,19 @@
 "please read the documentation of LIRC to \n"
 "know how to create a proper config file\n"
 msgstr ""
-"No puedo leer el archivo de configuración de LIRC\n"
+"No se puede leer el archivo de configuración de LIRC\n"
 "consulte el manual de LIRC para saber\n"
-"como crear un archivo de configuración correcto\n"
+"cómo crear un archivo de configuración correcto\n"
 
 #: ../src/logwindow.c:142
 msgid "Log"
-msgstr "Log"
-
-#: ../src/logwindow.c:171 ../src/preferences.c:2411
+msgstr "Registro"
+
+#: ../src/logwindow.c:172 ../src/preferences.c:2460
 msgid "Debug level:"
-msgstr "Debug level:"
-
-#: ../src/main.c:361
+msgstr "Nivel de depuración:"
+
+#: ../src/main.c:362
 #, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
@@ -3559,93 +3579,94 @@
 "Uso: %s [opciones] [ruta]\n"
 "\n"
 
-#: ../src/main.c:362
+#: ../src/main.c:363
 msgid "valid options are:\n"
-msgstr "Opciones válidas son:\n"
-
-#: ../src/main.c:363
-#, fuzzy
-msgid "  +t, --with-tools                 force show of tools\n"
-msgstr "  +t, --with-tools           forzar que se vean las herramientas\n"
+msgstr "las opciones válidas son:\n"
 
 #: ../src/main.c:364
-#, fuzzy
-msgid "  -t, --without-tools              force hide of tools\n"
-msgstr "  -t, --without-tools        forzar que se oculten las herramientas\n"
+msgid "  +t, --with-tools                 force show of tools\n"
+msgstr ""
+"  +t, --with-tools                   forzar que se vean las herramientas\n"
 
 #: ../src/main.c:365
-#, fuzzy
-msgid "  -f, --fullscreen                 start in full screen mode\n"
-msgstr "  -f, --fullscreen           comenzar en modo pantalla completa\n"
+msgid "  -t, --without-tools              force hide of tools\n"
+msgstr ""
+"  -t, --without-tools                forzar que se oculten las herramientas\n"
 
 #: ../src/main.c:366
-#, fuzzy
-msgid "  -s, --slideshow                  start in slideshow mode\n"
-msgstr "  -s, --slideshow            comenzar en modo diapositivas\n"
+msgid "  -f, --fullscreen                 start in full screen mode\n"
+msgstr ""
+"  -f, --fullscreen                   comenzar en modo pantalla completa\n"
 
 #: ../src/main.c:367
-#, fuzzy
+msgid "  -s, --slideshow                  start in slideshow mode\n"
+msgstr ""
+"  -s, --slideshow                    comenzar en modo de pase de"
+" diapositivas\n"
+
+#: ../src/main.c:368
 msgid ""
 "  -l, --list [files] [collections] open collection window for command line\n"
 msgstr ""
-"  -l, --list                 abrir ventana de colecciones para la línea de\n"
-"                             comandos\n"
-
-#: ../src/main.c:368
+"  -l, --list [archivos][colecciones] abrir la ventana de colecciones para la"
+" línea de comandos\n"
+
+#: ../src/main.c:369
 msgid "      --blank                      start with blank file list\n"
 msgstr ""
-
-#: ../src/main.c:369
-#, fuzzy
-msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
-msgstr "      --geometry=GEOMETRÃA    localización de la ventana principal\n"
+"      --blank                        empezar con una lista de archivos vacía\n"
 
 #: ../src/main.c:370
-#, fuzzy
+msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
+msgstr ""
+"      --geometry=XxY+DESP.-X+DESP.-Y ubicación de la "
+"ventana principal\n"
+
+#: ../src/main.c:371
 msgid ""
 "  -r, --remote                     send following commands to open window\n"
 msgstr ""
-"  -r, --remote               enviar los siguientes comandos a la ventana\n"
-"                             abierta\n"
-
-#: ../src/main.c:371
-#, fuzzy
+"  -r, --remote                       enviar los siguientes comandos a la"
+" ventana abierta\n"
+
+#: ../src/main.c:372
 msgid "  -rh,--remote-help                print remote command list\n"
-msgstr "  -rh,--remote-help          mostrar lista de comandos remotos\n"
-
-#: ../src/main.c:373
-#, fuzzy
-msgid "      --debug[=level]              turn on debug output\n"
-msgstr "  --debug[=nivel]             activar mensajes de depuración\n"
+msgstr ""
+"  -rh,--remote-help                  mostrar la lista de comandos remotos\n"
 
 #: ../src/main.c:374
-msgid "  -g:<regexp>, --grep:<regexp>     filter debug output\n"
+msgid "      --debug[=level]              turn on debug output\n"
 msgstr ""
-
-#: ../src/main.c:376
-#, fuzzy
-msgid "  +w, --show-log-window            show log window\n"
-msgstr "  +t, --with-tools           forzar que se vean las herramientas\n"
+"  --debug[=nivel]                    activar los mensajes de depuración\n"
+
+#: ../src/main.c:375
+msgid "  -g:<regexp>, --grep:<regexp>     filter debug output\n"
+msgstr "  -g:<regexp>, --grep:<regexp>       filtrar la salida de depuración\n"
 
 #: ../src/main.c:377
-msgid "  -o:<file>, --log-file:<file>     save log data to file\n"
-msgstr ""
+msgid "  +w, --show-log-window            show log window\n"
+msgstr "  +w, --show-log-window              mostrar la ventana del registro\n"
 
 #: ../src/main.c:378
-#, fuzzy
-msgid "  -v, --version                    print version info\n"
-msgstr "  -v, --version              mostrar información de versión\n"
+msgid "  -o:<file>, --log-file:<file>     save log data to file\n"
+msgstr ""
+"  -o:<archivo>, --log-file:<archivo> guardar los datos del registro a un "
+"archivo\n"
 
 #: ../src/main.c:379
-#, fuzzy
+msgid "  -v, --version                    print version info\n"
+msgstr ""
+"  -v, --version                      mostrar información de la versión\n"
+
+#: ../src/main.c:380
 msgid ""
 "  -h, --help                       show this message\n"
 "\n"
 msgstr ""
-"  -h, --help                 mostrar este mensaje\n"
+"  -h, --help                         mostrar este mensaje\n"
 "\n"
 
-#: ../src/main.c:392
+#: ../src/main.c:393
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
@@ -3654,34 +3675,34 @@
 "No válido o ignorado: %s\n"
 "Utilice --help para ver las opciones\n"
 
-#: ../src/main.c:421
+#: ../src/main.c:433
 msgid "Invalid or ignored remote options: "
 msgstr "Opciones remotas no válidas o ignoradas: "
 
-#: ../src/main.c:430
+#: ../src/main.c:442
 msgid ""
 "\n"
 "Use --remote-help for valid remote options.\n"
 msgstr ""
 "\n"
-" Use --remote-help para ver las ociones remota válidas.\n"
-
-#: ../src/main.c:532
+" Use --remote-help para ver las opciones remotas válidas.\n"
+
+#: ../src/main.c:563
 #, c-format
 msgid "Creating %s dir:%s\n"
-msgstr "Creando directorio %s: %s\n"
-
-#: ../src/main.c:536
+msgstr "Creando el directorio %s:%s\n"
+
+#: ../src/main.c:567
 #, c-format
 msgid "Could not create dir:%s\n"
-msgstr "No se puede crear el directorio: %s\n"
-
-#: ../src/main.c:588
+msgstr "No se puede crear el directorio:%s\n"
+
+#: ../src/main.c:619
 #, c-format
 msgid "error saving file: %s\n"
 msgstr "error al guardar archivo: %s\n"
 
-#: ../src/main.c:607
+#: ../src/main.c:638
 #, c-format
 msgid ""
 "error saving file: %s\n"
@@ -3690,22 +3711,22 @@
 "error al guardar archivo: %s\n"
 "error: %s\n"
 
-#: ../src/main.c:717
+#: ../src/main.c:748
 msgid "exit"
 msgstr "salir"
 
-#: ../src/main.c:722
+#: ../src/main.c:753
 #, c-format
 msgid "Quit %s"
 msgstr "Finalizar %s"
 
-#: ../src/main.c:724
+#: ../src/main.c:755
 msgid "Collections have been modified. Quit anyway?"
 msgstr ""
 "Algunas colecciones han sido modificadas.\n"
-"¿Salir de todos modos?"
-
-#: ../src/main.c:939 ../src/remote.c:708
+"¿Quiere salir de todos modos?"
+
+#: ../src/main.c:973 ../src/remote.c:790
 msgid "Command line"
 msgstr "Línea de comandos"
 
@@ -3718,60 +3739,64 @@
 msgstr "Ordenar por fecha"
 
 #: ../src/menu.c:149
-#, fuzzy
 msgid "Sort by file creation date"
-msgstr "Ordenar por fecha Exif"
+msgstr "Ordenar por fecha de creación del archivo"
 
 #: ../src/menu.c:152
-#, fuzzy
-msgid "Sort by Exif-date"
-msgstr "Ordenar por fecha Exif"
+msgid "Sort by Exif date original"
+msgstr "Ordenar por la fecha Exif original"
 
 #: ../src/menu.c:155
-msgid "Unsorted"
-msgstr "Desordenados"
+msgid "Sort by Exif date digitized"
+msgstr "Ordenar por la fecha Exif de digitalización"
 
 #: ../src/menu.c:158
+msgid "Unsorted"
+msgstr "Desordenados"
+
+#: ../src/menu.c:161
 msgid "Sort by path"
 msgstr "Ordenar por ruta"
 
-#: ../src/menu.c:161
-msgid "Sort by number"
-msgstr "Ordenar por número"
-
 #: ../src/menu.c:164
-#, fuzzy
+msgid "Sort by number"
+msgstr "Ordenar por número"
+
+#: ../src/menu.c:167
 msgid "Sort by rating"
-msgstr "Ordenar por fecha"
-
-#: ../src/menu.c:168
+msgstr "Ordenar por valoración"
+
+#: ../src/menu.c:170
+msgid "Sort by class"
+msgstr "Ordenar por clase"
+
+#: ../src/menu.c:174
 msgid "Sort by name"
 msgstr "Ordenar por nombre"
 
-#: ../src/menu.c:234 ../src/menu.c:243
+#: ../src/menu.c:242 ../src/menu.c:251
 msgid "Zoom to original size"
-msgstr "Hacer zoom al tamaño original"
-
-#: ../src/menu.c:237 ../src/preferences.c:1731
+msgstr "Hacer zum al tamaño original"
+
+#: ../src/menu.c:245 ../src/preferences.c:1771
 msgid "Fit image to window"
-msgstr "Ajustar imagen a la ventana"
-
-#: ../src/menu.c:240
+msgstr "Ajustar la imagen a la ventana"
+
+#: ../src/menu.c:248
 msgid "Leave Zoom at previous setting"
-msgstr "Dejar el zoom en la configuración anterior"
-
-#: ../src/menu.c:295 ../src/preferences.c:1712
+msgstr "Dejar el zum en la configuración anterior"
+
+#: ../src/menu.c:303 ../src/preferences.c:1752
 msgid "Zoom"
-msgstr "Zoom"
-
-#: ../src/menu.c:320
+msgstr "Zum"
+
+#: ../src/menu.c:328
 msgid "Rotate _180"
 msgstr "Rotar _180°"
 
-#: ../src/menu.c:426
-#, fuzzy
+#: ../src/menu.c:434
 msgid "_Add to Collection"
-msgstr "Añadir colección"
+msgstr "_Añadir a la colección"
 
 #: ../src/metadata.c:1702
 msgid "People"
@@ -3827,7 +3852,7 @@
 
 #: ../src/metadata.c:1715
 msgid "Zoo"
-msgstr "Zoo"
+msgstr "Zoológico"
 
 #: ../src/metadata.c:1716
 msgid "Plant"
@@ -3935,7 +3960,7 @@
 
 #: ../src/metadata.c:1744
 msgid "Conditions"
-msgstr "Condicciones"
+msgstr "Condiciones"
 
 #: ../src/metadata.c:1745
 msgid "Night"
@@ -4007,216 +4032,216 @@
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../src/options.c:195 ../src/ui_bookmark.c:578
+#: ../src/options.c:200 ../src/ui_bookmark.c:578
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: ../src/pan-view/pan-view.c:438
+#: ../src/options.c:221 ../src/search.c:2127 ../src/search.c:2131
+#: ../src/search.c:3245 ../src/search.c:3249 ../src/view_file/view_file.c:782
+msgid "Mark "
+msgstr "Marca"
+
+#: ../src/pan-view/pan-view.c:439
 #, c-format
 msgid "%d images, %s"
 msgstr "%d imágenes, %s"
 
-#: ../src/pan-view/pan-view.c:448
+#: ../src/pan-view/pan-view.c:449
 #, c-format
 msgid "The pan view does not support the folder \"%s\"."
-msgstr "La vista panorámica no soporta la carpeta\"%s\"."
-
-#: ../src/pan-view/pan-view.c:449
+msgstr "La vista panorámica no admite la carpeta «%s»."
+
+#: ../src/pan-view/pan-view.c:450
 msgid "Folder not supported"
 msgstr "Carpeta no soportada"
 
-#: ../src/pan-view/pan-view.c:1001 ../src/pan-view/pan-view.c:1017
+#: ../src/pan-view/pan-view.c:1002 ../src/pan-view/pan-view.c:1018
 msgid "Reading image data..."
-msgstr "Leyendo datos de imagen..."
-
-#: ../src/pan-view/pan-view.c:1076
+msgstr "Leyendo datos de la imagen..."
+
+#: ../src/pan-view/pan-view.c:1077
 msgid "Sorting images..."
-msgstr "Ordenando imágenes..."
-
-#: ../src/pan-view/pan-view.c:1385 ../src/print.c:2609
+msgstr "Ordenando las imágenes..."
+
+#: ../src/pan-view/pan-view.c:1408 ../src/print.c:2609
 msgid "Filename:"
 msgstr "Nombre del archivo:"
 
-#: ../src/pan-view/pan-view.c:1387 ../src/pan-view/pan-view.c:1812
-#: ../src/preferences.c:1826
+#: ../src/pan-view/pan-view.c:1410 ../src/pan-view/pan-view.c:1823
+#: ../src/preferences.c:1869
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: ../src/pan-view/pan-view.c:1389 ../src/pan-view/pan-view-search.c:377
+#: ../src/pan-view/pan-view.c:1412 ../src/pan-view/pan-view-search.c:377
 msgid "Date:"
 msgstr "Fecha:"
 
-#: ../src/pan-view/pan-view.c:1391 ../src/preferences.c:1602
+#: ../src/pan-view/pan-view.c:1414 ../src/preferences.c:1621
 #: ../src/print.c:3222 ../src/print.c:3427
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../src/pan-view/pan-view.c:1698 ../src/search.c:2417
+#: ../src/pan-view/pan-view.c:1721 ../src/search.c:2547
 msgid "Folder not found"
-msgstr "No se encontró la carpeta"
-
-#: ../src/pan-view/pan-view.c:1699
+msgstr "No se encuentra la carpeta"
+
+#: ../src/pan-view/pan-view.c:1722
 msgid "The entered path is not a folder"
-msgstr "El path no es una carpeta"
-
-#: ../src/pan-view/pan-view.c:1796
+msgstr "La ruta introducida no es de una carpeta"
+
+#: ../src/pan-view/pan-view.c:1807
 msgid "Pan View"
 msgstr "Vista avanzada"
 
-#: ../src/pan-view/pan-view.c:1821
+#: ../src/pan-view/pan-view.c:1830
 msgid "Timeline"
 msgstr "Linea de tiempo"
 
-#: ../src/pan-view/pan-view.c:1822
+#: ../src/pan-view/pan-view.c:1831
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../src/pan-view/pan-view.c:1824
+#: ../src/pan-view/pan-view.c:1833
 msgid "Folders (flower)"
 msgstr "Carpetas (flor)"
 
-#: ../src/pan-view/pan-view.c:1825
-msgid "Grid"
-msgstr "Rejilla"
-
 #: ../src/pan-view/pan-view.c:1834
+msgid "Grid"
+msgstr "Rejilla"
+
+#: ../src/pan-view/pan-view.c:1843
 msgid "Dots"
 msgstr "puntos"
 
-#: ../src/pan-view/pan-view.c:1835
+#: ../src/pan-view/pan-view.c:1844
 msgid "No Images"
-msgstr "Sin imágenes"
-
-#: ../src/pan-view/pan-view.c:1836
+msgstr "No hay imágenes"
+
+#: ../src/pan-view/pan-view.c:1845
 msgid "Small Thumbnails"
 msgstr "Miniaturas pequeñas"
 
-#: ../src/pan-view/pan-view.c:1837
+#: ../src/pan-view/pan-view.c:1846
 msgid "Normal Thumbnails"
 msgstr "Miniaturas normales"
 
-#: ../src/pan-view/pan-view.c:1838
+#: ../src/pan-view/pan-view.c:1847
 msgid "Large Thumbnails"
 msgstr "Miniaturas grandes"
 
-#: ../src/pan-view/pan-view.c:1839 ../src/pan-view/pan-view.c:2311
+#: ../src/pan-view/pan-view.c:1848 ../src/pan-view/pan-view.c:2320
 msgid "1:10 (10%)"
 msgstr "1:10 (10%)"
 
-#: ../src/pan-view/pan-view.c:1840 ../src/pan-view/pan-view.c:2307
+#: ../src/pan-view/pan-view.c:1849 ../src/pan-view/pan-view.c:2316
 msgid "1:4 (25%)"
 msgstr "1:4 (25%)"
 
-#: ../src/pan-view/pan-view.c:1841 ../src/pan-view/pan-view.c:2303
+#: ../src/pan-view/pan-view.c:1850 ../src/pan-view/pan-view.c:2312
 msgid "1:3 (33%)"
 msgstr "1:3 (33%)"
 
-#: ../src/pan-view/pan-view.c:1842 ../src/pan-view/pan-view.c:2299
+#: ../src/pan-view/pan-view.c:1851 ../src/pan-view/pan-view.c:2308
 msgid "1:2 (50%)"
 msgstr "1:2 (50%)"
 
-#: ../src/pan-view/pan-view.c:1843
+#: ../src/pan-view/pan-view.c:1852
 msgid "1:1 (100%)"
 msgstr "1:1 (100%)"
 
-#: ../src/pan-view/pan-view.c:1989
+#: ../src/pan-view/pan-view.c:1998
 msgid "Pan View Performance"
 msgstr "Rendimiento de la vista panorámica"
 
-#: ../src/pan-view/pan-view.c:1996
+#: ../src/pan-view/pan-view.c:2005
 msgid "Pan view performance may be poor."
-msgstr "El rendimiento de la vista panorámica será bajo."
-
-#: ../src/pan-view/pan-view.c:1997
+msgstr "El rendimiento de la vista panorámica puede ser bajo."
+
+#: ../src/pan-view/pan-view.c:2006
 msgid ""
 "To improve performance of thumbnails in the pan view the following options "
 "can be enabled. Note that both options must be enabled to notice a change in "
 "performance."
 msgstr ""
-"Para mejorar el rendimiento de las miniaturas en la vista panorámica puede "
-"habilitar las siguientes. Ambas opciones deben ser habilitadas para notar "
-"uncambio en el rendimiento."
-
-#: ../src/pan-view/pan-view.c:2005 ../src/preferences.c:1605
+"Para mejorar el rendimiento de las miniaturas en la vista panorámica, puede "
+"habilitar las siguientes opciones. Tenga en cuenta que deben habilitar ambas "
+"para notar un cambio en el rendimiento."
+
+#: ../src/pan-view/pan-view.c:2014 ../src/preferences.c:1624
 msgid "Cache thumbnails"
 msgstr "Hacer caché de miniaturas"
 
-#: ../src/pan-view/pan-view.c:2007
+#: ../src/pan-view/pan-view.c:2016
 msgid "Use shared thumbnail cache"
 msgstr "Utilizar caché de miniaturas compartido"
 
-#: ../src/pan-view/pan-view.c:2013
+#: ../src/pan-view/pan-view.c:2022
 msgid "Do not show this dialog again"
-msgstr "No mostrar más este aviso."
-
-#: ../src/pan-view/pan-view.c:2279
+msgstr "No mostrar más este aviso"
+
+#: ../src/pan-view/pan-view.c:2288
 msgid "Sort by E_xif date"
 msgstr "Ordenar por fecha Exif"
 
-#: ../src/pan-view/pan-view.c:2285
+#: ../src/pan-view/pan-view.c:2294
 msgid "_Show Exif information"
 msgstr "Mo_strar información Exif"
 
-#: ../src/pan-view/pan-view.c:2287
+#: ../src/pan-view/pan-view.c:2296
 msgid "Show im_age"
-msgstr "Mostrar im_agen"
-
-#: ../src/pan-view/pan-view.c:2291
+msgstr "Mostrar la im_agen"
+
+#: ../src/pan-view/pan-view.c:2300
 msgid "_None"
 msgstr "_Ninguno"
 
-#: ../src/pan-view/pan-view.c:2295
+#: ../src/pan-view/pan-view.c:2304
 msgid "_Full size"
-msgstr "de _tamaño natural"
+msgstr "Tamaño real"
 
 #: ../src/pan-view/pan-view-filter.c:48
 msgid "Require"
-msgstr ""
+msgstr "Contiene"
 
 #: ../src/pan-view/pan-view-filter.c:48
 msgid "R"
 msgstr ""
 
 #: ../src/pan-view/pan-view-filter.c:51
-#, fuzzy
 msgid "Exclude"
-msgstr "no incluyen"
+msgstr "No incluye"
 
 #: ../src/pan-view/pan-view-filter.c:51
 msgid "E"
 msgstr ""
 
 #: ../src/pan-view/pan-view-filter.c:54
-#, fuzzy
 msgid "Include"
-msgstr "no incluyen"
+msgstr "Incluye"
 
 #: ../src/pan-view/pan-view-filter.c:54
 msgid "I"
 msgstr ""
 
 #: ../src/pan-view/pan-view-filter.c:57
-#, fuzzy
 msgid "Group"
-msgstr "Grupo:"
+msgstr "Grupo"
 
 #: ../src/pan-view/pan-view-filter.c:57
 msgid "G"
 msgstr ""
 
 #: ../src/pan-view/pan-view-filter.c:71
-#, fuzzy
 msgid "Keyword Filter:"
-msgstr "Tipo de palabra clave:"
-
-#: ../src/pan-view/pan-view-filter.c:104 ../src/preferences.c:1989
+msgstr "Filtro de palabra clave:"
+
+#: ../src/pan-view/pan-view-filter.c:104 ../src/preferences.c:2033
 msgid "Filter"
 msgstr "Filtro"
 
 #: ../src/pan-view/pan-view-filter.c:139
-#, fuzzy
 msgid "Removed keyword…"
-msgstr "Activar palabra clave"
+msgstr "Palabra clave eliminada..."
 
 #: ../src/pan-view/pan-view-search.c:41
 msgid "Find:"
@@ -4242,254 +4267,264 @@
 msgid "no match"
 msgstr "sin coincidencias"
 
-#: ../src/preferences.c:107
+#: ../src/preferences.c:108 ../src/search.c:3230
 msgid "Unknown"
-msgstr "desconocido"
-
-#: ../src/preferences.c:109
+msgstr "Desconocida"
+
+#: ../src/preferences.c:110
 msgid "RAW Image"
 msgstr "Imagen RAW"
 
-#: ../src/preferences.c:111
+#: ../src/preferences.c:112 ../src/search.c:2085 ../src/search.c:3228
 msgid "Video"
-msgstr ""
-
-#: ../src/preferences.c:559
-msgid "Nearest (worst, but fastest)"
-msgstr "Más cercano (el peor, pero el más rápido)"
-
-#: ../src/preferences.c:561
-msgid "Tiles"
-msgstr "Cuadros"
-
-#: ../src/preferences.c:563
-msgid "Bilinear"
-msgstr "Bilineal"
+msgstr "Vídeo"
 
 #: ../src/preferences.c:565
+msgid "Nearest (worst, but fastest)"
+msgstr "Más cercano (el peor, pero el más rápido)"
+
+#: ../src/preferences.c:567
+msgid "Tiles"
+msgstr "Cuadros"
+
+#: ../src/preferences.c:569
+msgid "Bilinear"
+msgstr "Bilineal"
+
+#: ../src/preferences.c:571
 msgid "Hyper (best, but slowest)"
-msgstr "Hiper (el mejor, pero el más lento)"
-
-#: ../src/preferences.c:590
+msgstr "Hiper (la mejor, pero la más lenta)"
+
+#: ../src/preferences.c:596
 msgid "PRIMARY"
-msgstr ""
-
-#: ../src/preferences.c:592
+msgstr "PRIMARIO"
+
+#: ../src/preferences.c:598
 msgid "CLIPBOARD"
-msgstr ""
-
-#: ../src/preferences.c:657 ../src/print.c:390
+msgstr "PORTAPAPELES"
+
+#: ../src/preferences.c:663 ../src/print.c:390
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../src/preferences.c:740
-#, fuzzy
+#: ../src/preferences.c:746
 msgid "Single image"
-msgstr "siguiente imagen"
-
-#: ../src/preferences.c:742
-msgid "Anaglyph Red-Cyan"
-msgstr ""
-
-#: ../src/preferences.c:744
-msgid "Anaglyph Green-Magenta"
-msgstr ""
-
-#: ../src/preferences.c:746
-msgid "Anaglyph Yellow-Blue"
-msgstr ""
+msgstr "Una sola imagen"
 
 #: ../src/preferences.c:748
-msgid "Anaglyph Gray Red-Cyan"
+msgid "Anaglyph Red-Cyan"
 msgstr ""
 
 #: ../src/preferences.c:750
-msgid "Anaglyph Gray Green-Magenta"
+msgid "Anaglyph Green-Magenta"
 msgstr ""
 
 #: ../src/preferences.c:752
-msgid "Anaglyph Gray Yellow-Blue"
+msgid "Anaglyph Yellow-Blue"
 msgstr ""
 
 #: ../src/preferences.c:754
-msgid "Anaglyph Dubois Red-Cyan"
+msgid "Anaglyph Gray Red-Cyan"
 msgstr ""
 
 #: ../src/preferences.c:756
-msgid "Anaglyph Dubois Green-Magenta"
+msgid "Anaglyph Gray Green-Magenta"
 msgstr ""
 
 #: ../src/preferences.c:758
-msgid "Anaglyph Dubois Yellow-Blue"
+msgid "Anaglyph Gray Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:761
-msgid "Side by Side"
+#: ../src/preferences.c:760
+msgid "Anaglyph Dubois Red-Cyan"
 msgstr ""
 
 #: ../src/preferences.c:762
-msgid "Side by Side Half size"
+msgid "Anaglyph Dubois Green-Magenta"
+msgstr ""
+
+#: ../src/preferences.c:764
+msgid "Anaglyph Dubois Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:769
-#, fuzzy
+#: ../src/preferences.c:767
+msgid "Side by Side"
+msgstr "Lado a lado"
+
+#: ../src/preferences.c:768
+msgid "Side by Side Half size"
+msgstr "Lado a lado a mitad de tamaño"
+
+#: ../src/preferences.c:775
 msgid "Top - Bottom"
-msgstr "Inferior:"
-
-#: ../src/preferences.c:770
+msgstr "Arriba - Izquierda"
+
+#: ../src/preferences.c:776
 msgid "Top - Bottom Half size"
-msgstr ""
-
-#: ../src/preferences.c:779 ../src/preferences.c:2602
-#, fuzzy
+msgstr "Arriba - Abajo mitad de tamaño"
+
+#: ../src/preferences.c:785 ../src/preferences.c:2651
 msgid "Fixed position"
-msgstr "Posición GPS"
-
-#: ../src/preferences.c:1118 ../src/preferences.c:1121
+msgstr "Posición fija"
+
+#: ../src/preferences.c:1124 ../src/preferences.c:1127
 msgid "Reset filters"
 msgstr "Reiniciar filtros"
 
-#: ../src/preferences.c:1122
+#: ../src/preferences.c:1128
 msgid ""
 "This will reset the file filters to the defaults.\n"
 "Continue?"
 msgstr ""
 "Esto reiniciará los filtros de archivos a lo predeterminado.\n"
-"¿Continuar?"
-
-#: ../src/preferences.c:1149 ../src/preferences.c:1152
+"¿Quiere continuar?"
+
+#: ../src/preferences.c:1155 ../src/preferences.c:1158
 msgid "Clear trash"
 msgstr "Borrar basura"
 
-#: ../src/preferences.c:1153
+#: ../src/preferences.c:1159
 msgid "This will remove the trash contents."
-msgstr "Esto borrará el contenido de la carpeta de basura."
-
-#: ../src/preferences.c:1197 ../src/preferences.c:1200
+msgstr "Esto borrará el contenido de la papelera."
+
+#: ../src/preferences.c:1203 ../src/preferences.c:1206
 msgid "Reset image overlay template string"
 msgstr "Reiniciar la cadena de plantilla de información superpuesta"
 
-#: ../src/preferences.c:1201
+#: ../src/preferences.c:1207
 msgid ""
 "This will reset the image overlay template string to the default.\n"
 "Continue?"
 msgstr ""
-"Esto reiniciará la plantilla de información superpuesta a la "
-"predeterminado.\n"
-"¿Continuar?"
-
-#: ../src/preferences.c:1597
+"Esto reinicia la plantilla de información superpuesta a su estado inicial.\n"
+"¿Quiere continuar?"
+
+#: ../src/preferences.c:1616
 msgid "General"
 msgstr "General"
 
-#: ../src/preferences.c:1603 ../src/preferences.c:1715
+#: ../src/preferences.c:1622 ../src/preferences.c:1755
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: ../src/preferences.c:1611
-#, fuzzy
+#: ../src/preferences.c:1630
 msgid "Use Geeqie thumbnail style and cache"
-msgstr "Utilizar caché de miniaturas compartido"
-
-#: ../src/preferences.c:1618
-#, fuzzy
+msgstr "Utilizar el estilo de miniaturas y la caché de Geeqie"
+
+#: ../src/preferences.c:1637
 msgid "Store thumbnails local to image folder (non-standard)"
-msgstr ""
-"Almacenar miniaturas en la carpeta local '.thumbnails' dentro de la carpeta "
-"de imágenes (no estándar)."
-
-#: ../src/preferences.c:1625
-#, fuzzy
+msgstr "Almacenar las miniaturas en la carpeta de las imágenes (no estándar)"
+
+#: ../src/preferences.c:1644
 msgid "Use standard thumbnail style and cache, shared with other applications"
 msgstr ""
-"Usar la caché estándar de miniaturas, compartida con otras aplicaciones"
-
-#: ../src/preferences.c:1631
+"Usar el estilo de miniaturas y la caché estándares, compartido con otras "
+"aplicaciones"
+
+#: ../src/preferences.c:1650
 msgid "Use EXIF thumbnails when available (EXIF thumbnails may be outdated)"
 msgstr ""
-"Usar las miniaturas EXIF si están disponibles (Pueden estar desactualizadas)"
-
-#: ../src/preferences.c:1635
+"Usar las miniaturas EXIF si están disponibles (pueden estar desactualizadas)"
+
+#: ../src/preferences.c:1654
 msgid "Use embedded metadata in video files as thumbnails when available"
 msgstr ""
-
-#: ../src/preferences.c:1642
+"Usar los metadatos embebidos en archivos de vídeo como miniaturas cuando sea "
+"posible"
+
+#: ../src/preferences.c:1661
 msgid "Slide show"
-msgstr "Diapositivas"
-
-#: ../src/preferences.c:1653
-#, fuzzy
-msgid "Delay between image change hrs:mins:secs.dec"
-msgstr "Espera entre cambio de imagen:"
-
-#: ../src/preferences.c:1669
-msgid "Random"
-msgstr "Aleatorias"
-
-#: ../src/preferences.c:1670
-msgid "Repeat"
-msgstr "Repetitivas"
+msgstr "Pase de diapositivas"
 
 #: ../src/preferences.c:1672
-msgid "Image loading and caching"
-msgstr "Cargando imágen"
-
-#: ../src/preferences.c:1674
-msgid "Decoded image cache size (Mb):"
-msgstr "Tamaño de caché de imagen (MB):"
-
-#: ../src/preferences.c:1676
-msgid "Preload next image"
-msgstr "Precargar siguiente imagen"
-
-#: ../src/preferences.c:1679
-msgid "Refresh on file change"
-msgstr "Actualizar cuando se cambian archivos"
-
-#: ../src/preferences.c:1682
-#, fuzzy
-msgid "Info sidebar heights"
-msgstr "Barra lateral de Info"
-
-#: ../src/preferences.c:1683
-msgid "NOTE! Geeqie must be restarted for changes to take effect"
-msgstr ""
-
-#: ../src/preferences.c:1685
-#, fuzzy
-msgid "Keywords:"
-msgstr "Palabras clave"
+msgid "Delay between image change hrs:mins:secs.dec"
+msgstr "Espera entre cambios de imagen hrs:mins:secs.dec"
+
+#: ../src/preferences.c:1688
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../src/preferences.c:1689
+msgid "Repeat"
+msgstr "Repetir"
 
 #: ../src/preferences.c:1691
-#, fuzzy
+msgid "Image loading and caching"
+msgstr "Cargando imagen"
+
+#: ../src/preferences.c:1693
+msgid "Decoded image cache size (Mb):"
+msgstr "Tamaño de caché de imágenes decodificadas (MB):"
+
+#: ../src/preferences.c:1695
+msgid "Preload next image"
+msgstr "Precargar la siguiente imagen"
+
+#: ../src/preferences.c:1698
+msgid "Refresh on file change"
+msgstr "Actualizar si cambian los archivos"
+
+#: ../src/preferences.c:1701
+msgid "Info sidebar heights"
+msgstr "Alturas de las barras laterales de información"
+
+#: ../src/preferences.c:1702
+msgid "NOTE! Geeqie must be restarted for changes to take effect"
+msgstr "NOTA: debe reiniciar Geeqie para que los cambios tengan efecto"
+
+#: ../src/preferences.c:1704
+msgid "Keywords:"
+msgstr "Palabras clave:"
+
+#: ../src/preferences.c:1710
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../src/preferences.c:1694
-#, fuzzy
+#: ../src/preferences.c:1713
 msgid "Rating:"
-msgstr "Pintando"
-
-#: ../src/preferences.c:1718
+msgstr "Valoración:"
+
+#: ../src/preferences.c:1717
+msgid "On-line help search engine"
+msgstr "Motor de búsqueda de ayuda en línea"
+
+#: ../src/preferences.c:1724
+msgid ""
+"The format varies between search engines, e.g the format may be:\n"
+"https://www.search_engine.com/search?q=site:geeqie.org/help\n"
+"https://www.search_engine.com/?q=site:geeqie.org/help"
+msgstr ""
+"El formato varía entre motores de búsqueda, p. ej. el formato puede ser:\n"
+"https://www.search_engine.com/search?q=site:geeqie.org/help\n"
+"https://www.search_engine.com/?q=site:geeqie.org/help"
+
+#: ../src/preferences.c:1729 ../src/window.c:397
+msgid "Clear"
+msgstr "Borrar"
+
+#: ../src/preferences.c:1733
+msgid "Default"
+msgstr "Por omisión"
+
+#: ../src/preferences.c:1758
 msgid "Use GPU acceleration via Clutter library"
-msgstr ""
-
-#: ../src/preferences.c:1722
+msgstr "Usar aceleración por GPU mediante la biblioteca Clutter"
+
+#: ../src/preferences.c:1762
 msgid "Two pass rendering (apply HQ zoom and color correction in second pass)"
 msgstr ""
-"Visualización en dos pasos (aplicar zoom de alta calidad y corrección de "
-"color en el segundo paso)"
-
-#: ../src/preferences.c:1726
+"Visualización en dos pasos (aplicar el zum de alta calidad y la corrección "
+"de color en un segundo paso)"
+
+#: ../src/preferences.c:1766
 msgid "Zoom increment:"
-msgstr "Incremento del zoom:"
-
-#: ../src/preferences.c:1734
-#, fuzzy
+msgstr "Incremento del zum:"
+
+#: ../src/preferences.c:1774
 msgid "Allow enlargement of image (max. size in %)"
-msgstr "Permitir agrandar la imagen para ajustarla a la ventana"
-
-#: ../src/preferences.c:1740
+msgstr "Permitir agrandar la imagen (tamaño máximo en %)"
+
+#: ../src/preferences.c:1780
 #, c-format
 msgid ""
 "Enable this to allow Geeqie to increase the image size for images that are "
@@ -4497,13 +4532,17 @@
 "window\". This value sets the maximum expansion permitted in percent i.e. "
 "100% is full-size."
 msgstr ""
-
-#: ../src/preferences.c:1743
+"Actívelo para permitir que Geeqie incremente el tamaño de las imágenes más "
+"pequeñas que el área de visión actual cuando el zum esté en «Ajustar la "
+"imagen a la ventana». Este valor establece la expansión máxima permitida en "
+"porcentaje, es decir que 100% es el tamaño real."
+
+#: ../src/preferences.c:1783
 #, c-format
 msgid "Virtual window size (% of actual window):"
-msgstr ""
-
-#: ../src/preferences.c:1749
+msgstr "Tamaño de ventana virtual (% del actual de la ventana):"
+
+#: ../src/preferences.c:1789
 msgid ""
 "This value will set the virtual size of the window when \"Fit image to window"
 "\" is set. Instead of using the actual size of the window, the specified "
@@ -4511,99 +4550,108 @@
 "the image (values lower than 100%) or to auto zoom the image (values greater "
 "than 100%). It affects fullscreen mode too."
 msgstr ""
-
-#: ../src/preferences.c:1751
+"Este valor establece el tamaño virtual de la ventana cuando «Ajustar la "
+"imagen a la ventana» está activado. En vez de usar el tamaño real de la "
+"ventana, se usa el porcentaje dado de la ventana. Permite mantener un borde "
+"alrededor de la imagen (valores menores que 100%) o ajustar automáticamente "
+"el zum de la imagen (valores mayores que 100%). También afecta al modo "
+"pantalla completa."
+
+#: ../src/preferences.c:1791
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/preferences.c:1753
+#: ../src/preferences.c:1793
 msgid "Use custom border color in window mode"
-msgstr "Usar borde de color elegido en modo ventana"
-
-#: ../src/preferences.c:1756
+msgstr "Usar el borde del color elegido en modo ventana"
+
+#: ../src/preferences.c:1796
 msgid "Use custom border color in fullscreen mode"
 msgstr "Usar borde de color personalizado en pantalla completa"
 
-#: ../src/preferences.c:1759
+#: ../src/preferences.c:1799
 msgid "Border color"
 msgstr "Color del borde"
 
-#: ../src/preferences.c:1764
+#: ../src/preferences.c:1804
 msgid "Alpha channel color 1"
-msgstr ""
-
-#: ../src/preferences.c:1767
+msgstr "Color 1 del canal alfa"
+
+#: ../src/preferences.c:1807
 msgid "Alpha channel color 2"
-msgstr ""
-
-#: ../src/preferences.c:1773
+msgstr "Color 2 del canal alfa"
+
+#: ../src/preferences.c:1813
 msgid "Convenience"
 msgstr "Conveniencia"
 
-#: ../src/preferences.c:1775
-#, fuzzy
+#: ../src/preferences.c:1815
 msgid "Auto rotate proofs using Exif information"
 msgstr "Rotación automática de la imagen utilizando la información Exif"
 
-#: ../src/preferences.c:1792
+#: ../src/preferences.c:1832
 msgid "Windows"
 msgstr "Ventanas"
 
-#: ../src/preferences.c:1794
+#: ../src/preferences.c:1834
 msgid "State"
 msgstr "Estado"
 
-#: ../src/preferences.c:1796
+#: ../src/preferences.c:1836
 msgid "Remember window positions"
 msgstr "Recordar las posiciones de las ventanas"
 
-#: ../src/preferences.c:1799
+#: ../src/preferences.c:1839
 msgid "Use saved window positions also for new windows"
-msgstr ""
-
-#: ../src/preferences.c:1803
+msgstr "Usar también las posiciones guardadas de ventana para ventanas nuevas"
+
+#: ../src/preferences.c:1843
 msgid "Remember tool state (float/hidden)"
 msgstr "Recordar el estado de las herramientas (flotantes/escondidas)"
 
-#: ../src/preferences.c:1806
-#, fuzzy
+#: ../src/preferences.c:1846
 msgid "Remember dialog window positions"
-msgstr "Recordar las posiciones de las ventanas"
-
-#: ../src/preferences.c:1811
+msgstr "Recordar las posiciones de las ventanas de diálogo"
+
+#: ../src/preferences.c:1849
+msgid "Show window IDs"
+msgstr "Mostrar los ID de ventanas"
+
+#: ../src/preferences.c:1854
 msgid "Fit window to image when tools are hidden/floating"
 msgstr ""
 "Ajustar ventana a la imagen cuando las herramientas están escondidas o "
 "flotando"
 
-#: ../src/preferences.c:1815
+#: ../src/preferences.c:1858
 msgid "Limit size when auto-sizing window (%):"
-msgstr "Tamaño límite cuando se auto-redimensione la ventana (%):"
-
-#: ../src/preferences.c:1830
+msgstr "Tamaño límite cuando se autoredimensione la ventana (%):"
+
+#: ../src/preferences.c:1873
 msgid "Smooth image flip"
 msgstr "Transición de imágenes suave"
 
-#: ../src/preferences.c:1832
+#: ../src/preferences.c:1875
 msgid "Disable screen saver"
-msgstr "Deshabilitar salvapantalla"
-
-#: ../src/preferences.c:1836
+msgstr "Deshabilitar el salvapantallas"
+
+#: ../src/preferences.c:1879
 msgid "Overlay Screen Display"
 msgstr "Mostrar información superpuesta en pantalla"
 
-#: ../src/preferences.c:1838
+#: ../src/preferences.c:1881
 msgid "Image overlay template"
 msgstr "Plantilla de información superpuesta"
 
-#: ../src/preferences.c:1851
-#, fuzzy
+#: ../src/preferences.c:1894
 msgid ""
 "<i>%name%</i> results in the filename of the picture.\n"
 "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>"
 "%date%</i>,\n"
 "<i>%size%</i> (filesize), <i>%width%</i>, <i>%height%</i>, <i>%res%</i> "
-"(resolution)\n"
+"(resolution),\n"
+"<i>%rating%</i>, <i>%keywords%</i>, <i>%comment%</i> (XMP), <i>%imagecomment"
+"%</i> (JPEG)\n"
 "To access exif data use the exif name, e. g. <i>%formatted.Camera%</i> is "
 "the formatted camera name,\n"
 "<i>%Exif.Photo.DateTimeOriginal%</i> the date of the original shot.\n"
@@ -4621,467 +4669,459 @@
 "<i>%name%</i> será el nombre del archivo de imagen.\n"
 "También disponible: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>"
 "%date%</i>,\n"
-"<i>%size%</i> (filesize), <i>%width%</i>, <i>%height%</i>, <i>%res%</i> "
+"<i>%size%</i> (tamaño del archivo), <i>%width%</i>, <i>%height%</i>, <i>%res"
+"%</i> "
 "(resolución)\n"
-"Para acceder a los datos exif usar la etiqueta exif, p.e. <i>%formatted."
-"Camera%</i> sería el contenido del dato exif formatted.Camera,\n"
-"<i>%Exif.Photo.DateTimeOriginal%</i> la fecha de disparo.\n"
-"<i>%formatted.Camera:20</i> se truncaría el dato a 20 caracteres añadiendo "
-"puntos suspensivos para indicar el recorte.\n"
-"Si se conectan dos o más variables con signos | en medio se imprimiran las "
+"<i>%rating%</i>, <i>%keywords%</i>, <i>%comment%</i> (XMP), <i>%imagecomment"
+"%</i> (JPEG)\n"
+"Para acceder a los datos exif use la etiqueta exif, p. ej. <i>"
+"%formatted.Camera%</i> es "
+"el nombre formateado de la cámara,\n"
+"<i>%Exif.Photo.DateTimeOriginal%</i> la fecha original de disparo.\n"
+"la notación <i>%formatted.Camera:20</i> trunca el dato a 20 "
+"caracteres añadiendo puntos suspensivos para indicar el recorte.\n"
+"Si se conectan dos o más variables con el signo | en medio, se imprimen las "
 "variables disponibles con un separador.\n"
 "<i>%formatted.ShutterSpeed%</i>|<i>%formatted.ISOSpeedRating%</i>|<i>"
-"%formatted.FocalLength%</i> podría mostrar \"1/20s - 400 - 80 mm\"\n"
-"o \"1/200 - 80 mm\",Si no hubiese información ISO en los datos exif.\n"
-"Las líneas vacías se suprimen. Esto permite añadir lineas que no se \n"
+"%formatted.FocalLength%</i> podría mostrar «1/20s - 400 - 80 mm»\n"
+"o «1/200 - 80 mm»,\n"
+"si no hubiese información ISO en los datos Exif.\n"
+"Las líneas vacías se suprimen. Esto permite añadir líneas que no se \n"
 "mostrarán si no hay datos.\n"
 
-#: ../src/preferences.c:1868 ../src/print.c:3220
+#: ../src/preferences.c:1912 ../src/print.c:3220
 msgid "Font"
 msgstr "Fuente"
 
-#: ../src/preferences.c:1880 ../src/print.c:3410
+#: ../src/preferences.c:1924 ../src/print.c:3410
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/preferences.c:1885
-#, fuzzy
+#: ../src/preferences.c:1929
 msgid "Background"
-msgstr "Fondo negro"
-
-#: ../src/preferences.c:1891 ../src/preferences.c:2069
-#: ../src/preferences.c:2515
+msgstr "Fondo"
+
+#: ../src/preferences.c:1935 ../src/preferences.c:2113
+#: ../src/preferences.c:2564
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: ../src/preferences.c:1945
+#: ../src/preferences.c:1989
 msgid "Show hidden files or folders"
-msgstr "Mostrar archivos o carpetas ocultos"
-
-#: ../src/preferences.c:1947
+msgstr "Mostrar archivos y carpetas ocultos"
+
+#: ../src/preferences.c:1991
 msgid "Show parent folder (..)"
-msgstr ""
-
-#: ../src/preferences.c:1949
+msgstr "Mostrar el directorio padre (..)"
+
+#: ../src/preferences.c:1993
 msgid "Case sensitive sort"
-msgstr "Ordenar teniendo en cuenta mayúsculas y minúsculas"
-
-#: ../src/preferences.c:1951
+msgstr "Ordenar distinguiendo mayúsculas de minúsculas"
+
+#: ../src/preferences.c:1995
 msgid "Natural sort order"
-msgstr ""
-
-#: ../src/preferences.c:1953
-#, fuzzy
+msgstr "Orden natural"
+
+#: ../src/preferences.c:1997
 msgid "Disable file extension checks"
-msgstr "Desactivar filtrado de archivos"
-
-#: ../src/preferences.c:1956
+msgstr "Desactivar la comprobación de extensión de archivo"
+
+#: ../src/preferences.c:2000
 msgid "Disable File Filtering"
-msgstr "Desactivar filtrado de archivos"
-
-#: ../src/preferences.c:1960
+msgstr "Desactivar el filtrado de archivos"
+
+#: ../src/preferences.c:2004
 msgid "Grouping sidecar extensions"
-msgstr "Agrupar extensiones sidecar"
-
-#: ../src/preferences.c:1967
+msgstr "Agrupación de extensiones de adjuntos (sidecars)"
+
+#: ../src/preferences.c:2011
 msgid "File types"
 msgstr "Tipos de archivo"
 
-#: ../src/preferences.c:2024
+#: ../src/preferences.c:2068
 msgid "Class"
 msgstr "Clase"
 
-#: ../src/preferences.c:2041
+#: ../src/preferences.c:2085
 msgid "Writable"
-msgstr "Escribible"
-
-#: ../src/preferences.c:2052
+msgstr "Se puede escribir"
+
+#: ../src/preferences.c:2096
 msgid "Sidecar is allowed"
-msgstr "Sidecar permitido"
-
-#: ../src/preferences.c:2098
+msgstr "Admite adjuntos (sidecar)"
+
+#: ../src/preferences.c:2142
 msgid "Metadata writing process"
-msgstr "Proceso de escritura de Metadatos"
-
-#: ../src/preferences.c:2100
+msgstr "Proceso de escritura de metadatos"
+
+#: ../src/preferences.c:2144
 msgid "Warning: Geeqie is built without Exiv2. Some options are disabled."
 msgstr ""
-"Advertencia: Geeqie se ha compilado sin Exiv2. Algunas opciones no "
-"funcionarán."
-
-#: ../src/preferences.c:2102
+"Aviso: Geeqie se ha compilado sin Exiv2. Algunas opciones están "
+"deshabilitadas."
+
+#: ../src/preferences.c:2146
 msgid ""
 "Metadata are written in the following order. The process ends after first "
 "success."
 msgstr ""
-"Los Metadatos se escribirán en el siguiente orden. El proceso termina "
-"después del primer acierto."
-
-#: ../src/preferences.c:2105
-#, fuzzy
+"Los metadatos se escriben en el siguiente orden. El proceso termina después "
+"del primer acierto."
+
+#: ../src/preferences.c:2149
 msgid ""
 "1) Save metadata in image files, or sidecar files, according to the XMP "
 "standard"
 msgstr ""
-"1) Guardar metadatos en los archivos de imagen, resp. archivos sidecar de "
-"acuerdo con el estandar XMP"
-
-#: ../src/preferences.c:2111
+"1) Guardar los metadatos en los archivos de imagen, o archivos adjuntos, "
+"(sidecar) conforme al estándar XMP"
+
+#: ../src/preferences.c:2155
 msgid ""
 "2) Save metadata in '.metadata' folder, local to image folder (non-standard)"
 msgstr ""
-"2) Guardar los metadatos en la carpeta local '.metadata'  dentro de la "
-"carpeta de la imagen (no estandar)"
-
-#: ../src/preferences.c:2114
+"2) Guardar los metadatos en la carpeta «.metadata», dentro de la carpeta de "
+"la imagen (no estándar)"
+
+#: ../src/preferences.c:2158
 #, c-format
 msgid "3) Save metadata in Geeqie private directory '%s'"
-msgstr "3) Guardar los metadatos el el directorio privado de Geeqie '%s'"
-
-#: ../src/preferences.c:2120
+msgstr "3) Guardar los metadatos el el directorio privado de Geeqie «%s»"
+
+#: ../src/preferences.c:2164
 msgid "Step 1: Write to image files"
-msgstr "Paso 1: Escribir a archivo de imagen"
-
-#: ../src/preferences.c:2128
+msgstr "Paso 1: Escribir en los archivos de imagen"
+
+#: ../src/preferences.c:2172
 msgid ""
 "Store metadata also in legacy IPTC tags (converted according to IPTC4XMP "
 "standard)"
 msgstr ""
-"Guardar metadatos también en etiquetas IPCT (Convertidas de acuerdo con el "
-"standar IPTC4XMP)"
-
-#: ../src/preferences.c:2131
+"Guardar metadatos también en etiquetas IPCT (convertidas según el  "
+"estándar IPTC4XMP)"
+
+#: ../src/preferences.c:2175
 msgid "Warn if the image files are unwritable"
-msgstr "Avisar si los archivos de imagen no son escribibles"
-
-#: ../src/preferences.c:2134
+msgstr "Avisar si no se puede escribir en los archivos de imagen"
+
+#: ../src/preferences.c:2178
 msgid "Ask before writing to image files"
 msgstr "Preguntar antes de grabar"
 
-#: ../src/preferences.c:2137
+#: ../src/preferences.c:2181
 msgid "Create sidecar files named image.ext.xmp (as opposed to image.xmp)"
 msgstr ""
-
-#: ../src/preferences.c:2140
+"Crear archivos adicionales llamados imagen.ext.xmp (en lugar de imagen.xmp)"
+
+#: ../src/preferences.c:2184
 msgid "Step 2 and 3: write to Geeqie private files"
 msgstr "Paso 2 y 3: Escribir en archivos privados de Geeqie"
 
-#: ../src/preferences.c:2145
+#: ../src/preferences.c:2189
 msgid ""
 "Use GQview legacy metadata format (supports only keywords and comments) "
 "instead of XMP"
 msgstr ""
-"Usar el formato de metadatos de GQview (Slo soporta palabras clave y "
+"Usar el formato de metadatos de GQview (solo permite palabras clave y "
 "comentarios) en lugar de XMP"
 
-#: ../src/preferences.c:2149
+#: ../src/preferences.c:2193
 msgid "Miscellaneous"
 msgstr "Misceláneos"
 
-#: ../src/preferences.c:2150
+#: ../src/preferences.c:2194
 msgid ""
 "Write the same description tags (keywords, comment, etc.) to all grouped "
 "sidecars"
 msgstr ""
-"Escribir las mismas etiquetas (claves, comentarios, etc..)en todos "
-"lossidecars agrupados"
-
-#: ../src/preferences.c:2153
+"Escribir las mismas etiquetas de descripción (palabras clave, comentarios,"
+" etc.) "
+"en todos los adjuntos (sidecars) agrupados"
+
+#: ../src/preferences.c:2197
 msgid "Allow keywords to differ only in case"
 msgstr "Permitir claves que solo cambien mayúsculas/minúsculas"
 
-#: ../src/preferences.c:2156
+#: ../src/preferences.c:2200
 msgid "Write altered image orientation to the metadata"
 msgstr "Escribir en metadatos el cambio de orientación de la imagen"
 
-#: ../src/preferences.c:2162
+#: ../src/preferences.c:2206
 msgid "Auto-save options"
-msgstr "Opciones de autogurdado"
-
-#: ../src/preferences.c:2164
+msgstr "Opciones de autoguardado"
+
+#: ../src/preferences.c:2208
 msgid "Write metadata after timeout"
 msgstr "Guardar metadatos después de un tiempo"
 
-#: ../src/preferences.c:2170
+#: ../src/preferences.c:2214
 msgid "Timeout (seconds):"
-msgstr "Timeout (segundos):"
-
-#: ../src/preferences.c:2173
+msgstr "Tiempo límite (segundos):"
+
+#: ../src/preferences.c:2217
 msgid "Write metadata on image change"
-msgstr "Grabar metadatos en la imagen al cambiar:"
-
-#: ../src/preferences.c:2176
+msgstr "Grabar los metadatos al cambiar de imagen"
+
+#: ../src/preferences.c:2220
 msgid "Write metadata on directory change"
-msgstr "Guardar metadatos al cambiar de carpeta"
-
-#: ../src/preferences.c:2216
+msgstr "Guardar metadatos al cambiar de directorio"
+
+#: ../src/preferences.c:2260
 msgid "Perceptual"
 msgstr ""
 
-#: ../src/preferences.c:2218
+#: ../src/preferences.c:2262
 msgid "Relative Colorimetric"
-msgstr ""
-
-#: ../src/preferences.c:2222
+msgstr "Colorimétrico relativo"
+
+#: ../src/preferences.c:2266
 msgid "Absolute Colorimetric"
-msgstr ""
-
-#: ../src/preferences.c:2247
+msgstr "Colorimétrico absoluto"
+
+#: ../src/preferences.c:2291
 msgid "Color management"
 msgstr "Gestión de color"
 
-#: ../src/preferences.c:2249
+#: ../src/preferences.c:2293
 msgid "Input profiles"
 msgstr "Perfiles de entrada"
 
-#: ../src/preferences.c:2257
+#: ../src/preferences.c:2301
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/preferences.c:2260
+#: ../src/preferences.c:2304
 msgid "Menu name"
 msgstr "Nombre en el menú"
 
-#: ../src/preferences.c:2263
+#: ../src/preferences.c:2307
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/preferences.c:2271
+#: ../src/preferences.c:2315
 #, c-format
 msgid "Input %d:"
-msgstr "Entrada %d"
-
-#: ../src/preferences.c:2287 ../src/preferences.c:2307
+msgstr "Entrada %d:"
+
+#: ../src/preferences.c:2331 ../src/preferences.c:2351
 msgid "Select color profile"
 msgstr "Seleccionar perfil de color"
 
-#: ../src/preferences.c:2295
+#: ../src/preferences.c:2339
 msgid "Screen profile"
 msgstr "Perfil de pantalla"
 
-#: ../src/preferences.c:2299
+#: ../src/preferences.c:2343
 msgid "Use system screen profile if available"
-msgstr "Usar perfil de pantalla del sistema si está disponible"
-
-#: ../src/preferences.c:2304
+msgstr "Usar el perfil de pantalla del sistema si está disponible"
+
+#: ../src/preferences.c:2348
 msgid "Screen:"
 msgstr "Pantalla:"
 
-#: ../src/preferences.c:2310
-#, fuzzy
+#: ../src/preferences.c:2354
 msgid "Render Intent:"
-msgstr "Generar"
-
-#: ../src/preferences.c:2331 ../src/preferences.c:2372
+msgstr "Propuesta de visualización:"
+
+#: ../src/preferences.c:2376 ../src/preferences.c:2417
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: ../src/preferences.c:2333 ../src/utilops.c:2156
+#: ../src/preferences.c:2378 ../src/utilops.c:2172
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/preferences.c:2335
+#: ../src/preferences.c:2380
 msgid "Confirm file delete"
 msgstr "Confirmar el borrado de archivos"
 
-#: ../src/preferences.c:2337
+#: ../src/preferences.c:2382
 msgid "Enable Delete key"
-msgstr "Activar tecla Suprimir"
-
-#: ../src/preferences.c:2340
+msgstr "Activar la tecla Suprimir"
+
+#: ../src/preferences.c:2385
 msgid "Safe delete"
 msgstr "Borrado seguro"
 
-#: ../src/preferences.c:2358
+#: ../src/preferences.c:2403
 msgid "Maximum size:"
 msgstr "Tamaño máximo:"
 
-#: ../src/preferences.c:2358
+#: ../src/preferences.c:2403
 msgid "MB"
 msgstr "MB"
 
-#: ../src/preferences.c:2360
+#: ../src/preferences.c:2405
 msgid "Set to 0 for unlimited size"
 msgstr "Poner a 0 para tamaño ilimitado"
 
-#: ../src/preferences.c:2361
+#: ../src/preferences.c:2406
 msgid "View"
 msgstr "Ver"
 
-#: ../src/preferences.c:2374
+#: ../src/preferences.c:2419
 msgid "Descend folders in tree view"
 msgstr "Descender carpetas en vista de árbol"
 
-#: ../src/preferences.c:2377
+#: ../src/preferences.c:2422
 msgid "In place renaming"
 msgstr "Renombrar in situ"
 
-#: ../src/preferences.c:2380
+#: ../src/preferences.c:2425
 msgid "List directory view uses single click to enter"
-msgstr ""
-
-#: ../src/preferences.c:2383
-#, fuzzy
+msgstr "La vista de lista de directorios usa un clic para entrar"
+
+#: ../src/preferences.c:2428
+msgid "Save marks on exit"
+msgstr "Guardar las marcas al salir"
+
+#: ../src/preferences.c:2432
 msgid "Recent folder list maximum size"
-msgstr "Tamaño máximo de la lista de 'Abrir reciente':"
-
-#: ../src/preferences.c:2386
+msgstr "Tamaño máximo de la lista de carpetas recientes"
+
+#: ../src/preferences.c:2435
 msgid "Drag'n drop icon size"
 msgstr "Tamaño del icono de arrastrar y soltar"
 
-#: ../src/preferences.c:2390
-#, fuzzy
+#: ../src/preferences.c:2439
 msgid "Copy path clipboard selection:"
-msgstr "Copiar path al portapapeles"
-
-#: ../src/preferences.c:2392
+msgstr "Selección del portapapeles para copia de rutas:"
+
+#: ../src/preferences.c:2441
 msgid "Navigation"
 msgstr "Navegación"
 
-#: ../src/preferences.c:2394
+#: ../src/preferences.c:2443
 msgid "Progressive keyboard scrolling"
 msgstr "Desplazamiento progresivo con el teclado"
 
-#: ../src/preferences.c:2396
+#: ../src/preferences.c:2445
 msgid "Keyboard scrolling step multiplier:"
-msgstr ""
-
-#: ../src/preferences.c:2398
+msgstr "Multiplicador de paso al desplazarse con el teclado:"
+
+#: ../src/preferences.c:2447
 msgid "Mouse wheel scrolls image"
-msgstr "Utilizar ratón con rueda para desplazar la imagen"
-
-#: ../src/preferences.c:2400
+msgstr "La rueda del ratón desplaza la imagen"
+
+#: ../src/preferences.c:2449
 msgid "Navigation by left or middle click on image"
-msgstr ""
-
-#: ../src/preferences.c:2402
+msgstr "Navegar mediante clic derecho o central en la imagen"
+
+#: ../src/preferences.c:2451
 msgid "Play video by left click on image"
-msgstr ""
-
-#: ../src/preferences.c:2405
+msgstr "Reproducir vídeos haciendo clic izquierdo en la imagen"
+
+#: ../src/preferences.c:2454
 msgid "Play with:"
-msgstr ""
-
-#: ../src/preferences.c:2409
+msgstr "Reproducir con:"
+
+#: ../src/preferences.c:2458
 msgid "Debugging"
-msgstr "Debugging"
-
-#: ../src/preferences.c:2414
-#, fuzzy
+msgstr "Depuración"
+
+#: ../src/preferences.c:2463
 msgid "Timer data"
-msgstr "Fecha del archivo"
-
-#: ../src/preferences.c:2417
-#, fuzzy
+msgstr "Datos del temporizador"
+
+#: ../src/preferences.c:2466
 msgid "Log Window max. lines:"
-msgstr "Ventana de Log"
-
-#: ../src/preferences.c:2435
+msgstr "Número máximo de líneas en la ventana del registro:"
+
+#: ../src/preferences.c:2484
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../src/preferences.c:2437
+#: ../src/preferences.c:2486
 msgid "Accelerators"
 msgstr "Atajos"
 
-#: ../src/preferences.c:2456
+#: ../src/preferences.c:2505
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/preferences.c:2478
+#: ../src/preferences.c:2527
 msgid "KEY"
 msgstr "TECLA"
 
-#: ../src/preferences.c:2489
+#: ../src/preferences.c:2538
 msgid "Tooltip"
-msgstr "Tooltip"
-
-#: ../src/preferences.c:2520
+msgstr "Descripción emergente"
+
+#: ../src/preferences.c:2569
 msgid "Reset selected"
 msgstr "Reiniciar selección"
 
-#: ../src/preferences.c:2535
-#, fuzzy
+#: ../src/preferences.c:2584
 msgid "Toolbar"
-msgstr "Herramientas"
-
-#: ../src/preferences.c:2552
+msgstr "Barra de herramientas"
+
+#: ../src/preferences.c:2601
 msgid "Stereo"
-msgstr ""
-
-#: ../src/preferences.c:2554 ../src/preferences.c:2557
+msgstr "Estéreo"
+
+#: ../src/preferences.c:2603 ../src/preferences.c:2606
 msgid "Windowed stereo mode"
-msgstr ""
-
-#: ../src/preferences.c:2561 ../src/preferences.c:2586
-#, fuzzy
+msgstr "Modo estéreo en ventana"
+
+#: ../src/preferences.c:2610 ../src/preferences.c:2635
 msgid "Mirror left image"
-msgstr "primera imagen"
-
-#: ../src/preferences.c:2564 ../src/preferences.c:2589
-#, fuzzy
+msgstr "Reflejar la imagen izquierda"
+
+#: ../src/preferences.c:2613 ../src/preferences.c:2638
 msgid "Flip left image"
-msgstr "siguiente imagen"
-
-#: ../src/preferences.c:2567 ../src/preferences.c:2592
-#, fuzzy
+msgstr "Voltear la imagen izquierda"
+
+#: ../src/preferences.c:2616 ../src/preferences.c:2641
 msgid "Mirror right image"
-msgstr "primera imagen"
-
-#: ../src/preferences.c:2570 ../src/preferences.c:2595
-#, fuzzy
+msgstr "Reflejar la imagen derecha"
+
+#: ../src/preferences.c:2619 ../src/preferences.c:2644
 msgid "Flip right image"
-msgstr "primera imagen"
-
-#: ../src/preferences.c:2572 ../src/preferences.c:2597
+msgstr "Voltear la imagen derecha"
+
+#: ../src/preferences.c:2621 ../src/preferences.c:2646
 msgid "Swap left and right images"
-msgstr ""
-
-#: ../src/preferences.c:2574 ../src/preferences.c:2599
+msgstr "Intercambiar las imágenes izquierda y derecha"
+
+#: ../src/preferences.c:2623 ../src/preferences.c:2648
 msgid "Disable stereo mode on single image source"
-msgstr ""
-
-#: ../src/preferences.c:2577 ../src/preferences.c:2583
-#, fuzzy
+msgstr "Desactivar el modo estéreo para fuentes con una sola imagen"
+
+#: ../src/preferences.c:2626 ../src/preferences.c:2632
 msgid "Fullscreen stereo mode"
-msgstr "Pantalla completa"
-
-#: ../src/preferences.c:2578
+msgstr "Modo estéreo en pantalla completa"
+
+#: ../src/preferences.c:2627
 msgid "Use different settings for fullscreen"
-msgstr ""
-
-#: ../src/preferences.c:2608
-#, fuzzy
+msgstr "Usar una configuración distinta para pantalla completa"
+
+#: ../src/preferences.c:2657
 msgid "Left X"
-msgstr "Izquierdo:"
-
-#: ../src/preferences.c:2610
-#, fuzzy
+msgstr "X izquierdo"
+
+#: ../src/preferences.c:2659
 msgid "Left Y"
-msgstr "Izquierdo:"
-
-#: ../src/preferences.c:2612
-#, fuzzy
+msgstr "Y izquierdo"
+
+#: ../src/preferences.c:2661
 msgid "Right X"
-msgstr "Derecho:"
-
-#: ../src/preferences.c:2614
-#, fuzzy
+msgstr "X derecho"
+
+#: ../src/preferences.c:2663
 msgid "Right Y"
-msgstr "Derecho:"
-
-#: ../src/preferences.c:2630 ../src/toolbar.c:89
+msgstr "Y derecho"
+
+#: ../src/preferences.c:2679 ../src/toolbar.c:89
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/preferences.c:2781
-#, fuzzy
+#: ../src/preferences.c:2828
 msgid "About Geeqie"
-msgstr "Acerca de... - Geeqie"
-
-#: ../src/preferences.c:2791
+msgstr "Acerca de Geeqie"
+
+#: ../src/preferences.c:2838
 msgid "translator-credits"
-msgstr ""
+msgstr "créditos de traductores"
 
 #: ../src/print.c:134
 msgid "Selection"
@@ -5232,8 +5272,8 @@
 "Unable to open pipe for writing.\n"
 "\"%s\""
 msgstr ""
-"No se pudo abrir la tubería para escribir.\n"
-"\"%s\""
+"No se puede abrir la tubería para escribir.\n"
+"«%s»"
 
 #: ../src/print.c:1084 ../src/print.c:1476 ../src/ui_pathsel.c:432
 #, c-format
@@ -5243,7 +5283,7 @@
 #: ../src/print.c:1099 ../src/print.c:1531
 #, c-format
 msgid "Failure writing to file %s"
-msgstr "Fallo al escribir al archivo %s"
+msgstr "Error al escribir al archivo %s"
 
 #: ../src/print.c:1154 ../src/print.c:1191 ../src/print.c:1227
 #: ../src/print.c:1344 ../src/print.c:1417
@@ -5261,7 +5301,7 @@
 
 #: ../src/print.c:1978
 #, c-format
-msgid "An error occured printing to %s."
+msgid "An error occurred printing to %s."
 msgstr "Ha ocurrido un error al imprimir en %s."
 
 #: ../src/print.c:1982
@@ -5315,7 +5355,7 @@
 
 #: ../src/print.c:3394
 msgid "Proof size:"
-msgstr "Tamaño de la imagen de prueba:"
+msgstr "Tamaño de la prueba:"
 
 #: ../src/print.c:3420
 msgid "Paper"
@@ -5366,16 +5406,16 @@
 msgstr "Recordar la configuración de impresión"
 
 #: ../src/rcfile.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Option %s ignored: %s\n"
-msgstr "Creando directorio %s: %s\n"
-
-#: ../src/rcfile.c:532
+msgstr "Se ignora la opción %s: %s\n"
+
+#: ../src/rcfile.c:552
 #, c-format
 msgid "error saving config file: %s\n"
 msgstr "error al guardar archivo de configuración: %s\n"
 
-#: ../src/rcfile.c:590
+#: ../src/rcfile.c:613
 #, c-format
 msgid ""
 "error saving config file: %s\n"
@@ -5384,391 +5424,426 @@
 "error al guardar archivo de configuración: %s\n"
 "error: %s\n"
 
-#: ../src/remote.c:752 ../src/remote.c:757
+#: ../src/remote.c:673
+#, c-format
+msgid "[%d,%d]: RGB(%3d,%3d,%3d)"
+msgstr ""
+
+#: ../src/remote.c:834 ../src/remote.c:839
 msgid "lua error: no data"
-msgstr ""
+msgstr "error de lua: no hay datos"
 
 #. short, long                  callback,               extra, prefer, parameter, description
-#: ../src/remote.c:780
+#: ../src/remote.c:862
 msgid "next image"
 msgstr "siguiente imagen"
 
-#: ../src/remote.c:781
+#: ../src/remote.c:863
 msgid "previous image"
 msgstr "anterior imagen"
 
-#: ../src/remote.c:782
+#: ../src/remote.c:864
 msgid "first image"
 msgstr "primera imagen"
 
-#: ../src/remote.c:783
+#: ../src/remote.c:865
 msgid "last image"
 msgstr "última imagen"
 
-#: ../src/remote.c:784
+#: ../src/remote.c:866
 msgid "toggle full screen"
 msgstr "conmutar pantalla completa"
 
-#: ../src/remote.c:785
+#: ../src/remote.c:867
 msgid "start full screen"
 msgstr "iniciar pantalla completa"
 
-#: ../src/remote.c:786
+#: ../src/remote.c:868
 msgid "stop full screen"
 msgstr "detener pantalla completa"
 
-#: ../src/remote.c:787
+#: ../src/remote.c:869
 msgid "toggle slide show"
-msgstr "conmutar diapositivas"
-
-#: ../src/remote.c:788
+msgstr "conmutar el pase de diapositivas"
+
+#: ../src/remote.c:870
 msgid "start slide show"
-msgstr "iniciar diapositivas"
-
-#: ../src/remote.c:789
+msgstr "iniciar el pase de diapositivas"
+
+#: ../src/remote.c:871
 msgid "stop slide show"
-msgstr "detener diapositivas"
-
-#: ../src/remote.c:790
+msgstr "detener el pase de diapositivas"
+
+#: ../src/remote.c:872
 msgid "<FOLDER>"
-msgstr ""
-
-#: ../src/remote.c:790
-#, fuzzy
+msgstr "<CARPETA>"
+
+#: ../src/remote.c:872
 msgid "start recursive slide show in FOLDER"
-msgstr "iniciar diapositivas en forma recursiva"
-
-#: ../src/remote.c:791
+msgstr "iniciar pase de diapositivas recursivo en CARPETA"
+
+#: ../src/remote.c:873
 msgid "<[H:][M:][N][.M]>"
 msgstr ""
 
-#: ../src/remote.c:791
-#, fuzzy
+#: ../src/remote.c:873
 msgid "set slide show delay to Hrs Mins N.M seconds"
-msgstr "establecer tiempo entre diapositivas (en segundos)"
-
-#: ../src/remote.c:792
+msgstr "establecer tiempo entre diapositivas a Hrs Mins N.M segundos"
+
+#: ../src/remote.c:874
 msgid "show tools"
-msgstr "mostrar herramientas"
-
-#: ../src/remote.c:793
+msgstr "mostrar las herramientas"
+
+#: ../src/remote.c:875
 msgid "hide tools"
-msgstr "esconder herramientas"
-
-#: ../src/remote.c:794
+msgstr "ocultar las herramientas"
+
+#: ../src/remote.c:876
 msgid "quit"
 msgstr "salir"
 
-#: ../src/remote.c:795 ../src/remote.c:796 ../src/remote.c:797
-#: ../src/remote.c:798 ../src/remote.c:799 ../src/remote.c:801
-#: ../src/remote.c:803
+#: ../src/remote.c:877 ../src/remote.c:878 ../src/remote.c:879
+#: ../src/remote.c:880 ../src/remote.c:881 ../src/remote.c:884
+#: ../src/remote.c:886
 msgid "<FILE>"
-msgstr ""
-
-#: ../src/remote.c:795
+msgstr "<ARCHIVO>"
+
+#: ../src/remote.c:877
 msgid "load configuration from FILE"
-msgstr ""
-
-#: ../src/remote.c:796
-#, fuzzy
+msgstr "cargar configuración desde ARCHIVO"
+
+#: ../src/remote.c:878
 msgid "get list of sidecars of FILE"
-msgstr "obtener lista de sidecars del archivo"
-
-#: ../src/remote.c:797
-#, fuzzy
-msgid "get destination path of FILE"
-msgstr "obtener el directorio de destino del archivo"
-
-#: ../src/remote.c:798
-#, fuzzy
-msgid "open FILE, bring Geeqie window to the top"
-msgstr "abrir archivo en una ventana nueva"
-
-#: ../src/remote.c:799
-msgid "open FILE, do not bring Geeqie window to the top"
-msgstr ""
-
-#: ../src/remote.c:800
-msgid "print filename of current image"
-msgstr ""
-
-#: ../src/remote.c:801
-#, fuzzy
-msgid "open FILE in new window"
-msgstr "abrir archivo en una ventana nueva"
-
-#: ../src/remote.c:802
-msgid "clear command line collection list"
-msgstr ""
-
-#: ../src/remote.c:803
-#, fuzzy
-msgid "add FILE to command line collection list"
-msgstr "Añadir a nueva colección"
-
-#: ../src/remote.c:804
-msgid "bring the Geeqie window to the top"
-msgstr ""
-
-#: ../src/remote.c:805 ../src/remote.c:806
-msgid "clear|clean"
-msgstr ""
-
-#: ../src/remote.c:805
-#, fuzzy
-msgid "clear or clean thumbnail cache"
-msgstr "Caché de miniaturas compartido"
-
-#: ../src/remote.c:806
-#, fuzzy
-msgid "clear or clean shared thumbnail cache"
-msgstr "Utilizar caché de miniaturas compartido"
-
-#: ../src/remote.c:807
-msgid "    clean the metadata cache"
-msgstr ""
-
-#: ../src/remote.c:808
-#, fuzzy
-msgid "<folder>  "
-msgstr "carpeta"
-
-#: ../src/remote.c:808
-#, fuzzy
-msgid " render thumbnails"
-msgstr "Crear miniaturas"
-
-#: ../src/remote.c:809 ../src/remote.c:810
-#, fuzzy
-msgid "<folder> "
-msgstr "carpeta"
-
-#: ../src/remote.c:809
-#, fuzzy
-msgid "render thumbnails recursively"
-msgstr "Generar miniaturas para una carpeta específica."
-
-#: ../src/remote.c:810
-#, fuzzy
-msgid " render thumbnails (see Help)"
-msgstr "Generar miniaturas para una carpeta específica."
-
-#: ../src/remote.c:811
-#, fuzzy
-msgid "<folder>"
-msgstr "carpeta"
-
-#: ../src/remote.c:811
-msgid " render thumbnails recursively (see Help)"
-msgstr ""
-
-#: ../src/remote.c:813
-msgid "<FILE>,<lua script>"
-msgstr ""
-
-#: ../src/remote.c:813
-msgid "run lua script on FILE"
-msgstr ""
+msgstr "obtener la lista de adjuntos (sidecars) de ARCHIVO"
 
 #: ../src/remote.c:879
+msgid "get destination path of FILE"
+msgstr "obtener la ruta de destino de ARCHIVO"
+
+#: ../src/remote.c:880
+msgid "open FILE, bring Geeqie window to the top"
+msgstr "abrir ARCHIVO, poner la ventana de Geeqie sobre el resto"
+
+#: ../src/remote.c:881
+msgid "open FILE, do not bring Geeqie window to the top"
+msgstr "abrir ARCHIVO, no poner la ventana de Geeqie sobre el resto"
+
+#: ../src/remote.c:882
+msgid "print filename of current image"
+msgstr "imprimir el nombre de archivo de la imagen actual"
+
+#: ../src/remote.c:883
+msgid "print pixel info of mouse pointer on current image"
+msgstr ""
+"imprimir la información de píxel del puntero del ratón en la imagen actual"
+
+#: ../src/remote.c:884
+msgid "open FILE in new window"
+msgstr "abrir ARCHIVO en una ventana nueva"
+
+#: ../src/remote.c:885
+msgid "clear command line collection list"
+msgstr "vaciar al lista de colecciones de la línea de comandos"
+
+#: ../src/remote.c:886
+msgid "add FILE to command line collection list"
+msgstr "añadir ARCHIVO a la lista de colecciones de la línea de comandos"
+
+#: ../src/remote.c:887
+msgid "bring the Geeqie window to the top"
+msgstr "poner la ventana de Geeqie sobre el resto"
+
+#: ../src/remote.c:888
+msgid "<ID>"
+msgstr "<ID>"
+
+#: ../src/remote.c:888
+msgid "window id for following commands"
+msgstr "«id» de ventana para los siguientes comandos"
+
+#: ../src/remote.c:889
+msgid "new window"
+msgstr "nueva ventana"
+
+#: ../src/remote.c:890
+msgid "close window"
+msgstr "cerrar la ventana"
+
+#: ../src/remote.c:891 ../src/remote.c:892
+msgid "clear|clean"
+msgstr "vaciar|limpiar"
+
+#: ../src/remote.c:891
+msgid "clear or clean thumbnail cache"
+msgstr "vaciar o limpiar la caché de miniaturas"
+
+#: ../src/remote.c:892
+msgid "clear or clean shared thumbnail cache"
+msgstr "vaciar o limpiar la caché de miniaturas compartida"
+
+#: ../src/remote.c:893
+msgid "    clean the metadata cache"
+msgstr "    vaciar la caché de metadatos"
+
+#: ../src/remote.c:894
+msgid "<folder>  "
+msgstr "<carpeta>"
+
+#: ../src/remote.c:894
+msgid " render thumbnails"
+msgstr "generar miniaturas"
+
+#: ../src/remote.c:895 ../src/remote.c:896
+msgid "<folder> "
+msgstr "<carpeta>"
+
+#: ../src/remote.c:895
+msgid "render thumbnails recursively"
+msgstr "generar miniaturas recursivamente"
+
+#: ../src/remote.c:896
+msgid " render thumbnails (see Help)"
+msgstr "generar miniaturas (ver Ayuda)"
+
+#: ../src/remote.c:897
+msgid "<folder>"
+msgstr "<carpeta>"
+
+#: ../src/remote.c:897
+msgid " render thumbnails recursively (see Help)"
+msgstr "generar miniaturas recursivamente (ver Ayuda)"
+
+#: ../src/remote.c:899
+msgid "<FILE>,<lua script>"
+msgstr "<ARCHIVO>,<guion lua>"
+
+#: ../src/remote.c:899
+msgid "run lua script on FILE"
+msgstr "ejecutar guion lua sobre ARCHIVO"
+
+#: ../src/remote.c:965
 msgid "Remote command list:\n"
 msgstr "Lista de comandos remotos:\n"
 
-#: ../src/remote.c:898
+#: ../src/remote.c:984
 msgid ""
 "\n"
 "  All other command line parameters are used as plain files if they exists.\n"
 msgstr ""
-
-#: ../src/remote.c:948
+"\n"
+"  El resto de parámetros de la línea de comandos se usan como simples "
+"archivos si existen.\n"
+
+#: ../src/remote.c:1034
 #, c-format
 msgid "Remote %s not running, starting..."
 msgstr "%s remoto no está ejecutándose; iniciando..."
 
-#: ../src/remote.c:1084
+#: ../src/remote.c:1170
 msgid "Remote not available\n"
 msgstr "Geeqie remoto no está disponible\n"
 
-#: ../src/search.c:243
+#: ../src/search.c:254
 msgid "folder"
 msgstr "carpeta"
 
-#: ../src/search.c:244
+#: ../src/search.c:255
 msgid "comments"
 msgstr "comentarios"
 
-#: ../src/search.c:245
+#: ../src/search.c:256
 msgid "results"
 msgstr "resultados"
 
-#: ../src/search.c:249 ../src/search.c:274
+#: ../src/search.c:260 ../src/search.c:285
 msgid "contains"
 msgstr "contiene"
 
-#: ../src/search.c:250
+#: ../src/search.c:261 ../src/search.c:304 ../src/search.c:309
 msgid "is"
 msgstr "es"
 
-#: ../src/search.c:254 ../src/search.c:261 ../src/search.c:280
+#: ../src/search.c:265 ../src/search.c:272 ../src/search.c:291
 msgid "equal to"
 msgstr "igual a"
 
-#: ../src/search.c:255 ../src/search.c:281 ../src/search.c:288
+#: ../src/search.c:266 ../src/search.c:292 ../src/search.c:299
 msgid "less than"
 msgstr "menor que"
 
-#: ../src/search.c:256 ../src/search.c:282 ../src/search.c:289
+#: ../src/search.c:267 ../src/search.c:293 ../src/search.c:300
 msgid "greater than"
 msgstr "mayor que"
 
-#: ../src/search.c:257 ../src/search.c:264 ../src/search.c:283
+#: ../src/search.c:268 ../src/search.c:275 ../src/search.c:294
 msgid "between"
 msgstr "entre"
 
-#: ../src/search.c:262
+#: ../src/search.c:273
 msgid "before"
 msgstr "antes del"
 
-#: ../src/search.c:263
+#: ../src/search.c:274
 msgid "after"
 msgstr "después del"
 
-#: ../src/search.c:268
+#: ../src/search.c:279
 msgid "match all"
-msgstr "concuerdan con todo"
-
-#: ../src/search.c:269
+msgstr "coinciden con todo"
+
+#: ../src/search.c:280
 msgid "match any"
-msgstr "concuerdan con cualquiera"
-
-#: ../src/search.c:270
+msgstr "coinciden con cualquiera"
+
+#: ../src/search.c:281
 msgid "exclude"
 msgstr "no incluyen"
 
-#: ../src/search.c:275
+#: ../src/search.c:286
 msgid "miss"
-msgstr "fallo"
-
-#: ../src/search.c:287
-#, fuzzy
+msgstr "no contiene"
+
+#: ../src/search.c:298
 msgid "not geocoded"
-msgstr "no definido"
-
-#: ../src/search.c:340
+msgstr "no geocodificado"
+
+#: ../src/search.c:305 ../src/search.c:310
+msgid "is not"
+msgstr "no es"
+
+#: ../src/search.c:361
 #, c-format
 msgid "%s, %d files (%s, %d)"
 msgstr "%s, %d archivos (%s, %d)"
 
-#: ../src/search.c:345
+#: ../src/search.c:366
 #, c-format
 msgid "%s, %d files"
 msgstr "%s, %d archivos"
 
-#: ../src/search.c:363
+#: ../src/search.c:384
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: ../src/search.c:2045 ../src/search.c:3043
+#: ../src/search.c:1872
+msgid "Changed"
+msgstr "Modificado"
+
+#: ../src/search.c:1877 ../src/search.c:3101
+msgid "Original"
+msgstr "Original"
+
+#: ../src/search.c:1883 ../src/search.c:3102
+msgid "Digitized"
+msgstr "Digitalizado"
+
+#: ../src/search.c:2080 ../src/search.c:3227
+msgid "Raw Image"
+msgstr "Imagen Raw"
+
+#: ../src/search.c:2119 ../src/search.c:3242
+msgid "Any mark"
+msgstr "Cualquier marca"
+
+#: ../src/search.c:2175 ../src/search.c:3200
 msgid "km"
 msgstr ""
 
-#: ../src/search.c:2050 ../src/search.c:3044
-#, fuzzy
+#: ../src/search.c:2180 ../src/search.c:3201
 msgid "miles"
-msgstr "Archivos"
-
-#: ../src/search.c:2342
+msgstr "millas"
+
+#: ../src/search.c:2472
 msgid "File not found"
-msgstr "No se encontró el archivo"
-
-#: ../src/search.c:2343
+msgstr "No se encuentra el archivo"
+
+#: ../src/search.c:2473
 msgid "Please enter an existing file for image content."
-msgstr ""
-"Por favor, introduzca un archivo existente para el contenido de la imagen."
-
-#: ../src/search.c:2368
+msgstr "Introduzca un archivo existente para el contenido de la imagen."
+
+#: ../src/search.c:2498
 msgid "Entry does not contain a valid lat/long value"
-msgstr ""
-
-#: ../src/search.c:2418
+msgstr "La entrada no contiene un valor de latitud/longitud válido"
+
+#: ../src/search.c:2548
 msgid "Please enter an existing folder to search."
-msgstr "Por favor, introduzca una carpeta existente para buscar."
-
-#: ../src/search.c:2860
+msgstr "Introduzca una carpeta existente para buscar."
+
+#: ../src/search.c:3008
 msgid "Image search"
 msgstr "Búsqueda de imagen"
 
-#: ../src/search.c:2890
+#: ../src/search.c:3038
 msgid "Search:"
-msgstr "Buscar en:"
-
-#: ../src/search.c:2904
+msgstr "Buscar:"
+
+#: ../src/search.c:3052
 msgid "Recurse"
 msgstr "Incluir subcarpetas"
 
-#: ../src/search.c:2909
+#: ../src/search.c:3057
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: ../src/search.c:2915 ../src/search.c:3014
+#: ../src/search.c:3063 ../src/search.c:3171
 msgid "Match case"
-msgstr "Distinguir mayúsculas y minúsculas"
-
-#: ../src/search.c:2920
+msgstr "Distinguir mayúsculas de minúsculas"
+
+#: ../src/search.c:3068
 msgid "File size is"
 msgstr "Tamaño del archivo"
 
-#: ../src/search.c:2927 ../src/search.c:2943 ../src/search.c:2964
-#: ../src/search.c:3026
+#: ../src/search.c:3075 ../src/search.c:3092 ../src/search.c:3121
+#: ../src/search.c:3183
 msgid "and"
 msgstr "y"
 
-#: ../src/search.c:2933
+#: ../src/search.c:3081
 msgid "File date is"
 msgstr "Fecha del archivo"
 
-#: ../src/search.c:2948
-#, fuzzy
-msgid "Exif date"
-msgstr "Datos E_xif"
-
-#: ../src/search.c:2953
+#: ../src/search.c:3099
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../src/search.c:3100
+msgid "Status Changed"
+msgstr "Estado cambiado"
+
+#: ../src/search.c:3110
 msgid "Image dimensions are"
 msgstr "Dimensiones de la imagen"
 
-#: ../src/search.c:2974
+#: ../src/search.c:3131
 msgid "Image content is"
 msgstr "Contenido de la imagen"
 
-#: ../src/search.c:2980
+#: ../src/search.c:3137
 #, no-c-format
 msgid "% similar to"
 msgstr "% similar a"
 
-#: ../src/search.c:2988
-#, fuzzy
+#: ../src/search.c:3145
 msgid "Ignore rotation"
-msgstr "Orientación"
-
-#: ../src/search.c:3019
-#, fuzzy
+msgstr "Ignorar la rotación"
+
+#: ../src/search.c:3176
 msgid "Image rating is"
-msgstr "Contenido de la imagen"
-
-#: ../src/search.c:3033
-#, fuzzy
+msgstr "La valoración de la imagen es"
+
+#: ../src/search.c:3190
 msgid "Image is"
-msgstr "_Lista de imágenes"
-
-#: ../src/search.c:3045
+msgstr "La imagen es"
+
+#: ../src/search.c:3202
 msgid "n.m."
 msgstr ""
 
-#: ../src/search.c:3051
+#: ../src/search.c:3208
 msgid "from"
-msgstr ""
-
-#: ../src/search.c:3056
+msgstr "desde"
+
+#: ../src/search.c:3213
 msgid ""
 "Enter a coordinate in the form:\n"
 "89.123 179.456\n"
@@ -5778,10 +5853,25 @@
 "an internet search URL\n"
 "See the Help file"
 msgstr ""
+"Introduzca una coordenada con la forma:\n"
+"89.123 179.456\n"
+"o arrastre y suelte una imagen geocodificada\n"
+"o haga clic izquierdo en el mapa y pegue\n"
+"o corte y pegue o arrastre y suelte\n"
+"un URL de búsqueda en internet.\n"
+"Vea el archivo de Help."
+
+#: ../src/search.c:3221
+msgid "Image class"
+msgstr "Clase de imagen"
+
+#: ../src/search.c:3237
+msgid "Marks"
+msgstr "Marcas"
 
 # 'Rank' hace referencia al porcentaje de similitud entre dos imágenes, es
 # decir el 'Grado de similitud', o directamente 'Similitud'.
-#: ../src/search.c:3109
+#: ../src/search.c:3310
 msgid "Rank"
 msgstr "Similitud"
 
@@ -5791,11 +5881,11 @@
 
 #: ../src/secure_save.c:407
 msgid "Cannot get file status"
-msgstr "No puedo obtener estado del archivo"
+msgstr "No se puede obtener estado del archivo"
 
 #: ../src/secure_save.c:409
 msgid "Cannot access the file"
-msgstr "No puedo acceder al archivo"
+msgstr "No se puede acceder al archivo"
 
 #: ../src/secure_save.c:411
 msgid "Cannot create temp file"
@@ -5815,87 +5905,76 @@
 
 #: ../src/secure_save.c:419
 msgid "Cannot write the file"
-msgstr "No puedo escribir el archivo"
+msgstr "No se puede escribir el archivo"
 
 #: ../src/secure_save.c:423
 msgid "Secure file saving error"
 msgstr "Error de guardado seguro"
 
 #: ../src/shortcuts.c:106 ../src/shortcuts.c:160
-#, fuzzy
 msgid "Add Shortcut"
-msgstr "Atajos de teclado"
+msgstr "Añadir atajo de teclado"
 
 #: ../src/thumb.c:405
 msgid "Thumbnail image in cache failed to load, trying to recreate.\n"
-msgstr "No se pudo cargar miniatura desde el caché; intentando recrearla.\n"
+msgstr "No se puede cargar miniatura desde la caché; intentando recrearla.\n"
 
 #: ../src/toolbar.c:85
-#, fuzzy
 msgid "Search"
-msgstr "Buscar en:"
+msgstr "Buscar"
 
 #: ../src/toolbar.c:90
-#, fuzzy
 msgid "Configure this window"
 msgstr "Configurar esta ventana"
 
 #: ../src/toolbar.c:91
-#, fuzzy
-msgid "Thumbnail maintenance"
-msgstr "Mantenimiento de miniaturas..."
+msgid "Cache maintenance"
+msgstr "Mantenimiento de la caché"
 
 #: ../src/toolbar.c:96
-#, fuzzy
 msgid "Fit Horizontaly"
 msgstr "Encajar horizontalmente"
 
 #: ../src/toolbar.c:97
-#, fuzzy
 msgid "Fit vertically"
-msgstr "Encajar Verticalmente"
+msgstr "Encajar verticalmente"
 
 #: ../src/toolbar.c:102
-#, fuzzy
 msgid "Zoom1:3"
-msgstr "Zoom 1:3"
+msgstr "Zum 1:3"
 
 #: ../src/toolbar.c:107
-#, fuzzy
 msgid "Slideshow Faster"
-msgstr " Diapositivas"
+msgstr "Pase de diapositivas más rápido"
 
 #: ../src/toolbar.c:108
-#, fuzzy
 msgid "Slideshow Slower"
-msgstr " Diapositivas"
-
-#: ../src/toolbar.c:110 ../src/window.c:274 ../src/window.c:295
+msgstr "Pase de diapositivas más lento"
+
+#: ../src/toolbar.c:110 ../src/window.c:287 ../src/window.c:308
 msgid "Help"
 msgstr "A_yuda"
 
 #: ../src/toolbar.c:112
-#, fuzzy
 msgid "Show thumbnails"
-msgstr "_Mostrar miniaturas"
+msgstr "Mostrar miniaturas"
 
 #: ../src/toolbar.c:113
-#, fuzzy
 msgid "Show marks"
-msgstr "Mostrar Marcas"
+msgstr "Mostrar las marcas"
 
 #: ../src/toolbar.c:503
 msgid "Add Toolbar Item"
-msgstr ""
-
-#: ../src/trash.c:88 ../src/utilops.c:2621 ../src/utilops.c:2632
-#: ../src/utilops.c:2689
+msgstr "Añadir elemento de la barra de herramientas"
+
+#: ../src/trash.c:88 ../src/utilops.c:2637 ../src/utilops.c:2648
+#: ../src/utilops.c:2705
 msgid "Delete failed"
-msgstr "Falló el borrado"
+msgstr "Error al borrar"
 
 #: ../src/trash.c:89
 msgid "Unable to remove old file from trash folder"
-msgstr "No se pudo quitar archivo viejo de la carpeta de basura"
+msgstr "No se puede eliminar un archivo viejo de la carpeta de basura"
 
 #: ../src/trash.c:146
 msgid "Could not create folder"
@@ -5911,8 +5990,8 @@
 "Unable to access or create the trash folder.\n"
 "\"%s\""
 msgstr ""
-"No se pudo acceder o crear la carpeta de basura.\n"
-"\"%s\""
+"No se puede acceder o crear la carpeta de basura.\n"
+"«%s»"
 
 #: ../src/trash.c:182
 msgid "Turn off safe delete"
@@ -5925,7 +6004,7 @@
 #: ../src/trash.c:209
 #, c-format
 msgid " (max. %d MB)"
-msgstr " (max. %d MB)"
+msgstr " (máx. %d MB)"
 
 #: ../src/trash.c:213
 #, c-format
@@ -5955,11 +6034,11 @@
 
 #: ../src/ui_bookmark.c:315
 msgid "Icon:"
-msgstr "Ãcono:"
+msgstr "Icono:"
 
 #: ../src/ui_bookmark.c:321
 msgid "Select icon"
-msgstr "Seleccionar ícono"
+msgstr "Seleccionar icono"
 
 #: ../src/ui_bookmark.c:414
 msgid "_Properties..."
@@ -6006,7 +6085,7 @@
 "The locale appears to be set to \"%s\"\n"
 "(set by the LANG environment variable)\n"
 msgstr ""
-"El 'locale' parece ser \"%s\"\n"
+"La configuración regional parece ser «%s»\n"
 "(Establecido por la variable de entorno LANG)\n"
 
 #: ../src/ui_fileops.c:102
@@ -6024,16 +6103,18 @@
 #: ../src/ui_fileops.c:106
 #, c-format
 msgid "\"%s\" is encoded in valid UTF-8."
-msgstr "\"%s\" está codificado en UTF-8 válido."
+msgstr "«%s» está codificado en UTF-8 válido."
 
 #: ../src/ui_fileops.c:108
 #, c-format
 msgid "\"%s\" is not encoded in valid UTF-8."
-msgstr "\"%s\" no está codificado en UTF-8 válido."
+msgstr "«%s» no está codificado en UTF-8 válido."
 
 #: ../src/ui_fileops.c:113 ../src/ui_fileops.c:118
 msgid "Filename encoding locale mismatch"
-msgstr "No coincide la codificación del archivo y el 'locale'"
+msgstr ""
+"La codificación del nombre del archivo no coincide con la configuración"
+" regional"
 
 #: ../src/ui_help.c:119
 #, c-format
@@ -6041,18 +6122,18 @@
 "Unable to load:\n"
 "%s"
 msgstr ""
-"No se pudo cargar:\n"
+"No se puede cargar:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2320
-#: ../src/utilops.c:2347 ../src/utilops.c:2813
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2336
+#: ../src/utilops.c:2363 ../src/utilops.c:2829
 msgid "Rename failed"
-msgstr "Fallo al eenombrar"
+msgstr "Error al renombrar"
 
 #: ../src/ui_pathsel.c:438
 #, c-format
 msgid "Failed to rename %s to %s."
-msgstr "Fallo al renombrar %s a %s."
+msgstr "Error al renombrar %s a %s."
 
 #: ../src/ui_pathsel.c:634 ../src/ui_pathsel.c:642
 msgid "_Rename"
@@ -6066,7 +6147,7 @@
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../src/ui_pathsel.c:752 ../src/ui_pathsel.c:1058 ../src/utilops.c:2847
+#: ../src/ui_pathsel.c:752 ../src/ui_pathsel.c:1058 ../src/utilops.c:2863
 msgid "New folder"
 msgstr "Nueva carpeta"
 
@@ -6076,7 +6157,7 @@
 "Unable to create folder:\n"
 "%s"
 msgstr ""
-"No se pudo crear carpeta:\n"
+"No se puede crear la carpeta:\n"
 "%s"
 
 #: ../src/ui_pathsel.c:763
@@ -6095,18 +6176,17 @@
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/ui_tabcomp.c:933
+#: ../src/ui_tabcomp.c:941
 msgid "Select path"
 msgstr "Seleccionar ruta"
 
-#: ../src/ui_tabcomp.c:949
+#: ../src/ui_tabcomp.c:963
 msgid "All files"
 msgstr "Todos los archivos"
 
 #: ../src/uri_utils.c:43
-#, fuzzy
 msgid "Drag and Drop failed"
-msgstr "Comando externo fallido"
+msgstr "Error al arrastrar y soltar"
 
 #: ../src/utilops.c:590
 msgid ""
@@ -6114,7 +6194,7 @@
 " Continue multiple file operation?"
 msgstr ""
 "\n"
-"¿Continuar operación con múltiples archivos?"
+"¿Quiere continuar la operación con múltiples archivos?"
 
 #: ../src/utilops.c:597 ../src/utilops.c:1034
 msgid "Co_ntinue"
@@ -6157,90 +6237,90 @@
 msgid "This operation can't continue:"
 msgstr "Esta operación no puede continuar:"
 
-#: ../src/utilops.c:1503 ../src/utilops.c:1617 ../src/utilops.c:2032
+#: ../src/utilops.c:1518 ../src/utilops.c:1633 ../src/utilops.c:2048
 msgid "Discard changes"
 msgstr "Desechar cambios"
 
-#: ../src/utilops.c:1504 ../src/utilops.c:1618 ../src/utilops.c:1982
-#: ../src/utilops.c:1998
+#: ../src/utilops.c:1519 ../src/utilops.c:1634 ../src/utilops.c:1998
+#: ../src/utilops.c:2014
 msgid "File details"
 msgstr "Detalles del archivo"
 
-#: ../src/utilops.c:1526 ../src/utilops.c:1635
+#: ../src/utilops.c:1541 ../src/utilops.c:1651
 msgid "Sidecars"
-msgstr "Sidecars"
-
-#: ../src/utilops.c:1528
+msgstr "Adjuntos (sidecars)"
+
+#: ../src/utilops.c:1543
 msgid "Write to file"
 msgstr "Escribir en archivo"
 
-#: ../src/utilops.c:1568
+#: ../src/utilops.c:1583
 msgid "Choose the destination folder."
 msgstr "Elegir la carpeta de destino."
 
-#: ../src/utilops.c:1637
+#: ../src/utilops.c:1653
 msgid "New name"
 msgstr "Nuevo nombre"
 
-#: ../src/utilops.c:1674
+#: ../src/utilops.c:1690
 msgid "Manual rename"
 msgstr "Renombrado manual"
 
-#: ../src/utilops.c:1679
-msgid "Original name:"
-msgstr "Nombre original:"
-
-#: ../src/utilops.c:1682
-msgid "New name:"
-msgstr "Nuevo nombre:"
-
 #: ../src/utilops.c:1695
+msgid "Original name:"
+msgstr "Nombre original:"
+
+#: ../src/utilops.c:1698
+msgid "New name:"
+msgstr "Nuevo nombre:"
+
+#: ../src/utilops.c:1711
 msgid "Auto rename"
-msgstr "Auto-renombrar"
-
-#: ../src/utilops.c:1701
+msgstr "Autorenombrar"
+
+#: ../src/utilops.c:1717
 msgid "Begin text"
 msgstr "Comienzo del texto"
 
-#: ../src/utilops.c:1709 ../src/utilops.c:1741
+#: ../src/utilops.c:1725 ../src/utilops.c:1757
 msgid "Start #"
 msgstr "Nº inicial"
 
-#: ../src/utilops.c:1715
+#: ../src/utilops.c:1731
 msgid "End text"
 msgstr "Fin del texto"
 
-#: ../src/utilops.c:1723
+#: ../src/utilops.c:1739
 msgid "Padding:"
 msgstr "Relleno:"
 
-#: ../src/utilops.c:1728
+#: ../src/utilops.c:1744
 msgid "Formatted rename"
 msgstr "Renombrar formateado"
 
-#: ../src/utilops.c:1733
+#: ../src/utilops.c:1749
 msgid "Format (* = original name, ## = numbers)"
 msgstr "Formato (* =nombre original, ## = números)"
 
-#: ../src/utilops.c:1885
+#: ../src/utilops.c:1901
 msgid "Another operation in progress.\n"
 msgstr "Hay otra operación en progreso.\n"
 
-#: ../src/utilops.c:1941
+#: ../src/utilops.c:1957
 #, c-format
 msgid "File: '%s'\n"
-msgstr "Archivo:'%s'\n"
-
-#: ../src/utilops.c:1946
+msgstr "Archivo: «%s»\n"
+
+#: ../src/utilops.c:1962
 msgid "with sidecar files:\n"
-msgstr "con archivos de sidecar:\n"
-
-#: ../src/utilops.c:1952
+msgstr "con archivos adjuntos (sidecar):\n"
+
+#: ../src/utilops.c:1968
 #, c-format
 msgid " '%s'\n"
-msgstr " '%s'\n"
-
-#: ../src/utilops.c:1956
+msgstr " «%s»\n"
+
+#: ../src/utilops.c:1972
 msgid ""
 "\n"
 "Status: "
@@ -6248,124 +6328,123 @@
 "\n"
 "Estado: "
 
-#: ../src/utilops.c:1968
+#: ../src/utilops.c:1984
 msgid "no problem detected"
 msgstr "no se detectan problemas"
 
-#: ../src/utilops.c:1984 ../src/utilops.c:2031
+#: ../src/utilops.c:2000 ../src/utilops.c:2047
 msgid "Exclude file"
-msgstr "Excluír archivo"
-
-#: ../src/utilops.c:2029 ../src/utilops.c:2054
+msgstr "Excluir archivo"
+
+#: ../src/utilops.c:2045 ../src/utilops.c:2070
 msgid "Overview of changed metadata"
 msgstr "Resumen de metadatos cambiados"
 
-#: ../src/utilops.c:2047
+#: ../src/utilops.c:2063
 #, c-format
 msgid ""
 "The following metadata tags will be written to\n"
 "'%s'."
 msgstr ""
 "Las siguientes etiquetas de metadatos se escribirán en\n"
-"'%s'."
-
-#: ../src/utilops.c:2051
+"«%s»."
+
+#: ../src/utilops.c:2067
 #, c-format
 msgid "The following metadata tags will be written to the image file itself."
 msgstr ""
 "Las siguientes etiquetas de metadatos se escribirán en el propio archivo de "
 "imagen."
 
-#: ../src/utilops.c:2157
+#: ../src/utilops.c:2173
 msgid "Delete files?"
-msgstr "¿Borrar archivos?"
-
-#: ../src/utilops.c:2158
+msgstr "¿Quiere borrar archivos?"
+
+#: ../src/utilops.c:2174
 msgid "This will delete the following files"
 msgstr "Esto borrará los siguientes archivos"
 
-#: ../src/utilops.c:2177
+#: ../src/utilops.c:2193
 msgid "Can't write metadata"
-msgstr "No puedo guardar metadatos"
-
-#: ../src/utilops.c:2200
+msgstr "No se pueden guardar los metadatos"
+
+#: ../src/utilops.c:2216
 msgid "Write metadata"
-msgstr "Escribir Metadatos"
-
-#: ../src/utilops.c:2201
+msgstr "Guardar los metadatos"
+
+#: ../src/utilops.c:2217
 msgid "Write metadata?"
-msgstr "¿Escribir Metadatos?"
-
-#: ../src/utilops.c:2202
+msgstr "¿Quiere guardar los metadatos?"
+
+#: ../src/utilops.c:2218
 msgid "This will write the changed metadata into the following files"
-msgstr "Esto grabará los metadatos cambiados en los siguientes archivos"
-
-#: ../src/utilops.c:2204
-#, fuzzy
+msgstr "Esto va a guardar los metadatos cambiados en los siguientes archivos"
+
+#: ../src/utilops.c:2220
 msgid "Metadata writing failed"
-msgstr "Fallo guardando metadatos"
-
-#: ../src/utilops.c:2223 ../src/utilops.c:2251
+msgstr "Error al escribir los metadatos"
+
+#: ../src/utilops.c:2239 ../src/utilops.c:2267
 msgid "Move failed"
-msgstr "Fallo al mover"
-
-#: ../src/utilops.c:2248
+msgstr "Error al mover"
+
+#: ../src/utilops.c:2264
 msgid "Move files?"
-msgstr "¿Mover archivos?"
-
-#: ../src/utilops.c:2249
+msgstr "¿Quiere mover los archivos?"
+
+#: ../src/utilops.c:2265
 msgid "This will move the following files"
 msgstr "Esto moverá los siguientes archivos"
 
-#: ../src/utilops.c:2273 ../src/utilops.c:2301
+#: ../src/utilops.c:2289 ../src/utilops.c:2317
 msgid "Copy failed"
-msgstr "Fallo al copiar"
-
-#: ../src/utilops.c:2298
+msgstr "Error al copiar"
+
+#: ../src/utilops.c:2314
 msgid "Copy files?"
-msgstr "¿Copiar archivos?"
-
-#: ../src/utilops.c:2299 ../src/utilops.c:2433
+msgstr "¿Quiere copiar los archivos?"
+
+#: ../src/utilops.c:2315 ../src/utilops.c:2449
 msgid "This will copy the following files"
 msgstr "Esto copiará los siguientes archivos"
 
-#: ../src/utilops.c:2343 ../src/utilops.c:2809
+#: ../src/utilops.c:2359 ../src/utilops.c:2825
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../src/utilops.c:2344
+#: ../src/utilops.c:2360
 msgid "Rename files?"
-msgstr "¿Renombrar archivos?"
-
-#: ../src/utilops.c:2345
+msgstr "¿Quiere renombrar los archivos?"
+
+#: ../src/utilops.c:2361
 msgid "This will rename the following files"
 msgstr "Esto renombrará los siguientes archivos"
 
-#: ../src/utilops.c:2397
+#: ../src/utilops.c:2413
 msgid "Can't run external editor"
-msgstr "No puedo ejecutar editor externo"
-
-#: ../src/utilops.c:2431
+msgstr "No se puede ejecutar el editor externo"
+
+#: ../src/utilops.c:2447
 msgid "Editor"
 msgstr "Editor"
 
-#: ../src/utilops.c:2432
+#: ../src/utilops.c:2448
 msgid "Run editor?"
-msgstr "¿Lanzar editor?"
-
-#: ../src/utilops.c:2435
+msgstr "¿Quiere lanzar el editor?"
+
+#: ../src/utilops.c:2451
 msgid "External command failed"
 msgstr "Comando externo fallido"
 
-#: ../src/utilops.c:2604 ../src/utilops.c:2677
+#: ../src/utilops.c:2620 ../src/utilops.c:2693
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: ../src/utilops.c:2605
+#: ../src/utilops.c:2621
 msgid "Delete symbolic link?"
-msgstr "¿Borrar enlace simbólico?"
-
-#: ../src/utilops.c:2607
+msgstr "¿Quiere borrar el enlace simbólico?"
+
+#: ../src/utilops.c:2623
 msgid ""
 "This will delete the symbolic link.\n"
 "The folder this link points to will not be deleted."
@@ -6373,11 +6452,11 @@
 "Esto borrará el enlace simbólico.\n"
 "La carpeta a la que apunta este enlace no se borrará."
 
-#: ../src/utilops.c:2609
+#: ../src/utilops.c:2625
 msgid "Link deletion failed"
-msgstr "Falló el borrado del enlace"
-
-#: ../src/utilops.c:2619
+msgstr "Error al borrar el enlace"
+
+#: ../src/utilops.c:2635
 #, c-format
 msgid ""
 "Unable to remove folder %s\n"
@@ -6386,16 +6465,16 @@
 "Imposible borrar carpeta %s\n"
 "Los permisos no dejan escribir en ella."
 
-#: ../src/utilops.c:2631 ../src/utilops.c:2688
+#: ../src/utilops.c:2647 ../src/utilops.c:2704
 #, c-format
 msgid "Unable to list contents of folder %s"
 msgstr "imposible listar contenidos de la carpeta %s"
 
-#: ../src/utilops.c:2645 ../src/utilops.c:2653
+#: ../src/utilops.c:2661 ../src/utilops.c:2669
 msgid "Folder contains subfolders"
 msgstr "La carpeta contiene subcarpetas"
 
-#: ../src/utilops.c:2649
+#: ../src/utilops.c:2665
 #, c-format
 msgid ""
 "Unable to delete the folder:\n"
@@ -6408,45 +6487,45 @@
 "\n"
 "%s\n"
 "\n"
-"Esta carpeta contiene subcarpetas que deben ser retiradas antes del borrado."
-
-#: ../src/utilops.c:2657
+"Esta carpeta contiene subcarpetas que debe mover antes de que pueda borrarse."
+
+#: ../src/utilops.c:2673
 msgid "Subfolders:"
 msgstr "Subcarpetas:"
 
-#: ../src/utilops.c:2678
+#: ../src/utilops.c:2694
 msgid "Delete folder?"
-msgstr "¿Borrar carpeta?"
-
-#: ../src/utilops.c:2679
+msgstr "¿Quiere borrar la carpeta?"
+
+#: ../src/utilops.c:2695
 msgid "The folder contains these files:"
 msgstr "La carpeta contiene estos archivos:"
 
-#: ../src/utilops.c:2680
+#: ../src/utilops.c:2696
 msgid ""
 "This will delete the folder.\n"
 "The contents of this folder will also be deleted."
 msgstr ""
 "Esto borrará la carpeta:\n"
-"Los contenidos de esta carpeta también serán borrados."
-
-#: ../src/utilops.c:2810
+"El contenido de esta carpeta también serán borrado."
+
+#: ../src/utilops.c:2826
 msgid "Rename folder?"
-msgstr "¿Renombrar caropeta?"
-
-#: ../src/utilops.c:2811
+msgstr "¿Quiere renombrar la carpeta?"
+
+#: ../src/utilops.c:2827
 msgid "The folder contains the following files"
 msgstr "La carpeta contiene los siguientes archivos"
 
-#: ../src/utilops.c:2857
+#: ../src/utilops.c:2873
 msgid "Create Folder"
 msgstr "Crear carpeta"
 
-#: ../src/utilops.c:2858
+#: ../src/utilops.c:2874
 msgid "Create folder?"
-msgstr "¿Crear carpeta?"
-
-#: ../src/utilops.c:2861
+msgstr "¿Quiere crear la carpeta?"
+
+#: ../src/utilops.c:2877
 msgid "Can't create folder"
 msgstr "No se puede crear la carpeta"
 
@@ -6464,11 +6543,11 @@
 
 #: ../src/view_dir.c:667
 msgid "_Slideshow"
-msgstr "_Diapositivas"
+msgstr "Pa_se de diapositivas"
 
 #: ../src/view_dir.c:669
 msgid "Slideshow recursive"
-msgstr "Diapositivas en modo _recursivo"
+msgstr "Pase de diapositivas _recursivo"
 
 #: ../src/view_dir.c:673
 msgid "Find _duplicates..."
@@ -6476,15 +6555,15 @@
 
 #: ../src/view_dir.c:675
 msgid "Find duplicates recursive..."
-msgstr "_Buscar duplicados recursivamente..."
+msgstr "Buscar duplicados recursivamente..."
 
 #: ../src/view_dir.c:680
 msgid "_New folder..."
 msgstr "N_ueva carpeta..."
 
-#: ../src/view_dir.c:697 ../src/view_file/view_file.c:640
+#: ../src/view_dir.c:697 ../src/view_file/view_file.c:642
 msgid "View as _List"
-msgstr "Ver como _Lista"
+msgstr "Ver como _lista"
 
 #: ../src/view_dir.c:700
 msgid "View as _Tree"
@@ -6492,19 +6571,31 @@
 
 #: ../src/view_dir.c:705
 msgid "Show _hidden files"
-msgstr "Mostrar arc_hivos ocultos"
-
-#: ../src/view_dir.c:708 ../src/view_file/view_file.c:658
+msgstr "Mostrar los arc_hivos ocultos"
+
+#: ../src/view_dir.c:708 ../src/view_file/view_file.c:660
 msgid "Re_fresh"
 msgstr "_Actualizar"
 
-#: ../src/view_file/view_file.c:643
+#: ../src/view_file/view_file.c:645
 msgid "View as _Icons"
-msgstr "Ver como _Iconos"
-
-#: ../src/view_file/view_file.c:649
+msgstr "Ver como _iconos"
+
+#: ../src/view_file/view_file.c:651
 msgid "Show _thumbnails"
-msgstr "_Mostrar miniaturas"
+msgstr "_Mostrar las miniaturas"
+
+#: ../src/view_file/view_file.c:771
+msgid "Mark text"
+msgstr "Texto de la marca"
+
+#: ../src/view_file/view_file.c:774
+msgid "Set mark text"
+msgstr "Establecer texto de marca"
+
+#: ../src/view_file/view_file.c:775
+msgid "This will set or clear the mark text."
+msgstr "Establece o borra la marca de texto."
 
 #: ../src/view_file/view_file_icon.c:1964 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
@@ -6523,6 +6614,36 @@
 msgid "Error renaming file"
 msgstr "Error al renombrar archivo"
 
+#: ../src/window.c:374
+msgid "Search the on-line help files.\n"
+msgstr "Buscar en los archivos de ayuda en línea.\n"
+
+#: ../src/window.c:379
+msgid "Search engine:"
+msgstr "Motor de búsqueda:"
+
+#: ../src/window.c:387
+msgid "Search terms:"
+msgstr "Términos de búsqueda:"
+
+#~ msgid "File: "
+#~ msgstr "Archivo: "
+
+#~ msgid "_Thumbnail maintenance..."
+#~ msgstr "_Mantenimiento de miniaturas..."
+
+#~ msgid "Thumbnail maintenance..."
+#~ msgstr "Mantenimiento de miniaturas..."
+
+#~ msgid "Sort by Exif-date"
+#~ msgstr "Ordenar por fecha Exif"
+
+#~ msgid "Exif date"
+#~ msgstr "Fecha E_xif"
+
+#~ msgid "Thumbnail maintenance"
+#~ msgstr "Mantenimiento de miniaturas"
+
 #~ msgid "Thumbnail cache"
 #~ msgstr "Caché de miniaturas"
 
@@ -7037,9 +7158,6 @@
 #~ msgid "Rename multiple files"
 #~ msgstr "Renombrar múltiples archivos"
 
-#~ msgid "Original Name"
-#~ msgstr "Nombre original"
-
 #~ msgid ""
 #~ "Unable to rename file:\n"
 #~ "%s\n"
--- a/scripts/decode_sim	Fri Apr 13 19:06:23 2018 +0300
+++ b/scripts/decode_sim	Sat Jun 30 15:28:52 2018 +0300
@@ -25,7 +25,7 @@
    }
    elsif (/^Dimensions=\[(\d+) x (\d+)\]$/)
    {
-      printf "Original image dimensions: %d×%d\n", $1, $2;
+      printf "Original image dimensions: %dx%d\n", $1, $2;
    }
    elsif (/^Date=(.*)/)
    {
@@ -41,10 +41,10 @@
    }
    elsif ($raw =~ /^SimilarityGrid\[(\d+) x (\d+)\]=(.*)$/s)
    {
-      printf "Similarity image %d×%d\n", $1, $2;
+      printf "Similarity image %dx%d\n", $1, $2;
       if ($1 != 32 or $2 != 32)
       {
-	 print "Warning, similarity data are not size 32×32!\n";
+	 print "Warning, similarity data are not size 32x32!\n";
       }
 
       my $simn = $1 * $2 * 3;
--- a/src/Makefile.am	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/Makefile.am	Sat Jun 30 15:28:52 2018 +0300
@@ -266,7 +266,9 @@
 	window.c	\
 	window.h	\
 	lua.c		\
-	glua.h
+	glua.h		\
+	zonedetect.c	\
+	zonedetect.h
 
 geeqie_LDADD = $(GTK_LIBS) $(GLIB_LIBS) $(INTLLIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(BPG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(LIBCHAMPLAIN_LIBS) $(LIBCHAMPLAIN_GTK_LIBS) $(LUA_LIBS) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) $(FFMPEGTHUMBNAILER_LIBS)
 
--- a/src/bar.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/bar.c	Sat Jun 30 15:28:52 2018 +0300
@@ -99,6 +99,7 @@
 "            <pane_exif id = 'exif' expanded = 'true' >"
 "                <entry key = 'formatted.Camera' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.DateTime' if_set = 'true' editable = 'false' />"
+"                <entry key = 'formatted.localtime' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.ShutterSpeed' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.Aperture' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.ExposureBias' if_set = 'true' editable = 'false' />"
@@ -113,6 +114,7 @@
 "                <entry key = 'formatted.SubjectDistance' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.Resolution' if_set = 'true' editable = 'false' />"
 "                <entry key = '" ORIENTATION_KEY "' if_set = 'true' editable = 'false' />"
+"                <entry key = 'formatted.star_rating' if_set = 'true' editable = 'false' />"
 "            </pane_exif>"
 "        </bar>"
 "    </layout>"
@@ -138,6 +140,7 @@
 "            <pane_exif id = 'location' expanded = 'true' >"
 "                <entry key = 'formatted.GPSPosition' if_set = 'true' editable = 'false' />"
 "                <entry key = 'formatted.GPSAltitude' if_set = 'true' editable = 'false' />"
+"                <entry key = 'formatted.timezone' if_set = 'true' editable = 'false' />"
 "                <entry key = 'Xmp.photoshop.Country' if_set = 'false' editable = 'true' />"
 "                <entry key = 'Xmp.iptc.CountryCode' if_set = 'false' editable = 'true' />"
 "                <entry key = 'Xmp.photoshop.State' if_set = 'false' editable = 'true' />"
--- a/src/bar_exif.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/bar_exif.c	Sat Jun 30 15:28:52 2018 +0300
@@ -33,6 +33,7 @@
 #include "rcfile.h"
 #include "dnd.h"
 #include "ui_utildlg.h"
+#include "layout.h"
 
 
 #include <math.h>
@@ -725,6 +726,40 @@
 	WRITE_NL(); WRITE_STRING("</pane_exif>");
 }
 
+GList * bar_pane_exif_list()
+{
+	PaneExifData *ped;
+	GList *list;
+	GList *work_windows;
+	GList *exif_list = NULL;
+	LayoutWindow *lw;
+	GtkWidget *bar;
+	GtkWidget *pane;
+	GtkWidget *entry;
+	ExifEntry *ee;
+
+	work_windows = layout_window_list;
+	lw = work_windows->data;
+	bar = lw->bar;
+	pane = bar_find_pane_by_id(bar, PANE_EXIF, "exif");
+	if (pane)
+		{
+		ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+
+		list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
+		while (list)
+			{
+			entry = list->data;
+			list = list->next;
+			ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+			exif_list = g_list_append(exif_list, g_strdup(ee->title));
+			exif_list = g_list_append(exif_list, g_strdup(ee->key));
+			}
+
+		g_list_free(list);
+		}
+	return exif_list;
+}
 
 void bar_pane_exif_close(GtkWidget *widget)
 {
--- a/src/bar_exif.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/bar_exif.h	Sat Jun 30 15:28:52 2018 +0300
@@ -31,7 +31,7 @@
 
 const gchar **bar_exif_key_list;
 const gint bar_exif_key_count;
-
+GList *bar_pane_exif_list();
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/cache_maint.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/cache_maint.c	Sat Jun 30 15:28:52 2018 +0300
@@ -1261,6 +1261,7 @@
 				   G_CALLBACK(cache_manager_render_cb), cache_manager);
 	gtk_size_group_add_widget(sizegroup, button);
 	pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), 0.0);
+	gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
 
 	group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL);
 
--- a/src/collect-table.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/collect-table.c	Sat Jun 30 15:28:52 2018 +0300
@@ -33,6 +33,7 @@
 #include "layout.h"
 #include "layout_image.h"
 #include "menu.h"
+#include "metadata.h"
 #include "print.h"
 #include "utilops.h"
 #include "ui_fileops.h"
@@ -253,6 +254,16 @@
 	collection_table_populate_at_new_size(ct, allocation.width, allocation.height, TRUE);
 }
 
+static void collection_table_toggle_stars(CollectTable *ct)
+{
+	GtkAllocation allocation;
+	ct->show_stars = !ct->show_stars;
+	options->show_star_rating = ct->show_stars;
+
+	gtk_widget_get_allocation(ct->listview, &allocation);
+	collection_table_populate_at_new_size(ct, allocation.width, allocation.height, TRUE);
+}
+
 static gint collection_table_get_icon_width(CollectTable *ct)
 {
 	gint width;
@@ -903,6 +914,13 @@
 	collection_table_toggle_filenames(ct);
 }
 
+static void collection_table_popup_show_stars_cb(GtkWidget *widget, gpointer data)
+{
+	CollectTable *ct = data;
+
+	collection_table_toggle_stars(ct);
+}
+
 static void collection_table_popup_destroy_cb(GtkWidget *widget, gpointer data)
 {
 	CollectTable *ct = data;
@@ -989,6 +1007,8 @@
 
 	menu_item_add_check(menu, _("Show filename _text"), ct->show_text,
 			G_CALLBACK(collection_table_popup_show_names_cb), ct);
+	menu_item_add_check(menu, _("Show star rating"), ct->show_stars,
+				G_CALLBACK(collection_table_popup_show_stars_cb), ct);
 	menu_item_add_divider(menu);
 	menu_item_add_stock(menu, _("_Save collection"), GTK_STOCK_SAVE,
 			G_CALLBACK(collection_table_popup_save_cb), ct);
@@ -1817,7 +1837,7 @@
 				{
 				g_object_set(G_OBJECT(cell), "fixed_width", thumb_width,
 							     "fixed_height", options->thumbnails.max_height,
-							     "show_text", ct->show_text, NULL);
+							     "show_text", ct->show_text || ct->show_stars, NULL);
 				}
 			}
 		if (gtk_widget_get_realized(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
@@ -2447,6 +2467,8 @@
 	CollectInfo *info;
 	GdkColor color_fg;
 	GdkColor color_bg;
+	gchar *star_rating = NULL;
+	gchar *display_text = NULL;
 
 	ct = cd->ct;
 
@@ -2479,12 +2501,45 @@
 		shift_color(&color_bg, -1, 0);
 		}
 
+	if (ct->show_stars && info && info->fd)
+		{
+		star_rating = metadata_read_rating_stars(info->fd);
+		}
+	else
+		{
+		star_rating = g_strdup("");
+		}
+
+	if (info && info->fd)
+		{
+		if (ct->show_text && ct->show_stars)
+			{
+			display_text = g_strconcat(info->fd->name, "\n", star_rating, NULL);
+			}
+		else if (ct->show_text)
+			{
+			display_text = g_strdup(info->fd->name);
+			}
+		else if (ct->show_stars)
+			{
+			display_text = g_strdup(star_rating);
+			}
+		else
+			{
+			display_text = g_strdup("");
+			}
+		}
+	else
+		{
+		display_text = g_strdup("");
+		}
+
 	if (GQV_IS_CELL_RENDERER_ICON(cell))
 		{
 		if (info)
 			{
 			g_object_set(cell,	"pixbuf", info->pixbuf,
-						"text", info->fd->name,
+						"text",  display_text,
 						"cell-background-gdk", &color_bg,
 						"cell-background-set", TRUE,
 						"foreground-gdk", &color_fg,
@@ -2500,6 +2555,9 @@
 						"has-focus", FALSE,  NULL);
 			}
 		}
+
+	g_free(display_text);
+	g_free(star_rating);
 }
 
 static void collection_table_append_column(CollectTable *ct, gint n)
@@ -2583,6 +2641,7 @@
 
 	ct->cd = cd;
 	ct->show_text = options->show_icon_names;
+	ct->show_stars = options->show_star_rating;
 
 	ct->scrolled = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct->scrolled), GTK_SHADOW_IN);
--- a/src/exif-common.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/exif-common.c	Sat Jun 30 15:28:52 2018 +0300
@@ -56,6 +56,8 @@
 #include "ui_fileops.h"
 #include "cache.h"
 #include "jpeg_parser.h"
+#include "misc.h"
+#include "zonedetect.h"
 
 
 static gdouble exif_rational_to_double(ExifRational *r, gint sign)
@@ -383,6 +385,8 @@
 	gchar *text;
 
 	text = exif_get_data_as_text(exif, "Exif.Photo.ISOSpeedRatings");
+	/* old canon may set this instead */
+	if (!text) text = exif_get_data_as_text(exif, "Exif.CanonSi.ISOSpeed");
 	/* kodak may set this instead */
 	if (!text) text = exif_get_data_as_text(exif, "Exif.Photo.ExposureIndex");
 	return text;
@@ -607,6 +611,256 @@
 	return g_strdup_printf("%0.f m %s", alt, (ref==0)?_("Above Sea Level"):_("Below Sea Level"));
 }
 
+/**
+ * @brief Extracts timezone from a ZoneDetect search structure
+ * @param results ZoneDetect search structure
+ * @returns Timezone in the form "Europe/London"
+ * 
+ * Refer to https://github.com/BertoldVdb/ZoneDetect
+ * for structure details
+ */
+static gchar *zd_tz(ZoneDetectResult* results)
+{
+	gchar *timezone = NULL;
+	gchar *timezone_pre = NULL;
+	gchar *timezone_id = NULL;
+	unsigned int index = 0;
+
+    if (!results)
+		{
+		return NULL;
+		}
+
+	while(results[index].lookupResult != ZD_LOOKUP_END)
+		{
+		if(results[index].data)
+			{
+			for(unsigned int i=0; i<results[index].numFields; i++)
+				{
+				if (g_strstr_len(results[index].fieldNames[i], -1, "TimezoneIdPrefix"))
+					{
+					timezone_pre = g_strdup(results[index].data[i]);
+					}
+				if (g_strstr_len(results[index].fieldNames[i], -1, "TimezoneId"))
+					{
+					timezone_id = g_strdup(results[index].data[i]);
+					}
+				}
+			}
+		index++;
+		}
+
+	timezone = g_strconcat(timezone_pre, timezone_id, NULL);
+	g_free(timezone_pre);
+	g_free(timezone_id);
+	return timezone;
+}
+
+/**
+ * @brief Creates local time from GPS lat/long
+ * @param exif 
+ * @returns Localised time and date
+ * 
+ * GPS lat/long is translated to timezone using ZoneDetect.
+ * GPS UTC is converted to Unix time stamp (seconds since 1970).
+ * The TZ environment variable is set to the relevant timezone
+ * and the Unix timestamp converted to local time using locale.
+ * If the conversion fails, unformatted UTC is returned.
+ */
+static gchar *exif_build_formatted_localtime(ExifData *exif)
+{
+	gfloat latitude;
+	gfloat longitude;
+	gchar *text_latitude;
+	gchar *text_longitude;
+	gchar *text_latitude_ref;
+	gchar *text_longitude_ref;
+	gchar *text_date;
+	gchar *text_time;
+	gchar *text_date_time = NULL;
+	gchar buf[128];
+	gchar *tmp;
+	gint buflen;
+	GError *error = NULL;
+	gchar *lat_deg;
+	gchar *lat_min;
+	gchar *lon_deg;
+	gchar *lon_min;
+	gchar *time_zone;
+	gchar *time_zone_org;
+	struct tm *tm_local;
+	struct tm tm_utc;
+	time_t stamp;
+	gchar *zd_path;
+	gchar *zone_selected;
+	ZoneDetect *cd;
+	ZoneDetectResult *results;
+
+	text_latitude = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLatitude");
+	text_longitude = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLongitude");
+	text_latitude_ref = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLatitudeRef");
+	text_longitude_ref = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLongitudeRef");
+	text_date = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSDateStamp");
+	text_time = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSTimeStamp");
+
+	if (text_latitude && text_longitude && text_latitude_ref &&
+						text_longitude_ref && text_date && text_time)
+		{
+		text_date_time = g_strconcat(text_date, ":", text_time, NULL);
+
+		lat_deg = strtok(text_latitude, "deg'");
+		lat_min = strtok(NULL, "deg'");
+		latitude = atof(lat_deg) + atof(lat_min) / 60;
+		if (!g_strcmp0(text_latitude_ref, "South"))
+			{
+			latitude = -latitude;
+			}
+		lon_deg = strtok(text_longitude, "deg'");
+		lon_min = strtok(NULL, "deg'");
+		longitude = atof(lon_deg) + atof(lon_min) / 60;
+		if (!g_strcmp0(text_longitude_ref, "West"))
+			{
+			longitude = -longitude;
+			}
+
+		zd_path = g_build_filename(GQ_BIN_DIR, TIMEZONE_DATABASE, NULL);
+		cd = ZDOpenDatabase(zd_path);
+		if (cd)
+			{
+			results = ZDLookup(cd, latitude, longitude, NULL);
+			zone_selected = zd_tz(results);
+			time_zone = g_strconcat("TZ=", zone_selected, NULL);
+			time_zone_org = g_strconcat("TZ=", getenv("TZ"), NULL);
+			putenv("TZ=UTC");
+			g_free(zone_selected);
+
+			memset(&tm_utc, 0, sizeof(tm_utc));
+			if (text_date_time && strptime(text_date_time, "%Y:%m:%d:%H:%M:%S", &tm_utc))
+				{
+				stamp = mktime(&tm_utc);	// Convert the struct to a Unix timestamp
+				putenv(time_zone);	// Switch to destination time zone
+
+				tm_local = localtime(&stamp);
+
+				/* Convert to localtime using locale */
+				buflen = strftime(buf, sizeof(buf), "%x %X", tm_local);
+				if (buflen > 0)
+					{
+					tmp = g_locale_to_utf8(buf, buflen, NULL, NULL, &error);
+					if (error)
+						{
+						log_printf("Error converting locale strftime to UTF-8: %s\n", error->message);
+						g_error_free(error);
+						}
+					else
+						{
+						g_free(text_date_time);
+						text_date_time = g_strdup(tmp);
+						}
+					}
+					g_free(tmp);
+				}
+			putenv(time_zone_org);
+
+			g_free(time_zone);
+			g_free(time_zone_org);
+			}
+		else
+			{
+			log_printf("Error: Init of timezone database %s failed\n", zd_path);
+			}
+		ZDCloseDatabase(cd);
+		g_free(zd_path);
+		}
+
+	g_free(text_latitude);
+	g_free(text_longitude);
+	g_free(text_latitude_ref);
+	g_free(text_longitude_ref);
+	g_free(text_date);
+	g_free(text_time);
+
+	return text_date_time;
+}
+
+/**
+ * @brief Gets timezone from GPS lat/long
+ * @param exif 
+ * @returns Timezone string in the form "Europe/London"
+ * 
+ * 
+ */
+static gchar *exif_build_formatted_timezone(ExifData *exif)
+{
+	gfloat latitude;
+	gfloat longitude;
+	gchar *text_latitude;
+	gchar *text_longitude;
+	gchar *text_latitude_ref;
+	gchar *text_longitude_ref;
+	gchar *lat_deg;
+	gchar *lat_min;
+	gchar *lon_deg;
+	gchar *lon_min;
+	gchar *time_zone = NULL;
+	gchar *zd_path;
+	ZoneDetect *cd;
+	ZoneDetectResult *results;
+
+	text_latitude = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLatitude");
+	text_longitude = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLongitude");
+	text_latitude_ref = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLatitudeRef");
+	text_longitude_ref = exif_get_data_as_text(exif, "Exif.GPSInfo.GPSLongitudeRef");
+
+	if (text_latitude && text_longitude && text_latitude_ref &&
+						text_longitude_ref)
+		{
+		lat_deg = strtok(text_latitude, "deg'");
+		lat_min = strtok(NULL, "deg'");
+		latitude = atof(lat_deg) + atof(lat_min) / 60;
+		if (g_strcmp0(text_latitude_ref, "South") == 0)
+			{
+			latitude = -latitude;
+			}
+		lon_deg = strtok(text_longitude, "deg'");
+		lon_min = strtok(NULL, "deg'");
+		longitude = atof(lon_deg) + atof(lon_min) / 60;
+		if (g_strcmp0(text_longitude_ref, "West") == 0)
+			{
+			longitude = -longitude;
+			}
+		zd_path = g_build_filename(GQ_BIN_DIR, TIMEZONE_DATABASE, NULL);
+		cd = ZDOpenDatabase(zd_path);
+		if (cd)
+			{
+			results = ZDLookup(cd, latitude, longitude, NULL);
+			time_zone = zd_tz(results);
+			ZDFreeResults(results);
+			}
+		else
+			{
+			log_printf("Error: Init of timezone database %s failed\n", zd_path);
+			}
+		ZDCloseDatabase(cd);
+		g_free(zd_path);
+		}
+
+	g_free(text_latitude);
+	g_free(text_longitude);
+	g_free(text_latitude_ref);
+	g_free(text_longitude_ref);
+
+	return time_zone;
+}
+
+static gchar *exif_build_formatted_star_rating(ExifData *exif)
+{
+	gint n;
+
+	exif_get_integer(exif, "Xmp.xmp.Rating", &n);
+
+	return convert_rating_to_stars(n);
+}
 
 /* List of custom formatted pseudo-exif tags */
 #define EXIF_FORMATTED_TAG(name, label) { EXIF_FORMATTED()#name, label, exif_build_formatted##_##name }
@@ -627,9 +881,13 @@
 	EXIF_FORMATTED_TAG(ColorProfile,	N_("Color profile")),
 	EXIF_FORMATTED_TAG(GPSPosition,		N_("GPS position")),
 	EXIF_FORMATTED_TAG(GPSAltitude,		N_("GPS altitude")),
+	EXIF_FORMATTED_TAG(localtime,		N_("Local time")),
+	EXIF_FORMATTED_TAG(timezone,		N_("Time zone")),
+	EXIF_FORMATTED_TAG(star_rating,		N_("Star rating")),
 	{"file.size",				N_("File size"), 	NULL},
 	{"file.date",				N_("File date"), 	NULL},
 	{"file.mode",				N_("File mode"), 	NULL},
+	{"file.ctime",				N_("File ctime"), 	NULL},
 	{ NULL, NULL, NULL }
 };
 
@@ -890,6 +1148,10 @@
 		{
 		return mode_number(fd->mode);
 		}
+	if (strcmp(key, "file.ctime") == 0)
+		{
+		return g_strdup(text_from_time(fd->cdate));
+		}
 	return g_strdup("");
 }
 
--- a/src/exiv2.cc	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/exiv2.cc	Sat Jun 30 15:28:52 2018 +0300
@@ -374,7 +374,7 @@
 #endif
 			Exiv2::Image *image = imageData_->image();
 
-			if (!image) Exiv2::Error(21);
+			if (!image) throw Exiv2::Error(21);
 			image->setExifData(exifData_);
 			image->setIptcData(iptcData_);
 #if EXIV2_TEST_VERSION(0,16,0)
--- a/src/filedata.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/filedata.c	Sat Jun 30 15:28:52 2018 +0300
@@ -29,6 +29,7 @@
 #include "metadata.h"
 #include "trash.h"
 #include "histogram.h"
+#include "secure_save.h"
 
 #include "exif.h"
 
@@ -428,7 +429,7 @@
 	fd->ref = 1;
 	fd->magick = FD_MAGICK;
 	fd->exifdate = 0;
-	fd->rating = 0;
+	fd->rating = STAR_RATING_NOT_READ;
 	fd->format_class = filter_file_get_class(path_utf8);
 
 	if (disable_sidecars) fd->disable_grouping = TRUE;
@@ -476,7 +477,10 @@
 		return;
 		}
 
-	file->exif = exif_read_fd(file);
+	if (!file->exif)
+		{
+		exif_read_fd(file);
+		}
 
 	if (file->exif)
 		{
@@ -505,13 +509,16 @@
 
 void read_exif_time_digitized_data(FileData *file)
 {
-	if (file->exifdate > 0)
+	if (file->exifdate_digitized > 0)
 		{
 		DEBUG_1("%s set_exif_time_digitized_data: Already exists for %s", get_exec_time(), file->path);
 		return;
 		}
 
-	file->exif = exif_read_fd(file);
+	if (!file->exif)
+		{
+		exif_read_fd(file);
+		}
 
 	if (file->exif)
 		{
@@ -538,6 +545,18 @@
 		}
 }
 
+void read_rating_data(FileData *file)
+{
+	gchar *rating_str;
+
+	rating_str = metadata_read_string(file, RATING_KEY, METADATA_PLAIN);
+	if (rating_str)
+		{
+		file->rating = atoi(rating_str);
+		g_free(rating_str);
+		}
+}
+
 void set_exif_time_data(GList *files)
 {
 	DEBUG_1("%s set_exif_time_data: ...", get_exec_time());
@@ -1160,18 +1179,6 @@
 
 GList *filelist_sort(GList *list, SortType method, gboolean ascend)
 {
-	if (method == SORT_EXIFTIME)
-		{
-		set_exif_time_data(list);
-		}
-	if (method == SORT_EXIFTIMEDIGITIZED)
-		{
-		set_exif_time_digitized_data(list);
-		}
-	if (method == SORT_RATING)
-		{
-		set_rating_data(list);
-		}
 	return filelist_sort_full(list, method, ascend, (GCompareFunc) filelist_sort_file_cb);
 }
 
@@ -3159,4 +3166,133 @@
 
 	return TRUE;
 }
+
+/*
+ *-----------------------------------------------------------------------------
+ * Saving marks list, clearing marks
+ * Uses file_data_pool
+ *-----------------------------------------------------------------------------
+ */
+
+static void marks_get_files(gpointer key, gpointer value, gpointer userdata)
+{
+	gchar *file_name = key;
+	GString *result = userdata;
+	FileData *fd;
+
+	if (isfile(file_name))
+		{
+		fd = value;
+		if (fd && fd->marks > 0)
+			{
+			g_string_append_printf(result, "%s,%i\n", fd->path, fd->marks);
+			}
+		}
+}
+
+gboolean marks_list_load(const gchar *path)
+{
+	FILE *f;
+	gchar s_buf[1024];
+	gchar *pathl;
+	gchar *file_path;
+	gchar *marks_value;
+
+	pathl = path_from_utf8(path);
+	f = fopen(pathl, "r");
+	g_free(pathl);
+	if (!f) return FALSE;
+
+	/* first line must start with Marks comment */
+	if (!fgets(s_buf, sizeof(s_buf), f) ||
+					strncmp(s_buf, "#Marks", 6) != 0)
+		{
+		fclose(f);
+		return FALSE;
+		}
+
+	while (fgets(s_buf, sizeof(s_buf), f))
+		{
+		if (s_buf[0]=='#') continue;
+			file_path = strtok(s_buf, ",");
+			marks_value = strtok(NULL, ",");
+			if (isfile(file_path))
+				{
+				FileData *fd = file_data_new_group(file_path);
+				file_data_ref(fd);
+				gint n = 0;
+				while (n <= 9)
+					{
+					gint mark_no = 1 << n;
+					if (atoi(marks_value) & mark_no)
+						{
+						file_data_set_mark(fd, n , 1);
+						}
+					n++;
+					}
+				}
+		}
+
+	fclose(f);
+	return TRUE;
+}
+
+gboolean marks_list_save(gchar *path, gboolean save)
+{
+	SecureSaveInfo *ssi;
+	gchar *pathl;
+	GString  *marks = g_string_new("");
+
+	pathl = path_from_utf8(path);
+	ssi = secure_open(pathl);
+	g_free(pathl);
+	if (!ssi)
+		{
+		log_printf(_("Error: Unable to write marks lists to: %s\n"), path);
+		return FALSE;
+		}
+
+	secure_fprintf(ssi, "#Marks lists\n");
+
+	if (save)
+		{
+		g_hash_table_foreach(file_data_pool, marks_get_files, marks);
+		}
+	secure_fprintf(ssi, "%s", marks->str);
+	g_string_free(marks, FALSE);
+
+	secure_fprintf(ssi, "#end\n");
+	return (secure_close(ssi) == 0);
+}
+
+static void marks_clear(gpointer key, gpointer value, gpointer userdata)
+{
+	gchar *file_name = key;
+	gint mark_no;
+	gint n;
+	FileData *fd;
+
+	if (isfile(file_name))
+		{
+		fd = value;
+		if (fd && fd->marks > 0)
+			{
+			n = 0;
+			while (n <= 9)
+				{
+				mark_no = 1 << n;
+				if (fd->marks & mark_no)
+					{
+					file_data_set_mark(fd, n , 0);
+					}
+				n++;
+				}
+			}
+		}
+}
+
+void marks_clear_all()
+{
+	g_hash_table_foreach(file_data_pool, marks_clear, NULL);
+}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/filedata.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/filedata.h	Sat Jun 30 15:28:52 2018 +0300
@@ -163,5 +163,10 @@
 
 void read_exif_time_data(FileData *file);
 void read_exif_time_digitized_data(FileData *file);
+
+gboolean marks_list_save(gchar *path, gboolean clear);
+gboolean marks_list_load(const gchar *path);
+void marks_clear_all();
+void read_rating_data(FileData *file);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/img-view.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/img-view.c	Sat Jun 30 15:28:52 2018 +0300
@@ -940,41 +940,44 @@
 {
 	GList *list;
 
-	if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
+	if (fd)
 		{
-		ViewWindow *vw;
-		CollectionData *cd;
-		CollectInfo *info;
+		if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
+			{
+			ViewWindow *vw;
+			CollectionData *cd;
+			CollectInfo *info;
 
-		cd = collection_new(fd->path);
-		if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
+			cd = collection_new(fd->path);
+			if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
+				{
+				info = collection_get_first(cd);
+				}
+			else
+				{
+				collection_unref(cd);
+				cd = NULL;
+				info = NULL;
+				}
+			vw = real_view_window_new(NULL, NULL, cd, info);
+			if (vw && cd)
+				{
+				g_signal_connect(G_OBJECT(vw->window), "destroy",
+						 G_CALLBACK(view_window_collection_unref_cb), cd);
+				}
+			}
+		else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
 			{
-			info = collection_get_first(cd);
+			list = filelist_sort_path(list);
+			list = filelist_filter(list, FALSE);
+			real_view_window_new(NULL, list, NULL, NULL);
+			filelist_free(list);
 			}
 		else
 			{
-			collection_unref(cd);
-			cd = NULL;
-			info = NULL;
-			}
-		vw = real_view_window_new(NULL, NULL, cd, info);
-		if (vw && cd)
-			{
-			g_signal_connect(G_OBJECT(vw->window), "destroy",
-					 G_CALLBACK(view_window_collection_unref_cb), cd);
+			real_view_window_new(fd, NULL, NULL, NULL);
 			}
 		}
-	else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
-		{
-		list = filelist_sort_path(list);
-		list = filelist_filter(list, FALSE);
-		real_view_window_new(NULL, list, NULL, NULL);
-		filelist_free(list);
-		}
-	else
-		{
-		real_view_window_new(fd, NULL, NULL, NULL);
-		}
 }
 
 void view_window_new_from_list(GList *list)
--- a/src/layout.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/layout.c	Sat Jun 30 15:28:52 2018 +0300
@@ -363,6 +363,10 @@
 
 	type = (SortType)GPOINTER_TO_INT(data);
 
+	if (type == SORT_EXIFTIME || type == SORT_EXIFTIMEDIGITIZED || type == SORT_RATING)
+		{
+		vf_read_metadata_in_idle(lw->vf);
+		}
 	layout_sort_set(lw, type, lw->sort_ascend);
 }
 
@@ -547,11 +551,30 @@
 
 void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text)
 {
+	static gdouble thumb = 0;
+	static gdouble meta = 0;
+
 	if (!layout_valid(&lw)) return;
 	if (!lw->info_progress_bar) return;
 
+	/* Give priority to the loading meta data message
+	 */
+	if(!g_strcmp0(text, "Loading thumbs..."))
+		{
+		thumb = val;
+		if (meta)
+			{
+			return;
+			}
+		}
+	else
+		{
+		meta = val;
+		}
+
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(lw->info_progress_bar), val);
-	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), (text) ? text : " ");
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar),
+									val ? ((text) ? text : " ") : " ");
 }
 
 void layout_status_update_info(LayoutWindow *lw, const gchar *text)
@@ -777,7 +800,7 @@
 	gtk_widget_show(toolbar);
 	gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
 	lw->info_zoom = layout_zoom_button(lw, hbox, ZOOM_LABEL_WIDTH, TRUE);
-	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom mode"));
+	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom and scroll mode"));
 	gtk_widget_show(lw->info_zoom);
 
 	if (small_format)
@@ -1096,6 +1119,11 @@
 	if (options->metadata.confirm_on_dir_change && dir_changed)
 		metadata_write_queue_confirm(FALSE, NULL, NULL);
 
+	if (lw->vf && (options->read_metadata_in_idle || (lw->sort_method == SORT_EXIFTIME || lw->sort_method == SORT_EXIFTIMEDIGITIZED || lw->sort_method == SORT_RATING)))
+		{
+		vf_read_metadata_in_idle(lw->vf);
+		}
+
 	return TRUE;
 }
 
--- a/src/layout_image.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/layout_image.c	Sat Jun 30 15:28:52 2018 +0300
@@ -1125,6 +1125,7 @@
 static void image_alter_rating(FileData *fd_n, const gchar *rating)
 {
 	metadata_write_string(fd_n, RATING_KEY, rating);
+	read_rating_data(fd_n);
 }
 
 void layout_image_rating(LayoutWindow *lw, const gchar *rating)
--- a/src/layout_util.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/layout_util.c	Sat Jun 30 15:28:52 2018 +0300
@@ -231,6 +231,39 @@
 	return nw;
 }
 
+
+static void clear_marks_cancel_cb(GenericDialog *gd, gpointer data)
+{
+	generic_dialog_close(gd);
+}
+
+static void clear_marks_help_cb(GenericDialog *gd, gpointer data)
+{
+	help_window_show("GuideMainWindowMenus.html");
+}
+
+void layout_menu_clear_marks_ok_cb(GenericDialog *gd, gpointer data)
+{
+	marks_clear_all();
+	generic_dialog_close(gd);
+}
+
+static void layout_menu_clear_marks_cb(GtkAction *action, gpointer data)
+{
+	GenericDialog *gd;
+
+	gd = generic_dialog_new(_("Clear Marks"),
+				"marks_clear", NULL, FALSE, clear_marks_cancel_cb, NULL);
+	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, "Clear all marks?",
+				"This will clear all marks for all images,\nincluding those linked to keywords",
+				TRUE);
+	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, layout_menu_clear_marks_ok_cb, TRUE);
+	generic_dialog_add_button(gd, GTK_STOCK_HELP, NULL,
+				clear_marks_help_cb, FALSE);
+
+	gtk_widget_show(gd->dialog);
+}
+
 static void layout_menu_new_window_cb(GtkAction *action, gpointer data)
 {
 	layout_menu_new_window(action, data);
@@ -1092,6 +1125,14 @@
 	help_window_show("index.html");
 }
 
+static void layout_menu_help_search_cb(GtkAction *action, gpointer data)
+{
+	LayoutWindow *lw = data;
+
+	layout_exit_fullscreen(lw);
+	help_search_window_show();
+}
+
 static void layout_menu_help_keys_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
@@ -1803,7 +1844,7 @@
   { "Preferences",	GTK_STOCK_PREFERENCES,	N_("P_references..."),			"<control>O",		N_("Preferences..."),			CB(layout_menu_config_cb) },
   { "Plugins",		GTK_STOCK_PREFERENCES,	N_("Configure _Plugins..."),		NULL,			N_("Configure Plugins..."),		CB(layout_menu_editors_cb) },
   { "LayoutConfig",	GTK_STOCK_PREFERENCES,	N_("_Configure this window..."),	NULL,			N_("Configure this window..."),		CB(layout_menu_layout_config_cb) },
-  { "Maintenance",	GTK_STOCK_FILE,			N_("_Thumbnail maintenance..."),	NULL,			N_("Thumbnail maintenance..."),		CB(layout_menu_remove_thumb_cb) },
+  { "Maintenance",	GTK_STOCK_FILE,			N_("_Cache maintenance..."),	NULL,			N_("Cache maintenance..."),		CB(layout_menu_remove_thumb_cb) },
   { "Wallpaper",	NULL,			N_("Set as _wallpaper"),		NULL,			N_("Set as wallpaper"),			CB(layout_menu_wallpaper_cb) },
   { "SaveMetadata",	GTK_STOCK_SAVE,		N_("_Save metadata"),			"<control>S",		N_("Save metadata"),			CB(layout_menu_metadata_write_cb) },
   { "ZoomIn",		GTK_STOCK_ZOOM_IN,	N_("Zoom _in"),				"equal",		N_("Zoom in"),				CB(layout_menu_zoom_in_cb) },
@@ -1853,6 +1894,7 @@
   { "SlideShowSlower",	GTK_STOCK_FILE,	N_("Slower"), 		"<control>KP_Subtract",			N_("Slower"), 			CB(layout_menu_slideshow_slower_cb) },
   { "Refresh",		GTK_STOCK_REFRESH,	N_("_Refresh"),				"R",			N_("Refresh"),				CB(layout_menu_refresh_cb) },
   { "HelpContents",	GTK_STOCK_HELP,		N_("_Contents"),			"F1",			N_("Contents"),				CB(layout_menu_help_cb) },
+  { "HelpSearch",	NULL,		N_("On-line help search"),			NULL,			N_("On-line help search"),				CB(layout_menu_help_search_cb) },
   { "HelpShortcuts",	NULL,			N_("_Keyboard shortcuts"),		NULL,			N_("Keyboard shortcuts"),		CB(layout_menu_help_keys_cb) },
   { "HelpKbd",		NULL,			N_("_Keyboard map"),			NULL,			N_("Keyboard map"),			CB(layout_menu_kbd_map_cb) },
   { "HelpNotes",	NULL,			N_("_Release notes"),			NULL,			N_("Release notes"),			CB(layout_menu_notes_cb) },
@@ -1867,7 +1909,7 @@
   { "SplitDownPane",	NULL,			N_("_Down Pane"),	"<alt>Down",			N_("Down Pane"),	CB(layout_menu_split_pane_updown_cb) },
   { "WriteRotation",	NULL,			N_("_Write orientation to file"),  		NULL,		N_("Write orientation to file"),			CB(layout_menu_write_rotate_cb) },
   { "WriteRotationKeepDate",	NULL,			N_("_Write orientation to file (preserve timestamp)"),  		NULL,		N_("Write orientation to file (preserve timestamp)"),			CB(layout_menu_write_rotate_keep_date_cb) },
-
+  { "ClearMarks",	NULL,		N_("Clear Marks..."),			NULL,		N_("Clear Marks"),			CB(layout_menu_clear_marks_cb) },
 };
 
 static GtkToggleActionEntry menu_toggle_entries[] = {
@@ -1991,6 +2033,7 @@
 "      <placeholder name='ClipboardSection'/>"
 "      <separator/>"
 "      <menuitem action='ShowMarks'/>"
+"      <menuitem action='ClearMarks'/>"
 "      <placeholder name='MarksSection'/>"
 "      <separator/>"
 "    </menu>"
@@ -2155,6 +2198,7 @@
 "    <menu action='HelpMenu'>"
 "      <separator/>"
 "      <menuitem action='HelpContents'/>"
+"      <menuitem action='HelpSearch'/>"
 "      <menuitem action='HelpShortcuts'/>"
 "      <menuitem action='HelpKbd'/>"
 "      <menuitem action='HelpNotes'/>"
--- a/src/logwindow.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/logwindow.c	Sat Jun 30 15:28:52 2018 +0300
@@ -165,6 +165,7 @@
 	gtk_box_pack_start(GTK_BOX(win_vbox), scrolledwin, TRUE, TRUE, 0);
 	gtk_widget_show(scrolledwin);
 
+#ifdef DEBUG
 	hbox = pref_box_new(win_vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 
 	gtk_widget_show(hbox);
@@ -188,6 +189,7 @@
 	gtk_widget_show(textbox);
 	g_signal_connect(G_OBJECT(textbox), "activate",
 			 G_CALLBACK(log_window_regexp_cb), logwin);
+#endif
 
 	text = gtk_text_view_new();
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
--- a/src/main.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/main.c	Sat Jun 30 15:28:52 2018 +0300
@@ -510,6 +510,7 @@
  */
 
 #define RC_HISTORY_NAME "history"
+#define RC_MARKS_NAME "marks"
 
 static void setup_env_path(void)
 {
@@ -537,6 +538,24 @@
 	g_free(path);
 }
 
+static void marks_load(void)
+{
+	gchar *path;
+
+	path = g_build_filename(get_rc_dir(), RC_MARKS_NAME, NULL);
+	marks_list_load(path);
+	g_free(path);
+}
+
+static void marks_save(gboolean save)
+{
+	gchar *path;
+
+	path = g_build_filename(get_rc_dir(), RC_MARKS_NAME, NULL);
+	marks_list_save(path, save);
+	g_free(path);
+}
+
 static void mkdir_if_not_exists(const gchar *path)
 {
 	if (isdir(path)) return;
@@ -753,6 +772,8 @@
 
 	if (metadata_write_queue_confirm(FALSE, exit_program_write_metadata_cb, NULL)) return;
 
+	options->marks_save ? marks_save(TRUE) : marks_save(FALSE);
+
 	if (exit_confirm_dlg()) return;
 
 	exit_program_final();
@@ -988,6 +1009,8 @@
 	remote_connection = remote_server_init(buf, cd);
 	g_free(buf);
 
+	marks_load();
+
 	DEBUG_1("%s main: gtk_main", get_exec_time());
 	gtk_main();
 #ifdef HAVE_GTHREAD
--- a/src/main.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/main.h	Sat Jun 30 15:28:52 2018 +0300
@@ -115,7 +115,8 @@
 				"(%number%/%total%) [%zoom%] <b>%name%</b>\n" \
 				"%res%|%date%|%size%\n" \
 				"%formatted.Aperture%|%formatted.ShutterSpeed%|%formatted.ISOSpeedRating:ISO *%|%formatted.FocalLength%|%formatted.ExposureBias:* Ev%\n" \
-				"%formatted.Camera:40%|%formatted.Flash%"
+				"%formatted.Camera:40%|%formatted.Flash%\n"            \
+				"%formatted.star_rating%"
 
 #define GQ_LINK_STR "↗"
 #include "typedefs.h"
@@ -123,6 +124,15 @@
 #include "options.h"
 
 #define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop"
+
+#define TIMEZONE_DATABASE "timezone21.bin"
+
+#define HELP_SEARCH_ENGINE "https://duckduckgo.com/?q=site:geeqie.org/help "
+
+#define STAR_RATING_NOT_READ -12345
+#define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark'
+#define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star'
+
 /*
  *----------------------------------------------------------------------------
  * main.c
--- a/src/metadata.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/metadata.c	Sat Jun 30 15:28:52 2018 +0300
@@ -749,6 +749,16 @@
 	return ret;
 }
 
+gchar *metadata_read_rating_stars(FileData *fd)
+{
+	gchar *ret;
+	gint n = metadata_read_int(fd, RATING_KEY, METADATA_PLAIN);
+
+	ret = convert_rating_to_stars(n);
+
+	return ret;
+}
+
 gdouble metadata_read_GPS_coord(FileData *fd, const gchar *key, gdouble fallback)
 {
 	gdouble coord;
--- a/src/metadata.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/metadata.h	Sat Jun 30 15:28:52 2018 +0300
@@ -112,5 +112,6 @@
 GtkTreeIter *keyword_add_from_config(GtkTreeStore *keyword_tree, GtkTreeIter *parent, const gchar **attribute_names, const gchar **attribute_values);
 
 void keyword_tree_disconnect_marks();
+gchar *metadata_read_rating_stars(FileData *fd);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/misc.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/misc.c	Sat Jun 30 15:28:52 2018 +0300
@@ -22,6 +22,8 @@
 #include "misc.h"
 #include "ui_fileops.h"
 
+#include <langinfo.h>
+
 gdouble get_zoom_increment(void)
 {
 	return ((options->image.zoom_increment != 0) ? (gdouble)options->image.zoom_increment / 100.0 : 1.0);
@@ -237,5 +239,88 @@
 #endif
 }
 
+/**
+ * @brief Returns integer representing first_day_of_week
+ * @returns Integer in range 1 to 7
+ * 
+ * Uses current locale to get first day of week
+ * 
+ * Sunday == 1
+ */
+gint date_get_first_day_of_week()
+{
+	return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0];
+}
+
+/**
+ * @brief Get an abbreviated day name from locale
+ * @param day Integer in range 1 to 7, representing day of week
+ * @returns String containing abbreviated day name
+ * 
+ *  Uses current locale to get day name
+ * 
+ * Sunday == 1
+ * Result must be freed
+ */
+gchar *date_get_abbreviated_day_name(gint day)
+{
+	gchar *abday = NULL;
+
+	switch (day)
+		{
+		case 1:
+		abday = g_strdup(nl_langinfo(ABDAY_1));
+		break;
+		case 2:
+		abday = g_strdup(nl_langinfo(ABDAY_2));
+		break;
+		case 3:
+		abday = g_strdup(nl_langinfo(ABDAY_3));
+		break;
+		case 4:
+		abday = g_strdup(nl_langinfo(ABDAY_4));
+		break;
+		case 5:
+		abday = g_strdup(nl_langinfo(ABDAY_5));
+		break;
+		case 6:
+		abday = g_strdup(nl_langinfo(ABDAY_6));
+		break;
+		case 7:
+		abday = g_strdup(nl_langinfo(ABDAY_7));
+		break;
+		}
+
+	return abday;
+}
+
+gchar *convert_rating_to_stars(gint rating)
+{
+	gchar *ret;
+	GString *str = g_string_new(NULL);
+
+	if (rating == -1)
+		{
+		str = g_string_append_unichar(str, options->star_rating.rejected);
+		ret = g_strdup(str->str);
+		g_string_free(str, TRUE);
+		}
+	else if (rating > 0 && rating < 6)
+		{
+		while (rating > 0)
+			{
+			str = g_string_append_unichar(str, options->star_rating.star);
+			rating = rating - 1;
+			}
+		ret = g_strdup(str->str);
+		g_string_free(str, TRUE);
+		}
+	else
+		{
+		ret = g_strdup("");
+		}
+
+	return ret;
+}
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/misc.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/misc.h	Sat Jun 30 15:28:52 2018 +0300
@@ -27,6 +27,8 @@
 gchar *expand_tilde(const gchar *filename);
 int runcmd(gchar *cmd);
 gchar *decode_geo_parameters(const gchar *input_text);
-
+gint date_get_first_day_of_week();
+gchar *date_get_abbreviated_day_name(gint day);
+gchar *convert_rating_to_stars(gint rating);
 #endif /* MISC_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/options.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/options.c	Sat Jun 30 15:28:52 2018 +0300
@@ -34,6 +34,8 @@
 
 ConfOptions *init_options(ConfOptions *options)
 {
+	gint i;
+
 	if (!options) options = g_new0(ConfOptions, 1);
 
 	options->collections.rectangular_selection = FALSE;
@@ -79,6 +81,9 @@
 	options->fullscreen.disable_saver = TRUE;
 	options->fullscreen.screen = -1;
 
+	options->marks_save = TRUE;
+	options->with_rename = FALSE;
+
 	memset(&options->image.border_color, 0, sizeof(options->image.border_color));
 	memset(&options->image.alpha_color_1, 0, sizeof(options->image.alpha_color_1));
 	memset(&options->image.alpha_color_2, 0, sizeof(options->image.alpha_color_2));
@@ -149,6 +154,7 @@
 	options->metadata.sidecar_extended_name = FALSE;
 
 	options->show_icon_names = TRUE;
+	options->show_star_rating = FALSE;
 
 	options->slideshow.delay = 50;
 	options->slideshow.random = FALSE;
@@ -182,6 +188,9 @@
 	options->log_window.paused = FALSE;
 	options->log_window.timer_data = FALSE;
 
+	options->read_metadata_in_idle = FALSE;
+	options->star_rating.star = STAR_RATING_STAR;
+	options->star_rating.rejected = STAR_RATING_REJECTED;
 	return options;
 }
 
@@ -211,6 +220,13 @@
 
 	options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
 	options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
+
+	for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+		{
+		options->marks_tooltips[i] = g_strdup_printf("%s%d", _("Mark "), i + 1);
+		}
+
+	options->help_search_engine = g_strdup(HELP_SEARCH_ENGINE);
 }
 
 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
--- a/src/options.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/options.h	Sat Jun 30 15:28:52 2018 +0300
@@ -34,6 +34,7 @@
 	gboolean image_l_click_video;
 	gchar *image_l_click_video_editor;
 	gboolean show_icon_names;
+	gboolean show_star_rating;
 
 	/* various */
 	gboolean tree_descend_subdirs;
@@ -61,6 +62,13 @@
 
 	gint log_window_lines;
 
+	gboolean marks_save;		// save marks on exit
+	gchar *marks_tooltips[FILEDATA_MARKS_SIZE];
+
+	gboolean with_rename;
+
+	gchar *help_search_engine;
+
 	/* info sidebar component heights */
 	struct {
 		gint height;
@@ -281,6 +289,14 @@
 		gboolean line_wrap;
 		gboolean timer_data;
 	} log_window;
+
+	/* star rating */
+	struct {
+		gunichar star;
+		gunichar rejected;
+	} star_rating;
+
+	gboolean read_metadata_in_idle;
 };
 
 ConfOptions *options;
--- a/src/pan-view/pan-calendar.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-calendar.c	Sat Jun 30 15:28:52 2018 +0300
@@ -24,6 +24,7 @@
 #include <glib/gprintf.h>
 #include <math.h>
 
+#include "misc.h"
 #include "pan-util.h"
 #include "pan-view.h"
 #include "pan-view-filter.h"
@@ -55,6 +56,7 @@
 #define PAN_CAL_DOT_COLOR 128, 128, 128
 #define PAN_CAL_DOT_ALPHA 128
 
+#define PAN_CAL_DAY_OF_WEEK_COLOR 128, 128, 128
 
 /*
  *-----------------------------------------------------------------------------
@@ -199,9 +201,10 @@
 	gint month = 0;
 	gint end_year = 0;
 	gint end_month = 0;
+	gint day_of_week;
 
 	list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks);
-	pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
+	pan_filter_fd_list(&list, pw->filter_ui->filter_elements, pw->filter_ui->filter_classes);
 
 	if (pw->cache_list && pw->exif_date_enable)
 		{
@@ -267,6 +270,7 @@
 		{
 		PanItem *pi_month;
 		PanItem *pi_text;
+		PanItem *pi_day_number;
 		gint day;
 		gint days;
 		gint col;
@@ -293,6 +297,8 @@
 		days = pan_date_value(dt, PAN_DATE_LENGTH_DAY);
 		dt = pan_date_to_time(year, month, 1);
 		col = pan_date_value(dt, PAN_DATE_LENGTH_WEEK);
+		col = col - (date_get_first_day_of_week() - 1);
+		if (col < 0) col = col + 7;
 		row = 1;
 
 		x = PAN_BOX_BORDER;
@@ -388,11 +394,19 @@
 				}
 
 			buf = g_strdup_printf("%d", day);
-			pan_item_text_new(pw, x + 4, y + 4, buf, PAN_TEXT_ATTR_BOLD | PAN_TEXT_ATTR_HEADING,
+			pi_day_number = pan_item_text_new(pw, x + 4, y + 4, buf, PAN_TEXT_ATTR_BOLD | PAN_TEXT_ATTR_HEADING,
 					  PAN_TEXT_BORDER_SIZE,
 					  PAN_CAL_DAY_TEXT_COLOR, 255);
 			g_free(buf);
 
+			day_of_week = date_get_first_day_of_week() + col;
+			if (day_of_week > 7) day_of_week = day_of_week - 7;
+
+			buf = date_get_abbreviated_day_name(day_of_week);
+			pan_item_text_new(pw, x + 4 + pi_day_number->width + 4, y + 4, buf, PAN_TEXT_ATTR_NONE,
+					  PAN_TEXT_BORDER_SIZE,
+					  PAN_CAL_DAY_OF_WEEK_COLOR, 255);
+			g_free(buf);
 
 			pan_item_size_coordinates(pi_day, PAN_BOX_BORDER, width, height);
 
--- a/src/pan-view/pan-folder.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-folder.c	Sat Jun 30 15:28:52 2018 +0300
@@ -243,7 +243,7 @@
 	f = filelist_sort(f, SORT_NAME, TRUE);
 	d = filelist_sort(d, SORT_NAME, TRUE);
 
-	pan_filter_fd_list(&f, pw->filter_ui->filter_elements);
+	pan_filter_fd_list(&f, pw->filter_ui->filter_elements, pw->filter_ui->filter_classes);
 
 	pi_box = pan_item_text_new(pw, x, y, dir_fd->path, PAN_TEXT_ATTR_NONE,
 				   PAN_TEXT_BORDER_SIZE,
@@ -389,7 +389,7 @@
 	f = filelist_sort(f, SORT_NAME, TRUE);
 	d = filelist_sort(d, SORT_NAME, TRUE);
 
-	pan_filter_fd_list(&f, pw->filter_ui->filter_elements);
+	pan_filter_fd_list(&f, pw->filter_ui->filter_elements, pw->filter_ui->filter_classes);
 
 	*x = PAN_BOX_BORDER + ((*level) * MAX(PAN_BOX_BORDER, PAN_THUMB_GAP));
 
--- a/src/pan-view/pan-grid.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-grid.c	Sat Jun 30 15:28:52 2018 +0300
@@ -36,7 +36,7 @@
 	gint next_y;
 
 	list = pan_list_tree(dir_fd, SORT_NAME, TRUE, pw->ignore_symlinks);
-	pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
+	pan_filter_fd_list(&list, pw->filter_ui->filter_elements, pw->filter_ui->filter_classes);
 
 	grid_size = (gint)sqrt((gdouble)g_list_length(list));
 	if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)
--- a/src/pan-view/pan-timeline.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-timeline.c	Sat Jun 30 15:28:52 2018 +0300
@@ -42,7 +42,7 @@
 	gint y_height;
 
 	list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks);
-	pan_filter_fd_list(&list, pw->filter_ui->filter_elements);
+	pan_filter_fd_list(&list, pw->filter_ui->filter_elements, pw->filter_ui->filter_classes);
 
 	if (pw->cache_list && pw->exif_date_enable)
 		{
--- a/src/pan-view/pan-view-filter.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-view-filter.c	Sat Jun 30 15:28:52 2018 +0300
@@ -35,6 +35,7 @@
 	PanViewFilterUi *ui = g_new0(PanViewFilterUi, 1);
 	GtkWidget *combo;
 	GtkWidget *hbox;
+	gint i;
 
 	/* Since we're using the GHashTable as a HashSet (in which key and value pointers
 	 * are always identical), specifying key _and_ value destructor callbacks will
@@ -70,7 +71,7 @@
 	pref_spacer(ui->filter_box, 0);
 	pref_label_new(ui->filter_box, _("Keyword Filter:"));
 
-	gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_mode_combo, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_mode_combo, FALSE, FALSE, 0);
 	gtk_widget_show(ui->filter_mode_combo);
 
 	hbox = gtk_hbox_new(TRUE, PREF_PAD_SPACE);
@@ -106,6 +107,23 @@
 	g_signal_connect(G_OBJECT(ui->filter_button), "clicked",
 			 G_CALLBACK(pan_filter_toggle_cb), pw);
 
+	// Add check buttons for filtering by image class
+	for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+	{
+		ui->filter_check_buttons[i] = gtk_check_button_new_with_label(_(format_class_list[i]));
+		gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_check_buttons[i], FALSE, FALSE, 0);
+		gtk_widget_show(ui->filter_check_buttons[i]);
+	}
+
+	gtk_toggle_button_set_active((GtkToggleButton *)ui->filter_check_buttons[FORMAT_CLASS_IMAGE], TRUE);
+	gtk_toggle_button_set_active((GtkToggleButton *)ui->filter_check_buttons[FORMAT_CLASS_RAWIMAGE], TRUE);
+	gtk_toggle_button_set_active((GtkToggleButton *)ui->filter_check_buttons[FORMAT_CLASS_VIDEO], TRUE);
+	ui->filter_classes = (1 << FORMAT_CLASS_IMAGE) | (1 << FORMAT_CLASS_RAWIMAGE) | (1 << FORMAT_CLASS_VIDEO);
+
+	// Connecting the signal before setting the state causes segfault as pw is not yet prepared
+	for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+		g_signal_connect((GtkToggleButton *)(ui->filter_check_buttons[i]), "toggled", G_CALLBACK(pan_filter_toggle_button_cb), pw);
+
 	return ui;
 }
 
@@ -248,6 +266,23 @@
 		}
 }
 
+void pan_filter_toggle_button_cb(GtkWidget *button, gpointer data)
+{
+	PanWindow *pw = data;
+	PanViewFilterUi *ui = pw->filter_ui;
+
+	gint old_classes = ui->filter_classes;
+	ui->filter_classes = 0;
+
+	for (gint i = 0; i < FILE_FORMAT_CLASSES; i++)
+	{
+		ui->filter_classes |= gtk_toggle_button_get_active((GtkToggleButton *)ui->filter_check_buttons[i]) ? 1 << i : 0;
+	}
+
+	if (ui->filter_classes != old_classes) 
+		pan_layout_update(pw);
+}
+
 static gboolean pan_view_list_contains_kw_pattern(GList *haystack, PanViewFilterElement *filter, gchar **found_kw)
 {
 	if (filter->kw_regex)
@@ -275,16 +310,17 @@
 		}
 }
 
-gboolean pan_filter_fd_list(GList **fd_list, GList *filter_elements)
+gboolean pan_filter_fd_list(GList **fd_list, GList *filter_elements, gint filter_classes)
 {
 	GList *work;
 	gboolean modified = FALSE;
 	GHashTable *seen_kw_table = NULL;
 
-	if (!fd_list || !*fd_list || !filter_elements) return modified;
+	if (!fd_list || !*fd_list) return modified;
 
 	// seen_kw_table is only valid in this scope, so don't take ownership of any strings.
-	seen_kw_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	if (filter_elements)
+		seen_kw_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 
 	work = *fd_list;
 	while (work)
@@ -293,54 +329,61 @@
 		GList *last_work = work;
 		work = work->next;
 
-		// TODO(xsdg): OPTIMIZATION Do the search inside of metadata.c to avoid a
-		// bunch of string list copies.
-		GList *img_keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
-
-		// TODO(xsdg): OPTIMIZATION Determine a heuristic for when to linear-search the
-		// keywords list, and when to build a hash table for the image's keywords.
 		gboolean should_reject = FALSE;
 		gchar *group_kw = NULL;
-		GList *filter_element = filter_elements;
-		while (filter_element)
+
+		if (!((1 << fd -> format_class) & filter_classes))
+			{
+			should_reject = TRUE;
+			}
+		else if (filter_elements)
 			{
-			PanViewFilterElement *filter = filter_element->data;
-			filter_element = filter_element->next;
-			gchar *found_kw = NULL;
-			gboolean has_kw = pan_view_list_contains_kw_pattern(img_keywords, filter, &found_kw);
+			// TODO(xsdg): OPTIMIZATION Do the search inside of metadata.c to avoid a
+			// bunch of string list copies.
+			GList *img_keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
 
-			switch (filter->mode)
+			// TODO(xsdg): OPTIMIZATION Determine a heuristic for when to linear-search the
+			// keywords list, and when to build a hash table for the image's keywords.
+			GList *filter_element = filter_elements;
+
+			while (filter_element)
 				{
-				case PAN_VIEW_FILTER_REQUIRE:
-					should_reject |= !has_kw;
-					break;
-				case PAN_VIEW_FILTER_EXCLUDE:
-					should_reject |= has_kw;
-					break;
-				case PAN_VIEW_FILTER_INCLUDE:
-					if (has_kw) should_reject = FALSE;
-					break;
-				case PAN_VIEW_FILTER_GROUP:
-					if (has_kw)
-						{
-						if (g_hash_table_contains(seen_kw_table, found_kw))
+				PanViewFilterElement *filter = filter_element->data;
+				filter_element = filter_element->next;
+				gchar *found_kw = NULL;
+				gboolean has_kw = pan_view_list_contains_kw_pattern(img_keywords, filter, &found_kw);
+
+				switch (filter->mode)
+					{
+					case PAN_VIEW_FILTER_REQUIRE:
+						should_reject |= !has_kw;
+						break;
+					case PAN_VIEW_FILTER_EXCLUDE:
+						should_reject |= has_kw;
+						break;
+					case PAN_VIEW_FILTER_INCLUDE:
+						if (has_kw) should_reject = FALSE;
+						break;
+					case PAN_VIEW_FILTER_GROUP:
+						if (has_kw)
 							{
-							should_reject = TRUE;
-							}
-						else if (group_kw == NULL)
-							{
-							group_kw = found_kw;
+							if (g_hash_table_contains(seen_kw_table, found_kw))
+								{
+								should_reject = TRUE;
+								}
+							else if (group_kw == NULL)
+								{
+								group_kw = found_kw;
+								}
 							}
-						}
-					break;
+						break;
+					}
 				}
+			string_list_free(img_keywords);
+			if (!should_reject && group_kw != NULL) g_hash_table_add(seen_kw_table, group_kw);
+			group_kw = NULL;  // group_kw references an item from img_keywords.
 			}
 
-		if (!should_reject && group_kw != NULL) g_hash_table_add(seen_kw_table, group_kw);
-
-		group_kw = NULL;  // group_kw references an item from img_keywords.
-		string_list_free(img_keywords);
-
 		if (should_reject)
 			{
 			*fd_list = g_list_delete_link(*fd_list, last_work);
@@ -348,6 +391,8 @@
 			}
 		}
 
-	g_hash_table_destroy(seen_kw_table);
+	if (filter_elements)
+		g_hash_table_destroy(seen_kw_table);
+
 	return modified;
 }
--- a/src/pan-view/pan-view-filter.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-view-filter.h	Sat Jun 30 15:28:52 2018 +0300
@@ -55,15 +55,18 @@
 	GtkWidget *filter_button;
 	GtkWidget *filter_button_arrow;
 	GtkWidget *filter_kw_hbox;
+	GtkWidget *filter_check_buttons[FILE_FORMAT_CLASSES];
 	GtkListStore *filter_mode_model;
 	GtkWidget *filter_mode_combo;
 	GList *filter_elements;  // List of PanViewFilterElement.
+	gint filter_classes;
 };
 
 void pan_filter_toggle_visible(PanWindow *pw, gboolean enable);
 void pan_filter_activate(PanWindow *pw);
 void pan_filter_activate_cb(const gchar *text, gpointer data);
 void pan_filter_toggle_cb(GtkWidget *button, gpointer data);
+void pan_filter_toggle_button_cb(GtkWidget *button, gpointer data);
 
 // Creates a new PanViewFilterUi instance and returns it.
 PanViewFilterUi *pan_filter_ui_new(PanWindow *pw);
@@ -71,7 +74,7 @@
 // Destroys the specified PanViewFilterUi and sets the pointer to NULL.
 void pan_filter_ui_destroy(PanViewFilterUi **ui);
 
-gboolean pan_filter_fd_list(GList **fd_list, GList *filter_elements);
+gboolean pan_filter_fd_list(GList **fd_list, GList *filter_elements, gint filter_classes);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/pan-view/pan-view.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/pan-view/pan-view.c	Sat Jun 30 15:28:52 2018 +0300
@@ -1322,10 +1322,31 @@
 
 static void pan_info_add_exif(PanTextAlignment *ta, FileData *fd)
 {
+	GList *exif_list;
+	gchar *text;
+	gchar *title;
+	gchar *key;
 
 	if (!fd) return;
 
-	pan_text_alignment_add(ta, NULL, NULL);
+	exif_list = bar_pane_exif_list();
+	while (exif_list)
+		{
+		title = exif_list->data;
+		exif_list = exif_list->next;
+		key = exif_list->data;
+		exif_list = exif_list->next;
+
+		text = metadata_read_string(fd, key, METADATA_FORMATTED);
+		if (text && text[0] != '\0')
+			{
+			pan_text_alignment_add(ta, title, text);
+			}
+
+		g_free(text);
+		}
+
+	string_list_free(exif_list);
 }
 
 
@@ -1713,18 +1734,6 @@
 	g_free(path);
 }
 
-static void pan_window_entry_change_cb(GtkWidget *combo, gpointer data)
-{
-	PanWindow *pw = data;
-	gchar *text;
-
-	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) < 0) return;
-
-	text = g_strdup(gtk_entry_get_text(GTK_ENTRY(pw->path_entry)));
-	pan_window_entry_activate_cb(text, pw);
-	g_free(text);
-}
-
 static void pan_window_close(PanWindow *pw)
 {
 	pan_window_list = g_list_remove(pan_window_list, pw);
@@ -1814,8 +1823,6 @@
 	pref_label_new(box, _("Location:"));
 	combo = tab_completion_new_with_history(&pw->path_entry, dir_fd->path, "pan_view_path", -1,
 						pan_window_entry_activate_cb, pw);
-	g_signal_connect(G_OBJECT(gtk_widget_get_parent(pw->path_entry)), "changed",
-			 G_CALLBACK(pan_window_entry_change_cb), pw);
 	gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
 	gtk_widget_show(combo);
 
@@ -2057,6 +2064,21 @@
 		}
 }
 
+static void pan_go_to_original_cb(GtkWidget *widget, gpointer data)
+{
+	LayoutWindow *lw = NULL;
+	PanWindow *pw = data;
+	FileData *fd;
+
+	if (!layout_valid(&lw)) return;
+
+	fd = pan_menu_click_fd(pw);
+	if (fd)
+		{
+		layout_set_fd(lw, fd);
+		}
+}
+
 static void pan_edit_cb(GtkWidget *widget, gpointer data)
 {
 	PanWindow *pw;
@@ -2197,6 +2219,13 @@
 	filelist_free(editmenu_fd_list);
 }
 
+static void pan_play_cb(GtkWidget *widget, gpointer data)
+{
+	PanWindow *pw = data;
+
+	start_editor_from_file(options->image_l_click_video_editor, pw->click_pi->fd);
+}
+
 static GList *pan_view_get_fd_list(PanWindow *pw)
 {
 	GList *list = NULL;
@@ -2231,13 +2260,18 @@
 	GtkWidget *menu;
 	GtkWidget *submenu;
 	GtkWidget *item;
-	gboolean active;
+	gboolean active, video;
 	GList *editmenu_fd_list;
 
 	active = (pw->click_pi != NULL);
+	video = (active && pw->click_pi->fd && pw->click_pi->fd->format_class == FORMAT_CLASS_VIDEO);
 
 	menu = popup_menu_short_lived();
 
+	menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video,
+			    G_CALLBACK(pan_play_cb), pw);
+	menu_item_add_divider(menu);
+
 	menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN,
 			    G_CALLBACK(pan_zoom_in_cb), pw);
 	menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT,
@@ -2255,6 +2289,8 @@
 
 	menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active,
 				      G_CALLBACK(pan_new_window_cb), pw);
+	menu_item_add_stock(menu, _("Go to original"), GTK_STOCK_FIND,
+			G_CALLBACK(pan_go_to_original_cb), pw);
 
 	menu_item_add_divider(menu);
 	menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active,
--- a/src/preferences.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/preferences.c	Sat Jun 30 15:28:52 2018 +0300
@@ -46,6 +46,7 @@
 #include "ui_tabcomp.h"
 #include "ui_utildlg.h"
 #include "window.h"
+#include "zonedetect.h"
 
 #include <math.h>
 
@@ -103,7 +104,7 @@
 	AE_ACCEL
 };
 
-static gchar *format_class_list[] = {
+gchar *format_class_list[] = {
 	N_("Unknown"),
 	N_("Image"),
 	N_("RAW Image"),
@@ -130,6 +131,7 @@
 static GtkWidget *color_profile_screen_file_entry;
 
 static GtkWidget *sidecar_ext_entry;
+static GtkWidget *help_search_engine_entry;
 
 
 #define CONFIG_WINDOW_DEF_WIDTH		700
@@ -406,6 +408,14 @@
 	options->info_comment.height = c_options->info_comment.height;
 	options->info_rating.height = c_options->info_rating.height;
 
+	options->marks_save = c_options->marks_save;
+	options->with_rename = c_options->with_rename;
+	config_entry_to_option(help_search_engine_entry, &options->help_search_engine, NULL);
+
+	options->read_metadata_in_idle = c_options->read_metadata_in_idle;
+
+	options->star_rating.star = c_options->star_rating.star;
+	options->star_rating.rejected = c_options->star_rating.rejected;
 #ifdef DEBUG
 	set_debug_level(debug_c);
 #endif
@@ -1580,6 +1590,107 @@
 		}
 }
 
+static void help_search_engine_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
+									GdkEvent *event, gpointer userdata)
+{
+	if (pos == GTK_ENTRY_ICON_PRIMARY)
+		{
+		gtk_entry_set_text(GTK_ENTRY(userdata), HELP_SEARCH_ENGINE);
+		}
+	else
+		{
+		gtk_entry_set_text(GTK_ENTRY(userdata), "");
+		}
+}
+
+static void star_rating_star_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
+									GdkEvent *event, gpointer userdata)
+{
+	gchar *rating_symbol;
+
+	if (pos == GTK_ENTRY_ICON_PRIMARY)
+		{
+		rating_symbol = g_strdup_printf("U+%X", STAR_RATING_STAR);
+		gtk_entry_set_text(GTK_ENTRY(userdata), rating_symbol);
+		g_free(rating_symbol);
+		}
+	else
+		{
+		gtk_entry_set_text(GTK_ENTRY(userdata), "U+");
+		gtk_widget_grab_focus(GTK_WIDGET(userdata));
+		gtk_editable_select_region(GTK_EDITABLE(userdata), 2, 2);
+		}
+}
+
+static void star_rating_rejected_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
+									GdkEvent *event, gpointer userdata)
+{
+	gchar *rating_symbol;
+
+	if (pos == GTK_ENTRY_ICON_PRIMARY)
+		{
+		rating_symbol = g_strdup_printf("U+%X", STAR_RATING_REJECTED);
+		gtk_entry_set_text(GTK_ENTRY(userdata), rating_symbol);
+		g_free(rating_symbol);
+		}
+	else
+		{
+		gtk_entry_set_text(GTK_ENTRY(userdata), "U+");
+		gtk_widget_grab_focus(GTK_WIDGET(userdata));
+		gtk_editable_select_region(GTK_EDITABLE(userdata), 2, 2);
+		}
+}
+
+static guint star_rating_symbol_test(GtkWidget *widget, gpointer data)
+{
+	GtkContainer *hbox = data;
+	GString *str = g_string_new(NULL);
+	GtkEntry *hex_code_entry;
+	gchar *hex_code_full;
+	gchar **hex_code;
+	GList *list;
+	guint64 hex_value = 0;
+
+	list = gtk_container_get_children(hbox);
+
+	hex_code_entry = g_list_nth_data(list, 2);
+	hex_code_full = g_strdup(gtk_entry_get_text(hex_code_entry));
+
+	hex_code = g_strsplit(hex_code_full, "+", 2);
+	if (hex_code[0] && hex_code[1])
+		{
+		hex_value = strtoull(hex_code[1], NULL, 16);
+		}
+	if (!hex_value || hex_value > 0x10FFFF)
+		{
+		hex_value = 0x003F; // Unicode 'Question Mark'
+		}
+	str = g_string_append_unichar(str, (gunichar)hex_value);
+	gtk_label_set_text(g_list_nth_data(list, 1), str->str);
+
+	g_strfreev(hex_code);
+	g_string_free(str, TRUE);
+	g_free(hex_code_full);
+
+	return hex_value;
+}
+
+static void star_rating_star_test_cb(GtkWidget *widget, gpointer data)
+{
+	guint64 star_symbol;
+
+	star_symbol = star_rating_symbol_test(widget, data);
+	c_options->star_rating.star = star_symbol;
+}
+
+static void star_rating_rejected_test_cb(GtkWidget *widget, gpointer data)
+{
+	guint64 rejected_symbol;
+
+	rejected_symbol = star_rating_symbol_test(widget, data);
+	c_options->star_rating.rejected = rejected_symbol;
+}
+
 /* general options tab */
 static void config_tab_general(GtkWidget *notebook)
 {
@@ -1594,6 +1705,9 @@
 	GtkWidget *spin;
 	gint hours, minutes, remainder;
 	gdouble seconds;
+	GtkWidget *star_rating_entry;
+	GString *str;
+	gchar *rating_symbol;
 
 	vbox = scrolled_notebook_page(notebook, _("General"));
 
@@ -1640,6 +1754,75 @@
 // 			      options->thumbnails.use_ft_metadata_small, &c_options->thumbnails.use_ft_metadata_small);
 #endif
 
+	group = pref_group_new(vbox, FALSE, _("Star Rating"), GTK_ORIENTATION_VERTICAL);
+
+	c_options->star_rating.star = options->star_rating.star;
+	c_options->star_rating.rejected = options->star_rating.rejected;
+
+	str = g_string_new(NULL);
+	hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+	pref_label_new(hbox, "Star character: ");
+	str = g_string_append_unichar(str, options->star_rating.star);
+	pref_label_new(hbox, g_strdup(str->str));
+	rating_symbol = g_strdup_printf("U+%X", options->star_rating.star);
+	star_rating_entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(star_rating_entry), rating_symbol);
+	gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
+	gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15);
+	gtk_widget_show(star_rating_entry);
+	button = pref_button_new(NULL, NULL, _("Set"), FALSE,
+					G_CALLBACK(star_rating_star_test_cb), hbox);
+	gtk_widget_set_tooltip_text(button, _("Display selected character"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_SECONDARY, _("Clear"));
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_PRIMARY, _("Default"));
+	g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press",
+						G_CALLBACK(star_rating_star_icon_cb),
+						star_rating_entry);
+
+	g_string_free(str, TRUE);
+	g_free(rating_symbol);
+
+	str = g_string_new(NULL);
+	hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+	pref_label_new(hbox, "Rejected character: ");
+	str = g_string_append_unichar(str, options->star_rating.rejected);
+	pref_label_new(hbox, g_strdup(str->str));
+	rating_symbol = g_strdup_printf("U+%X", options->star_rating.rejected);
+	star_rating_entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(star_rating_entry), rating_symbol);
+	gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
+	gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15);
+	gtk_widget_show(star_rating_entry);
+	button = pref_button_new(NULL, NULL, _("Set"), FALSE,
+					G_CALLBACK(star_rating_rejected_test_cb), hbox);
+	gtk_widget_set_tooltip_text(button, _("Display selected character"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_SECONDARY, _("Clear"));
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry),
+						GTK_ENTRY_ICON_PRIMARY, _("Default"));
+	g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press",
+						G_CALLBACK(star_rating_rejected_icon_cb),
+						star_rating_entry);
+
+	g_string_free(str, TRUE);
+	g_free(rating_symbol);
+
 	group = pref_group_new(vbox, FALSE, _("Slide show"), GTK_ORIENTATION_VERTICAL);
 
 	c_options->slideshow.delay = options->slideshow.delay;
@@ -1695,6 +1878,27 @@
 	pref_spin_new_int(hbox, _("Rating:"), NULL,
 				 1, 9999, 1,
 				 options->info_rating.height, &c_options->info_rating.height);
+
+	group = pref_group_new(vbox, FALSE, _("On-line help search engine"), GTK_ORIENTATION_VERTICAL);
+
+	help_search_engine_entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(help_search_engine_entry), options->help_search_engine);
+	gtk_box_pack_start(GTK_BOX(group), help_search_engine_entry, FALSE, FALSE, 0);
+	gtk_widget_show(help_search_engine_entry);
+
+	gtk_widget_set_tooltip_text(help_search_engine_entry, _("The format varies between search engines, e.g the format may be:\nhttps://www.search_engine.com/search?q=site:geeqie.org/help\nhttps://www.search_engine.com/?q=site:geeqie.org/help"));
+
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(help_search_engine_entry),
+						GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry),
+						GTK_ENTRY_ICON_SECONDARY, _("Clear"));
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(help_search_engine_entry),
+						GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_REVERT_TO_SAVED);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry),
+						GTK_ENTRY_ICON_PRIMARY, _("Default"));
+	g_signal_connect(GTK_ENTRY(help_search_engine_entry), "icon-press",
+						G_CALLBACK(help_search_engine_entry_icon_cb),
+						help_search_engine_entry);
 }
 
 /* image tab */
@@ -2180,6 +2384,12 @@
 
 	pref_checkbox_new_int(group, _("Write metadata on directory change"),
 			      options->metadata.confirm_on_dir_change, &c_options->metadata.confirm_on_dir_change);
+
+	group = pref_group_new(vbox, FALSE, _("Pre-load metadata"), GTK_ORIENTATION_VERTICAL);
+
+	ct_button = pref_checkbox_new_int(group, _("Read metadata in background"),
+					  options->read_metadata_in_idle, &c_options->read_metadata_in_idle);
+	gtk_widget_set_tooltip_text(ct_button,"On folder change, read DateTimeOriginal, DateTimeDigitized and Star Rating in the idle loop.\nIf this is not selected, initial loading of the folder will be faster but sorting on these items will be slower");
 }
 
 /* metadata tab */
@@ -2332,6 +2542,8 @@
 	GtkWidget *ct_button;
 	GtkWidget *spin;
 	GtkWidget *table;
+	GtkWidget *marks;
+	GtkWidget *with_rename;
 
 	vbox = scrolled_notebook_page(notebook, _("Behavior"));
 
@@ -2385,6 +2597,14 @@
 	pref_checkbox_new_int(group, _("List directory view uses single click to enter"),
 			      options->view_dir_list_single_click_enter, &c_options->view_dir_list_single_click_enter);
 
+	marks = pref_checkbox_new_int(group, _("Save marks on exit"),
+				options->marks_save, &c_options->marks_save);
+	gtk_widget_set_tooltip_text(marks,"Note that marks linked to a keyword will be saved irrespective of this setting");
+
+	with_rename = pref_checkbox_new_int(group, _("Use \"With Rename\" as default for Copy/Move dialogs"),
+				options->with_rename, &c_options->with_rename);
+	gtk_widget_set_tooltip_text(with_rename,"Change the default button for Copy/Move dialogs");
+
 	pref_spin_new_int(group, _("Recent folder list maximum size"), NULL,
 			  1, 50, 1, options->open_recent_list_maxsize, &c_options->open_recent_list_maxsize);
 
@@ -2739,26 +2959,24 @@
 	gchar *comment;
 	gint i_authors = 0;
 	gchar *path;
+	GString *copyright;
+	gchar *zd_path;
+	ZoneDetect *cd;
 	FILE *fp = NULL;
 #define LINE_LENGTH 1000
 	gchar line[LINE_LENGTH];
 
-#if !GTK_CHECK_VERSION(3,0,0)
-	GString *copyright;
-
 	copyright = g_string_new(NULL);
-	path = g_build_filename(GQ_HELPDIR, "COPYING", NULL);
-	fp = fopen(path, "r");
-	if (fp)
+	copyright = g_string_append(copyright, "This program comes with absolutely no warranty.\nGNU General Public License, version 2 or later.\nSee https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\n\n");
+
+	zd_path = g_build_filename(GQ_BIN_DIR, TIMEZONE_DATABASE, NULL);
+	cd = ZDOpenDatabase(zd_path);
+	if (cd)
 		{
-		while(fgets(line, LINE_LENGTH, fp))
-			{
-			copyright = g_string_append(copyright, line);
-			}
-		fclose(fp);
+		copyright = g_string_append(copyright, ZDGetNotice(cd));
 		}
-	g_free(path);
-#endif
+	ZDCloseDatabase(cd);
+	g_free(zd_path);
 
 	authors[0] = NULL;
 	path = g_build_filename(GQ_HELPDIR, "AUTHORS", NULL);
@@ -2794,16 +3012,12 @@
 		"comments", comment,
 		"authors", authors,
 		"translator-credits", _("translator-credits"),
-#if GTK_CHECK_VERSION(3,0,0)
-		"license-type", GTK_LICENSE_GPL_2_0,
-#else
-		"license",  copyright->str,
-#endif
+		"wrap-license", TRUE,
+		"license", copyright->str,
 		NULL);
 
-#if !GTK_CHECK_VERSION(3,0,0)
 	g_string_free(copyright, TRUE);
-#endif
+
 	gint n = 0;
 	while(n < i_authors)
 		{
--- a/src/rcfile.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/rcfile.c	Sat Jun 30 15:28:52 2018 +0300
@@ -306,6 +306,7 @@
 {
 	/* General Options */
 	WRITE_NL(); WRITE_BOOL(*options, show_icon_names);
+	WRITE_NL(); WRITE_BOOL(*options, show_star_rating);
 	WRITE_SEPARATOR();
 
 	WRITE_NL(); WRITE_BOOL(*options, tree_descend_subdirs);
@@ -343,6 +344,11 @@
 	WRITE_NL(); WRITE_UINT(*options, log_window_lines);
 	WRITE_NL(); WRITE_BOOL(*options, log_window.timer_data);
 
+	WRITE_NL(); WRITE_BOOL(*options, marks_save);
+	WRITE_NL(); WRITE_CHAR(*options, help_search_engine);
+
+	WRITE_NL(); WRITE_BOOL(*options, with_rename);
+
 	/* File operations Options */
 	WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_in_place_rename);
 	WRITE_NL(); WRITE_BOOL(*options, file_ops.confirm_delete);
@@ -474,6 +480,11 @@
 	WRITE_NL(); WRITE_INT(*options, stereo.fixed_x2);
 	WRITE_NL(); WRITE_INT(*options, stereo.fixed_y2);
 
+	WRITE_NL(); WRITE_BOOL(*options, read_metadata_in_idle);
+
+	WRITE_NL(); WRITE_UINT(*options, star_rating.star);
+	WRITE_NL(); WRITE_UINT(*options, star_rating.rejected);
+
 	/* copy move rename */
 	WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_start);
 	WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_padding);
@@ -510,6 +521,22 @@
 	WRITE_NL(); WRITE_STRING("</color_profiles>");
 }
 
+static void write_marks_tooltips(GString *outstr, gint indent)
+{
+	gint i;
+
+	WRITE_NL(); WRITE_STRING("<marks_tooltips>");
+	indent++;
+	for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+		{
+		WRITE_NL();
+		write_char_option(outstr, indent, "<tooltip text", options->marks_tooltips[i]);
+		WRITE_STRING("/>");
+		}
+	indent--;
+	WRITE_NL(); WRITE_STRING("</marks_tooltips>");
+}
+
 
 /*
  *-----------------------------------------------------------------------------
@@ -564,6 +591,9 @@
 	filter_write_list(outstr, indent);
 
 	WRITE_SEPARATOR();
+	write_marks_tooltips(outstr, indent);
+
+	WRITE_SEPARATOR();
 	keyword_tree_write_config(outstr, indent);
 	indent--;
 	WRITE_NL(); WRITE_STRING("</global>\n");
@@ -612,6 +642,7 @@
 
 		/* General options */
 		if (READ_BOOL(*options, show_icon_names)) continue;
+		if (READ_BOOL(*options, show_star_rating)) continue;
 
 		if (READ_BOOL(*options, tree_descend_subdirs)) continue;
 		if (READ_BOOL(*options, view_dir_list_single_click_enter)) continue;
@@ -647,9 +678,14 @@
 		if (READ_INT(*options, log_window_lines)) continue;
 		if (READ_BOOL(*options, log_window.timer_data)) continue;
 
+		if (READ_BOOL(*options, marks_save)) continue;
+		if (READ_CHAR(*options, help_search_engine)) continue;
+
 		/* Properties dialog options */
 		if (READ_CHAR(*options, properties.tabs_order)) continue;
 
+		if (READ_BOOL(*options, with_rename)) continue;
+
 		/* Image options */
 		if (READ_UINT_CLAMP(*options, image.zoom_mode, 0, ZOOM_RESET_NONE)) continue;
 		if (READ_BOOL(*options, image.zoom_2pass)) continue;
@@ -773,6 +809,11 @@
 		if (READ_INT(*options, stereo.fixed_x2)) continue;
 		if (READ_INT(*options, stereo.fixed_y2)) continue;
 
+		if (READ_BOOL(*options, read_metadata_in_idle)) continue;
+
+		if (READ_UINT(*options, star_rating.star)) continue;
+		if (READ_UINT(*options, star_rating.rejected)) continue;
+
 		/* copy move rename */
 		if (READ_INT(*options, cp_mv_rn.auto_start))  continue;
 		if (READ_INT(*options, cp_mv_rn.auto_padding)) continue;
@@ -827,7 +868,22 @@
 
 }
 
+static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+{
+	gint i = GPOINTER_TO_INT(data);
+	if (i < 0 || i >= FILEDATA_MARKS_SIZE) return;
+	while (*attribute_names)
+		{
+		const gchar *option = *attribute_names++;
+		const gchar *value = *attribute_values++;
+		if (READ_CHAR_FULL("text",  options->marks_tooltips[i])) continue;
 
+		log_printf("unkown attribute %s = %s\n", option, value);
+		}
+	i++;
+	options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
+
+}
 
 /*
  *-----------------------------------------------------------------------------
@@ -874,6 +930,20 @@
 		}
 }
 
+static void options_parse_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+{
+	if (g_ascii_strcasecmp(element_name, "tooltip") == 0)
+		{
+		options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
+		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+		}
+	else
+		{
+		log_printf("unexpected in <profile>: <%s>\n", element_name);
+		options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+		}
+}
+
 static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
 {
 	if (g_ascii_strcasecmp(element_name, "file_type") == 0)
@@ -944,6 +1014,11 @@
 		{
 		options_parse_func_push(parser_data, options_parse_filter, options_parse_filter_end, NULL);
 		}
+	else if (g_ascii_strcasecmp(element_name, "marks_tooltips") == 0)
+		{
+		options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
+		options_parse_func_push(parser_data, options_parse_marks_tooltips, NULL, NULL);
+		}
 	else if (g_ascii_strcasecmp(element_name, "keyword_tree") == 0)
 		{
 		if (!keyword_tree) keyword_tree_new();
--- a/src/search.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/search.c	Sat Jun 30 15:28:52 2018 +0300
@@ -55,7 +55,7 @@
 
 
 #define DEF_SEARCH_WIDTH  700
-#define DEF_SEARCH_HEIGHT 450
+#define DEF_SEARCH_HEIGHT 650
 
 #define SEARCH_BUFFER_MATCH_LOAD 20
 #define SEARCH_BUFFER_MATCH_HIT  5
@@ -148,6 +148,8 @@
 	GtkWidget *check_class;
 	GtkWidget *menu_class;
 	GtkWidget *class_type;
+	GtkWidget *marks_type;
+	GtkWidget *menu_marks;
 
 	FileData *search_dir_fd;
 	gboolean   search_path_recurse;
@@ -185,6 +187,7 @@
 	MatchType match_rating;
 	MatchType match_gps;
 	MatchType match_class;
+	MatchType match_marks;
 
 	gboolean match_name_enable;
 	gboolean match_size_enable;
@@ -195,6 +198,7 @@
 	gboolean match_comment_enable;
 	gboolean match_rating_enable;
 	gboolean match_class_enable;
+	gboolean match_marks_enable;
 
 	GList *search_folder_list;
 	GList *search_done_list;
@@ -301,6 +305,11 @@
 	{ N_("is not"),	SEARCH_MATCH_NONE }
 };
 
+static const MatchList text_search_menu_marks[] = {
+	{ N_("is"),	SEARCH_MATCH_EQUAL },
+	{ N_("is not"),	SEARCH_MATCH_NONE }
+};
+
 static GList *search_window_list = NULL;
 
 
@@ -1035,6 +1044,13 @@
 	search_result_clear(sd);
 }
 
+static void sr_menu_play_cb(GtkWidget *widget, gpointer data)
+{
+	SearchData *sd = data;
+
+	start_editor_from_file(options->image_l_click_video_editor, sd->click_fd);
+}
+
 static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
 {
 	GList *editmenu_fd_list = data;
@@ -1067,9 +1083,15 @@
 	GtkWidget *item;
 	GList *editmenu_fd_list;
 	GtkWidget *submenu;
+	gboolean video;
 
 	menu = popup_menu_short_lived();
 
+	video = (on_row && sd->click_fd && sd->click_fd->format_class == FORMAT_CLASS_VIDEO);
+	menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video,
+			    G_CALLBACK(sr_menu_play_cb), sd);
+	menu_item_add_divider(menu);
+
 	menu_item_add_sensitive(menu, _("_View"), on_row,
 				G_CALLBACK(sr_menu_view_cb), sd);
 	menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
@@ -2098,6 +2120,58 @@
 			}
 		}
 
+	if (match && sd->match_marks_enable)
+		{
+		tested = TRUE;
+		match = FALSE;
+		gint search_marks;
+		gint i;
+		gchar *marks_string;
+
+		if (g_strcmp0(gtk_combo_box_text_get_active_text(
+						GTK_COMBO_BOX_TEXT(sd->marks_type)), _("Any mark")) == 0)
+			{
+			search_marks = -1;
+			}
+		else
+			{
+			for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+				{
+				marks_string = g_strdup_printf("%s%d", _("Mark "), i + 1);
+				if (g_strcmp0(marks_string, options->marks_tooltips[i]) != 0)
+					{
+					g_free(marks_string);
+					marks_string = g_strdup_printf("%s%d %s", _("Mark "), i + 1,
+													options->marks_tooltips[i]);
+					}
+
+				if (g_strcmp0(gtk_combo_box_text_get_active_text(
+								GTK_COMBO_BOX_TEXT(sd->marks_type)),
+								marks_string) == 0)
+					{
+					search_marks = 1 << i;
+					}
+				g_free(marks_string);
+				}
+			}
+
+		if (sd->match_marks == SEARCH_MATCH_EQUAL)
+			{
+			match = (fd->marks & search_marks);
+			}
+		else
+			{
+			if (search_marks == -1)
+				{
+				match = fd->marks ? FALSE : TRUE;
+				}
+			else
+				{
+				match = (fd->marks & search_marks) ? FALSE : TRUE;
+				}
+			}
+		}
+
 	if (match && sd->match_gps_enable)
 		{
 		/* Calculate the distance the image is from the specified origin.
@@ -2691,6 +2765,13 @@
 	if (!menu_choice_get_match_type(combo, &sd->match_class)) return;
 }
 
+static void menu_choice_marks_cb(GtkWidget *combo, gpointer data)
+{
+	SearchData *sd = data;
+
+	if (!menu_choice_get_match_type(combo, &sd->match_marks)) return;
+}
+
 static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
 {
 	SearchData *sd = data;
@@ -2900,6 +2981,8 @@
 	GtkTreeSelection *selection;
 	GtkWidget *combo;
 	GdkGeometry geometry;
+	gint i;
+	gchar *marks_string;
 
 	sd = g_new0(SearchData, 1);
 
@@ -2921,6 +3004,7 @@
 	sd->match_comment = SEARCH_MATCH_CONTAINS;
 	sd->match_rating = SEARCH_MATCH_EQUAL;
 	sd->match_class = SEARCH_MATCH_EQUAL;
+	sd->match_marks = SEARCH_MATCH_EQUAL;
 
 	sd->match_name_enable = TRUE;
 
@@ -3161,6 +3245,34 @@
 	gtk_combo_box_set_active(GTK_COMBO_BOX(sd->class_type), 0);
 	gtk_widget_show(sd->class_type);
 
+	/* Search for image marks */
+	hbox = menu_choice(sd->box_search, &sd->check_class, &sd->menu_marks,
+			   _("Marks"), &sd->match_marks_enable,
+			   text_search_menu_marks, sizeof(text_search_menu_marks) / sizeof(MatchList),
+			   G_CALLBACK(menu_choice_marks_cb), sd);
+
+	sd->marks_type = gtk_combo_box_text_new();
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), _("Any mark"));
+	for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+		{
+		marks_string = g_strdup_printf("%s%d", _("Mark "), i + 1);
+		if (g_strcmp0(marks_string, options->marks_tooltips[i]) != 0)
+			{
+			g_free(marks_string);
+			marks_string = g_strdup_printf("%s%d %s", _("Mark "), i + 1,
+											options->marks_tooltips[i]);
+			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), marks_string);
+			}
+		else
+			{
+			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->marks_type), marks_string);
+			}
+		g_free(marks_string);
+		}
+	gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(sd->marks_type), 0);
+	gtk_widget_show(sd->marks_type);
+
 	/* Done the types of searches */
 
 	scrolled = gtk_scrolled_window_new(NULL, NULL);
--- a/src/thumb_standard.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/thumb_standard.c	Sat Jun 30 15:28:52 2018 +0300
@@ -348,8 +348,7 @@
 		mark_uri = (tl->cache_local) ? tl->local_uri :tl->thumb_uri;
 
 		mark_app = g_strdup_printf("%s %s", GQ_APPNAME, VERSION);
-		mark_mtime = g_strdup_printf("%lu", tl->source_mtime);
-
+		mark_mtime = g_strdup_printf("%llu", (unsigned long long)tl->source_mtime);
 		pathl = path_from_utf8(tmp_path);
 		success = gdk_pixbuf_save(pixbuf, pathl, "png", NULL,
 					  THUMB_MARKER_URI, mark_uri,
--- a/src/toolbar.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/toolbar.c	Sat Jun 30 15:28:52 2018 +0300
@@ -88,7 +88,7 @@
 	{"Print",	N_("Print"), GTK_STOCK_PRINT},
 	{"Preferences",	N_("Preferences"), GTK_STOCK_PREFERENCES},
 	{"LayoutConfig",	N_("Configure this window"), GTK_STOCK_PREFERENCES},
-	{"Maintenance",	N_("Thumbnail maintenance"), GTK_STOCK_FILE},
+	{"Maintenance",	N_("Cache maintenance"), GTK_STOCK_FILE},
 	{"ZoomIn",	N_("Zoom in"), GTK_STOCK_ZOOM_IN},
 	{"ZoomOut",	N_("Zoom out"), GTK_STOCK_ZOOM_OUT},
 	{"Zoom100",	N_("Zoom 1:1"), GTK_STOCK_ZOOM_100},
--- a/src/typedefs.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/typedefs.h	Sat Jun 30 15:28:52 2018 +0300
@@ -146,6 +146,8 @@
 	FILE_FORMAT_CLASSES
 } FileFormatClass;
 
+extern gchar *format_class_list[];
+
 typedef enum {
 	SS_ERR_NONE = 0,
 	SS_ERR_DISABLED, /**< secsave is disabled. */
@@ -437,6 +439,7 @@
 	guint drop_idle_id; /* event source id */
 
 	gboolean show_text;
+	gboolean show_stars;
 
 	/* file list for edit menu */
 	GList *editmenu_fd_list;
@@ -593,6 +596,7 @@
 	GHashTable *modified_xmp; // hash table which contains unwritten xmp metadata in format: key->list of string values
 	GList *cached_metadata;
 	gint rating;
+	gboolean metadata_in_idle_loaded;
 
 	SelectionType selected;  // Used by view_file_icon.
 };
@@ -885,6 +889,8 @@
 
 	/* file list for edit menu */
 	GList *editmenu_fd_list;
+
+	guint read_metadata_in_idle_id;
 };
 
 struct _ViewFileInfoList
--- a/src/ui_fileops.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/ui_fileops.c	Sat Jun 30 15:28:52 2018 +0300
@@ -570,10 +570,20 @@
 			{
 			gchar *absolute;
 
-			absolute = g_malloc(PATH_MAX + 1);
 			char *lastslash = strrchr(sl, G_DIR_SEPARATOR);
 			int len = lastslash - sl + 1;
 
+			int path_max;
+#ifdef PATH_MAX
+			path_max = PATH_MAX;
+#else
+			path_max = pathconf(sl, _PC_PATH_MAX);
+			if (path_max <= 0)
+				path_max = 4096;
+#endif
+
+			absolute = g_malloc(path_max + 1);
+
 			strncpy(absolute, sl, len);
 			strcpy(absolute + len, link_target);
 			strcpy(link_target, absolute);
@@ -813,14 +823,14 @@
 {
 	const gchar *base;
 
-	if (!path) return NULL;
+	if (!path) return g_strdup("");
 
 	base = strrchr(path, G_DIR_SEPARATOR);
 	/* Take account of a file being in the root ( / ) folder - ensure the returned value
 	 * is at least one character long */
 	if (base) return g_strndup(path, (strlen(path)-strlen(base)) == 0 ? 1 : (strlen(path)-strlen(base)));
 
-	return NULL;
+	return g_strdup("");
 }
 
 gboolean file_extension_match(const gchar *path, const gchar *ext)
--- a/src/ui_tabcomp.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/ui_tabcomp.c	Sat Jun 30 15:28:52 2018 +0300
@@ -136,7 +136,8 @@
 	while ((dir = readdir(dp)) != NULL)
 		{
 		gchar *name = dir->d_name;
-		if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0)
+		if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0 &&
+						(name[0] != '.' || options->file_filter.show_hidden_files))
 			{
 			gchar *abspath = g_build_filename(pathl, name, NULL);
 
--- a/src/utilops.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/utilops.c	Sat Jun 30 15:28:52 2018 +0300
@@ -1584,8 +1584,16 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
 
-	file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE);
-	file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+	if (options->with_rename)
+		{
+		file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+		file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE);
+		}
+	else
+		{
+		file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE);
+		file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE);
+		}
 
 	file_dialog_add_path_widgets(fdlg, NULL, ud->dest_path, "move_copy", NULL, NULL);
 
--- a/src/view_file.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file.h	Sat Jun 30 15:28:52 2018 +0300
@@ -39,6 +39,7 @@
 
 void vf_thumb_set(ViewFile *vf, gboolean enable);
 void vf_marks_set(ViewFile *vf, gboolean enable);
+void vf_star_rating_set(ViewFile *vf, gboolean enable);
 void vf_sort_set(ViewFile *vf, SortType type, gboolean ascend);
 
 guint vf_marks_get_filter(ViewFile *vf);
@@ -72,6 +73,6 @@
 void vf_thumb_update(ViewFile *vf);
 void vf_thumb_cleanup(ViewFile *vf);
 void vf_thumb_stop(ViewFile *vf);
-
+void vf_read_metadata_in_idle(ViewFile *vf);
 #endif /* VIEW_FILE_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/view_file/view_file.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file/view_file.c	Sat Jun 30 15:28:52 2018 +0300
@@ -30,9 +30,11 @@
 #include "thumb.h"
 #include "ui_menu.h"
 #include "ui_fileops.h"
+#include "ui_misc.h"
 #include "utilops.h"
 #include "view_file/view_file_list.h"
 #include "view_file/view_file_icon.h"
+#include "window.h"
 
 /*
  *-----------------------------------------------------------------------------
@@ -402,6 +404,11 @@
 
 	type = (SortType)GPOINTER_TO_INT(data);
 
+	if (type == SORT_EXIFTIME || type == SORT_EXIFTIMEDIGITIZED || type == SORT_RATING)
+		{
+		vf_read_metadata_in_idle(vf);
+		}
+
 	if (vf->layout)
 		{
 		layout_sort_set(vf->layout, type, vf->sort_ascend);
@@ -477,6 +484,23 @@
 	layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
 }
 
+static void vf_pop_menu_toggle_star_rating(ViewFile *vf)
+{
+	GtkAllocation allocation;
+
+	options->show_star_rating = !options->show_star_rating;
+
+	gtk_widget_get_allocation(vf->listview, &allocation);
+	vf_star_rating_set(vf, options->show_star_rating);
+}
+
+static void vf_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
+{
+	ViewFile *vf = data;
+
+	vf_pop_menu_toggle_star_rating(vf);
+}
+
 static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
@@ -655,6 +679,18 @@
 		break;
 	}
 
+	switch (vf->type)
+	{
+	case FILEVIEW_LIST:
+		menu_item_add_check(menu, _("Show star rating"), options->show_star_rating,
+				    G_CALLBACK(vflist_pop_menu_show_star_rating_cb), vf);
+		break;
+	case FILEVIEW_ICON:
+		menu_item_add_check(menu, _("Show star rating"), options->show_star_rating,
+				    G_CALLBACK(vficon_pop_menu_show_star_rating_cb), vf);
+		break;
+	}
+
 	menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf);
 
 	return menu;
@@ -695,6 +731,10 @@
 		gtk_widget_destroy(vf->popup);
 		}
 
+	if (vf->read_metadata_in_idle_id)
+		{
+		g_idle_remove_by_data(vf);
+		}
 	file_data_unref(vf->dir_fd);
 	g_free(vf->info);
 	g_free(vf);
@@ -706,6 +746,104 @@
 	vf_refresh_idle(vf);
 }
 
+typedef struct _MarksTextEntry MarksTextEntry;
+struct _MarksTextEntry {
+	GenericDialog *gd;
+	gint mark_no;
+	GtkWidget *edit_widget;
+	gchar *text_entry;
+	GtkWidget *parent;
+};
+
+static void vf_marks_tooltip_cancel_cb(GenericDialog *gd, gpointer data)
+{
+	MarksTextEntry *mte = data;
+
+	g_free(mte->text_entry);
+	generic_dialog_close(gd);
+}
+
+static void vf_marks_tooltip_ok_cb(GenericDialog *gd, gpointer data)
+{
+	MarksTextEntry *mte = data;
+
+	g_free(options->marks_tooltips[mte->mark_no]);
+	options->marks_tooltips[mte->mark_no] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mte->edit_widget)));
+
+	gtk_widget_set_tooltip_text(mte->parent, options->marks_tooltips[mte->mark_no]);
+
+	g_free(mte->text_entry);
+	generic_dialog_close(gd);
+}
+
+void vf_marks_filter_on_icon_press(GtkEntry *entry, GtkEntryIconPosition pos,
+									GdkEvent *event, gpointer userdata)
+{
+	MarksTextEntry *mte = userdata;
+
+	g_free(mte->text_entry);
+	mte->text_entry = g_strdup("");
+	gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
+}
+
+static void vf_marks_tooltip_help_cb(GenericDialog *gd, gpointer data)
+{
+	help_window_show("GuideImageMarks.html");
+}
+
+static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
+										GdkEventButton *event,
+										gpointer user_data)
+{
+	GtkWidget *table;
+	gint i = GPOINTER_TO_INT(user_data);
+	MarksTextEntry *mte;
+
+	if (event->button == MOUSE_BUTTON_RIGHT)
+		{
+		mte = g_new0(MarksTextEntry, 1);
+		mte->mark_no = i;
+		mte->text_entry = g_strdup(options->marks_tooltips[i]);
+		mte->parent = widget;
+
+		mte->gd = generic_dialog_new(_("Mark text"), "mark_text",
+						widget, FALSE,
+						vf_marks_tooltip_cancel_cb, mte);
+		generic_dialog_add_message(mte->gd, GTK_STOCK_DIALOG_QUESTION, _("Set mark text"),
+					    _("This will set or clear the mark text."), FALSE);
+		generic_dialog_add_button(mte->gd, GTK_STOCK_OK, NULL,
+							vf_marks_tooltip_ok_cb, TRUE);
+		generic_dialog_add_button(mte->gd, GTK_STOCK_HELP, NULL,
+						vf_marks_tooltip_help_cb, FALSE);
+
+		table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE);
+		pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), 1.0);
+		mte->edit_widget = gtk_entry_new();
+		gtk_widget_set_size_request(mte->edit_widget, 300, -1);
+		if (mte->text_entry)
+			{
+			gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
+			}
+		gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
+		generic_dialog_attach_default(mte->gd, mte->edit_widget);
+
+		gtk_entry_set_icon_from_stock(GTK_ENTRY(mte->edit_widget),
+							GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+		gtk_entry_set_icon_tooltip_text (GTK_ENTRY(mte->edit_widget),
+							GTK_ENTRY_ICON_SECONDARY, "Clear");
+		g_signal_connect(GTK_ENTRY(mte->edit_widget), "icon-press",
+							G_CALLBACK(vf_marks_filter_on_icon_press), mte);
+
+		gtk_widget_show(mte->edit_widget);
+		gtk_widget_grab_focus(mte->edit_widget);
+		gtk_widget_show(GTK_WIDGET(mte->gd->dialog));
+
+		return TRUE;
+		}
+
+	return FALSE;
+}
+
 
 static GtkWidget *vf_marks_filter_init(ViewFile *vf)
 {
@@ -720,6 +858,9 @@
 		gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
 		g_signal_connect(G_OBJECT(check), "toggled",
 			 G_CALLBACK(vf_marks_filter_toggle_cb), vf);
+		g_signal_connect(G_OBJECT(check), "button_press_event",
+			 G_CALLBACK(vf_marks_tooltip_cb), GINT_TO_POINTER(i));
+		gtk_widget_set_tooltip_text(check, options->marks_tooltips[i]);
 
 		gtk_widget_show(check);
 		vf->filter_check[i] = check;
@@ -745,6 +886,7 @@
 	vf->type = type;
 	vf->sort_method = SORT_NAME;
 	vf->sort_ascend = TRUE;
+	vf->read_metadata_in_idle_id = 0;
 
 	vf->scrolled = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
@@ -823,6 +965,20 @@
 	return (gdouble)done / count;
 }
 
+static gdouble vf_read_metadata_in_idle_progress(ViewFile *vf)
+{
+	gint count = 0;
+	gint done = 0;
+
+	switch (vf->type)
+		{
+		case FILEVIEW_LIST: vflist_read_metadata_progress_count(vf->list, &count, &done); break;
+		case FILEVIEW_ICON: vficon_read_metadata_progress_count(vf->list, &count, &done); break;
+		}
+
+	return (gdouble)done / count;
+}
+
 static void vf_set_thumb_fd(ViewFile *vf, FileData *fd)
 {
 	switch (vf->type)
@@ -986,6 +1142,19 @@
 	vf_refresh_idle(vf);
 }
 
+void vf_star_rating_set(ViewFile *vf, gboolean enable)
+{
+	if (options->show_star_rating == enable) return;
+	options->show_star_rating = enable;
+
+	switch (vf->type)
+		{
+		case FILEVIEW_LIST: vflist_star_rating_set(vf, enable); break;
+		case FILEVIEW_ICON: vficon_star_rating_set(vf, enable); break;
+		}
+	vf_refresh_idle(vf);
+}
+
 guint vf_marks_get_filter(ViewFile *vf)
 {
 	guint ret = 0;
@@ -1094,4 +1263,74 @@
 		}
 }
 
+static gboolean vf_read_metadata_in_idle_cb(gpointer data)
+{
+	FileData *fd;
+	ViewFile *vf = data;
+	GList *list_entry;
+	GList *work;
+
+	vf_thumb_status(vf, vf_read_metadata_in_idle_progress(vf), _("Loading meta..."));
+
+	work = vf->list;
+
+	while (work)
+		{
+		fd = work->data;
+
+		if (fd && !fd->metadata_in_idle_loaded)
+			{
+			if (!fd->exifdate)
+				{
+				read_exif_time_data(fd);
+				}
+			if (!fd->exifdate_digitized)
+				{
+				read_exif_time_digitized_data(fd);
+				}
+			if (fd->rating == STAR_RATING_NOT_READ)
+				{
+				read_rating_data(fd);
+				}
+			fd->metadata_in_idle_loaded = TRUE;
+			return TRUE;
+			}
+		work = work->next;
+		}
+
+	vf_thumb_status(vf, 0.0, NULL);
+	vf->read_metadata_in_idle_id = 0;
+	vf_refresh(vf);
+	return FALSE;
+}
+
+static void vf_read_metadata_in_idle_finished_cb(gpointer data)
+{
+	ViewFile *vf = data;
+
+	vf_thumb_status(vf, 0.0, "Loading meta...");
+	vf->read_metadata_in_idle_id = 0;
+}
+
+void vf_read_metadata_in_idle(ViewFile *vf)
+{
+	GList *work;
+	FileData *fd;
+
+	if (!vf) return;
+
+	if (vf->read_metadata_in_idle_id)
+		{
+		g_idle_remove_by_data(vf);
+		}
+	vf->read_metadata_in_idle_id = 0;
+
+	if (vf->list)
+		{
+		vf->read_metadata_in_idle_id = g_idle_add_full(G_PRIORITY_LOW, vf_read_metadata_in_idle_cb, vf, vf_read_metadata_in_idle_finished_cb);
+		}
+
+	return;
+}
+
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/view_file/view_file_icon.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file/view_file_icon.c	Sat Jun 30 15:28:52 2018 +0300
@@ -125,6 +125,23 @@
 	vficon_toggle_filenames(vf);
 }
 
+static void vficon_toggle_star_rating(ViewFile *vf)
+{
+	GtkAllocation allocation;
+
+	options->show_star_rating = !options->show_star_rating;
+
+	gtk_widget_get_allocation(vf->listview, &allocation);
+	vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
+}
+
+void vficon_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
+{
+	ViewFile *vf = data;
+
+	vficon_toggle_star_rating(vf);
+}
+
 void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
@@ -621,6 +638,13 @@
 	vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
 }
 
+void vficon_star_rating_set(ViewFile *vf, gint enable)
+{
+	GtkAllocation allocation;
+	gtk_widget_get_allocation(vf->listview, &allocation);
+	vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
+}
+
 /*
  *-------------------------------------------------------------------
  * selections
@@ -1542,7 +1566,7 @@
 				{
 				g_object_set(G_OBJECT(cell), "fixed_width", thumb_width,
 							     "fixed_height", options->thumbnails.max_height,
-							     "show_text", VFICON(vf)->show_text,
+							     "show_text", VFICON(vf)->show_text || options->show_star_rating,
 							     "show_marks", vf->marks_enabled,
 							     "num_marks", FILEDATA_MARKS_SIZE,
 							     NULL);
@@ -1690,6 +1714,19 @@
 		}
 }
 
+void vficon_read_metadata_progress_count(GList *list, gint *count, gint *done)
+{
+	GList *work = list;
+	while (work)
+		{
+		FileData *fd = work->data;
+		work = work->next;
+
+		if (fd->metadata_in_idle_loaded) (*done)++;
+		(*count)++;
+		}
+}
+
 void vficon_set_thumb_fd(ViewFile *vf, FileData *fd)
 {
 	GtkTreeModel *store;
@@ -1934,6 +1971,7 @@
 	FileData *fd;
 	ColumnData *cd = data;
 	ViewFile *vf = cd->vf;
+	gchar *star_rating;
 
 	if (!GQV_IS_CELL_RENDERER_ICON(cell)) return;
 
@@ -1946,24 +1984,56 @@
 		GdkColor color_fg;
 		GdkColor color_bg;
 		GtkStyle *style;
-		gchar *name_sidecars;
+		gchar *name_sidecars = NULL;
 		gchar *link;
 		GtkStateType state = GTK_STATE_NORMAL;
 
 		g_assert(fd->magick == FD_MAGICK);
 
+		if (options->show_star_rating)
+			{
+			star_rating = metadata_read_rating_stars(fd);
+			}
+		else
+			{
+			star_rating = NULL;
+			}
+
 		link = islink(fd->path) ? GQ_LINK_STR : "";
 		if (fd->sidecar_files)
 			{
 			gchar *sidecars = file_data_sc_list_to_string(fd);
-			name_sidecars = g_strdup_printf("%s%s %s", link, fd->name, sidecars);
+			if (options->show_star_rating && VFICON(vf)->show_text)
+				{
+				name_sidecars = g_strdup_printf("%s%s %s\n%s", link, fd->name, sidecars, star_rating);
+				}
+			else if (options->show_star_rating)
+				{
+				name_sidecars = g_strdup_printf("%s", star_rating);
+				}
+			else if (VFICON(vf)->show_text)
+				{
+				name_sidecars = g_strdup_printf("%s%s %s", link, fd->name, sidecars);
+				}
 			g_free(sidecars);
 			}
 		else
 			{
 			gchar *disabled_grouping = fd->disable_grouping ? _(" [NO GROUPING]") : "";
-			name_sidecars = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping);
+			if (options->show_star_rating && VFICON(vf)->show_text)
+				{
+				name_sidecars = g_strdup_printf("%s%s%s\n%s", link, fd->name, disabled_grouping, star_rating);
+				}
+			else if (options->show_star_rating)
+				{
+				name_sidecars = g_strdup_printf("%s", star_rating);
+				}
+			else if (VFICON(vf)->show_text)
+				{
+				name_sidecars = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping);
+				}
 			}
+		g_free(star_rating);
 
 		style = gtk_widget_get_style(vf->listview);
 		if (fd->selected & SELECTION_SELECTED)
--- a/src/view_file/view_file_icon.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file/view_file_icon.h	Sat Jun 30 15:28:52 2018 +0300
@@ -39,6 +39,7 @@
 void vficon_sort_set(ViewFile *vf, SortType type, gboolean ascend);
 
 void vficon_marks_set(ViewFile *vf, gboolean enable);
+void vficon_star_rating_set(ViewFile *vf, gboolean enable);
 
 GList *vficon_selection_get_one(ViewFile *vf, FileData *fd);
 GList *vficon_pop_menu_file_list(ViewFile *vf);
@@ -47,6 +48,7 @@
 void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data);
 void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data);
 void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data);
+void vficon_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data);
 
 FileData *vficon_index_get_data(ViewFile *vf, gint row);
 gint vficon_index_by_fd(ViewFile *vf, FileData *in_fd);
@@ -68,6 +70,7 @@
 
 
 void vficon_thumb_progress_count(GList *list, gint *count, gint *done);
+void vficon_read_metadata_progress_count(GList *list, gint *count, gint *done);
 void vficon_set_thumb_fd(ViewFile *vf, FileData *fd);
 FileData *vficon_thumb_next_fd(ViewFile *vf);
 void vficon_thumb_reset_all(ViewFile *vf);
--- a/src/view_file/view_file_list.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file/view_file_list.c	Sat Jun 30 15:28:52 2018 +0300
@@ -47,8 +47,10 @@
 	FILE_COLUMN_VERSION,
 	FILE_COLUMN_THUMB,
 	FILE_COLUMN_FORMATTED,
+	FILE_COLUMN_FORMATTED_WITH_STARS,
 	FILE_COLUMN_NAME,
 	FILE_COLUMN_SIDECARS,
+	FILE_COLUMN_STAR_RATING,
 	FILE_COLUMN_SIZE,
 	FILE_COLUMN_DATE,
 	FILE_COLUMN_EXPANDED,
@@ -65,6 +67,8 @@
 	FILE_VIEW_COLUMN_MARKS_LAST = FILE_VIEW_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1,
 	FILE_VIEW_COLUMN_THUMB,
 	FILE_VIEW_COLUMN_FORMATTED,
+	FILE_VIEW_COLUMN_FORMATTED_WITH_STARS,
+	FILE_VIEW_COLUMN_STAR_RATING,
 	FILE_VIEW_COLUMN_SIZE,
 	FILE_VIEW_COLUMN_DATE,
 	FILE_VIEW_COLUMN_COUNT
@@ -422,6 +426,53 @@
 		}
 }
 
+void vflist_star_rating_set(ViewFile *vf, gboolean enable)
+{
+	GList *columns, *work;
+
+	columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(vf->listview));
+
+	work = columns;
+	while (work)
+		{
+		GtkTreeViewColumn *column = work->data;
+		gint col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx"));
+		work = work->next;
+
+		if (vflist_is_multiline(vf))
+			{
+			if (col_idx == FILE_COLUMN_FORMATTED_WITH_STARS)
+				{
+				gtk_tree_view_column_set_visible(column, enable);
+				}
+			if (col_idx == FILE_COLUMN_FORMATTED)
+				{
+				gtk_tree_view_column_set_visible(column, !enable);
+				}
+			}
+		else
+			{
+			if (col_idx == FILE_COLUMN_STAR_RATING)
+				{
+				gtk_tree_view_column_set_visible(column, enable);
+				}
+			}
+		}
+	g_list_free(columns);
+}
+
+void vflist_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
+{
+	ViewFile *vf = data;
+
+	options->show_star_rating = !options->show_star_rating;
+
+	vflist_populate_view(vf, TRUE);
+
+	vflist_color_set(vf, VFLIST(vf)->click_fd, FALSE);
+	vflist_star_rating_set(vf, options->show_star_rating);
+}
+
 void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
@@ -768,14 +819,21 @@
  */
 
 
-static gchar* vflist_get_formatted(ViewFile *vf, const gchar *name, const gchar *sidecars, const gchar *size, const gchar *time, gboolean expanded)
+static gchar* vflist_get_formatted(ViewFile *vf, const gchar *name, const gchar *sidecars, const gchar *size, const gchar *time, gboolean expanded, gboolean with_stars, const gchar *star_rating)
  {
 	gboolean multiline = vflist_is_multiline(vf);
 	gchar *text;
 
 	if (multiline)
 		{
-		text = g_strdup_printf("%s %s\n%s\n%s", name, expanded ? "" : sidecars, size, time);
+		if (with_stars)
+			{
+					text = g_strdup_printf("%s %s\n%s\n%s\n%s", name, expanded ? "" : sidecars, size, time, star_rating);
+			}
+		else
+			{
+			text = g_strdup_printf("%s %s\n%s\n%s", name, expanded ? "" : sidecars, size, time);
+			}
 		}
 	else
 		{
@@ -792,7 +850,8 @@
 	gchar *size;
 	gchar *time;
 	gchar *formatted;
-
+	gchar *formatted_with_stars;
+	gchar *star_rating;
 	store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)));
 
 	gtk_tree_model_get(GTK_TREE_MODEL(store), iter,
@@ -800,12 +859,18 @@
 					FILE_COLUMN_SIDECARS, &sidecars,
 					FILE_COLUMN_SIZE, &size,
 					FILE_COLUMN_DATE, &time,
+					FILE_COLUMN_STAR_RATING, &star_rating,
 					-1);
-	formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded);
+
+	formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded, FALSE, NULL);
+	formatted_with_stars = vflist_get_formatted(vf, name, sidecars, size, time, expanded, TRUE, star_rating);
 
 	gtk_tree_store_set(store, iter, FILE_COLUMN_FORMATTED, formatted,
 					FILE_COLUMN_EXPANDED, expanded,
 					-1);
+	gtk_tree_store_set(store, iter, FILE_COLUMN_FORMATTED_WITH_STARS, formatted_with_stars,
+					FILE_COLUMN_EXPANDED, expanded,
+					-1);
 	g_free(time);
 	g_free(size);
 	g_free(sidecars);
@@ -822,7 +887,18 @@
 	gchar *link = islink(fd->path) ? GQ_LINK_STR : "";
 	const gchar *disabled_grouping;
 	gchar *formatted;
+	gchar *formatted_with_stars;
 	gboolean expanded = FALSE;
+	gchar *star_rating;
+
+	if (options->show_star_rating)
+		{
+		star_rating = metadata_read_rating_stars(fd);
+		}
+	else
+		{
+		star_rating = NULL;
+		}
 
 	if (fd->sidecar_files) /* expanded has no effect on files without sidecars */
 		{
@@ -835,14 +911,17 @@
 	name = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping);
 	size = text_from_size(fd->size);
 
-	formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded);
+	formatted = vflist_get_formatted(vf, name, sidecars, size, time, expanded, FALSE, NULL);
+	formatted_with_stars = vflist_get_formatted(vf, name, sidecars, size, time, expanded, TRUE, star_rating);
 
 	gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd,
 					FILE_COLUMN_VERSION, fd->version,
 					FILE_COLUMN_THUMB, fd->thumb_pixbuf,
 					FILE_COLUMN_FORMATTED, formatted,
+					FILE_COLUMN_FORMATTED_WITH_STARS, formatted_with_stars,
 					FILE_COLUMN_SIDECARS, sidecars,
 					FILE_COLUMN_NAME, name,
+					FILE_COLUMN_STAR_RATING, star_rating,
 					FILE_COLUMN_SIZE, size,
 					FILE_COLUMN_DATE, time,
 #define STORE_SET_IS_SLOW 1
@@ -1079,6 +1158,24 @@
 		}
 }
 
+void vflist_read_metadata_progress_count(GList *list, gint *count, gint *done)
+{
+	GList *work = list;
+	while (work)
+		{
+		FileData *fd = work->data;
+		work = work->next;
+
+		if (fd->metadata_in_idle_loaded) (*done)++;
+
+		if (fd->sidecar_files)
+			{
+			vflist_read_metadata_progress_count(fd->sidecar_files, count, done);
+			}
+		(*count)++;
+		}
+}
+
 void vflist_set_thumb_fd(ViewFile *vf, FileData *fd)
 {
 	GtkTreeStore *store;
@@ -1590,9 +1687,32 @@
 	g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL);
 	gtk_tree_view_column_set_visible(column, thumb);
 
-	column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED);
+	if (options->show_star_rating)
+		{
+		column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED_WITH_STARS);
+		if (!column) return;
+		gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column);
+		gtk_tree_view_column_set_visible(column, TRUE);
+
+		column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED);
+		if (!column) return;
+		gtk_tree_view_column_set_visible(column, FALSE);
+		}
+	else
+		{
+		column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED);
+		if (!column) return;
+		gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column);
+		gtk_tree_view_column_set_visible(column, TRUE);
+
+		column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_FORMATTED_WITH_STARS);
+		if (!column) return;
+		gtk_tree_view_column_set_visible(column, FALSE);
+		}
+
+	column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_STAR_RATING);
 	if (!column) return;
-	gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column);
+	gtk_tree_view_column_set_visible(column, !multiline && options->show_star_rating);
 
 	column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_SIZE);
 	if (!column) return;
@@ -1892,7 +2012,9 @@
 	flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT;
 	flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF;
 	flist_types[FILE_COLUMN_FORMATTED] = G_TYPE_STRING;
+	flist_types[FILE_COLUMN_FORMATTED_WITH_STARS] = G_TYPE_STRING;
 	flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING;
+	flist_types[FILE_COLUMN_STAR_RATING] = G_TYPE_STRING;
 	flist_types[FILE_COLUMN_SIDECARS] = G_TYPE_STRING;
 	flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING;
 	flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING;
@@ -1919,6 +2041,8 @@
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vf->listview), FALSE);
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vf->listview), FALSE);
 
+	gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(vf->listview), FILE_COLUMN_FORMATTED);
+
 	column = 0;
 
 	for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
@@ -1936,6 +2060,14 @@
 	g_assert(column == FILE_VIEW_COLUMN_FORMATTED);
 	column++;
 
+	vflist_listview_add_column(vf, FILE_COLUMN_FORMATTED_WITH_STARS, _("NameStars"), FALSE, FALSE, TRUE);
+	g_assert(column == FILE_VIEW_COLUMN_FORMATTED_WITH_STARS);
+	column++;
+
+	vflist_listview_add_column(vf, FILE_COLUMN_STAR_RATING, _("Stars"), FALSE, FALSE, FALSE);
+	g_assert(column == FILE_VIEW_COLUMN_STAR_RATING);
+	column++;
+
 	vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE);
 	g_assert(column == FILE_VIEW_COLUMN_SIZE);
 	column++;
--- a/src/view_file/view_file_list.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/view_file/view_file_list.h	Sat Jun 30 15:28:52 2018 +0300
@@ -38,6 +38,7 @@
 
 void vflist_thumb_set(ViewFile *vf, gboolean enable);
 void vflist_marks_set(ViewFile *vf, gboolean enable);
+void vflist_star_rating_set(ViewFile *vf, gboolean enable);
 void vflist_sort_set(ViewFile *vf, SortType type, gboolean ascend);
 
 GList *vflist_selection_get_one(ViewFile *vf, FileData *fd);
@@ -69,9 +70,10 @@
 void vflist_color_set(ViewFile *vf, FileData *fd, gboolean color_set);
 
 void vflist_thumb_progress_count(GList *list, gint *count, gint *done);
+void vflist_read_metadata_progress_count(GList *list, gint *count, gint *done);
 void vflist_set_thumb_fd(ViewFile *vf, FileData *fd);
 FileData *vflist_thumb_next_fd(ViewFile *vf);
 void vflist_thumb_reset_all(ViewFile *vf);
-
+void vflist_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/window.c	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/window.c	Sat Jun 30 15:28:52 2018 +0300
@@ -25,6 +25,8 @@
 #include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_help.h"
+#include "ui_misc.h"
+#include "ui_utildlg.h"
 
 GtkWidget *window_new(GtkWindowType type, const gchar *role, const gchar *icon,
 		      const gchar *icon_file, const gchar *subtitle)
@@ -313,4 +315,91 @@
 		}
 }
 
+/*
+ *-----------------------------------------------------------------------------
+ * on-line help search dialog
+ *-----------------------------------------------------------------------------
+ */
+
+typedef struct _HelpSearchData HelpSearchData;
+struct _HelpSearchData {
+	GenericDialog *gd;
+	GtkWidget *edit_widget;
+	gchar *text_entry;
+};
+
+static void help_search_window_show_icon_press(GtkEntry *entry, GtkEntryIconPosition pos,
+									GdkEvent *event, gpointer userdata)
+{
+	HelpSearchData *hsd = userdata;
+
+	g_free(hsd->text_entry);
+	hsd->text_entry = g_strdup("");
+	gtk_entry_set_text(GTK_ENTRY(hsd->edit_widget), hsd->text_entry);
+}
+
+static void help_search_window_ok_cb(GenericDialog *gd, gpointer data)
+{
+	HelpSearchData *hsd = data;
+	gchar *search_command;
+
+	search_command = g_strconcat(options->help_search_engine,
+						gtk_entry_get_text(GTK_ENTRY(hsd->edit_widget)),
+						NULL);
+	help_browser_run(search_command);
+	g_free(search_command);
+
+	g_free(hsd);
+}
+
+static void help_search_window_cancel_cb(GenericDialog *gd, gpointer data)
+{
+	HelpSearchData *hsd = data;
+
+	g_free(hsd);
+}
+
+void help_search_window_show()
+{
+	HelpSearchData *hsd;
+	GenericDialog *gd;
+	GtkWidget *table;
+	GtkWidget *label1;
+	GtkWidget *label2;
+
+	hsd = g_new0(HelpSearchData, 1);
+	hsd->gd = gd = generic_dialog_new(_("On-line help search"), "help_search",
+				NULL, TRUE,
+				help_search_window_cancel_cb, hsd);
+	generic_dialog_add_message(gd, NULL, _("Search the on-line help files.\n"), NULL, FALSE);
+
+	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
+				  help_search_window_ok_cb, TRUE);
+
+	label1 = pref_label_new(GENERIC_DIALOG(gd)->vbox, _("Search engine:"));
+	gtk_misc_set_alignment(GTK_MISC(label1), 0.0, 0.5);
+
+	label2 = pref_label_new(GENERIC_DIALOG(gd)->vbox, options->help_search_engine);
+	gtk_misc_set_alignment(GTK_MISC(label2), 0.0, 0.5);
+	pref_spacer(GENERIC_DIALOG(gd)->vbox, 0);
+
+	table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE);
+	pref_table_label(table, 0, 0, _("Search terms:"), 1.0);
+	hsd->edit_widget = gtk_entry_new();
+	gtk_widget_set_size_request(hsd->edit_widget, 300, -1);
+	gtk_table_attach_defaults(GTK_TABLE(table), hsd->edit_widget, 1, 2, 0, 1);
+	generic_dialog_attach_default(gd, hsd->edit_widget);
+	gtk_widget_show(hsd->edit_widget);
+
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(hsd->edit_widget),
+						GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+	gtk_entry_set_icon_tooltip_text (GTK_ENTRY(hsd->edit_widget),
+						GTK_ENTRY_ICON_SECONDARY, _("Clear"));
+	g_signal_connect(GTK_ENTRY(hsd->edit_widget), "icon-press",
+						G_CALLBACK(help_search_window_show_icon_press), hsd);
+
+	gtk_widget_grab_focus(hsd->edit_widget);
+
+	gtk_widget_show(gd->dialog);
+}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/window.h	Fri Apr 13 19:06:23 2018 +0300
+++ b/src/window.h	Sat Jun 30 15:28:52 2018 +0300
@@ -27,7 +27,7 @@
 gboolean window_maximized(GtkWidget *window);
 
 void help_window_show(const gchar *key);
-
+void help_search_window_show();
 
 #endif /* WINDOW_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/zonedetect.c	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,597 @@
+/*
+ * Copyright (c) 2018, Bertold Van den Bergh (vandenbergh@bertold.org)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the author nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <math.h>
+
+#include "zonedetect.h"
+
+struct ZoneDetectOpaque {
+    int fd;
+    uint32_t length;
+    uint8_t* mapping;
+
+    uint8_t tableType;
+    uint8_t version;
+    uint8_t precision;
+    uint8_t numFields;
+
+    char* notice;
+    char** fieldNames;
+
+    uint32_t bboxOffset;
+    uint32_t metadataOffset;
+    uint32_t dataOffset;
+};
+
+static int32_t ZDFloatToFixedPoint(float input, float scale, unsigned int precision) {
+    float inputScaled = input / scale;
+    return inputScaled * (float)(1 << (precision-1));
+}
+
+static unsigned int ZDDecodeVariableLengthUnsigned(ZoneDetect* library, uint32_t* index, uint32_t* result) {
+    uint32_t value = 0;
+    unsigned int i=0, shift = 0;
+
+    if(*index >= library->length) {
+        return 0;
+    }
+
+    uint8_t* buffer = library->mapping + *index;
+    uint8_t* bufferEnd = library->mapping + library->length - 1;
+
+    while(1) {
+        value |= (buffer[i] & 0x7F) << shift;
+        shift += 7;
+
+        if(!(buffer[i] & 0x80)) {
+            break;
+        }
+
+        i++;
+        if(buffer + i > bufferEnd) {
+            return 0;
+        }
+    }
+
+    i++;
+    *result = value;
+    *index += i;
+    return i;
+}
+
+static unsigned int ZDDecodeVariableLengthSigned(ZoneDetect* library, uint32_t* index, int32_t* result) {
+    uint32_t value = 0;
+    unsigned int retVal = ZDDecodeVariableLengthUnsigned(library, index, &value);
+    *result = (value & 1)?-(value/2):(value/2);
+    return retVal;
+}
+
+static char* ZDParseString(ZoneDetect* library, uint32_t* index) {
+    uint32_t strLength;
+    if(!ZDDecodeVariableLengthUnsigned(library, index, &strLength)) {
+        return NULL;
+    }
+
+    uint32_t strOffset = *index;
+    unsigned int remoteStr = 0;
+    if(strLength >= 256) {
+        strOffset = library->metadataOffset + strLength - 256;
+        remoteStr = 1;
+
+        if(!ZDDecodeVariableLengthUnsigned(library, &strOffset, &strLength)) {
+            return NULL;
+        }
+
+        if(strLength > 256) {
+            return NULL;
+        }
+    }
+
+    char* str = malloc(strLength + 1);
+
+    if(str) {
+        unsigned int i;
+        for(i=0; i<strLength; i++) {
+            str[i] = library->mapping[strOffset+i] ^ 0x80;
+        }
+        str[strLength] = 0;
+    }
+
+    if(!remoteStr) {
+        *index += strLength;
+    }
+
+    return str;
+}
+
+static int ZDParseHeader(ZoneDetect* library) {
+    if(library->length < 7) {
+        return -1;
+    }
+
+    if(memcmp(library->mapping, "PLB", 3)) {
+        return -1;
+    }
+
+    library->tableType = library->mapping[3];
+    library->version   = library->mapping[4];
+    library->precision = library->mapping[5];
+    library->numFields = library->mapping[6];
+
+    if(library->version != 0) {
+        return -1;
+    }
+
+    uint32_t index = 7;
+
+    library->fieldNames = malloc(library->numFields * sizeof(char*));
+    unsigned int i;
+    for(i=0; i<library->numFields; i++) {
+        library->fieldNames[i] = ZDParseString(library, &index);
+    }
+
+    library->notice = ZDParseString(library, &index);
+    if(!library->notice) {
+        return -1;
+    }
+
+    uint32_t tmp;
+    /* Read section sizes */
+    /* By memset: library->bboxOffset = 0 */
+
+    if(!ZDDecodeVariableLengthUnsigned(library, &index, &tmp)) return -1;
+    library->metadataOffset = tmp + library->bboxOffset;
+
+    if(!ZDDecodeVariableLengthUnsigned(library, &index, &tmp))return -1;
+    library->dataOffset = tmp + library->metadataOffset;
+
+    if(!ZDDecodeVariableLengthUnsigned(library, &index, &tmp)) return -1;
+
+    /* Add header size to everything */
+    library->bboxOffset += index;
+    library->metadataOffset += index;
+    library->dataOffset += index;
+
+    /* Verify file length */
+    if(tmp + library->dataOffset != library->length) {
+        return -2;
+    }
+
+    return 0;
+}
+
+static int ZDPointInBox(int32_t xl, int32_t x, int32_t xr, int32_t yl, int32_t y, int32_t yr) {
+    if((xl <= x && x <= xr) || (xr <= x && x <= xl)) {
+        if((yl <= y && y <= yr) || (yr <= y && y <= yl)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static ZDLookupResult ZDPointInPolygon(ZoneDetect* library, uint32_t polygonIndex, int32_t latFixedPoint, int32_t lonFixedPoint, uint64_t* distanceSqrMin) {
+    uint32_t numVertices;
+    int32_t pointLat = 0, pointLon = 0, diffLat = 0, diffLon = 0, firstLat = 0, firstLon = 0, prevLat = 0, prevLon = 0;
+    lonFixedPoint -= 3;
+
+    /* Read number of vertices */
+    if(!ZDDecodeVariableLengthUnsigned(library, &polygonIndex, &numVertices)) return ZD_LOOKUP_PARSE_ERROR;
+    if(numVertices > 1000000) return ZD_LOOKUP_PARSE_ERROR;
+
+    int prevQuadrant = 0, winding = 0;
+
+    uint32_t i;
+    for(i=0; i<=numVertices; i++) {
+        if(i<numVertices) {
+            if(!ZDDecodeVariableLengthSigned(library, &polygonIndex, &diffLat)) return ZD_LOOKUP_PARSE_ERROR;
+            if(!ZDDecodeVariableLengthSigned(library, &polygonIndex, &diffLon)) return ZD_LOOKUP_PARSE_ERROR;
+            pointLat += diffLat;
+            pointLon += diffLon;
+            if(i==0) {
+                firstLat = pointLat;
+                firstLon = pointLon;
+            }
+        } else {
+            /* The polygons should be closed, but just in case */
+            pointLat = firstLat;
+            pointLon = firstLon;
+        }
+
+        /* Check if point is ON the border */
+        if(pointLat == latFixedPoint && pointLon == lonFixedPoint) {
+            if(distanceSqrMin) *distanceSqrMin=0;
+            return ZD_LOOKUP_ON_BORDER_VERTEX;
+        }
+
+        /* Find quadrant */
+        int quadrant;
+        if(pointLat>=latFixedPoint) {
+            if(pointLon>=lonFixedPoint) {
+                quadrant = 0;
+            } else {
+                quadrant = 1;
+            }
+        } else {
+            if(pointLon>=lonFixedPoint) {
+                quadrant = 3;
+            } else {
+                quadrant = 2;
+            }
+        }
+
+        if(i>0) {
+            int windingNeedCompare = 0, lineIsStraight = 0;
+            float a = 0, b = 0;
+
+            /* Calculate winding number */
+            if(quadrant == prevQuadrant) {
+                /* Do nothing */
+            } else if(quadrant == (prevQuadrant + 1) % 4) {
+                winding ++;
+            } else if((quadrant + 1) % 4 == prevQuadrant) {
+                winding --;
+            } else {
+                windingNeedCompare = 1;
+            }
+
+            /* Avoid horizontal and vertical lines */
+            if((pointLon == prevLon || pointLat == prevLat)) {
+                lineIsStraight = 1;
+            }
+
+            /* Calculate the parameters of y=ax+b if needed */
+            if(!lineIsStraight && (distanceSqrMin || windingNeedCompare)) {
+                a = ((float)pointLat - (float)prevLat)/((float)pointLon - prevLon);
+                b = (float)pointLat - a*(float)pointLon;
+            }
+
+            /* Jumped two quadrants. */
+            if(windingNeedCompare) {
+                if(lineIsStraight) {
+                    if(distanceSqrMin) *distanceSqrMin=0;
+                    return ZD_LOOKUP_ON_BORDER_SEGMENT;
+                }
+
+                /* Check if the target is on the border */
+                int32_t intersectLon = ((float)latFixedPoint - b)/a;
+                if(intersectLon == lonFixedPoint) {
+                    if(distanceSqrMin) *distanceSqrMin=0;
+                    return ZD_LOOKUP_ON_BORDER_SEGMENT;
+                }
+
+                /* Ok, it's not. In which direction did we go round the target? */
+                int sign = (intersectLon < lonFixedPoint)?2:-2;
+                if(quadrant == 2 || quadrant == 3) {
+                    winding += sign;
+                } else {
+                    winding -= sign;
+                }
+            }
+
+            /* Calculate closest point on line (if needed) */
+            if(distanceSqrMin) {
+                float closestLon, closestLat;
+                if(!lineIsStraight) {
+                    closestLon=((float)lonFixedPoint+a*(float)latFixedPoint-a*b)/(a*a+1);
+                    closestLat=(a*((float)lonFixedPoint+a*(float)latFixedPoint)+b)/(a*a+1);
+                } else {
+                    if(pointLon == prevLon) {
+                        closestLon=pointLon;
+                        closestLat=latFixedPoint;
+                    } else {
+                        closestLon=lonFixedPoint;
+                        closestLat=pointLat;
+                    }
+                }
+
+                int closestInBox = ZDPointInBox(pointLon, closestLon, prevLon, pointLat, closestLat, prevLat);
+
+                int64_t diffLat, diffLon;
+                if(closestInBox) {
+                    /* Calculate squared distance to segment. */
+                    diffLat = closestLat - latFixedPoint;
+                    diffLon = (closestLon - lonFixedPoint);
+                } else {
+                    /*
+                     * Calculate squared distance to vertices
+                     * It is enough to check the current point since the polygon is closed.
+                     */
+                    diffLat = pointLat - latFixedPoint;
+                    diffLon = (pointLon - lonFixedPoint);
+                }
+
+                /* Note: lon has half scale */
+                uint64_t distanceSqr = diffLat*diffLat + diffLon*diffLon*4;
+                if(distanceSqr < *distanceSqrMin) *distanceSqrMin = distanceSqr;
+            }
+        }
+
+        prevQuadrant = quadrant;
+        prevLat = pointLat;
+        prevLon = pointLon;
+    }
+
+    if(winding == -4) {
+        return ZD_LOOKUP_IN_ZONE;
+    } else if(winding == 4) {
+        return ZD_LOOKUP_IN_EXCLUDED_ZONE;
+    } else if(winding == 0) {
+        return ZD_LOOKUP_NOT_IN_ZONE;
+    }
+
+    /* Should not happen */
+    if(distanceSqrMin) *distanceSqrMin=0;
+    return ZD_LOOKUP_ON_BORDER_SEGMENT;
+}
+
+void ZDCloseDatabase(ZoneDetect* library) {
+    if(library) {
+        if(library->fieldNames) {
+            unsigned int i;
+            for(i=0; i<library->numFields; i++) {
+                if(library->fieldNames[i]) {
+                    free(library->fieldNames[i]);
+                }
+            }
+            free(library->fieldNames);
+        }
+        if(library->notice) {
+            free(library->notice);
+        }
+        if(library->mapping) {
+            munmap(library->mapping, library->length);
+        }
+        if(library->fd >= 0) {
+            close(library->fd);
+        }
+        free(library);
+    }
+}
+
+ZoneDetect* ZDOpenDatabase(const char* path) {
+    ZoneDetect* library = (ZoneDetect*)malloc(sizeof(*library));
+
+    if(library) {
+        memset(library, 0, sizeof(*library));
+
+        library->fd = open(path, O_RDONLY | O_CLOEXEC);
+        if(library->fd < 0) {
+            goto fail;
+        }
+
+        library->length = lseek(library->fd, 0, SEEK_END);
+        if(library->length <= 0) {
+            goto fail;
+        }
+        lseek(library->fd, 0, SEEK_SET);
+
+        library->mapping = mmap(NULL, library->length, PROT_READ, MAP_PRIVATE | MAP_FILE, library->fd, 0);
+        if(!library->mapping) {
+            goto fail;
+        }
+
+        /* Parse the header */
+        if(ZDParseHeader(library)) {
+            goto fail;
+        }
+    }
+
+    return library;
+
+fail:
+    ZDCloseDatabase(library);
+    return NULL;
+}
+
+ZoneDetectResult* ZDLookup(ZoneDetect* library, float lat, float lon, float* safezone) {
+    int32_t latFixedPoint = ZDFloatToFixedPoint(lat, 90, library->precision);
+    int32_t lonFixedPoint = ZDFloatToFixedPoint(lon, 180, library->precision);
+    unsigned int numResults = 0;
+    uint64_t distanceSqrMin=-1;
+
+    /* Iterate over all polygons */
+    uint32_t bboxIndex = library->bboxOffset;
+    int32_t metadataIndex = 0;
+    int32_t polygonIndex = 0;
+
+    ZoneDetectResult* results = malloc(sizeof(ZoneDetectResult));
+    if(!results) {
+        return NULL;
+    }
+
+    while(bboxIndex < library->metadataOffset) {
+        int32_t minLat, minLon, maxLat, maxLon, metadataIndexDelta;
+        uint32_t polygonIndexDelta;
+        if(!ZDDecodeVariableLengthSigned(library, &bboxIndex, &minLat)) break;
+        if(!ZDDecodeVariableLengthSigned(library, &bboxIndex, &minLon)) break;
+        if(!ZDDecodeVariableLengthSigned(library, &bboxIndex, &maxLat)) break;
+        if(!ZDDecodeVariableLengthSigned(library, &bboxIndex, &maxLon)) break;
+        if(!ZDDecodeVariableLengthSigned(library, &bboxIndex, &metadataIndexDelta)) break;
+        if(!ZDDecodeVariableLengthUnsigned(library, &bboxIndex, &polygonIndexDelta)) break;
+
+        metadataIndex+=metadataIndexDelta;
+        polygonIndex+=polygonIndexDelta;
+
+        if(latFixedPoint >= minLat) {
+            if(latFixedPoint <= maxLat &&
+                    lonFixedPoint >= minLon &&
+                    lonFixedPoint <= maxLon) {
+
+                /* Indices valid? */
+                if(library->metadataOffset + metadataIndex >= library->dataOffset) continue;
+                if(library->dataOffset + polygonIndex >= library->length) continue;
+
+                ZDLookupResult lookupResult = ZDPointInPolygon(library, library->dataOffset + polygonIndex, latFixedPoint, lonFixedPoint, (safezone)?&distanceSqrMin:NULL);
+                if(lookupResult == ZD_LOOKUP_PARSE_ERROR) {
+                    break;
+                } else if(lookupResult != ZD_LOOKUP_NOT_IN_ZONE) {
+                    ZoneDetectResult* newResults = realloc(results, sizeof(ZoneDetectResult) * (numResults+2));
+
+                    if(newResults) {
+                        results = newResults;
+                        results[numResults].metaId = metadataIndex;
+                        results[numResults].numFields = library->numFields;
+                        results[numResults].fieldNames = library->fieldNames;
+                        results[numResults].lookupResult = lookupResult;
+
+                        numResults++;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        } else {
+            /* The data is sorted along minLat */
+            break;
+        }
+    }
+
+    /* Clean up results */
+    unsigned int i, j;
+    for(i=0; i<numResults; i++) {
+        int insideSum = 0;
+        ZDLookupResult overrideResult = ZD_LOOKUP_IGNORE;
+        for(j=i; j<numResults; j++) {
+            if(results[i].metaId == results[j].metaId) {
+                ZDLookupResult tmpResult = results[j].lookupResult;
+                results[j].lookupResult = ZD_LOOKUP_IGNORE;
+
+                /* This is the same result. Is it an exclusion zone? */
+                if(tmpResult == ZD_LOOKUP_IN_ZONE) {
+                    insideSum++;
+                } else if(tmpResult == ZD_LOOKUP_IN_EXCLUDED_ZONE) {
+                    insideSum--;
+                } else {
+                    /* If on the bodrder then the final result is on the border */
+                    overrideResult = tmpResult;
+                }
+
+            }
+        }
+
+        if(overrideResult != ZD_LOOKUP_IGNORE) {
+            results[i].lookupResult = overrideResult;
+        } else {
+            if(insideSum) {
+                results[i].lookupResult = ZD_LOOKUP_IN_ZONE;
+            }
+        }
+    }
+
+    /* Remove zones to ignore */
+    unsigned int newNumResults = 0;
+    for(i=0; i<numResults; i++) {
+        if(results[i].lookupResult != ZD_LOOKUP_IGNORE) {
+            results[newNumResults] = results[i];
+            newNumResults++;
+        }
+    }
+    numResults = newNumResults;
+
+    /* Lookup metadata */
+    for(i=0; i<numResults; i++) {
+        uint32_t tmpIndex = library->metadataOffset + results[i].metaId;
+        results[i].data = malloc(library->numFields * sizeof(char*));
+        if(results[i].data) {
+            for(j=0; j<library->numFields; j++) {
+                results[i].data[j] = ZDParseString(library, &tmpIndex);
+            }
+        }
+    }
+
+    /* Write end marker */
+    results[numResults].lookupResult = ZD_LOOKUP_END;
+    results[numResults].numFields = 0;
+    results[numResults].fieldNames = NULL;
+    results[numResults].data = NULL;
+
+    if(safezone) {
+        *safezone = sqrtf(distanceSqrMin) * 90 / (float)(1 << (library->precision-1));
+    }
+
+    return results;
+}
+
+void ZDFreeResults(ZoneDetectResult* results) {
+    unsigned int index = 0;
+
+    if(!results) {
+        return;
+    }
+
+    while(results[index].lookupResult != ZD_LOOKUP_END) {
+        if(results[index].data) {
+            unsigned int i;
+            for(i=0; i<results[index].numFields; i++) {
+                if(results[index].data[i]) {
+                    free(results[index].data[i]);
+                }
+            }
+            free(results[index].data);
+        }
+        index++;
+    }
+    free(results);
+}
+
+const char* ZDGetNotice(ZoneDetect* library) {
+    return library->notice;
+}
+
+uint8_t ZDGetTableType(ZoneDetect* library) {
+    return library->tableType;
+}
+
+const char* ZDLookupResultToString(ZDLookupResult result) {
+    switch(result) {
+    case ZD_LOOKUP_IGNORE:
+        return "Ignore";
+    case ZD_LOOKUP_END:
+        return "End";
+    case ZD_LOOKUP_PARSE_ERROR:
+        return "Parsing error";
+    case ZD_LOOKUP_NOT_IN_ZONE:
+        return "Not in zone";
+    case ZD_LOOKUP_IN_ZONE:
+        return "In zone";
+    case ZD_LOOKUP_IN_EXCLUDED_ZONE:
+        return "In excluded zone";
+    case ZD_LOOKUP_ON_BORDER_VERTEX:
+        return "Target point is border vertex";
+    case ZD_LOOKUP_ON_BORDER_SEGMENT:
+        return "Target point is on border";
+    }
+
+    return "Unknown";
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/zonedetect.h	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018, Bertold Van den Bergh (vandenbergh@bertold.org)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the author nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR DISTRIBUTOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdint.h>
+
+#ifndef _ZONEDETECT_H_
+#define _ZONEDETECT_H_
+
+typedef enum {
+    ZD_LOOKUP_IGNORE = -3,
+    ZD_LOOKUP_END = -2,
+    ZD_LOOKUP_PARSE_ERROR = -1,
+    ZD_LOOKUP_NOT_IN_ZONE = 0,
+    ZD_LOOKUP_IN_ZONE = 1,
+    ZD_LOOKUP_IN_EXCLUDED_ZONE = 2,
+    ZD_LOOKUP_ON_BORDER_VERTEX = 3,
+    ZD_LOOKUP_ON_BORDER_SEGMENT = 4
+} ZDLookupResult;
+
+typedef struct {
+    ZDLookupResult lookupResult;
+
+    uint32_t metaId;
+    uint8_t numFields;
+    char** fieldNames;
+    char** data;
+} ZoneDetectResult;
+
+struct ZoneDetectOpaque;
+typedef struct ZoneDetectOpaque ZoneDetect;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ZoneDetect* ZDOpenDatabase(const char* path);
+void        ZDCloseDatabase(ZoneDetect* library);
+
+ZoneDetectResult* ZDLookup(ZoneDetect* library, float lat, float lon, float* safezone);
+void              ZDFreeResults(ZoneDetectResult* results);
+
+const char* ZDGetNotice(ZoneDetect* library);
+uint8_t     ZDGetTableType(ZoneDetect* library);
+const char* ZDLookupResultToString(ZDLookupResult result);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/web/help/GuideImageMarks.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideImageMarks.html	Sat Jun 30 15:28:52 2018 +0300
@@ -423,6 +423,7 @@
 <li><a class="xref" href="GuideOtherWindows.html" title="Stand-alone Windows">Stand-alone Windows</a></li>
 <li>
 <a class="xref" href="GuideImageSearch.html" title="Search and Select">Search and Select</a><div class="autotoc"><ul>
+<li><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></li>
 <li><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></li>
 <li><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a></li>
 <li>Marking Images</li>
@@ -459,23 +460,30 @@
     <span class="guimenu">Select</span>
     menu gives access to the marks operations of setting, filtering and intersection.
   </p>
-<p class="para block">There are 6 individual marks, any of which can be associated with an image simply by pressing the 1 to 6 keys on the keyboard.</p>
+<p class="para block">There are 10 individual marks, any of which can be associated with an image simply by pressing the 0 to 9 keys on the keyboard, where key 0 represents mark 10.</p>
 <p class="para block">
     If the
     <span class="guimenu">Show Marks</span>
-    menu has been selected, each image will have a set of 6 check-boxes displayed adjacent to it in the file pane in both icon and list mode. In addition a set of 6 check-boxes will be shown at the top of the files pane. Clicking any of these will filter the displayed list.
+    menu has been selected, each image will have a set of 10 check-boxes displayed adjacent to it in the file pane in both icon and list mode. In addition a set of 10 check-boxes will be shown at the top of the files pane. Clicking any of these will filter the displayed list.
   </p>
+<p class="para block">Moving the mouse over any of the check-boxes at the top of the files pane will show mnemonic text for that mark. The text can be modified by right-clicking on the check box.</p>
 <p class="para block">
     If the
     <a class="link" href="GuideMainWindowImagePane.html#InformationandhistogramOverlay" title="Image Overlay">Image Overlay</a>
     is being displayed, the currently set marks for the image are shown. It is not necessary to include an entry into the overlay template for this to happen.
   </p>
 <p class="para block">
-    A keyword can be associated with a single mark by right-clicking on the keyword in the sidebar panel. When a meta-data write operation for a file is triggered either <a class="link" href="GuideMainWindowStatusBar.html#Buttons" title="Buttons">manually</a> or as defined in
+    A keyword can be associated with a single mark by right-clicking on the keyword in the sidebar panel. When a meta-data write operation for a file is triggered either
+    <a class="link" href="GuideMainWindowStatusBar.html#Buttons" title="Buttons">manually</a>
+    or as defined in
     <a class="link" href="GuideOptionsMetadata.html" title="Metadata">Metadata</a>
     , the keyword data indicated by the current set of mark-to-keyword links will be written.
   </p>
-<p class="para block">Neither marks, nor the associations between keywords and marks, are preserved when Geeqie is shut down.</p>
+<p class="para block">
+    The associations between keywords and marks is preserved when Geeqie is shut down. The current setting of marks can also be optionally saved - the setting is in the
+    <a class="link" href="GuideOptionsBehavior.html#Behaviour" title="Behavior">Behavior tab of Preferences</a>
+    .
+  </p>
 <p class="para block"></p>
 <p class="para block"></p>
 </div></div>
--- a/web/help/GuideImageSearch.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideImageSearch.html	Sat Jun 30 15:28:52 2018 +0300
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Search and Select</title>
 <link rel="previous" href="GuideCollections.html" title="Collections">
-<link rel="next" href="GuideImageSearchSearch.html" title="Search Window">
+<link rel="next" href="GuideImageSearchCache.html" title="Caching Data For Searches">
 <link rel="top" href="GuideIndex.html" title="The Geeqie User Manual">
 <style type="text/css">
 
@@ -411,7 +411,7 @@
 <body>
 <div class="navbar navbar-top"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideCollections.html" title="Collections">Collections</a></td>
-<td class="navbar-next"><a class="navbar-next" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></td>
 </tr></table></div>
 <div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
 <li><a href="GuideIndex-info.html" title="About This Document">About This Document</a></li>
@@ -422,6 +422,7 @@
 <li><a class="xref" href="GuideSidebars.html" title="Sidebars">Sidebars</a></li>
 <li><a class="xref" href="GuideOtherWindows.html" title="Stand-alone Windows">Stand-alone Windows</a></li>
 <li>Search and Select<div class="autotoc"><ul>
+<li><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></li>
 <li><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></li>
 <li><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a></li>
 <li><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a></li>
@@ -451,19 +452,22 @@
 <p class="para block"></p>
 <div class="autotoc"><ul>
 <li>
-<span class="label">5.1. </span><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a>
+<span class="label">5.1. </span><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a>
 </li>
 <li>
-<span class="label">5.2. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a>
+<span class="label">5.2. </span><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a>
 </li>
 <li>
-<span class="label">5.3. </span><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a>
+<span class="label">5.3. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a>
+</li>
+<li>
+<span class="label">5.4. </span><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a>
 </li>
 </ul></div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideCollections.html" title="Collections">Collections</a></td>
-<td class="navbar-next"><a class="navbar-next" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></td>
 </tr></table></div>
 </body>
 </html>
--- a/web/help/GuideImageSearchFindingDuplicates.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideImageSearchFindingDuplicates.html	Sat Jun 30 15:28:52 2018 +0300
@@ -423,6 +423,7 @@
 <li><a class="xref" href="GuideOtherWindows.html" title="Stand-alone Windows">Stand-alone Windows</a></li>
 <li>
 <a class="xref" href="GuideImageSearch.html" title="Search and Select">Search and Select</a><div class="autotoc"><ul>
+<li><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></li>
 <li><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></li>
 <li>Finding Duplicates</li>
 <li><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a></li>
@@ -457,38 +458,38 @@
   </p>
 <div class="autotoc"><ul>
 <li>
-<span class="label">5.2.1. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Addingfilestobecompared" title="Adding files to be compared">Adding files to be compared</a>
+<span class="label">5.3.1. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Addingfilestobecompared" title="Adding files to be compared">Adding files to be compared</a>
 </li>
 <li>
-<span class="label">5.2.2. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Comparisonmethods" title="Comparison methods">Comparison methods</a>
+<span class="label">5.3.2. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Comparisonmethods" title="Comparison methods">Comparison methods</a>
 </li>
 <li>
-<span class="label">5.2.3. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Resultslist" title="Results list">Results list</a>
+<span class="label">5.3.3. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Resultslist" title="Results list">Results list</a>
 </li>
 <li>
-<span class="label">5.2.4. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Statusbar" title="Status bar">Status bar</a>
+<span class="label">5.3.4. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Statusbar" title="Status bar">Status bar</a>
 </li>
 <li>
-<span class="label">5.2.5. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Thumbnails" title="Thumbnails">Thumbnails</a>
+<span class="label">5.3.5. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Thumbnails" title="Thumbnails">Thumbnails</a>
 </li>
 <li>
-<span class="label">5.2.6. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Rotation" title="Ignore Rotation">Ignore Rotation</a>
+<span class="label">5.3.6. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Rotation" title="Ignore Rotation">Ignore Rotation</a>
 </li>
 <li>
-<span class="label">5.2.7. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Sort" title="Sort">Sort</a>
+<span class="label">5.3.7. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Sort" title="Sort">Sort</a>
 </li>
 <li>
-<span class="label">5.2.8. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Comparetwofilesets" title="Compare two file sets">Compare two file sets</a>
+<span class="label">5.3.8. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#Comparetwofilesets" title="Compare two file sets">Compare two file sets</a>
 </li>
 <li>
-<span class="label">5.2.9. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#DragandDrop" title="Drag and Drop">Drag and Drop</a>
+<span class="label">5.3.9. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#DragandDrop" title="Drag and Drop">Drag and Drop</a>
 </li>
 <li>
-<span class="label">5.2.10. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#ImageDataWindow" title="Image Data Window">Image Data Window</a>
+<span class="label">5.3.10. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html#ImageDataWindow" title="Image Data Window">Image Data Window</a>
 </li>
 </ul></div>
 <div class="division section">
-<a name="Addingfilestobecompared"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.1. </span>Adding files to be compared</span></h2></div>
+<a name="Addingfilestobecompared"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.1. </span>Adding files to be compared</span></h2></div>
 <p class="para block block-first">Add files to be compared using drag and drop. Drop files or folders onto the Find Duplicates window to add them to the list of files to compare. When one or more folders are dropped onto the window a menu will appear allowing you to choose the desired action:</p>
 <div class="block list variablelist"><dl class="variablelist">
 <dt class="term dt-first">
@@ -510,7 +511,7 @@
 </dl></div>
 </div>
 <div class="division section">
-<a name="Comparisonmethods"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.2. </span>Comparison methods</span></h2></div>
+<a name="Comparisonmethods"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.2. </span>Comparison methods</span></h2></div>
 <p class="para block block-first">
       The attribute to use for two images to match can be selected with the
       <span class="emphasis emphasis-bold">Compare by:</span>
@@ -588,7 +589,7 @@
 </dl></div>
 </div>
 <div class="division section">
-<a name="Resultslist"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.3. </span>Results list</span></h2></div>
+<a name="Resultslist"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.3. </span>Results list</span></h2></div>
 <p class="para block block-first">Files that match with the selected comparison method will appear in the list. Matching files are grouped in alternating color.</p>
 <p class="para block">The order of the result list can not be changed, files will appear in the order of the search. When comparing by image content similarity, the matching groups will be sorted by order of rank starting with the files that are most similar.</p>
 <p class="para block">
@@ -611,7 +612,7 @@
 <p class="para block">The image Dimensions column of the result list will only contain dimension information when comparing by dimensions, or when the data is easily available from memory or has been read from the cache.</p>
 </div>
 <div class="division section">
-<a name="Statusbar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.4. </span>Status bar</span></h2></div>
+<a name="Statusbar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.4. </span>Status bar</span></h2></div>
 <p class="para block block-first">Along the bottom of the Find Duplicates window is an area that displays the count of files contained in the window, and the number of files in the result list.</p>
 <p class="para block">The status bar will also display the status of an active compare operation using the progress bar. A compare operation involves 2 or 3 stages, depending on the type of comparison. These are the stages in order:</p>
 <div class="block list orderedlist"><ol class="orderedlist">
@@ -627,15 +628,15 @@
 </ol></div>
 </div>
 <div class="division section">
-<a name="Thumbnails"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.5. </span>Thumbnails</span></h2></div>
+<a name="Thumbnails"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.5. </span>Thumbnails</span></h2></div>
 <p class="para block block-first">Thumbnails can be displayed beside each image in the result list by enabling the Thumbnails check box.</p>
 </div>
 <div class="division section">
-<a name="Rotation"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.6. </span>Ignore Rotation</span></h2></div>
+<a name="Rotation"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.6. </span>Ignore Rotation</span></h2></div>
 <p class="para block block-first">When checked, the rotational orientation of images will be ignored.</p>
 </div>
 <div class="division section">
-<a name="Sort"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.7. </span>Sort</span></h2></div>
+<a name="Sort"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.7. </span>Sort</span></h2></div>
 <p class="para block block-first">
       The normal sort order is for groups (in the case of Similarity checks) with the highest number of near-100% matches to be at the top of the list.
       <p class="para block block-first"></p>
@@ -643,16 +644,16 @@
     </p>
 </div>
 <div class="division section">
-<a name="Comparetwofilesets"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.8. </span>Compare two file sets</span></h2></div>
+<a name="Comparetwofilesets"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.8. </span>Compare two file sets</span></h2></div>
 <p class="para block block-first">Sometimes it is useful to compare one group of files to another, different group of files. Enable this check box to compare two groups of files. When enabled, a second list will appear and files can be added to this list using the same methods for the main list.</p>
 <p class="para block">When comparing two file sets the results list will display matches between the two lists. For each match group, the first file is always from the main group, and the remaining files are always from the second group.</p>
 </div>
 <div class="division section">
-<a name="DragandDrop"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.9. </span>Drag and Drop</span></h2></div>
+<a name="DragandDrop"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.9. </span>Drag and Drop</span></h2></div>
 <p class="para block block-first">Drag and drop can be initiated with the primary or middle mouse buttons. Dragging a file that is selected will include all selected files in the drag. Dragging a file that is not selected will first change the selection to the dragged file, and clear the previous selection.</p>
 </div>
 <div class="division section">
-<a name="ImageDataWindow"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.10. </span>Image Data Window</span></h2></div>
+<a name="ImageDataWindow"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.3.10. </span>Image Data Window</span></h2></div>
 <p class="para block block-first">
       <span class="code" dir="ltr">Ctrl+Shift+Right Mouse click</span>
       : Use this to display a dialog containing the data stored for the clicked image file. This is usually only useful for debugging purposes.
--- a/web/help/GuideImageSearchSearch.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideImageSearchSearch.html	Sat Jun 30 15:28:52 2018 +0300
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Search Window</title>
-<link rel="previous" href="GuideImageSearchSearch.html" title="Search Window">
+<link rel="previous" href="GuideImageSearchCache.html" title="Caching Data For Searches">
 <link rel="next" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">
 <link rel="top" href="GuideIndex.html" title="The Geeqie User Manual">
 <style type="text/css">
@@ -410,7 +410,7 @@
 </head>
 <body>
 <div class="navbar navbar-top"><table class="navbar"><tr>
-<td class="navbar-prev"><a class="navbar-prev" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></td>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></td>
 <td class="navbar-next"><a class="navbar-next" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a></td>
 </tr></table></div>
 <div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
@@ -423,6 +423,7 @@
 <li><a class="xref" href="GuideOtherWindows.html" title="Stand-alone Windows">Stand-alone Windows</a></li>
 <li>
 <a class="xref" href="GuideImageSearch.html" title="Search and Select">Search and Select</a><div class="autotoc"><ul>
+<li><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></li>
 <li>Search Window</li>
 <li><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a></li>
 <li><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a></li>
@@ -483,23 +484,23 @@
 <p class="para block"></p>
 <div class="autotoc"><ul>
 <li>
-<span class="label">5.1.1. </span><a class="xref" href="GuideImageSearchSearch.html#Searchlocation" title="Search location">Search location</a>
+<span class="label">5.2.1. </span><a class="xref" href="GuideImageSearchSearch.html#Searchlocation" title="Search location">Search location</a>
 </li>
 <li>
-<span class="label">5.1.2. </span><a class="xref" href="GuideImageSearchSearch.html#Searchparameters" title="Search parameters">Search parameters</a>
+<span class="label">5.2.2. </span><a class="xref" href="GuideImageSearchSearch.html#Searchparameters" title="Search parameters">Search parameters</a>
 </li>
 <li>
-<span class="label">5.1.3. </span><a class="xref" href="GuideImageSearchSearch.html#Resultslist" title="Results list">Results list</a>
+<span class="label">5.2.3. </span><a class="xref" href="GuideImageSearchSearch.html#Resultslist" title="Results list">Results list</a>
 </li>
 <li>
-<span class="label">5.1.4. </span><a class="xref" href="GuideImageSearchSearch.html#Statusbar" title="Status bar">Status bar</a>
+<span class="label">5.2.4. </span><a class="xref" href="GuideImageSearchSearch.html#Statusbar" title="Status bar">Status bar</a>
 </li>
 <li>
-<span class="label">5.1.5. </span><a class="xref" href="GuideImageSearchSearch.html#DragandDrop" title="Drag and Drop">Drag and Drop</a>
+<span class="label">5.2.5. </span><a class="xref" href="GuideImageSearchSearch.html#DragandDrop" title="Drag and Drop">Drag and Drop</a>
 </li>
 </ul></div>
 <div class="division section">
-<a name="Searchlocation"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.1.1. </span>Search location</span></h2></div>
+<a name="Searchlocation"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.1. </span>Search location</span></h2></div>
 <p class="para block block-first">One of several locations can be chosen as the source to use in the search.</p>
 <div class="block list variablelist"><dl class="variablelist">
 <dt class="term dt-first">
@@ -524,7 +525,7 @@
 <p class="para block"></p>
 </div>
 <div class="division section">
-<a name="Searchparameters"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.1.2. </span>Search parameters</span></h2></div>
+<a name="Searchparameters"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.2. </span>Search parameters</span></h2></div>
 <p class="para block block-first">Each search parameter can be enabled or disabled with the check box to its left. For a file to be a match, all enabled parameters must be true.</p>
 <div class="block list variablelist"><dl class="variablelist">
 <dt class="term dt-first">
@@ -620,12 +621,20 @@
 <li>Metadata</li>
 </ul></div>
         </dd>
+<dt class="term">
+          <span class="guilabel">Marks</span>
+        </dt>
+<dd>
+          The search will match if the file does or does not have a mark attached to it. Refer to
+          <a class="link" href="GuideImageMarks.html" title="Marking Images">Marking Images</a>
+          .
+        </dd>
 </dl></div>
 <p class="para block"></p>
 <p class="para block"></p>
 </div>
 <div class="division section">
-<a name="Resultslist"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.1.3. </span>Results list</span></h2></div>
+<a name="Resultslist"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.3. </span>Results list</span></h2></div>
 <p class="para block block-first">Files that match the parameters of the search are shown in the list. By default they are displayed in the order that they are found. To sort the results list by a column, activate or click the column title. Activating a column that is already used to sort the list will toggle between increasing and decreasing sort order.</p>
 <p class="para block">
       A
@@ -641,7 +650,7 @@
 <p class="para block"></p>
 </div>
 <div class="division section">
-<a name="Statusbar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.1.4. </span>Status bar</span></h2></div>
+<a name="Statusbar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.4. </span>Status bar</span></h2></div>
 <p class="para block block-first">At the bottom of the search window is an area that includes the following items from left to right:</p>
 <div class="block list variablelist">
 <p class="para block"></p>
@@ -686,13 +695,13 @@
 <p class="para block"></p>
 </div>
 <div class="division section">
-<a name="DragandDrop"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.1.5. </span>Drag and Drop</span></h2></div>
+<a name="DragandDrop"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">5.2.5. </span>Drag and Drop</span></h2></div>
 <p class="para block block-first">Drag and drop can be initiated with the primary or middle mouse buttons. Dragging a file that is selected will include all selected files in the drag. Dragging a file that is not selected will first change the selection to the dragged file, and clear the previous selection.</p>
 <p class="para block"></p>
 </div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
-<td class="navbar-prev"><a class="navbar-prev" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a></td>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a></td>
 <td class="navbar-next"><a class="navbar-next" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a></td>
 </tr></table></div>
 </body>
--- a/web/help/GuideIndex.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideIndex.html	Sat Jun 30 15:28:52 2018 +0300
@@ -498,13 +498,16 @@
 <li>
 <span class="label">5. </span><a class="xref" href="GuideImageSearch.html" title="Search and Select">Search and Select</a><div class="autotoc"><ul>
 <li>
-<span class="label">5.1. </span><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a>
+<span class="label">5.1. </span><a class="xref" href="GuideImageSearchCache.html" title="Caching Data For Searches">Caching Data For Searches</a>
 </li>
 <li>
-<span class="label">5.2. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a>
+<span class="label">5.2. </span><a class="xref" href="GuideImageSearchSearch.html" title="Search Window">Search Window</a>
 </li>
 <li>
-<span class="label">5.3. </span><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a>
+<span class="label">5.3. </span><a class="xref" href="GuideImageSearchFindingDuplicates.html" title="Finding Duplicates">Finding Duplicates</a>
+</li>
+<li>
+<span class="label">5.4. </span><a class="xref" href="GuideImageMarks.html" title="Marking Images">Marking Images</a>
 </li>
 </ul></div>
 </li>
@@ -648,10 +651,13 @@
 <span class="label">13.10. </span><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a>
 </li>
 <li>
-<span class="label">13.11. </span><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a>
+<span class="label">13.11. </span><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a>
 </li>
 <li>
-<span class="label">13.12. </span><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a>
+<span class="label">13.12. </span><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a>
+</li>
+<li>
+<span class="label">13.13. </span><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a>
 </li>
 </ul></div>
 </li>
--- a/web/help/GuideMainWindowFilePane.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideMainWindowFilePane.html	Sat Jun 30 15:28:52 2018 +0300
@@ -636,6 +636,12 @@
 <dd>
           <p class="para block block-first">Toggles display of file names in the icon view display mode.</p>
         </dd>
+<dt class="term">
+          <span class="emphasis emphasis-bold">Show star rating</span>
+        </dt>
+<dd>
+          <p class="para block block-first">Toggles display of the "star rating" (Xmp.xmp.Rating).</p>
+        </dd>
 </dl></div>
 <p class="para block"></p>
 </div>
--- a/web/help/GuideMainWindowMenus.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideMainWindowMenus.html	Sat Jun 30 15:28:52 2018 +0300
@@ -732,6 +732,15 @@
           <p class="para block block-first">Displays marks in the file list</p>
         </dd>
 <dt class="term">
+          <span class="menuchoice"><span class="guimenu">Clear marks</span></span>
+        </dt>
+<dd>
+          <p class="para block block-first">Clear all marks for all images</p>
+          <div class="admonition block warning block-indent"><div class="warning-inner">
+            <p class="para block block-first">Marks that are linked to keywords will also be cleared. This may result in a metadata write operation being triggered.</p>
+          </div></div>
+        </dd>
+<dt class="term">
           <span class="menuchoice"><span class="guimenu">Mark n</span></span>
         </dt>
 <dd>
@@ -984,7 +993,7 @@
           </p>
         </dd>
 <dt class="term">
-          <span class="menuchoice"><span class="guimenu">Thumbnail maintenance</span></span>
+          <span class="menuchoice"><span class="guimenu">Cache maintenance</span></span>
         </dt>
 <dd>
           <p class="para block block-first">
@@ -1318,6 +1327,16 @@
           <p class="para block block-first">Opens the Geeqie user manual in a new browser window.</p>
         </dd>
 <dt class="term">
+          <span class="menuchoice"><span class="guimenu">On-line help search</span></span>
+        </dt>
+<dd>
+          <p class="para block block-first">
+            Use a web browser to search Geeqie's on-line help files. The search engine used is defined in
+            <a class="link" href="GuideOptionsGeneral.html#OnLineHelpSearch" title="On-line help search">Preferences General</a>
+            .
+          </p>
+        </dd>
+<dt class="term">
           <span class="menuchoice"><span class="guimenu">Keyboard shortcuts</span></span>
         </dt>
 <dd>
--- a/web/help/GuideMainWindowStatusBar.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideMainWindowStatusBar.html	Sat Jun 30 15:28:52 2018 +0300
@@ -453,8 +453,8 @@
 <li class="linktrail linktrail-first"><a class="linktrail" href="GuideIndex.html" title="The Geeqie User Manual">The Geeqie User Manual</a></li>
 <li class="linktrail linktrail-last"><a class="linktrail" href="GuideMainWindow.html" title="Main Window">Main Window</a></li>
 </ul>
-<p class="para block block-first">The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom setting. The current sort preference is also displayed, and can be adjusted from the status bar.</p>
-<p class="para block">The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom setting. Each section is described below.</p>
+<p class="para block block-first">The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom and image scroll settings. The current sort preference is also displayed, and can be adjusted from the status bar.</p>
+<p class="para block">The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom and scroll setting. Each section is described below.</p>
 <p class="para block"></p>
 <div class="autotoc"><ul>
 <li>
@@ -475,8 +475,14 @@
 </ul></div>
 <div class="division section">
 <a name="ProgressBar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">2.6.1. </span>Progress Bar</span></h2></div>
-<p class="para block block-first">The Progress bar updates to display the current state of thumbnail generation. When this section contains no text, thumbnail generation is idle. When “Loading thumbs...†is displayed, thumbnails are currently being generated when Geeqie is idle; the progress bar will update to display the percentage of thumbnails that are completed.</p>
-<p class="para block"></p>
+<p class="para block block-first">
+      The Progress bar updates to display the current state of thumbnail generation, or the reading of metadata in the current folder.
+      <p class="para block block-first"></p>
+      When “Loading thumbs...†is displayed, thumbnails are currently being generated when Geeqie is idle; the progress bar will update to display the percentage of thumbnails that are completed.
+      <p class="para block"></p>
+      When “Loading meta...†is displayed, certain metadata is being loaded when Geeqie is idle; the progress bar will update to display the percentage of files that have been read. Refer to
+      <a class="link" href="GuideOptionsMetadata.html#PreLoadMetadata" title="Pre-load metadata">Preferences metadata.</a>
+    </p>
 </div>
 <div class="division section">
 <a name="Sortmethod"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">2.6.2. </span>Sort method</span></h2></div>
@@ -560,7 +566,7 @@
 <p class="para block"></p>
 <div class="autotoc"><ul>
 <li>
-<span class="label">2.6.5.1. </span><a class="xref" href="GuideMainWindowStatusBar.html#Zoom" title="Zoom">Zoom</a>
+<span class="label">2.6.5.1. </span><a class="xref" href="GuideMainWindowStatusBar.html#ZoomAndScroll" title="Zoom and Scroll">Zoom and Scroll</a>
 </li>
 <li>
 <span class="label">2.6.5.2. </span><a class="xref" href="GuideMainWindowStatusBar.html#ExifRotate" title="Exif rotate">Exif rotate</a>
@@ -576,7 +582,7 @@
 </li>
 </ul></div>
 <div class="division section">
-<a name="Zoom"></a><div class="header"><h3 class="section title"><span class="title"><span class="label">2.6.5.1. </span>Zoom</span></h3></div>
+<a name="ZoomAndScroll"></a><div class="header"><h3 class="section title"><span class="title"><span class="label">2.6.5.1. </span>Zoom and Scroll</span></h3></div>
 <p class="para block block-first">The button label displays the current zoom ratio. A ratio of 1:1 is the image's original size. When the left number is larger the image is displayed larger than original size, when the right number is larger the image is displayed smaller.</p>
 <p class="para block">A tilde (~) appears within the ratio display when the zoom is set to fit the image within the display area. In this zoom mode the ratio is automatically adjusted, and the displayed ratio may not be the actual ratio because the status bar display rounds the actual value to the nearest tenth (0.1).</p>
 <p class="para block"></p>
--- a/web/help/GuideOptionsBehavior.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideOptionsBehavior.html	Sat Jun 30 15:28:52 2018 +0300
@@ -574,6 +574,12 @@
           <p class="para block block-first">If selected, a single click will enter a directory, rather than the GTK+ default of a double click.</p>
         </dd>
 <dt class="term">
+          <span class="guilabel">Save marks on exit</span>
+        </dt>
+<dd>
+          <p class="para block block-first">Save all marks that have been set. Note that marks that are linked to a keyword will always be saved irrespective of this setting.</p>
+        </dd>
+<dt class="term">
           <span class="guilabel">Recent folder list maximum size</span>
         </dt>
 <dd>
--- a/web/help/GuideOptionsGeneral.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideOptionsGeneral.html	Sat Jun 30 15:28:52 2018 +0300
@@ -462,13 +462,19 @@
 <span class="label">11.1.1. </span><a class="xref" href="GuideOptionsGeneral.html#PreferencesThumbnails" title="Thumbnails">Thumbnails</a>
 </li>
 <li>
-<span class="label">11.1.2. </span><a class="xref" href="GuideOptionsGeneral.html#Slideshow" title="Slide show">Slide show</a>
+<span class="label">11.1.2. </span><a class="xref" href="GuideOptionsGeneral.html#StarRatingCharacters" title="Star Rating">Star Rating</a>
+</li>
+<li>
+<span class="label">11.1.3. </span><a class="xref" href="GuideOptionsGeneral.html#Slideshow" title="Slide show">Slide show</a>
 </li>
 <li>
-<span class="label">11.1.3. </span><a class="xref" href="GuideOptionsGeneral.html#ImageLoadingandCaching" title="Image loading and caching">Image loading and caching</a>
+<span class="label">11.1.4. </span><a class="xref" href="GuideOptionsGeneral.html#ImageLoadingandCaching" title="Image loading and caching">Image loading and caching</a>
 </li>
 <li>
-<span class="label">11.1.4. </span><a class="xref" href="GuideOptionsGeneral.html#InfoSidebar" title="Info Sidebar component heights">Info Sidebar component heights</a>
+<span class="label">11.1.5. </span><a class="xref" href="GuideOptionsGeneral.html#InfoSidebar" title="Info Sidebar component heights">Info Sidebar component heights</a>
+</li>
+<li>
+<span class="label">11.1.6. </span><a class="xref" href="GuideOptionsGeneral.html#OnLineHelpSearch" title="On-line help search">On-line help search</a>
 </li>
 </ul></div>
 <div class="division section">
@@ -588,7 +594,11 @@
 </dl></div>
 </div>
 <div class="division section">
-<a name="Slideshow"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.2. </span>Slide show</span></h2></div>
+<a name="StarRatingCharacters"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.2. </span>Star Rating</span></h2></div>
+<p class="para block block-first">The characters used to display the Star Rating are defined here. They are defined as a hexadecimal Unicode character. The complete list of Unicode characters can be found in many places on the Internet.</p>
+</div>
+<div class="division section">
+<a name="Slideshow"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.3. </span>Slide show</span></h2></div>
 <div class="block list variablelist"><dl class="variablelist">
 <dt class="term dt-first">
           <span class="guilabel">Delay between image change</span>
@@ -614,7 +624,7 @@
 </dl></div>
 </div>
 <div class="division section">
-<a name="ImageLoadingandCaching"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.3. </span>Image loading and caching</span></h2></div>
+<a name="ImageLoadingandCaching"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.4. </span>Image loading and caching</span></h2></div>
 <div class="block list variablelist"><dl class="variablelist">
 <dt class="term dt-first">
           <span class="guilabel">Decoded image cache size</span>
@@ -643,7 +653,7 @@
 </dl></div>
 </div>
 <div class="division section">
-<a name="InfoSidebar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.4. </span>Info Sidebar component heights</span></h2></div>
+<a name="InfoSidebar"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.5. </span>Info Sidebar component heights</span></h2></div>
 <p class="para block block-first">
       The heights of the following components can be set individually:
       <div class="block list itemizedlist"><ul class="itemizedlist">
@@ -657,6 +667,17 @@
     </div></div>
 <div class="block list variablelist"><dl class="variablelist"></dl></div>
 </div>
+<div class="division section">
+<a name="OnLineHelpSearch"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.1.6. </span>On-line help search</span></h2></div>
+<p class="para block block-first">
+      An internet search engine may be used to search the help files on Geeqie's website. The string used to conduct the search is defined here. In most cases it will be in one of two formats:
+      <p class="para block block-first"></p>
+      <span class="code" dir="ltr">https://www.search-engine.com/search?q=site:geeqie.org/help</span>
+      <p class="para block"></p>
+      <span class="code" dir="ltr">https://www.search-engine.com/?q=site:geeqie.org/help'</span>
+    </p>
+<div class="block list variablelist"><dl class="variablelist"></dl></div>
+</div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideOptionsGeneral.html" title="General Options">General Options</a></td>
--- a/web/help/GuideOptionsMetadata.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideOptionsMetadata.html	Sat Jun 30 15:28:52 2018 +0300
@@ -484,6 +484,9 @@
 <li>
 <span class="label">11.6.5. </span><a class="xref" href="GuideOptionsMetadata.html#AutoSaveOptions" title="Auto-save options">Auto-save options</a>
 </li>
+<li>
+<span class="label">11.6.6. </span><a class="xref" href="GuideOptionsMetadata.html#PreLoadMetadata" title="Pre-load metadata">Pre-load metadata</a>
+</li>
 </ul></div>
 <div class="division section">
 <a name="MetadataWritingProcess"></a><div class="header"><h2 class="section title"><span class="title"><a name="titleMetadataWritingProcess"></a><span class="label">11.6.1. </span>Metadata writing process</span></h2></div>
@@ -628,6 +631,29 @@
 </ul></div>
 <p class="para block"></p>
 </div>
+<div class="division section">
+<a name="PreLoadMetadata"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.6.6. </span>Pre-load metadata</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist"><li class="li-first">
+        <span class="para">
+          <span class="guilabel">Read metadata in background</span>
+          <p class="para block"></p>
+          Using the folder sorting options:
+          <p class="para block"></p>
+          <span class="guilabel">Exif date original</span>
+          <p class="para block"></p>
+          <span class="guilabel">Exif date digitized</span>
+          <p class="para block"></p>
+          <span class="guilabel">Rating</span>
+          <p class="para block"></p>
+          requires metadata to be read from all files in a folder before the sort action can be made. If a folder contains a large number of file, this can take a noticeable period of time.
+          <p class="para block"></p>
+          If this option is checked, Geeqie will automatically read the required metatada in the background as soon as a folder is opened. This will reduce the amount of time you have to wait until the sort is completed.
+          <p class="para block"></p>
+          If you do not use these sort otions, leave this option unchecked.
+        </span>
+      </li></ul></div>
+<p class="para block"></p>
+</div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideOptionsFiltering.html" title="Files Options">Files Options</a></td>
--- a/web/help/GuideReference.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReference.html	Sat Jun 30 15:28:52 2018 +0300
@@ -440,6 +440,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
@@ -487,10 +488,13 @@
 <span class="label">13.10. </span><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a>
 </li>
 <li>
-<span class="label">13.11. </span><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a>
+<span class="label">13.11. </span><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a>
 </li>
 <li>
-<span class="label">13.12. </span><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a>
+<span class="label">13.12. </span><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a>
+</li>
+<li>
+<span class="label">13.13. </span><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a>
 </li>
 </ul></div>
 </div></div>
--- a/web/help/GuideReferenceCommandLine.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceCommandLine.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceConfig.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceConfig.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceDecodeLatLong.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceDecodeLatLong.html	Sat Jun 30 15:28:52 2018 +0300
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Decoding Latitude and Longitude</title>
-<link rel="previous" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">
+<link rel="previous" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">
 <link rel="next" href="GuideReferenceStandards.html" title="Standards">
 <link rel="top" href="GuideIndex.html" title="The Geeqie User Manual">
 <style type="text/css">
@@ -410,7 +410,7 @@
 </head>
 <body>
 <div class="navbar navbar-top"><table class="navbar"><tr>
-<td class="navbar-prev"><a class="navbar-prev" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></td>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></td>
 <td class="navbar-next"><a class="navbar-next" href="GuideReferenceStandards.html" title="Standards">Standards</a></td>
 </tr></table></div>
 <div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li>Decoding Latitude and Longitude</li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
@@ -481,7 +482,7 @@
   </p>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
-<td class="navbar-prev"><a class="navbar-prev" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></td>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></td>
 <td class="navbar-next"><a class="navbar-next" href="GuideReferenceStandards.html" title="Standards">Standards</a></td>
 </tr></table></div>
 </body>
--- a/web/help/GuideReferenceKeyboardShortcuts.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceKeyboardShortcuts.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceLIRC.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceLIRC.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceLua.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceLua.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceMetadata.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceMetadata.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferencePixbufLoaders.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferencePixbufLoaders.html	Sat Jun 30 15:28:52 2018 +0300
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Additional pixbuf loaders</title>
 <link rel="previous" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">
-<link rel="next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">
+<link rel="next" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">
 <link rel="top" href="GuideIndex.html" title="The Geeqie User Manual">
 <style type="text/css">
 
@@ -411,7 +411,7 @@
 <body>
 <div class="navbar navbar-top"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></td>
-<td class="navbar-next"><a class="navbar-next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></td>
 </tr></table></div>
 <div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
 <li><a href="GuideIndex-info.html" title="About This Document">About This Document</a></li>
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li>Additional pixbuf loaders</li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
@@ -525,7 +526,7 @@
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></td>
-<td class="navbar-next"><a class="navbar-next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></td>
 </tr></table></div>
 </body>
 </html>
--- a/web/help/GuideReferenceStandards.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceStandards.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li>Standards</li>
 </ul></div>
--- a/web/help/GuideReferenceSupportedFormats.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceSupportedFormats.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li>Supported File Formats</li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- a/web/help/GuideReferenceThumbnails.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceThumbnails.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/help/GuideReferenceUTC.html	Sat Jun 30 15:28:52 2018 +0300
@@ -0,0 +1,484 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UTC and Daylight Saving Time (DST)</title>
+<link rel="previous" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">
+<link rel="next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">
+<link rel="top" href="GuideIndex.html" title="The Geeqie User Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  margin-left left: 1.72em;
+  margin-: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  margin-left: 2.4em;
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 6px 0.5em 6px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+}
+div.caution-inner, div.important-inner, div.note-inner, div.tip-inner, div.warning-inner {
+  padding-left: 60px;
+  background-position: left top;
+  background-repeat: no-repeat;
+  min-height: 48px;
+}
+div.caution-inner { background-image: url("admon-caution.png"); }
+div.important-inner { background-image: url("admon-important.png"); }
+div.note-inner { background-image: url("admon-note.png"); }
+div.note-bug div.note-inner { background-image: url("admon-bug.png"); }
+div.tip-inner { background-image: url("admon-tip.png"); }
+div.warning-inner { background-image: url("admon-warning.png"); }
+div.blockquote {
+  
+  background-image: url('watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  background-position: top left;
+  padding: 0.5em;
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  text-align: right;
+  margin-left: 20%;
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.programlisting .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  padding-right: 1em;
+  float: left;
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  padding-left: 0;
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+div.cmdsynopsis { font-family: monospace; }
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="GuideIndex-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="GuideIndex.html" title="The Geeqie User Manual">The Geeqie User Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="GuideIntroduction.html" title="Introduction">Introduction</a></li>
+<li><a class="xref" href="GuideMainWindow.html" title="Main Window">Main Window</a></li>
+<li><a class="xref" href="GuideSidebars.html" title="Sidebars">Sidebars</a></li>
+<li><a class="xref" href="GuideOtherWindows.html" title="Stand-alone Windows">Stand-alone Windows</a></li>
+<li><a class="xref" href="GuideImageSearch.html" title="Search and Select">Search and Select</a></li>
+<li><a class="xref" href="GuideImageManagementPlugins.html" title="Plugins">Plugins</a></li>
+<li><a class="xref" href="GuideImageManagement.html" title="File Management">File Management</a></li>
+<li><a class="xref" href="GuideColorManagement.html" title="Color Management">Color Management</a></li>
+<li><a class="xref" href="GuideImagePresentation.html" title="Image Presentation">Image Presentation</a></li>
+<li><a class="xref" href="GuidePrinting.html" title="Printing">Printing</a></li>
+<li><a class="xref" href="GuideOptionsMain.html" title="Preferences">Preferences</a></li>
+<li><a class="xref" href="GuideOptionsAdditional.html" title="Additional Preferences">Additional Preferences</a></li>
+<li>
+<a class="xref" href="GuideReference.html" title="Reference">Reference</a><div class="autotoc"><ul>
+<li><a class="xref" href="GuideReferenceCommandLine.html" title="Command Line Options">Command Line Options</a></li>
+<li><a class="xref" href="GuideReferenceKeyboardShortcuts.html" title="Keyboard and Mouse Shortcuts">Keyboard and Mouse Shortcuts</a></li>
+<li><a class="xref" href="GuideReferenceThumbnails.html" title="Thumbnails">Thumbnails</a></li>
+<li><a class="xref" href="GuideReferenceMetadata.html" title="Metadata Processing">Metadata Processing</a></li>
+<li><a class="xref" href="GuideReferenceLua.html" title="Lua Extensions">Lua Extensions</a></li>
+<li><a class="xref" href="GuideReferenceConfig.html" title="Configuration Files and Locations">Configuration Files and Locations</a></li>
+<li><a class="xref" href="GuideReferenceLIRC.html" title="Infra-red controller">Infra-red controller</a></li>
+<li><a class="xref" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></li>
+<li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
+<li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li>UTC and Daylight Saving Time (DST)</li>
+<li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
+<li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="GuideFaq.html" title="Frequently Asked Questions">Frequently Asked Questions</a></li>
+<li><a class="xref" href="GuideLicence.html" title="Licence">Licence</a></li>
+<li><a class="xref" href="GuideCredits.html" title="Credits">Credits</a></li>
+<li><a class="xref" href="GuideGnuFdl.html" title="GNU Free Documentation License">GNU Free Documentation License</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division section">
+<a name="GuideReferenceUTC"></a><div class="header"><h1 class="section title"><span class="title"><a name="titleGuideReferenceUTC"></a>UTC and Daylight Saving Time (DST)</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="GuideIndex.html" title="The Geeqie User Manual">The Geeqie User Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="GuideReference.html" title="Reference">Reference</a></li>
+</ul>
+<p class="para block block-first">Geeqie can display the local time at which a photo was taken, adjusted for UTC offset and Daylight Saving Time.</p>
+<p class="para block">
+    If the image exif data contains the required parameters (see
+    <a class="link" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">Pre-formatted tags</a>
+    ), Geeqie will use the latitude and longitude to determine which timezone the image was taken in.
+    <p class="para block"></p>
+    The UTC offset and Daylight Saving Time Correction for that timezone, combined with the GPS UTC value, will then be used to compute the correct local time.
+    <p class="para block"></p>
+    This value may be displayed in either the Info Sidebar or Overlay Screen Display by using the parameter
+    <span class="code" dir="ltr">formatted.localtime</span>
+  </p>
+<p class="para block">
+    The timezone for the image may also be displayed by using the parameter
+    <span class="code" dir="ltr">formatted.timezone</span>
+    .
+  </p>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></td>
+<td class="navbar-next"><a class="navbar-next" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></td>
+</tr></table></div>
+</body>
+</html>
--- a/web/help/GuideReferenceXmpExif.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideReferenceXmpExif.html	Sat Jun 30 15:28:52 2018 +0300
@@ -441,6 +441,7 @@
 <li>XMP, Exif and IPTC</li>
 <li><a class="xref" href="GuideReferenceSupportedFormats.html" title="Supported File Formats">Supported File Formats</a></li>
 <li><a class="xref" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a></li>
+<li><a class="xref" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and Daylight Saving Time (DST)</a></li>
 <li><a class="xref" href="GuideReferenceDecodeLatLong.html" title="Decoding Latitude and Longitude">Decoding Latitude and Longitude</a></li>
 <li><a class="xref" href="GuideReferenceStandards.html" title="Standards">Standards</a></li>
 </ul></div>
@@ -687,10 +688,10 @@
             </td>
 </tr>
 <tr class="tr-shade">
-<td class="td-colsep">
+<td class="td-colsep td-rowsep">
               <span class="para">formatted.GPSPosition</span>
             </td>
-<td class="td-colsep">
+<td class="td-colsep td-rowsep">
               <span class="para">
                 Exif.GPSInfo.GPSLatitude
                 <p class="para block block-first"></p>
@@ -701,8 +702,67 @@
                 Exif.GPSInfo.GPSLongitudeRef
               </span>
             </td>
+<td class="td-rowsep">
+              <span class="para">Latitude, Longitude</span>
+            </td>
+</tr>
+<tr>
+<td class="td-colsep td-rowsep">
+              <span class="para">formatted.localtime</span>
+            </td>
+<td class="td-colsep td-rowsep">
+              <span class="para">
+                Exif.GPSInfo.GPSLatitude
+                <p class="para block block-first"></p>
+                Exif.GPSInfo.GPSLatitudeRef
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSLongitude
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSLongitudeRef
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSDateStamp
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSTimeStamp
+              </span>
+            </td>
+<td class="td-rowsep">
+              <span class="para">
+                Local time corrected for UTC offset, DST correction
+                <a name="-noteref-ref1"></a><sup><a class="footnote" href="#ref1">1</a></sup>
+              </span>
+            </td>
+</tr>
+<tr class="tr-shade">
+<td class="td-colsep td-rowsep">
+              <span class="para">formatted.timezone</span>
+            </td>
+<td class="td-colsep td-rowsep">
+              <span class="para">
+                Exif.GPSInfo.GPSLatitude
+                <p class="para block block-first"></p>
+                Exif.GPSInfo.GPSLatitudeRef
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSLongitude
+                <p class="para block"></p>
+                Exif.GPSInfo.GPSLongitudeRef
+              </span>
+            </td>
+<td class="td-rowsep">
+              <span class="para">
+                Timezone indicated by lat/long
+                <a name="-noteref-ref1"></a><sup><a class="footnote" href="#ref1">2</a></sup>
+              </span>
+            </td>
+</tr>
+<tr>
+<td class="td-colsep">
+              <span class="para">formatted.star_rating</span>
+            </td>
+<td class="td-colsep">
+              <span class="para">Xmp.xmp.Rating</span>
+            </td>
 <td>
-              <span class="para">Latitude, Longitude</span>
+              <span class="para">Rating shown as a set of 🟊  characters</span>
             </td>
 </tr>
 </tbody>
@@ -788,13 +848,21 @@
 </tr>
 <tr>
 <td class="td-colsep td-rowsep">
+              <span class="para">formatted.timezone</span>
+            </td>
+<td class="td-rowsep">
+              <span class="para">Time zone</span>
+            </td>
+</tr>
+<tr class="tr-shade">
+<td class="td-colsep td-rowsep">
               <span class="para">Xmp.photoshop.Country</span>
             </td>
 <td class="td-rowsep">
               <span class="para">Country</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">
                 <p class="para block block-first">Xmp.iptc.CountryCode</p>
@@ -804,7 +872,7 @@
               <span class="para">Country Code</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">Xmp.photoshop.State</span>
             </td>
@@ -812,7 +880,7 @@
               <span class="para">State</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">Xmp.photoshop.City</span>
             </td>
@@ -820,7 +888,7 @@
               <span class="para">City</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep">
               <span class="para">Xmp.iptc.Location</span>
             </td>
@@ -900,13 +968,21 @@
 </tr>
 <tr>
 <td class="td-colsep td-rowsep">
+              <span class="para">formatted.localtime</span>
+            </td>
+<td class="td-rowsep">
+              <span class="para">Local time</span>
+            </td>
+</tr>
+<tr class="tr-shade">
+<td class="td-colsep td-rowsep">
               <span class="para">formatted.ShutterSpeed</span>
             </td>
 <td class="td-rowsep">
               <span class="para">Shutter speed</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.Aperture</span>
             </td>
@@ -914,7 +990,7 @@
               <span class="para">Aperture</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.ExposureBias</span>
             </td>
@@ -922,7 +998,7 @@
               <span class="para">Exposure bias</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.ISOSpeedRating</span>
             </td>
@@ -930,7 +1006,7 @@
               <span class="para">ISO sensitivity</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.FocalLength</span>
             </td>
@@ -938,7 +1014,7 @@
               <span class="para">Focal length</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.FocalLength35mmFilm</span>
             </td>
@@ -946,7 +1022,7 @@
               <span class="para">Focal length 35mm</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.SubjectDistance</span>
             </td>
@@ -954,7 +1030,7 @@
               <span class="para">Subject distance</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.Flash</span>
             </td>
@@ -962,7 +1038,7 @@
               <span class="para">Flash</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.Resolution</span>
             </td>
@@ -970,7 +1046,7 @@
               <span class="para">Resolution</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">formatted.ColorProfile</span>
             </td>
@@ -978,7 +1054,7 @@
               <span class="para">Color profile</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">
               <span class="para">Exif.Photo.ExposureProgram</span>
             </td>
@@ -986,7 +1062,7 @@
               <span class="para">Exposure Program</span>
             </td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep td-rowsep">
               <span class="para">Exif.Photo.MeteringMode</span>
             </td>
@@ -994,7 +1070,7 @@
               <span class="para">Metering Mode</span>
             </td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep">
               <span class="para">Exif.Photo.LightSource</span>
             </td>
@@ -1200,6 +1276,24 @@
 </table>
 </div>
 </div>
+<div class="footnotes">
+<div class="footnote">
+<a name="ref1"></a><span class="footnote-number"><a class="footnote-ref" href="#-noteref-ref1">1</a></span>
+                  <p class="para block block-first">
+                    Refer to
+                    <a class="link" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and DST</a>
+                    section.
+                  </p>
+                </div>
+<div class="footnote">
+<a name="ref1"></a><span class="footnote-number"><a class="footnote-ref" href="#-noteref-ref1">2</a></span>
+                  <p class="para block block-first">
+                    Refer to
+                    <a class="link" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and DST</a>
+                    section.
+                  </p>
+                </div>
+</div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceLIRC.html" title="Infra-red controller">Infra-red controller</a></td>
--- a/web/help/GuideSidebarsInfo.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/help/GuideSidebarsInfo.html	Sat Jun 30 15:28:52 2018 +0300
@@ -708,6 +708,20 @@
 <td class="td-rowsep">Latitude, Longitude</td>
 </tr>
 <tr class="tr-shade">
+<td class="td-colsep td-rowsep">formatted.localtime</td>
+<td class="td-rowsep">
+              Local time corrected for UTC offset, DST correction
+              <a name="-noteref-ref1"></a><sup><a class="footnote" href="#ref1">1</a></sup>
+            </td>
+</tr>
+<tr>
+<td class="td-colsep td-rowsep">formatted.timezone</td>
+<td class="td-rowsep">
+              Timezone indicated by GPS lat/long values
+              <a name="-noteref-ref1"></a><sup><a class="footnote" href="#ref1">2</a></sup>
+            </td>
+</tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">file.size</td>
 <td class="td-rowsep">file size in bytes</td>
 </tr>
@@ -716,8 +730,12 @@
 <td class="td-rowsep">file date and time in human readable form</td>
 </tr>
 <tr class="tr-shade">
-<td class="td-colsep">file.mode</td>
-<td>file mode flags</td>
+<td class="td-colsep td-rowsep">file.mode</td>
+<td class="td-rowsep">file mode flags</td>
+</tr>
+<tr>
+<td class="td-colsep">file.ctime</td>
+<td>refer to operating system documentation for the meaning of ctime</td>
 </tr>
 </tbody></table>
 </div>
@@ -817,6 +835,24 @@
       </li>
 </ul></div>
 </div>
+<div class="footnotes">
+<div class="footnote">
+<a name="ref1"></a><span class="footnote-number"><a class="footnote-ref" href="#-noteref-ref1">1</a></span>
+                <p class="para block block-first">
+                  Refer to
+                  <a class="link" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and DST</a>
+                  section.
+                </p>
+              </div>
+<div class="footnote">
+<a name="ref1"></a><span class="footnote-number"><a class="footnote-ref" href="#-noteref-ref1">2</a></span>
+                <p class="para block block-first">
+                  Refer to
+                  <a class="link" href="GuideReferenceUTC.html" title="UTC and Daylight Saving Time (DST)">UTC and DST</a>
+                  section.
+                </p>
+              </div>
+</div>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideSidebarsInfo.html" title="Info Sidebar">Info Sidebar</a></td>
--- a/web/installing.html	Fri Apr 13 19:06:23 2018 +0300
+++ b/web/installing.html	Sat Jun 30 15:28:52 2018 +0300
@@ -146,7 +146,7 @@
           markdown
           when compiling Geeqie, to create this file in html format
 
-         libffmpegthumbnailer 2.0.0
+         libffmpegthumbnailer 2.1.0
          for thumbnailing camera video clips
          enabled by default
          disable with configure option: --disable-libffmpegthumbnailer