Mercurial > hg > forks > geeqie

changeset 2467:5e92b54ecfa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with default/master.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Apr 2017 23:33:20 +0300
parents 57fd6df5c0db (current diff) d286a43ba3b5 (diff)
children ee7e3a232511
files configure.in src/Makefile.am src/editors.c
diffstat 58 files changed, 4392 insertions(+), 3322 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Jan 13 18:10:38 2017 +0200
+++ b/configure.in	Wed Apr 26 23:33:20 2017 +0300
@@ -17,6 +17,9 @@
 AC_PREREQ(2.57)
 AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short master), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/])
 
+# Add -Werror to the default CFLAGS
+CFLAGS+=" -Werror -Wno-error=deprecated-declarations"
+
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])
 
--- a/doc/docbook/GuideCollections.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideCollections.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -29,6 +29,23 @@
     </menuchoice>
     . A dialog will appear requesting the location of the collection file. A window will the open containing the selected collection. Recently opened or saved collections can also be opened by selecting the collection's file name from the Open recent sub menu of the file menu.
   </para>
+  <para>
+    To delete or rename a collection, select
+    <menuchoice>
+      <shortcut>
+        <keycombo>
+          <keycap>O</keycap>
+        </keycombo>
+      </shortcut>
+      <guimenu>File</guimenu>
+      <guimenuitem>Open collection</guimenuitem>
+    </menuchoice>
+    , right-click on the collection you wish to delete or rename, and then select
+    <emphasis role="strong">Delete</emphasis>
+    or
+    <emphasis role="strong">Rename</emphasis>
+    .
+  </para>
   <para>The collection window consists of a pane to display the contents of the collection, and a status bar along the bottom of the window.</para>
   <para />
   <section id="Iconpane">
@@ -76,4 +93,18 @@
     </note>
     <para />
   </section>
+  <section id="AppendImages">
+    <title>Append Images</title>
+    <para>Right-click menu items permit images to be appended from either another collection or from the currently selected folder.</para>
+    <para />
+  </section>
+  <section id="RandomizedSort">
+    <title>Randomized Sort</title>
+    <para>
+      Right-click menu item
+      <emphasis role="strong">Sort</emphasis>
+      , in addition to the standard sort methods, permits images to be randomly arranged.
+    </para>
+    <para />
+  </section>
 </section>
--- a/doc/docbook/GuideFaq.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideFaq.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -47,4 +47,45 @@
       <para />
     </section>
   </section>
-</chapter>
+  <section id="ExifRotation">
+    <title>Exif Auto Rotation</title>
+    <para />
+    <section id="HowdotheExifauto-rotationcommandswork">
+      <title>How do the Exif auto-rotation commands work?</title>
+      <para>
+        Image auto-rotation works in either of two modes, set by
+        <link linkend="MetadataMiscellaneous">Write altered image orientation to the metadata</link>
+        option.
+      </para>
+      <para>
+        <guilabel>Write altered image orientation to the metadata not set</guilabel>
+        <para />
+        If you change the orientation of an image using any of the available commands, the image will always be displayed in the modified orientation. This new orientation is stored in temporary data structures associated with each image file. When Geeqie closes, these changes will be lost.
+      </para>
+      <warning>
+        <para>It is not possible to determine if the image as displayed is the original image or one which has been temporarily rotated.</para>
+      </warning>
+      <para>
+        If the option
+        <link linkend="Editmenu">Auto rotate image using EXIF information</link>
+        is selected, any images which have Exif orientation data will also be shown rotated. However, any rotation you have selected manually will always over-ride the embedded Exif rotation value.
+      </para>
+      <para>
+        <guilabel>Write altered image orientation to the metadata set</guilabel>
+        <para />
+        <para>If you change the orientation of an image using any of the available commands, this new orientation is stored in a metadata write queue.</para>
+        <para>
+          If the option
+          <link linkend="Editmenu">Auto rotate image using EXIF information</link>
+          is selected, any images which have Exif orientation data will be shown rotated, including any in the metadata write queue.
+        </para>
+        <para>
+          However if the option
+          <link linkend="Editmenu">Auto rotate image using EXIF information</link>
+          is not selected, no images will be auto-rotated. If you have manually rotated any images, the metadata write icon on the status bar will alert you to that fact. Clicking the icon will give a list of the modified files.
+        </para>
+      </para>
+      <para />
+    </section>
+  </section>
+</chapter>
--- a/doc/docbook/GuideImageSearchSearch.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideImageSearchSearch.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -101,7 +101,11 @@
               </guiicon>
             </guibutton>
           </code>
-          button displays a pop up calendar to enter the date
+          button displays a pop up calendar to enter the date.
+          <para />
+          The
+          <emphasis role="strong">Exif date</emphasis>
+          checkbox permits searches to be made on the exif date of images. If an image does not have an exif date, it will default to 01 January 1970.
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -210,4 +214,4 @@
     <para>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.</para>
     <para />
   </section>
-</section>
+</section>
--- a/doc/docbook/GuideMainWindowFolderPane.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideMainWindowFolderPane.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -183,13 +183,49 @@
   </section>
   <section id="Folderlist">
     <title>Folder list</title>
-    <para>This displays a list of sub folders contained in the active folder, or a tree that includes all folders in the file system.</para>
-    <para>
-      A
-      <emphasis role="strong">context menu</emphasis>
-      can be displayed by clicking the right mouse button on the folder pane or pressing the menu key while the folder pane has the focus
-    </para>
-    <para />
+    <para>This pane consists of two sections: a folder pane and a shortcuts pane. The shortcuts pane may be hidden or revealed simply by moving the vertical divider to or from the extreme left.</para>
+    <section id="folders">
+      <title>Folders</title>
+      <para>This displays a list of sub folders contained in the active folder, or a tree that includes all folders in the file system.</para>
+      <para>
+        A
+        <emphasis role="strong">context menu</emphasis>
+        can be displayed by clicking the right mouse button on the folder pane or pressing the menu key while the folder pane has the focus
+      </para>
+    </section>
+    <section id="Shortcutslist">
+      <title>Shortcuts</title>
+      <para>This is a list of shortcuts (bookmarks) to commonly used folders or images. A context menu will appear by right clicking on an item, or pressing the menu key when the item has the focus.</para>
+      <para>Folders or images can be added to the list by activating the Add button at the bottom of the pane, or dragging a folder or image onto the list.</para>
+      <para>
+        To edit an item select
+        <emphasis role="bold">Properties</emphasis>
+        from its context menu. A dialog will appear allowing the Name, Path, and Icon for the item to be changed. Select OK to close the dialog and apply the changes, or Cancel to close the dialog and discard the changes.
+      </para>
+      <para>
+        To change the order of the list, select
+        <emphasis role="bold">Move up</emphasis>
+        or
+        <emphasis role="bold">Move down</emphasis>
+        from the item's context menu. To move an item with the keyboard move the focus to that item, then press
+        <keycombo>
+          <keycap>Shift</keycap>
+          <keycap>Up</keycap>
+        </keycombo>
+        or
+        <keycombo>
+          <keycap>Shift</keycap>
+          <keycap>Down</keycap>
+        </keycombo>
+        to move the item.
+      </para>
+      <para>
+        To remove an item from the list select
+        <emphasis role="bold">Remove</emphasis>
+        from it's context menu.
+      </para>
+      <para />
+    </section>
   </section>
   <section id="Listview">
     <title>List view</title>
--- a/doc/docbook/GuideMainWindowImagePane.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideMainWindowImagePane.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -48,7 +48,6 @@
     </para>
     <para />
   </section>
-
   <section id="Imagepanningandmanipulation">
     <title>Image panning and manipulation</title>
     <para>When the image size is larger than the image pane, the visible region can be changed with the keyboard or mouse. The keyboard can also be used to adjust the orientation of the image.</para>
@@ -93,6 +92,20 @@
         <para>To start the smooth scroll function hold down the Shift key and click the primary mouse button. An icon will appear at the location of the mouse pointer, the mouse can then be positioned to pan the image. The image will pan in the direction of the mouse pointer relative to the icon. The pan speed will increase in proportion to the distance that the pointer is from the center of the icon. To end the smooth scroll function click the primary mouse button within the image pane.</para>
         <para />
       </section>
+      <section id="MouseWheelMode">
+        <title>Mouse Wheel Mode</title>
+        <para>A single click on the mouse middle button will toggle the function of the mouse wheel between "change image" and "change zoom".</para>
+        <note>
+          <para>
+            This option cannot be used if either the Preference
+            <emphasis>Mouse wheel scrolls image</emphasis>
+            or
+            <emphasis>Navigation by left or middle click on image</emphasis>
+            are selected.
+          </para>
+        </note>
+        <para>In Split View mode, each window can be clicked individually so that, in Quad View for example, Connected Zoom can be on 2, 3 or all 4 windows.</para>
+      </section>
     </section>
   </section>
   <section id="Navigation">
--- a/doc/docbook/GuideMainWindowMenus.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideMainWindowMenus.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -645,6 +645,18 @@
         </term>
         <listitem>
           <para>Swaps the top and bottom sides of the image, does not modify the file on disk.</para>
+          <warning>
+            <para>
+              The above orientation commands - Rotate, Mirror and Flip - do not change the image on disk. The changes will be lost when Geeqie closes. Refer to the
+              <link linkend="MetadataMiscellaneous">Metadata tab of the Preferences Dialog</link>
+              if you wish these changes to be written to metadata.
+            </para>
+            <para>
+              Refer also to the
+              <link linkend="HowdotheExifauto-rotationcommandswork">FAQ</link>
+              .
+            </para>
+          </warning>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -661,7 +673,19 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Removes all effects applied through the Adjust menu, reverting image to its original state.</para>
+          <para>Removes all temporary effects applied through the above commands, reverting the image according to its Exif Orientation tag.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <guilabel>Auto rotate image using EXIF information</guilabel>
+        </term>
+        <listitem>
+          <para>
+            Auto rotates images based on metadata stored in images that have Exif data. Refer also to the
+            <link linkend="HowdotheExifauto-rotationcommandswork">FAQ</link>
+            .
+          </para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -672,9 +696,14 @@
           </menuchoice>
         </term>
         <listitem>
-          The commands above modifies image metadata only. This commands actually transforms image pixels. See
-          <link linkend="GuideImageManagementExternalEditing">Editors section</link>
-          for details
+          <para>This command affects only jpeg, tiff and png files. The image file on disk is rotated to the orientation as specified by its Exif Orientation tag.</para>
+          <warning>
+            <para>
+              The file rotate.desktop, using external commands exiftran, exiv2 and mogrify, is used to implement this command. Refer to
+              <link linkend="GuideImageManagementExternalEditing">Editors section</link>
+              for details.
+            </para>
+          </warning>
         </listitem>
       </varlistentry>
       <varlistentry>
--- a/doc/docbook/GuideMainWindowStatusBar.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideMainWindowStatusBar.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -82,16 +82,82 @@
     <para>This section displays the dimensions (width x height) and file byte size of the image that is active in the image pane. When the format of the file in the image pane can not be determined the dimensions will show as “(0 x 0)”, in addition “(no read permision)” may appear if the file permissions do not allow reading the contents of the file.</para>
     <para />
   </section>
-  <section id="Zoom">
-    <title>Zoom</title>
-    <para>This section 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 />
-  </section>
   <section id="Buttons">
     <title>Buttons</title>
     <para>Statusbar buttons corresponds to selected menu action.</para>
     <para />
+    <section id="Zoom">
+      <title>Zoom</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 />
+      <para>Clicking this button permits control of the behavior of the zoom and scroll settings used when changing the displayed image.</para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Zoom to original size</guilabel>
+          </term>
+          <listitem>
+            <para>The new image is set to its original size.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Fit image to window</guilabel>
+          </term>
+          <listitem>
+            <para>The new image's zoom is changed so that the image will fit within the current view area.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Leave zoom at previous setting</guilabel>
+          </term>
+          <listitem>
+            <para>The zoom setting is unchanged, the new image will be scaled the same as the previous image.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Scroll to top left corner</guilabel>
+          </term>
+          <listitem>
+            <para>The new image is displayed from top left corner.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Scroll to image center</guilabel>
+          </term>
+          <listitem>
+            <para>The new image is centered</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Keep the region from previous iamge</guilabel>
+          </term>
+          <listitem>
+            <para>The new image is positioned as the previous one, whenever possible.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </section>
+    <section id="ExifRotate">
+      <title>Exif rotate</title>
+      <para>
+        <guiicon>
+          <inlinegraphic fileref="gtk-color-picker.png" />
+        </guiicon>
+        Toggles the auto-rotation of images if they have Exif orientation data.
+        Refer also to the
+        <link linkend="HowdotheExifauto-rotationcommandswork">FAQ</link>
+        .
+      </para>
+      <para />
+    </section>
     <section id="ShowPixelInfo">
       <title>Show Pixel Info</title>
       <para>
@@ -123,4 +189,4 @@
       <para />
     </section>
   </section>
-</section>
+</section>
--- a/doc/docbook/GuideOptionsBehavior.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideOptionsBehavior.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -118,6 +118,14 @@
       </varlistentry>
       <varlistentry>
         <term>
+          <guilabel>List directory view uses single click to enter</guilabel>
+        </term>
+        <listitem>
+          <para>If selected, a single click will enter a directory, rather than the GTK+ default of a double click.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
           <guilabel>Recent folder list maximum size</guilabel>
         </term>
         <listitem>
@@ -147,6 +155,14 @@
       </varlistentry>
       <varlistentry>
         <term>
+          <guilabel>Keyboard scrolling step multiplier:</guilabel>
+        </term>
+        <listitem>
+          <para>Defines the amount to pan an image when using the keyboard arrows.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
           <guilabel>Mouse wheel scrolls image</guilabel>
         </term>
         <listitem>
@@ -159,6 +175,14 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <guilabel>Navigation by left or middle click on image</guilabel>
+        </term>
+        <listitem>
+          <para>If selected, mouse left-click will select the next image; mouse middle-click will select the previous image.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </section>
   <section id="Debugging">
--- a/doc/docbook/GuideOptionsImage.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideOptionsImage.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -105,62 +105,6 @@
       </varlistentry>
     </variablelist>
   </section>
-  <section id="Whennewimageisselected">
-    <title>When new image is selected</title>
-    <para>This controls the behavior of the zoom and scroll settings when changing the displayed image.</para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <guilabel>Zoom to original size</guilabel>
-        </term>
-        <listitem>
-          <para>The new image is set to it's original size.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Fit image to window</guilabel>
-        </term>
-        <listitem>
-          <para>The new image's zoom is changed so that the image will fit within the current view area.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Leave zoom at previous setting</guilabel>
-        </term>
-        <listitem>
-          <para>The zoom setting is unchanged, the new image will be scaled the same as the previous image.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <guilabel>Scroll to top left corner</guilabel>
-        </term>
-        <listitem>
-          <para>The new image is displayed from top left corner.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Scroll to image center</guilabel>
-        </term>
-        <listitem>
-          <para>The new image is centered</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Keep the region from previous iamge</guilabel>
-        </term>
-        <listitem>
-          <para>The new image is positioned as the previous one, whenever possible.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
   <section id="Appearance">
     <title>Appearance</title>
     <variablelist>
@@ -190,24 +134,26 @@
         </listitem>
       </varlistentry>
     </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <guilabel>Alpha channel color 1/2</guilabel>
+        </term>
+        <listitem>
+          <para>These two colors define the checkerboard background used when images with an alpha channel are displayed.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </section>
   <section id="Convenience">
     <title>Convenience</title>
     <variablelist>
       <varlistentry>
         <term>
-          <guilabel>Auto rotate image using EXIF information</guilabel>
-        </term>
-        <listitem>
-          <para>Auto rotates images based on metadata stored in images that have Exif data.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
           <guilabel>Auto rotate proofs using EXIF information</guilabel>
         </term>
         <listitem>
-          <para>TBD</para>
+          <para>Auto rotate images on print proof sheet.</para>
         </listitem>
       </varlistentry>
     </variablelist>
--- a/doc/docbook/GuideOptionsMetadata.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideOptionsMetadata.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -70,6 +70,13 @@
           If checked, open a confirmation dialogue before writing to the file
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <guilabel>Create sidecar files named image.ext.xmp (as opposed to image.xmp)</guilabel>
+          <para />
+          If checked, new sidecar files will use image.ext.xmp naming scheme
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section id="WriteToGeeqiePrivateFiles">
@@ -112,8 +119,14 @@
         <para>
           <guilabel>Write altered image orientation to the metadata</guilabel>
           <para />
-          TBD
+          If checked, the results of orientation commands (Rotate, Mirror and Flip) issued on an image will be written to metadata either automatically as specified below or when manually initiated. This option also affects the
+          <link linkend="Editmenu">Auto rotate image using EXIF information</link>
+          menu item.
         </para>
+        <warning>
+          <para>If this option is not checked, the results of orientation commands will be lost when Geeqie closes.</para>
+          <para>Do not change this option while you have temporary rotations applied to images.</para>
+        </warning>
       </listitem>
     </itemizedlist>
     <para />
--- a/doc/docbook/GuideOptionsWindow.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideOptionsWindow.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -17,6 +17,29 @@
     <variablelist>
       <varlistentry>
         <term>
+          <guilabel>Use saved window positions also for new windows</guilabel>
+        </term>
+        <listitem>
+          <para>
+            A new window opened by menu
+            <menuchoice>
+              <shortcut>
+                <keycombo>
+                  <keycap>Ctrl</keycap>
+                  <keycap>N</keycap>
+                </keycombo>
+              </shortcut>
+              <guimenu>File</guimenu>
+              <guimenuitem>New Window</guimenuitem>
+            </menuchoice>
+            will use the saved window positions also.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>
           <guilabel>Remember tool state</guilabel>
         </term>
         <listitem>
--- a/doc/docbook/GuideReferenceCommandLine.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideReferenceCommandLine.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -9,7 +9,7 @@
   <table frame="all">
     <tgroup cols="3" rowsep="1" colsep="1">
       <thead rowsep="1" colsep="1">
-        <row >
+        <row>
           <entry>Short Option</entry>
           <entry>Long Option</entry>
           <entry>Description</entry>
@@ -88,16 +88,17 @@
   <section id="Remotecommands">
     <title>Remote commands</title>
     <para>The --remote command line option will send all entered commands to an existing Geeqie process, a new process will be started if one does not exist. These are the additional commands that can be used with the remote command:</para>
-  <table frame="all">
-    <tgroup cols="3" rowsep="1" colsep="1">
-      <thead rowsep="1" colsep="1">
-
+    <table frame="all">
+      <tgroup cols="3" rowsep="1" colsep="1">
+        <thead rowsep="1" colsep="1">
           <row>
             <entry>Short Option</entry>
             <entry>Long Option</entry>
             <entry>Description</entry>
-          </row></thead>
-        <tbody>          <row>
+          </row>
+        </thead>
+        <tbody>
+          <row>
             <entry>-n</entry>
             <entry>--next</entry>
             <entry>Change main window to display next image.</entry>
@@ -190,7 +191,12 @@
           <row>
             <entry />
             <entry>file:&lt;file&gt;</entry>
-            <entry>Change main window to display &lt;file&gt;</entry>
+            <entry>Open  &lt;file&gt; and bring Geeqie window to the top</entry>
+          </row>
+          <row>
+            <entry />
+            <entry>File:&lt;file&gt;</entry>
+            <entry>Open  &lt;file&gt; and do not bring Geeqie window to the top</entry>
           </row>
           <row>
             <entry />
@@ -222,4 +228,4 @@
     </table>
     <para />
   </section>
-</section>
+</section>
--- a/doc/docbook/GuideReferenceKeyboardShortcuts.xml	Fri Jan 13 18:10:38 2017 +0200
+++ b/doc/docbook/GuideReferenceKeyboardShortcuts.xml	Wed Apr 26 23:33:20 2017 +0300
@@ -135,7 +135,9 @@
           <row>
             <entry colsep="0">
               <emphasis role="strong">Image viewing</emphasis>
-              (image has keyboard focus)
+              (image has keyboard focus. Refer also to
+              <link linkend="MouseWheelMode">Mouse Wheel Mode</link>
+              )
             </entry>
             <entry colsep="0" />
             <entry colsep="0" />
--- a/po/POTFILES.in	Fri Jan 13 18:10:38 2017 +0200
+++ b/po/POTFILES.in	Wed Apr 26 23:33:20 2017 +0300
@@ -51,6 +51,7 @@
 src/image-overlay.c
 src/img-view.c
 src/jpeg_parser.c
+src/keymap_template.c
 src/layout.c
 src/layout_config.c
 src/layout_image.c
@@ -64,13 +65,13 @@
 src/metadata.c
 src/misc.c
 src/options.c
-src/pan-calendar.c
-src/pan-folder.c
-src/pan-grid.c
-src/pan-item.c
-src/pan-timeline.c
-src/pan-util.c
-src/pan-view.c
+src/pan-view/pan-calendar.c
+src/pan-view/pan-folder.c
+src/pan-view/pan-grid.c
+src/pan-view/pan-item.c
+src/pan-view/pan-timeline.c
+src/pan-view/pan-util.c
+src/pan-view/pan-view.c
 src/pixbuf-renderer.c
 src/pixbuf_util.c
 src/preferences.c
--- a/po/de.po	Fri Jan 13 18:10:38 2017 +0200
+++ b/po/de.po	Wed Apr 26 23:33:20 2017 +0300
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-24 12:53+0100\n"
-"PO-Revision-Date: 2016-05-24 13:58+0100\n"
+"POT-Creation-Date: 2017-02-16 00:09+0100\n"
+"PO-Revision-Date: 2017-02-16 00:19+0100\n"
 "Last-Translator: Klaus Ethgen <Klaus@Ethgen.de>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../geeqie.desktop.in.h:1
 msgid "Geeqie"
@@ -62,170 +62,170 @@
 msgid "UFRaw Batch recursive"
 msgstr "Rekursive UFRaw-Stapelverarbeitung"
 
-#: ../src/advanced_exif.c:328 ../src/cache_maint.c:1111 ../src/preferences.c:94
-#: ../src/preferences.c:1818
+#: ../src/advanced_exif.c:336 ../src/cache_maint.c:1131
+#: ../src/preferences.c:109 ../src/preferences.c:1869
 msgid "Metadata"
 msgstr "Schlüsselworte und Kommentare"
 
-#: ../src/advanced_exif.c:376 ../src/preferences.c:1732
+#: ../src/advanced_exif.c:384 ../src/preferences.c:1783
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../src/advanced_exif.c:377
+#: ../src/advanced_exif.c:385
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2642
-#: ../src/dupe.c:3129 ../src/print.c:3199 ../src/search.c:2790
-#: ../src/utilops.c:462 ../src/view_file_list.c:1980
+#: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2702
+#: ../src/dupe.c:3241 ../src/print.c:3208 ../src/search.c:2819
+#: ../src/utilops.c:505 ../src/view_file_list.c:1989
 msgid "Name"
 msgstr "Name"
 
-#: ../src/advanced_exif.c:379
+#: ../src/advanced_exif.c:387
 msgid "Tag"
 msgstr "Tag"
 
-#: ../src/advanced_exif.c:380
+#: ../src/advanced_exif.c:388
 msgid "Format"
 msgstr "Format"
 
-#: ../src/advanced_exif.c:381
+#: ../src/advanced_exif.c:389
 msgid "Elements"
 msgstr "Elemente"
 
 #. default sidebar
-#: ../src/bar.c:167
+#: ../src/bar.c:175
 msgid "Histogram"
 msgstr "Histogramm"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:176
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/bar.c:169 ../src/search.c:2717
+#: ../src/bar.c:177 ../src/search.c:2746
 msgid "Keywords"
 msgstr "Schlüsselworte"
 
-#: ../src/bar.c:170 ../src/search.c:2729
+#: ../src/bar.c:178 ../src/search.c:2758
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:179
 msgid "Exif"
 msgstr "Exif"
 
 #. other pre-configured panes
-#: ../src/bar.c:173
+#: ../src/bar.c:181
 msgid "File info"
 msgstr "Dateiinformationen"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:182
 msgid "Location and GPS"
 msgstr "Ortsangaben und GPS"
 
-#: ../src/bar.c:175 ../src/exif.c:348
+#: ../src/bar.c:183 ../src/exif.c:342
 msgid "Copyright"
 msgstr "Urheberangaben"
 
-#: ../src/bar.c:178 ../src/bar_gps.c:756
+#: ../src/bar.c:186 ../src/bar_gps.c:821
 msgid "GPS Map"
 msgstr "GPS-Karte"
 
-#: ../src/bar.c:297
+#: ../src/bar.c:305
 msgid "Move to _top"
 msgstr "Ganz nach oben verschieben"
 
-#: ../src/bar.c:298 ../src/ui_bookmark.c:407
+#: ../src/bar.c:306 ../src/ui_bookmark.c:416
 msgid "Move _up"
 msgstr "Nach _oben verschieben"
 
-#: ../src/bar.c:299 ../src/ui_bookmark.c:409
+#: ../src/bar.c:307 ../src/ui_bookmark.c:418
 msgid "Move _down"
 msgstr "Nach _unten verschieben"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:308
 msgid "Move to _bottom"
 msgstr "Ganz nach unten schieben"
 
-#: ../src/bar.c:302
+#: ../src/bar.c:310
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../src/bar_comment.c:195
+#: ../src/bar_comment.c:203
 msgid "Add text to selected files"
 msgstr "Text zu den ausgewählen Dateien hinzufügen"
 
-#: ../src/bar_comment.c:196
+#: ../src/bar_comment.c:204
 msgid "Replace existing text in selected files"
 msgstr "Text in ausgewählten Dateien ersetzen"
 
-#: ../src/bar_exif.c:213
+#: ../src/bar_exif.c:221
 msgid "<empty label, fixme>"
 msgstr "<leere Beschreibung, bitte beheben>"
 
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559
 msgid "Configure entry"
 msgstr "Eintrag bearbeiten"
 
 #. for the pane
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551 ../src/bar_exif.c:624
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559 ../src/bar_exif.c:632
 msgid "Add entry"
 msgstr "Eintrag hinzufügen"
 
-#: ../src/bar_exif.c:557
+#: ../src/bar_exif.c:565
 msgid "Key:"
 msgstr "Schlüssel:"
 
-#: ../src/bar_exif.c:566
+#: ../src/bar_exif.c:574
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/bar_exif.c:575
+#: ../src/bar_exif.c:583
 msgid "Show only if set"
 msgstr "Nur anzeigen wenn gesetzt"
 
-#: ../src/bar_exif.c:576
+#: ../src/bar_exif.c:584
 msgid "Editable (supported only for XMP)"
 msgstr "Editierbar (Nur für XMP unterstützt)"
 
 #. for the entry
-#: ../src/bar_exif.c:612
+#: ../src/bar_exif.c:620
 #, c-format
 msgid "Configure \"%s\""
 msgstr "\"%s\" konfigurieren"
 
-#: ../src/bar_exif.c:613 ../src/bar_keywords.c:1189
+#: ../src/bar_exif.c:621 ../src/bar_keywords.c:1198
 #, c-format
 msgid "Remove \"%s\""
 msgstr "Entferne \"%s\""
 
-#: ../src/bar_exif.c:625
+#: ../src/bar_exif.c:633
 msgid "Show hidden entries"
 msgstr "Versteckte Objekte anzeigen"
 
-#: ../src/bar_gps.c:483
+#: ../src/bar_gps.c:544
 #, c-format
 msgid "Zoom %i"
 msgstr "Zoom %i"
 
-#: ../src/bar_gps.c:501
+#: ../src/bar_gps.c:562
 #, c-format
 msgid "Zoom level %i"
 msgstr "Zoom-Einstellung %i"
 
-#: ../src/bar_gps.c:506
+#: ../src/bar_gps.c:567
 msgid "Loading map"
 msgstr "Lade Karte"
 
-#: ../src/bar_gps.c:572
+#: ../src/bar_gps.c:633
 msgid "Enable markers"
 msgstr "Markierungen einschalten"
 
-#: ../src/bar_gps.c:574
+#: ../src/bar_gps.c:635
 msgid "Centre map on marker"
 msgstr "Zentriere Karte an Markierung"
 
-#: ../src/bar_gps.c:596
+#: ../src/bar_gps.c:657
 msgid ""
 "Move map centre to marker\n"
 " is disabled"
@@ -233,7 +233,7 @@
 "Kartenzentrum zur Markierung bewegen\n"
 "ist ausgeschaltet"
 
-#: ../src/bar_gps.c:601
+#: ../src/bar_gps.c:662
 msgid ""
 "Move map centre to marker\n"
 " is enabled"
@@ -241,130 +241,127 @@
 "Kartenzentrum zur Markierung bewegen\n"
 "ist eingeschaltet"
 
-#: ../src/bar_gps.c:610
+#: ../src/bar_gps.c:671
 msgid "Map Centreing"
 msgstr "Kartenzentrierung"
 
 #. use the same strings as in layout_util.c
-#: ../src/bar_histogram.c:249 ../src/layout_util.c:1430
+#: ../src/bar_histogram.c:257 ../src/layout_util.c:1639
 msgid "Histogram on _Red"
 msgstr "Histogramm für _Rot"
 
-#: ../src/bar_histogram.c:250 ../src/layout_util.c:1431
+#: ../src/bar_histogram.c:258 ../src/layout_util.c:1640
 msgid "Histogram on _Green"
 msgstr "Histogramm für _Grün"
 
-#: ../src/bar_histogram.c:251 ../src/layout_util.c:1432
+#: ../src/bar_histogram.c:259 ../src/layout_util.c:1641
 msgid "Histogram on _Blue"
 msgstr "Histogramm für _Blau"
 
-#: ../src/bar_histogram.c:252 ../src/layout_util.c:1433
+#: ../src/bar_histogram.c:260 ../src/layout_util.c:1642
 msgid "_Histogram on RGB"
 msgstr "_Histogramm für RGB"
 
-#: ../src/bar_histogram.c:253 ../src/layout_util.c:1434
+#: ../src/bar_histogram.c:261 ../src/layout_util.c:1643
 msgid "Histogram on _Value"
 msgstr "Histogramm für _Wert"
 
-#: ../src/bar_histogram.c:257 ../src/layout_util.c:1438
+#: ../src/bar_histogram.c:265 ../src/layout_util.c:1647
 msgid "Li_near Histogram"
 msgstr "Li_neares Histogramm"
 
-#: ../src/bar_histogram.c:258
+#: ../src/bar_histogram.c:266
 msgid "L_og Histogram"
 msgstr "L_og. Histogramm"
 
-#: ../src/bar_keywords.c:403
+#: ../src/bar_keywords.c:412
 msgid "Add keywords to selected files"
 msgstr "Schlüsselworte zu den ausgewählen Dateien hinzufügen."
 
-#: ../src/bar_keywords.c:404
+#: ../src/bar_keywords.c:413
 msgid "Replace existing keywords in selected files"
 msgstr "Bestehende Schlüsselworte der ausgewählen Dateien austauschen"
 
-#: ../src/bar_keywords.c:875
+#: ../src/bar_keywords.c:884
 msgid "Edit keyword"
 msgstr "Schlüsselwort bearbeiten"
 
-#: ../src/bar_keywords.c:875
-msgid "Add keywords"
-msgstr "Schlüsselworte hinzufügen"
-
-#: ../src/bar_keywords.c:882
+#: ../src/bar_keywords.c:884 ../src/bar_keywords.c:891
+#: ../src/bar_keywords.c:1152
+msgid "New keyword"
+msgstr "Schlüsselwort hinzufügen"
+
+#: ../src/bar_keywords.c:891
 msgid "Configure keyword"
 msgstr "Einstellungen zu Schlüsselwort bearbeiten"
 
-#: ../src/bar_keywords.c:882 ../src/bar_keywords.c:1143
-msgid "Add keyword"
-msgstr "Schlüsselwort hinzufügen"
-
-#: ../src/bar_keywords.c:888
+#: ../src/bar_keywords.c:897
 msgid "Keyword:"
 msgstr "Schlüsselwort:"
 
-#: ../src/bar_keywords.c:897
+#: ../src/bar_keywords.c:906
 msgid "Keyword type:"
 msgstr "Art des Schlüsselwortes:"
 
-#: ../src/bar_keywords.c:899
+#: ../src/bar_keywords.c:908
 msgid "Active keyword"
 msgstr "Aktives Schlüsselwort"
 
-#: ../src/bar_keywords.c:902
+#: ../src/bar_keywords.c:911
 msgid "Helper"
 msgstr "Hilfseintrag"
 
-#: ../src/bar_keywords.c:1147
+#: ../src/bar_keywords.c:1156
 msgid "Add keyword to all selected images"
 msgstr "Schlüsselworte zu den ausgewählten Dateien hinzufügen."
 
-#: ../src/bar_keywords.c:1167
+#: ../src/bar_keywords.c:1176
 #, c-format
 msgid "Hide \"%s\""
 msgstr "Verberge \"%s\""
 
-#: ../src/bar_keywords.c:1174
+#: ../src/bar_keywords.c:1183
 #, c-format
 msgid "Mark %d"
 msgstr "Markierung %d"
 
-#: ../src/bar_keywords.c:1179
+#: ../src/bar_keywords.c:1188
 #, c-format
 msgid "Connect \"%s\" to mark"
 msgstr "Verbinde \"%s\" mit Markierung"
 
-#: ../src/bar_keywords.c:1186
+#: ../src/bar_keywords.c:1195
 #, c-format
 msgid "Edit \"%s\""
 msgstr "\"%s\" bearbeiten"
 
-#: ../src/bar_keywords.c:1196
+#: ../src/bar_keywords.c:1205
 #, c-format
 msgid "Disconnect \"%s\" from mark %s"
 msgstr "Löse Verbindung von \"%s\" zu Markierung %s"
 
 #. for the pane
-#: ../src/bar_keywords.c:1208 ../src/bar_keywords.c:1217
+#: ../src/bar_keywords.c:1217 ../src/bar_keywords.c:1226
 msgid "Expand checked"
 msgstr "Ausgewählte expandieren"
 
-#: ../src/bar_keywords.c:1209 ../src/bar_keywords.c:1218
+#: ../src/bar_keywords.c:1218 ../src/bar_keywords.c:1227
 msgid "Collapse unchecked"
 msgstr "Nicht ausgewählte schließen"
 
-#: ../src/bar_keywords.c:1210 ../src/bar_keywords.c:1219
+#: ../src/bar_keywords.c:1219 ../src/bar_keywords.c:1228
 msgid "Hide unchecked"
 msgstr "Nicht ausgewählte verbergen"
 
-#: ../src/bar_keywords.c:1211
+#: ../src/bar_keywords.c:1220
 msgid "Show all"
 msgstr "Alle anzeigen"
 
-#: ../src/bar_keywords.c:1214
+#: ../src/bar_keywords.c:1223
 msgid "On any change"
 msgstr "Bei jeder Änderung ..."
 
-#: ../src/bar_sort.c:449
+#: ../src/bar_sort.c:457
 #, c-format
 msgid ""
 "The collection:\n"
@@ -372,11 +369,11 @@
 "already exists."
 msgstr "Die Sammlung '%s' existiert bereits!"
 
-#: ../src/bar_sort.c:450
+#: ../src/bar_sort.c:458
 msgid "Collection exists"
 msgstr "Sammlung existiert"
 
-#: ../src/bar_sort.c:464 ../src/collect.c:1043 ../src/collect-dlg.c:85
+#: ../src/bar_sort.c:472 ../src/collect.c:1060 ../src/collect-dlg.c:93
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
@@ -385,55 +382,56 @@
 "Fehler beim Speichern der Sammlung:\n"
 "%s"
 
-#: ../src/bar_sort.c:465 ../src/collect.c:1044 ../src/collect-dlg.c:86
+#: ../src/bar_sort.c:473 ../src/collect.c:1061 ../src/collect-dlg.c:94
 msgid "Save Failed"
 msgstr "Fehler beim Speichern"
 
-#: ../src/bar_sort.c:500 ../src/bar_sort.c:670
+#: ../src/bar_sort.c:508 ../src/bar_sort.c:678
 msgid "Add Bookmark"
 msgstr "Lesezeichen/Sammlung hinzufügen"
 
-#: ../src/bar_sort.c:504
+#: ../src/bar_sort.c:512
 msgid "Add Collection"
 msgstr "Neue Sammlung"
 
-#: ../src/bar_sort.c:521 ../src/ui_bookmark.c:288
+#: ../src/bar_sort.c:529 ../src/ui_bookmark.c:297
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/bar_sort.c:597
+#: ../src/bar_sort.c:605
 msgid "Sort Manager"
 msgstr "Sortier-Manager"
 
-#: ../src/bar_sort.c:606 ../src/pan-view.c:2194 ../src/ui_pathsel.c:1097
+#: ../src/bar_sort.c:614 ../src/pan-view/pan-view.c:2213
+#: ../src/ui_pathsel.c:1106
 msgid "Folders"
 msgstr "Verzeichnisse"
 
-#: ../src/bar_sort.c:607 ../src/options.c:160
+#: ../src/bar_sort.c:615 ../src/options.c:174
 msgid "Collections"
 msgstr "Sammlungen"
 
-#: ../src/bar_sort.c:615 ../src/utilops.c:2137
+#: ../src/bar_sort.c:623 ../src/utilops.c:2277
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/bar_sort.c:618 ../src/utilops.c:2088
+#: ../src/bar_sort.c:626 ../src/utilops.c:2227
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../src/bar_sort.c:657
+#: ../src/bar_sort.c:665
 msgid "Add image"
 msgstr "Bild hinzufügen"
 
-#: ../src/bar_sort.c:660
+#: ../src/bar_sort.c:668
 msgid "Add selection"
 msgstr "Auswahl hinzufügen"
 
-#: ../src/bar_sort.c:673
+#: ../src/bar_sort.c:681
 msgid "Undo last image"
 msgstr "Letzten Vorgang rückgängig machen"
 
-#: ../src/cache.c:163
+#: ../src/cache.c:172
 #, c-format
 msgid ""
 "error saving sim cache data: %s\n"
@@ -442,78 +440,78 @@
 "Fehler beim Speichern des Cache für Ähnlichkeitsinformationen: %s\n"
 "Fehler: %s\n"
 
-#: ../src/cache_maint.c:110 ../src/cache_maint.c:549 ../src/cache_maint.c:765
-#: ../src/editors.c:1177
+#: ../src/cache_maint.c:120 ../src/cache_maint.c:559 ../src/cache_maint.c:775
+#: ../src/editors.c:1189
 msgid "done"
 msgstr "fertig"
 
-#: ../src/cache_maint.c:288
+#: ../src/cache_maint.c:298
 msgid "Removing old metadata..."
 msgstr "Entferne alte Metadaten..."
 
-#: ../src/cache_maint.c:292
+#: ../src/cache_maint.c:302
 msgid "Clearing cached thumbnails..."
 msgstr "Lösche gespeicherte Vorschaubilder..."
 
-#: ../src/cache_maint.c:296 ../src/cache_maint.c:923
+#: ../src/cache_maint.c:306 ../src/cache_maint.c:933
 msgid "Removing old thumbnails..."
 msgstr "Entferne alte Vorschaubilder..."
 
-#: ../src/cache_maint.c:299 ../src/cache_maint.c:926
+#: ../src/cache_maint.c:309 ../src/cache_maint.c:936
 msgid "Maintenance"
 msgstr "Bereinigung"
 
-#: ../src/cache_maint.c:660
+#: ../src/cache_maint.c:670
 msgid "Invalid folder"
 msgstr "Ungültiges Verzeichnis"
 
-#: ../src/cache_maint.c:661
+#: ../src/cache_maint.c:671
 msgid "The specified folder can not be found."
 msgstr "Fehler! Das angegebene Verzeichnis konnte nicht gefunden werden."
 
-#: ../src/cache_maint.c:692 ../src/cache_maint.c:706 ../src/cache_maint.c:1102
+#: ../src/cache_maint.c:702 ../src/cache_maint.c:716 ../src/cache_maint.c:1122
 msgid "Create thumbnails"
 msgstr "Vorschaubilder erzeugen"
 
-#: ../src/cache_maint.c:700 ../src/cache_maint.c:933
+#: ../src/cache_maint.c:710 ../src/cache_maint.c:943
 msgid "S_tart"
 msgstr "S_tart"
 
-#: ../src/cache_maint.c:713 ../src/preferences.c:2005
+#: ../src/cache_maint.c:723 ../src/preferences.c:2117
 msgid "Folder:"
 msgstr "Verzeichnis:"
 
-#: ../src/cache_maint.c:716
+#: ../src/cache_maint.c:726
 msgid "Select folder"
 msgstr "Verzeichnisauswahl"
 
-#: ../src/cache_maint.c:720
+#: ../src/cache_maint.c:730
 msgid "Include subfolders"
 msgstr "rekursiv (inkl. Unterverzeichnisse)"
 
-#: ../src/cache_maint.c:721
+#: ../src/cache_maint.c:731
 msgid "Store thumbnails local to source images"
 msgstr ""
 "Vorschaubilder innerhalb des Bilderverzeichnisses speichern (.thumbnails)"
 
-#: ../src/cache_maint.c:730 ../src/cache_maint.c:942
+#: ../src/cache_maint.c:740 ../src/cache_maint.c:952
 msgid "click start to begin"
 msgstr "Klicke den Start-Button, um mit der Bereinigung zu beginnen."
 
-#: ../src/cache_maint.c:869 ../src/editors.c:1103
+#: ../src/cache_maint.c:879 ../src/editors.c:1115
 msgid "running..."
 msgstr "läuft..."
 
-#: ../src/cache_maint.c:918
+#: ../src/cache_maint.c:928
 msgid "Clearing thumbnails..."
 msgstr "Lösche Vorschaubilder..."
 
-#: ../src/cache_maint.c:984 ../src/cache_maint.c:987 ../src/cache_maint.c:1080
-#: ../src/cache_maint.c:1097
+#: ../src/cache_maint.c:997 ../src/cache_maint.c:1000 ../src/cache_maint.c:1100
+#: ../src/cache_maint.c:1117
 msgid "Clear cache"
 msgstr "Löschen"
 
-#: ../src/cache_maint.c:988
+#: ../src/cache_maint.c:1001
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
@@ -521,75 +519,75 @@
 "Dies wird alle Vorschaubilder löschen!\n"
 "Wirklich löschen?"
 
-#: ../src/cache_maint.c:1030
+#: ../src/cache_maint.c:1048
 #, c-format
 msgid "Location: %s"
 msgstr "Pfad: %s"
 
-#: ../src/cache_maint.c:1055
+#: ../src/cache_maint.c:1073
 msgid "Cache Maintenance"
 msgstr "Cachewartung"
 
-#: ../src/cache_maint.c:1065
+#: ../src/cache_maint.c:1085
 msgid "Cache and Data Maintenance"
 msgstr "Speicher für Vorschaubilder, Schlüsselworte und Kommentare"
 
-#: ../src/cache_maint.c:1069
+#: ../src/cache_maint.c:1089
 msgid "Thumbnail cache"
 msgstr "Cache für Vorschaubilder"
 
-#: ../src/cache_maint.c:1075 ../src/cache_maint.c:1092
-#: ../src/cache_maint.c:1117
+#: ../src/cache_maint.c:1095 ../src/cache_maint.c:1112
+#: ../src/cache_maint.c:1137
 msgid "Clean up"
 msgstr "Bereinigen"
 
-#: ../src/cache_maint.c:1078 ../src/cache_maint.c:1095
+#: ../src/cache_maint.c:1098 ../src/cache_maint.c:1115
 msgid "Remove orphaned or outdated thumbnails."
 msgstr "Entfernt ungültige und veraltete Vorschaubilder aus diesem Speicher."
 
-#: ../src/cache_maint.c:1083 ../src/cache_maint.c:1100
+#: ../src/cache_maint.c:1103 ../src/cache_maint.c:1120
 msgid "Delete all cached thumbnails."
 msgstr "Entfernt alle Vorschaubilder aus diesem Speicher."
 
-#: ../src/cache_maint.c:1086
+#: ../src/cache_maint.c:1106
 msgid "Shared thumbnail cache"
 msgstr "Gemeinsamer Speicher für Vorschaubilder"
 
-#: ../src/cache_maint.c:1106
+#: ../src/cache_maint.c:1126
 msgid "Render"
 msgstr "Erzeugen"
 
-#: ../src/cache_maint.c:1109
+#: ../src/cache_maint.c:1129
 msgid "Render thumbnails for a specific folder."
 msgstr "Erzeugt Vorschaubilder für ein spezielles Verzeichnis."
 
-#: ../src/cache_maint.c:1120
+#: ../src/cache_maint.c:1140
 msgid "Remove orphaned keywords and comments."
 msgstr ""
 "Entfernt ungültige und veraltete Schlüsselworte und Kommenare aus diesem "
 "Speicher."
 
 #. When does this occur ??
-#: ../src/collect.c:331 ../src/image.c:160 ../src/image-overlay.c:532
-#: ../src/image-overlay.c:609
+#: ../src/collect.c:339 ../src/image.c:168 ../src/image-overlay.c:541
+#: ../src/image-overlay.c:618
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: ../src/collect.c:335
+#: ../src/collect.c:343
 #, c-format
 msgid "Untitled (%d)"
 msgstr "Unbenannt (%d)"
 
-#: ../src/collect.c:968
+#: ../src/collect.c:985
 #, c-format
 msgid "%s - Collection - %s"
 msgstr "%s - Sammlung - %s"
 
-#: ../src/collect.c:1080 ../src/collect.c:1084
+#: ../src/collect.c:1097 ../src/collect.c:1101
 msgid "Close collection"
 msgstr "Sammlung schließen"
 
-#: ../src/collect.c:1085
+#: ../src/collect.c:1102
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
@@ -597,11 +595,11 @@
 "Die Sammlung wurde verändert.\n"
 "Änderungen zuerst speichern?"
 
-#: ../src/collect.c:1088
+#: ../src/collect.c:1105
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: ../src/collect-dlg.c:59
+#: ../src/collect-dlg.c:67
 #, c-format
 msgid ""
 "Specified path:\n"
@@ -613,67 +611,67 @@
 "ist ein Verzeichnis.\n"
 "Sammlungen werden als Dateien gespeichert."
 
-#: ../src/collect-dlg.c:60
+#: ../src/collect-dlg.c:68
 msgid "Invalid filename"
 msgstr "Ungültiger Dateiname"
 
-#: ../src/collect-dlg.c:69
+#: ../src/collect-dlg.c:77
 msgid "Overwrite File"
 msgstr "Datei überschreiben"
 
-#: ../src/collect-dlg.c:74
+#: ../src/collect-dlg.c:82
 msgid "Overwrite existing file?"
 msgstr "Vorhandene Datei überschreiben?"
 
-#: ../src/collect-dlg.c:76
+#: ../src/collect-dlg.c:84
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../src/collect-dlg.c:127
+#: ../src/collect-dlg.c:135
 #, c-format
 msgid "No such file '%s'."
 msgstr "Datei '%s' existiert nicht."
 
-#: ../src/collect-dlg.c:132
+#: ../src/collect-dlg.c:140
 #, c-format
 msgid "'%s' is a directory, not a collection file."
 msgstr "'%s' ist ein Verzeichnis, keine Sammlung."
 
-#: ../src/collect-dlg.c:137
+#: ../src/collect-dlg.c:145
 #, c-format
 msgid "You do not have read permissions on the file '%s'."
 msgstr "Sie haben keine Leseberechtigung für die Datei '%s'."
 
-#: ../src/collect-dlg.c:143
+#: ../src/collect-dlg.c:151
 msgid "Can not open collection file"
 msgstr "Datei mit Sammlung kann nicht geöffnet werden"
 
-#: ../src/collect-dlg.c:195
+#: ../src/collect-dlg.c:203
 msgid "Save collection"
 msgstr "Sammlung speichern"
 
-#: ../src/collect-dlg.c:202
-msgid "Open collection"
-msgstr "Öffne Sammlung"
-
 #: ../src/collect-dlg.c:210
+msgid "Open collection"
+msgstr "Öffne Sammlung"
+
+#: ../src/collect-dlg.c:218
 msgid "Append collection"
 msgstr "Füge Sammlung hinzu"
 
-#: ../src/collect-dlg.c:211
+#: ../src/collect-dlg.c:219
 msgid "_Append"
 msgstr "_Hinzufügen"
 
-#: ../src/collect-dlg.c:228
+#: ../src/collect-dlg.c:236
 msgid "Collection Files"
 msgstr "Sammlungsdateien"
 
-#: ../src/collect-io.c:348
+#: ../src/collect-io.c:356
 #, c-format
 msgid "failed to open collection (write) \"%s\"\n"
 msgstr "Fehler beim Öffnen der Sammlung \"%s\" zum speichenr\n"
 
-#: ../src/collect-io.c:373
+#: ../src/collect-io.c:381
 #, c-format
 msgid ""
 "error saving collection file: %s\n"
@@ -692,168 +690,174 @@
 msgid "%s, %d images"
 msgstr "%s, %d Bilder"
 
-#: ../src/collect-table.c:223 ../src/layout_util.c:1229
-#: ../src/layout_util.c:2153
+#: ../src/collect-table.c:223 ../src/layout_util.c:1434
+#: ../src/layout_util.c:2369
 msgid "Empty"
 msgstr "Leer"
 
-#: ../src/collect-table.c:237 ../src/dupe.c:1314 ../src/search.c:320
-#: ../src/view_file.c:835 ../src/view_file.c:938
+#: ../src/collect-table.c:237 ../src/dupe.c:1334 ../src/search.c:329
+#: ../src/view_file.c:871 ../src/view_file.c:974
 msgid "Loading thumbs..."
 msgstr "Lade Vorschaubilder..."
 
-#: ../src/collect-table.c:873 ../src/dupe.c:2237 ../src/dupe.c:2550
-#: ../src/layout_util.c:1276 ../src/search.c:996
+#: ../src/collect-table.c:904 ../src/dupe.c:2295 ../src/dupe.c:2608
+#: ../src/layout_util.c:1481 ../src/search.c:1005
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/collect-table.c:875 ../src/dupe.c:2239 ../src/dupe.c:2552
-#: ../src/img-view.c:1268 ../src/layout_image.c:499 ../src/pan-view.c:2617
-#: ../src/search.c:998 ../src/view_file.c:588
+#: ../src/collect-table.c:906 ../src/dupe.c:2297 ../src/dupe.c:2610
+#: ../src/img-view.c:1278 ../src/layout_image.c:675
+#: ../src/pan-view/pan-view.c:2636 ../src/search.c:1007 ../src/view_file.c:618
 msgid "View in _new window"
 msgstr "In _neuem Fenster anzeigen"
 
-#: ../src/collect-table.c:878 ../src/dupe.c:2273 ../src/dupe.c:2560
-#: ../src/search.c:1028
+#: ../src/collect-table.c:909 ../src/dupe.c:2331 ../src/dupe.c:2618
+#: ../src/search.c:1037
 msgid "Rem_ove"
 msgstr "Ent_fernen"
 
-#: ../src/collect-table.c:881
+#: ../src/collect-table.c:912
 msgid "Append from file list"
 msgstr "Dateiliste hinzufügen"
 
-#: ../src/collect-table.c:883
+#: ../src/collect-table.c:914
 msgid "Append from collection..."
 msgstr "Sammlung hinzufügen..."
 
-#: ../src/collect-table.c:887
+#: ../src/collect-table.c:918
 msgid "_Selection"
 msgstr "Auswahl"
 
-#: ../src/collect-table.c:889 ../src/dupe.c:2242 ../src/dupe.c:2555
-#: ../src/layout_util.c:1324 ../src/search.c:1001
+#: ../src/collect-table.c:920 ../src/dupe.c:2300 ../src/dupe.c:2613
+#: ../src/layout_util.c:1529 ../src/search.c:1010
 msgid "Select all"
 msgstr "Alles auswählen"
 
-#: ../src/collect-table.c:891 ../src/dupe.c:2244 ../src/dupe.c:2557
-#: ../src/layout_util.c:1325 ../src/search.c:1003
+#: ../src/collect-table.c:922 ../src/dupe.c:2302 ../src/dupe.c:2615
+#: ../src/layout_util.c:1530 ../src/search.c:1012
 msgid "Select none"
 msgstr "Nichts auswählen"
 
-#: ../src/collect-table.c:893
+#: ../src/collect-table.c:924
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: ../src/collect-table.c:905 ../src/dupe.c:2262 ../src/img-view.c:1272
-#: ../src/layout_image.c:507 ../src/layout_util.c:1307 ../src/pan-view.c:2621
-#: ../src/search.c:1017 ../src/view_file.c:592
+#: ../src/collect-table.c:926
+msgid "Rectangular selection"
+msgstr "Rechteckige Auswahl"
+
+#: ../src/collect-table.c:938 ../src/dupe.c:2320 ../src/img-view.c:1282
+#: ../src/layout_image.c:683 ../src/layout_util.c:1512
+#: ../src/pan-view/pan-view.c:2640 ../src/search.c:1026 ../src/view_file.c:622
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ../src/collect-table.c:907 ../src/dupe.c:2264 ../src/img-view.c:1273
-#: ../src/layout_image.c:509 ../src/layout_util.c:1308 ../src/pan-view.c:2623
-#: ../src/search.c:1019 ../src/view_file.c:594
+#: ../src/collect-table.c:940 ../src/dupe.c:2322 ../src/img-view.c:1283
+#: ../src/layout_image.c:685 ../src/layout_util.c:1513
+#: ../src/pan-view/pan-view.c:2642 ../src/search.c:1028 ../src/view_file.c:624
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ../src/collect-table.c:909 ../src/dupe.c:2266 ../src/img-view.c:1274
-#: ../src/layout_image.c:511 ../src/layout_util.c:1309 ../src/pan-view.c:2625
-#: ../src/search.c:1021 ../src/view_dir.c:665 ../src/view_file.c:596
+#: ../src/collect-table.c:942 ../src/dupe.c:2324 ../src/img-view.c:1284
+#: ../src/layout_image.c:687 ../src/layout_util.c:1514
+#: ../src/pan-view/pan-view.c:2644 ../src/search.c:1030 ../src/view_dir.c:674
+#: ../src/view_file.c:626
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ../src/collect-table.c:911 ../src/dupe.c:2268 ../src/img-view.c:1275
-#: ../src/layout_image.c:513 ../src/layout_util.c:1310
-#: ../src/layout_util.c:1311 ../src/layout_util.c:1312 ../src/pan-view.c:2627
-#: ../src/search.c:1023 ../src/view_dir.c:667 ../src/view_file.c:598
+#: ../src/collect-table.c:944 ../src/dupe.c:2326 ../src/img-view.c:1285
+#: ../src/layout_image.c:689 ../src/layout_util.c:1515
+#: ../src/layout_util.c:1516 ../src/layout_util.c:1517
+#: ../src/pan-view/pan-view.c:2646 ../src/search.c:1032 ../src/view_dir.c:676
+#: ../src/view_file.c:628
 msgid "_Delete..."
 msgstr "_Löschen..."
 
-#: ../src/collect-table.c:913 ../src/dupe.c:2270 ../src/img-view.c:1276
-#: ../src/layout_image.c:516 ../src/pan-view.c:2629 ../src/search.c:1025
-#: ../src/view_dir.c:670 ../src/view_file.c:600
+#: ../src/collect-table.c:946 ../src/dupe.c:2328 ../src/img-view.c:1286
+#: ../src/layout_image.c:692 ../src/pan-view/pan-view.c:2648
+#: ../src/search.c:1034 ../src/view_dir.c:679 ../src/view_file.c:630
 msgid "_Copy path"
 msgstr "_Kopiere Pfad"
 
-#: ../src/collect-table.c:919
+#: ../src/collect-table.c:952
 msgid "Randomize"
 msgstr "Mischen"
 
-#: ../src/collect-table.c:921 ../src/view_file.c:616
+#: ../src/collect-table.c:954 ../src/view_file.c:652
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: ../src/collect-table.c:924 ../src/view_file.c:632
+#: ../src/collect-table.c:957 ../src/view_file.c:668
 msgid "Show filename _text"
 msgstr "_Dateinamen anzeigen"
 
-#: ../src/collect-table.c:927
+#: ../src/collect-table.c:960
 msgid "_Save collection"
 msgstr "Sammlung _speichern"
 
-#: ../src/collect-table.c:929
+#: ../src/collect-table.c:962
 msgid "Save collection _as..."
 msgstr "Sammlung speichern _als..."
 
-#: ../src/collect-table.c:932 ../src/layout_util.c:1303
+#: ../src/collect-table.c:965 ../src/layout_util.c:1508 ../src/view_file.c:639
 msgid "_Find duplicates..."
 msgstr "_Duplikate suchen..."
 
-#: ../src/collect-table.c:934 ../src/dupe.c:2259 ../src/layout_util.c:1305
-#: ../src/search.c:1014
+#: ../src/collect-table.c:967 ../src/dupe.c:2317 ../src/layout_util.c:1510
+#: ../src/search.c:1023
 msgid "Print..."
 msgstr "D_rucken..."
 
-#: ../src/collect-table.c:2099 ../src/dupe.c:3319 ../src/img-view.c:1430
+#: ../src/collect-table.c:2156 ../src/dupe.c:3455 ../src/img-view.c:1440
 msgid "Dropped list includes folders."
 msgstr "Markierung enthält Verzeichnisse"
 
-#: ../src/collect-table.c:2101 ../src/dupe.c:3321 ../src/img-view.c:1432
+#: ../src/collect-table.c:2158 ../src/dupe.c:3457 ../src/img-view.c:1442
 msgid "_Add contents"
 msgstr "Inhalt _hinzufügen"
 
-#: ../src/collect-table.c:2103 ../src/dupe.c:3322 ../src/img-view.c:1433
+#: ../src/collect-table.c:2160 ../src/dupe.c:3458 ../src/img-view.c:1443
 msgid "Add contents _recursive"
 msgstr "Inhalt _rekursiv hinzufügen"
 
-#: ../src/collect-table.c:2105 ../src/dupe.c:3323 ../src/img-view.c:1434
+#: ../src/collect-table.c:2162 ../src/dupe.c:3459 ../src/img-view.c:1444
 msgid "_Skip folders"
 msgstr "Über_springe Verzeichnisse"
 
-#: ../src/collect-table.c:2108 ../src/dupe.c:3325 ../src/img-view.c:1436
-#: ../src/view_dir.c:417
+#: ../src/collect-table.c:2165 ../src/dupe.c:3461 ../src/img-view.c:1446
+#: ../src/view_dir.c:426
 msgid "Cancel"
 msgstr "_Abbrechen"
 
-#: ../src/color-man.c:426 ../src/exif.c:233 ../src/exif-common.c:436
+#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:448
 msgid "sRGB"
 msgstr "sRGB"
 
-#: ../src/color-man.c:428
+#: ../src/color-man.c:436
 msgid "Adobe RGB compatible"
 msgstr "AdobeRGB-kompatibel"
 
-#: ../src/color-man.c:445
+#: ../src/color-man.c:453
 msgid "Custom profile"
 msgstr "Benutzerprofiel"
 
-#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
+#: ../src/desktop_file.c:83 ../src/desktop_file.c:95 ../src/desktop_file.c:101
 msgid "Can't save"
 msgstr "Kann nichts speichern"
 
-#: ../src/desktop_file.c:74
+#: ../src/desktop_file.c:83
 msgid "Please specify file name."
 msgstr "Bitte einen anderen Dateiname angeben."
 
-#: ../src/desktop_file.c:86
+#: ../src/desktop_file.c:95
 msgid "Could not create directory"
 msgstr "Verzeichnisses kann nicht erstellt werden"
 
-#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
+#: ../src/desktop_file.c:191 ../src/desktop_file.c:554
 msgid "Desktop file"
 msgstr "Desktop-Datei"
 
-#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:485
+#: ../src/desktop_file.c:300 ../src/ui_pathsel.c:494
 #, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -862,17 +866,17 @@
 "Fehler beim Löschen der Datei:\n"
 "%s"
 
-#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:486 ../src/utilops.c:1975
-#: ../src/utilops.c:2002 ../src/utilops.c:2522
+#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2113
+#: ../src/utilops.c:2140 ../src/utilops.c:2662
 msgid "File deletion failed"
 msgstr "Fehler beim Löschen der Datei"
 
-#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:528
-#: ../src/ui_pathsel.c:536
+#: ../src/desktop_file.c:345 ../src/desktop_file.c:353 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
 msgid "Delete file"
 msgstr "Datei löschen"
 
-#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:534
+#: ../src/desktop_file.c:351 ../src/ui_pathsel.c:543
 #, c-format
 msgid ""
 "About to delete the file:\n"
@@ -881,176 +885,184 @@
 "Werde Datei löschen:\n"
 " %s"
 
-#: ../src/desktop_file.c:374
+#: ../src/desktop_file.c:383
 msgid "new.desktop"
 msgstr "neu.desktop"
 
-#: ../src/desktop_file.c:453
+#: ../src/desktop_file.c:467
 msgid "Editors"
 msgstr "Eigene Befehle"
 
-#: ../src/desktop_file.c:524
+#: ../src/desktop_file.c:544
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../src/desktop_file.c:543 ../src/dupe.c:2648 ../src/dupe.c:3133
-#: ../src/print.c:3201 ../src/search.c:2794 ../src/ui_pathsel.c:1109
-#: ../src/utilops.c:458
+#: ../src/desktop_file.c:563 ../src/dupe.c:2708 ../src/dupe.c:3245
+#: ../src/print.c:3210 ../src/search.c:2823 ../src/ui_pathsel.c:1118
+#: ../src/utilops.c:501
 msgid "Path"
 msgstr "Pfad"
 
-#: ../src/dupe.c:100
+#: ../src/dupe.c:108
 msgid "Drop files to compare them."
 msgstr "Dateien herziehen um sie zu vergleichen."
 
-#: ../src/dupe.c:104
+#: ../src/dupe.c:112
 #, c-format
 msgid "%d files"
 msgstr "%d Dateien"
 
-#: ../src/dupe.c:108
+#: ../src/dupe.c:116
 #, c-format
 msgid "%d matches found in %d files"
 msgstr "%d Treffer gefunden in %d Dateien"
 
-#: ../src/dupe.c:113
+#: ../src/dupe.c:121
 msgid "[set 1]"
 msgstr "[menge 1]"
 
-#: ../src/dupe.c:1440
+#: ../src/dupe.c:1460
 msgid "Reading checksums..."
 msgstr "Lese Prüfsummen..."
 
-#: ../src/dupe.c:1473
+#: ../src/dupe.c:1493
 msgid "Reading dimensions..."
 msgstr "Lese Bildauflösungen..."
 
-#: ../src/dupe.c:1507
+#: ../src/dupe.c:1527
 msgid "Reading similarity data..."
 msgstr "Lese Ähnlichkeitsdaten..."
 
-#: ../src/dupe.c:1543 ../src/dupe.c:1574
+#: ../src/dupe.c:1563 ../src/dupe.c:1594
 msgid "Comparing..."
 msgstr "Vergleiche..."
 
-#: ../src/dupe.c:1554 ../src/pan-view.c:996
+#: ../src/dupe.c:1574 ../src/pan-view/pan-view.c:1012
 msgid "Sorting..."
 msgstr "Sortiere..."
 
-#: ../src/dupe.c:2246
+#: ../src/dupe.c:2304
 msgid "Select group _1 duplicates"
 msgstr "Duplikate der Gruppe _1 auswählen"
 
-#: ../src/dupe.c:2248
+#: ../src/dupe.c:2306
 msgid "Select group _2 duplicates"
 msgstr "Duplikate der Gruppe _2 auswählen"
 
-#: ../src/dupe.c:2257 ../src/search.c:1012
+#: ../src/dupe.c:2315 ../src/search.c:1021 ../src/view_file.c:642
 msgid "Add to new collection"
 msgstr "Füge zu neuer Sammlung hinzu"
 
-#: ../src/dupe.c:2275 ../src/dupe.c:2562 ../src/search.c:1030
+#: ../src/dupe.c:2333 ../src/dupe.c:2620 ../src/search.c:1039
 msgid "C_lear"
 msgstr "_Löschen"
 
-#: ../src/dupe.c:2278 ../src/dupe.c:2565
+#: ../src/dupe.c:2336 ../src/dupe.c:2623
 msgid "Close _window"
 msgstr "Fenster s_chließen"
 
-#: ../src/dupe.c:2438
+#: ../src/dupe.c:2496
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d Dateien (menge 2)"
 
-#: ../src/dupe.c:2643
+#: ../src/dupe.c:2703
 msgid "Name case-insensitive"
 msgstr "Name, ignoriere Groß-/Kleinschreibung"
 
-#: ../src/dupe.c:2644 ../src/dupe.c:3130 ../src/preferences.c:1534
-#: ../src/print.c:3205 ../src/search.c:2791 ../src/view_file_list.c:1984
+#: ../src/dupe.c:2704 ../src/dupe.c:3242 ../src/preferences.c:1583
+#: ../src/print.c:3214 ../src/search.c:2820 ../src/view_file_list.c:1993
 msgid "Size"
 msgstr "Größe"
 
-#: ../src/dupe.c:2645 ../src/dupe.c:3131 ../src/exif.c:342
-#: ../src/exif-common.c:553 ../src/print.c:3203 ../src/search.c:2792
-#: ../src/view_file_list.c:1988
+#: ../src/dupe.c:2705 ../src/dupe.c:3243 ../src/exif.c:336
+#: ../src/exif-common.c:565 ../src/print.c:3212 ../src/search.c:2821
+#: ../src/view_file_list.c:1997
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/dupe.c:2646 ../src/dupe.c:3132 ../src/print.c:3207
-#: ../src/search.c:2793
+#: ../src/dupe.c:2706 ../src/dupe.c:3244 ../src/print.c:3216
+#: ../src/search.c:2822
 msgid "Dimensions"
 msgstr "Bildauflösung"
 
-#: ../src/dupe.c:2647
+#: ../src/dupe.c:2707
 msgid "Checksum"
 msgstr "Prüfsumme"
 
-#: ../src/dupe.c:2649
+#: ../src/dupe.c:2709
 msgid "Similarity (high)"
 msgstr "Ähnlichkeit (hoch)"
 
-#: ../src/dupe.c:2650
+#: ../src/dupe.c:2710
 msgid "Similarity"
 msgstr "Ähnlichkeit"
 
-#: ../src/dupe.c:2651
+#: ../src/dupe.c:2711
 msgid "Similarity (low)"
 msgstr "Ähnlichkeit (niedrig)"
 
-#: ../src/dupe.c:2652
+#: ../src/dupe.c:2712
 msgid "Similarity (custom)"
 msgstr "Ähnlichkeit (benutzerdefiniert)"
 
-#: ../src/dupe.c:3083
+#: ../src/dupe.c:3195
 msgid "Find duplicates"
 msgstr "Duplikate suchen"
 
-#: ../src/dupe.c:3165
+#: ../src/dupe.c:3277
 msgid "Compare to:"
 msgstr "Vergleiche mit:"
 
-#: ../src/dupe.c:3178
+#: ../src/dupe.c:3290
 msgid "Compare by:"
 msgstr "Vergleiche nach:"
 
-#: ../src/dupe.c:3186 ../src/preferences.c:1374 ../src/search.c:2807
+#: ../src/dupe.c:3298 ../src/preferences.c:1421 ../src/search.c:2836
 msgid "Thumbnails"
 msgstr "Vorschaubilder"
 
-#: ../src/dupe.c:3193
+#: ../src/dupe.c:3306
+msgid "Ignore Rotation"
+msgstr "Ausrichtung ignorieren"
+
+#: ../src/dupe.c:3314
 msgid "Compare two file sets"
 msgstr "Vergleiche zwei Dateimengen"
 
-#: ../src/editors.c:281
+#: ../src/dupe.c:3334
+msgid "Custom Threshold"
+msgstr "Eigene Ähnlichkeitsschwelle"
+
+#: ../src/editors.c:289
 #, c-format
 msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
 msgstr ""
 "Desktop-Datei '%s' sollte keine Extension im Icon-Schlüssel '%s' enthalten.\n"
 
 #. flash fired (bit 0)
-#: ../src/editors.c:335 ../src/exif.c:226 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:220 ../src/exif-common.c:374
 msgid "yes"
 msgstr "ja"
 
-#: ../src/editors.c:335 ../src/exif.c:225 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:219 ../src/exif-common.c:374
 msgid "no"
 msgstr "nein"
 
-#: ../src/editors.c:507
+#: ../src/editors.c:515
 msgid "stopping..."
 msgstr "Halte an..."
 
-#: ../src/editors.c:528
+#: ../src/editors.c:536
 msgid "Edit command results"
 msgstr "Ergebnis der Bearbeitung"
 
-#: ../src/editors.c:531
+#: ../src/editors.c:539
 #, c-format
 msgid "Output of %s"
 msgstr "Ausgabe von %s"
 
-#: ../src/editors.c:1054
+#: ../src/editors.c:1066
 #, c-format
 msgid ""
 "Failed to run command:\n"
@@ -1059,11 +1071,11 @@
 "Fehler beim Ausführen des Befehles:\n"
 "%s\n"
 
-#: ../src/editors.c:1181
+#: ../src/editors.c:1193
 msgid "stopped by user"
 msgstr "Abbruch durch Benutzer"
 
-#: ../src/editors.c:1266
+#: ../src/editors.c:1278
 #, c-format
 msgid ""
 "%s\n"
@@ -1072,2033 +1084,2089 @@
 "%s\n"
 "\"%s\""
 
-#: ../src/editors.c:1268
+#: ../src/editors.c:1280
 msgid "Invalid editor command"
 msgstr "Ungültiges Editorkommando"
 
-#: ../src/editors.c:1355
+#: ../src/editors.c:1367
 msgid "Editor template is empty."
 msgstr "Editorvorlage ist leer."
 
-#: ../src/editors.c:1356
+#: ../src/editors.c:1368
 msgid "Editor template has incorrect syntax."
 msgstr "Editorvorlage hat falschen Syntax."
 
-#: ../src/editors.c:1357
+#: ../src/editors.c:1369
 msgid "Editor template uses incompatible macros."
 msgstr "Editorvorlage benützt inkompatible Makros."
 
-#: ../src/editors.c:1358
+#: ../src/editors.c:1370
 msgid "Can't find matching file type."
 msgstr "Passender Dateitype kann nicht gefunden werden."
 
-#: ../src/editors.c:1359
+#: ../src/editors.c:1371
 msgid "Can't execute external editor."
 msgstr "Externer Editor kann nicht gestartet werden."
 
-#: ../src/editors.c:1360
+#: ../src/editors.c:1372
 msgid "External editor returned error status."
 msgstr "Externer Editor kehrte mit einem Fehlercode zurück."
 
-#: ../src/editors.c:1361
+#: ../src/editors.c:1373
 msgid "File was skipped."
 msgstr "Datei wurde übersprungen."
 
-#: ../src/editors.c:1362
+#: ../src/editors.c:1374
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../src/exif.c:148 ../src/exif.c:161 ../src/exif.c:175 ../src/exif.c:200
-#: ../src/exif.c:317 ../src/exif.c:664 ../src/exif-common.c:338
-#: ../src/exif-common.c:341 ../src/exif-common.c:408
+#: ../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
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../src/exif.c:149
+#: ../src/exif.c:143
 msgid "top left"
 msgstr "oben links "
 
-#: ../src/exif.c:150
+#: ../src/exif.c:144
 msgid "top right"
 msgstr "oben rechts "
 
-#: ../src/exif.c:151
+#: ../src/exif.c:145
 msgid "bottom right"
 msgstr "unten rechts "
 
-#: ../src/exif.c:152
+#: ../src/exif.c:146
 msgid "bottom left"
 msgstr "unten links "
 
-#: ../src/exif.c:153
+#: ../src/exif.c:147
 msgid "left top"
 msgstr "links oben"
 
-#: ../src/exif.c:154
+#: ../src/exif.c:148
 msgid "right top"
 msgstr "rechts oben"
 
-#: ../src/exif.c:155
+#: ../src/exif.c:149
 msgid "right bottom"
 msgstr "rechts unten"
 
-#: ../src/exif.c:156
+#: ../src/exif.c:150
 msgid "left bottom"
 msgstr "links unten"
 
-#: ../src/exif.c:163
+#: ../src/exif.c:157
 msgid "inch"
 msgstr "Zoll"
 
-#: ../src/exif.c:164
+#: ../src/exif.c:158
 msgid "centimeter"
 msgstr "cm"
 
-#: ../src/exif.c:176
+#: ../src/exif.c:170
 msgid "average"
 msgstr "Durchschnitt"
 
-#: ../src/exif.c:177
+#: ../src/exif.c:171
 msgid "center weighted"
 msgstr "mittenbetont"
 
-#: ../src/exif.c:178
+#: ../src/exif.c:172
 msgid "spot"
 msgstr "Punkt"
 
-#: ../src/exif.c:179
+#: ../src/exif.c:173
 msgid "multi-spot"
 msgstr "Mehrfach-Punkte"
 
-#: ../src/exif.c:180
+#: ../src/exif.c:174
 msgid "multi-segment"
 msgstr "Mehrfachbereiche"
 
-#: ../src/exif.c:181
+#: ../src/exif.c:175
 msgid "partial"
 msgstr "teilweise"
 
-#: ../src/exif.c:182 ../src/exif.c:220
+#: ../src/exif.c:176 ../src/exif.c:214
 msgid "other"
 msgstr "anderes"
 
-#: ../src/exif.c:187 ../src/exif.c:239
+#: ../src/exif.c:181 ../src/exif.c:233
 msgid "not defined"
 msgstr "nicht definiert"
 
-#: ../src/exif.c:188 ../src/exif.c:267 ../src/exif.c:274
+#: ../src/exif.c:182 ../src/exif.c:261 ../src/exif.c:268
 msgid "manual"
 msgstr "manuell"
 
-#: ../src/exif.c:189 ../src/exif.c:260 ../src/exif.c:296 ../src/exif.c:303
-#: ../src/exif.c:310
+#: ../src/exif.c:183 ../src/exif.c:254 ../src/exif.c:290 ../src/exif.c:297
+#: ../src/exif.c:304
 msgid "normal"
 msgstr "normal"
 
-#: ../src/exif.c:190
+#: ../src/exif.c:184
 msgid "aperture"
 msgstr "Blende"
 
-#: ../src/exif.c:191
+#: ../src/exif.c:185
 msgid "shutter"
 msgstr "Belichtungszeit"
 
-#: ../src/exif.c:192
+#: ../src/exif.c:186
 msgid "creative"
 msgstr "Kreativ"
 
-#: ../src/exif.c:193
+#: ../src/exif.c:187
 msgid "action"
 msgstr "Sport"
 
-#: ../src/exif.c:194 ../src/exif.c:281
+#: ../src/exif.c:188 ../src/exif.c:275
 msgid "portrait"
 msgstr "Portrait"
 
-#: ../src/exif.c:195 ../src/exif.c:280
+#: ../src/exif.c:189 ../src/exif.c:274
 msgid "landscape"
 msgstr "Landschaft"
 
-#: ../src/exif.c:201
+#: ../src/exif.c:195
 msgid "daylight"
 msgstr "Tageslicht"
 
-#: ../src/exif.c:202
+#: ../src/exif.c:196
 msgid "fluorescent"
 msgstr "Leuchtstofflampe"
 
 # Man verzeihe mir die Übersetung mit Glühobst.
-#: ../src/exif.c:203
+#: ../src/exif.c:197
 msgid "tungsten (incandescent)"
 msgstr "Kunstlicht (Glühbirne)"
 
-#: ../src/exif.c:204
+#: ../src/exif.c:198
 msgid "flash"
 msgstr "Blitz"
 
-#: ../src/exif.c:205
+#: ../src/exif.c:199
 msgid "fine weather"
 msgstr "gutes Wetter"
 
-#: ../src/exif.c:206
+#: ../src/exif.c:200
 msgid "cloudy weather"
 msgstr "bewölkt"
 
-#: ../src/exif.c:207
+#: ../src/exif.c:201
 msgid "shade"
 msgstr "schattig"
 
-#: ../src/exif.c:208
+#: ../src/exif.c:202
 msgid "daylight fluorescent"
 msgstr "Tageslicht (Leuchtstofflampe)"
 
-#: ../src/exif.c:209
+#: ../src/exif.c:203
 msgid "day white fluorescent"
 msgstr "Tagesweiß (Leuchtstofflampe)"
 
-#: ../src/exif.c:210
+#: ../src/exif.c:204
 msgid "cool white fluorescent"
 msgstr "Kühles Weiß (Leuchtstofflampe)"
 
-#: ../src/exif.c:211
+#: ../src/exif.c:205
 msgid "white fluorescent"
 msgstr "Weiß (Leuchtstofflampe)"
 
-#: ../src/exif.c:212
+#: ../src/exif.c:206
 msgid "standard light A"
 msgstr "Standardlicht A"
 
-#: ../src/exif.c:213
+#: ../src/exif.c:207
 msgid "standard light B"
 msgstr "Standardlicht B"
 
-#: ../src/exif.c:214
+#: ../src/exif.c:208
 msgid "standard light C"
 msgstr "Standardlicht C"
 
-#: ../src/exif.c:215
+#: ../src/exif.c:209
 msgid "D55"
 msgstr "D55"
 
-#: ../src/exif.c:216
+#: ../src/exif.c:210
 msgid "D65"
 msgstr "D65"
 
-#: ../src/exif.c:217
+#: ../src/exif.c:211
 msgid "D75"
 msgstr "D75"
 
-#: ../src/exif.c:218
+#: ../src/exif.c:212
 msgid "D50"
 msgstr "D50"
 
-#: ../src/exif.c:219
+#: ../src/exif.c:213
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: ../src/exif.c:227
+#: ../src/exif.c:221
 msgid "yes, not detected by strobe"
 msgstr "ja, nicht durch Abtastimpuls erkannt"
 
-#: ../src/exif.c:228
+#: ../src/exif.c:222
 msgid "yes, detected by strobe"
 msgstr "ja, erkannt durch Abtastimpuls"
 
+#: ../src/exif.c:228
+msgid "uncalibrated"
+msgstr "Unkalibriert"
+
 #: ../src/exif.c:234
-msgid "uncalibrated"
-msgstr "Unkalibriert"
-
-#: ../src/exif.c:240
 msgid "1 chip color area"
 msgstr ""
 
-#: ../src/exif.c:241
+#: ../src/exif.c:235
 msgid "2 chip color area"
 msgstr ""
 
-#: ../src/exif.c:242
+#: ../src/exif.c:236
 msgid "3 chip color area"
 msgstr ""
 
-#: ../src/exif.c:243
+#: ../src/exif.c:237
 msgid "color sequential area"
 msgstr ""
 
+#: ../src/exif.c:238
+msgid "trilinear"
+msgstr "Trilinear"
+
+#: ../src/exif.c:239
+msgid "color sequential linear"
+msgstr ""
+
 #: ../src/exif.c:244
-msgid "trilinear"
-msgstr "Trilinear"
-
-#: ../src/exif.c:245
-msgid "color sequential linear"
-msgstr ""
-
-#: ../src/exif.c:250
 msgid "digital still camera"
 msgstr "Photoapparat"
 
-#: ../src/exif.c:255
+#: ../src/exif.c:249
 msgid "direct photo"
 msgstr ""
 
-#: ../src/exif.c:261
+#: ../src/exif.c:255
 msgid "custom"
 msgstr "benutzerdefiniert"
 
-#: ../src/exif.c:266 ../src/exif.c:273 ../src/exif-common.c:376
+#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:388
 msgid "auto"
 msgstr "automatisch"
 
-#: ../src/exif.c:268
+#: ../src/exif.c:262
 msgid "auto bracket"
 msgstr ""
 
-#: ../src/exif.c:279
+#: ../src/exif.c:273
 msgid "standard"
 msgstr "Standard"
 
-#: ../src/exif.c:282
+#: ../src/exif.c:276
 msgid "night scene"
 msgstr "Nachtszene"
 
-#: ../src/exif.c:287
+#: ../src/exif.c:281
 msgid "none"
 msgstr "nichts"
 
-#: ../src/exif.c:288
+#: ../src/exif.c:282
 msgid "low gain up"
 msgstr ""
 
-#: ../src/exif.c:289
+#: ../src/exif.c:283
 msgid "high gain up"
 msgstr ""
 
-#: ../src/exif.c:290
+#: ../src/exif.c:284
 msgid "low gain down"
 msgstr ""
 
-#: ../src/exif.c:291
+#: ../src/exif.c:285
 msgid "high gain down"
 msgstr ""
 
-#: ../src/exif.c:297 ../src/exif.c:311
+#: ../src/exif.c:291 ../src/exif.c:305
 msgid "soft"
 msgstr "weich"
 
-#: ../src/exif.c:298 ../src/exif.c:312
+#: ../src/exif.c:292 ../src/exif.c:306
 msgid "hard"
 msgstr "hart"
 
-#: ../src/exif.c:304
+#: ../src/exif.c:298
 msgid "low"
 msgstr "niedrig"
 
-#: ../src/exif.c:305
+#: ../src/exif.c:299
 msgid "high"
 msgstr "hoch"
 
-#: ../src/exif.c:318
+#: ../src/exif.c:312
 msgid "macro"
 msgstr "Makro"
 
-#: ../src/exif.c:319
+#: ../src/exif.c:313
 msgid "close"
 msgstr "nah"
 
-#: ../src/exif.c:320
+#: ../src/exif.c:314
 msgid "distant"
 msgstr "entfernt"
 
-#: ../src/exif.c:330
+#: ../src/exif.c:324
 msgid "Image Width"
 msgstr "Bildbreite"
 
-#: ../src/exif.c:331
+#: ../src/exif.c:325
 msgid "Image Height"
 msgstr "Bildhöhe"
 
-#: ../src/exif.c:332
+#: ../src/exif.c:326
 msgid "Bits per Sample/Pixel"
 msgstr "Bits pro Probe/Pixel"
 
-#: ../src/exif.c:333
+#: ../src/exif.c:327
 msgid "Compression"
 msgstr "Komprimierung"
 
-#: ../src/exif.c:334
+#: ../src/exif.c:328
 msgid "Image description"
 msgstr "Bildbeschreibung"
 
-#: ../src/exif.c:335
+#: ../src/exif.c:329
 msgid "Camera make"
 msgstr "Kamera Hersteller"
 
-#: ../src/exif.c:336
+#: ../src/exif.c:330
 msgid "Camera model"
 msgstr "Kamera-Modell"
 
-#: ../src/exif.c:337
+#: ../src/exif.c:331
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../src/exif.c:338
+#: ../src/exif.c:332
 msgid "X resolution"
 msgstr "X-Auflösung"
 
-#: ../src/exif.c:339
+#: ../src/exif.c:333
 msgid "Y Resolution"
 msgstr "Y-Auflösung"
 
-#: ../src/exif.c:340
+#: ../src/exif.c:334
 msgid "Resolution units"
 msgstr "Auflösungseinheiten"
 
-#: ../src/exif.c:341
+#: ../src/exif.c:335
 msgid "Firmware"
 msgstr "Firmware"
 
-#: ../src/exif.c:343
+#: ../src/exif.c:337
 msgid "White point"
 msgstr "Weißpunkt"
 
-#: ../src/exif.c:344
+#: ../src/exif.c:338
 msgid "Primary chromaticities"
 msgstr ""
 
-#: ../src/exif.c:345
+#: ../src/exif.c:339
 msgid "YCbCy coefficients"
 msgstr "YCbCy Koeffizienten"
 
-#: ../src/exif.c:346
+#: ../src/exif.c:340
 msgid "YCbCr positioning"
 msgstr "YCbCr Positionierung"
 
-#: ../src/exif.c:347
+#: ../src/exif.c:341
 msgid "Black white reference"
 msgstr "Schwarz-Weiß-Referenz"
 
-#: ../src/exif.c:349
+#: ../src/exif.c:343
 msgid "SubIFD Exif offset"
 msgstr ""
 
 #. subIFD follows
-#: ../src/exif.c:351
+#: ../src/exif.c:345
 msgid "Exposure time (seconds)"
 msgstr "Belichtungszeit (Sekunden)"
 
-#: ../src/exif.c:352
+#: ../src/exif.c:346
 msgid "FNumber"
 msgstr "Blende"
 
-#: ../src/exif.c:353
+#: ../src/exif.c:347
 msgid "Exposure program"
 msgstr "Belichtungsprogramm"
 
-#: ../src/exif.c:354
+#: ../src/exif.c:348
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: ../src/exif.c:355 ../src/exif.c:391 ../src/exif-common.c:557
+#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:569
 msgid "ISO sensitivity"
 msgstr "ISO"
 
-#: ../src/exif.c:356
+#: ../src/exif.c:350
 msgid "Optoelectric conversion factor"
 msgstr ""
 
-#: ../src/exif.c:357
+#: ../src/exif.c:351
 msgid "Exif version"
 msgstr "Exifversion"
 
-#: ../src/exif.c:358
+#: ../src/exif.c:352
 msgid "Date original"
 msgstr "Originaldatum"
 
-#: ../src/exif.c:359
+#: ../src/exif.c:353
 msgid "Date digitized"
 msgstr "Digitalisierungsdatum"
 
-#: ../src/exif.c:360
+#: ../src/exif.c:354
 msgid "Pixel format"
 msgstr "Pixelformat"
 
-#: ../src/exif.c:361
+#: ../src/exif.c:355
 msgid "Compression ratio"
 msgstr "Kompressionsverhältnis"
 
-#: ../src/exif.c:362 ../src/exif-common.c:554
+#: ../src/exif.c:356 ../src/exif-common.c:566
 msgid "Shutter speed"
 msgstr "Belichtungszeit"
 
-#: ../src/exif.c:363 ../src/exif-common.c:555
+#: ../src/exif.c:357 ../src/exif-common.c:567
 msgid "Aperture"
 msgstr "Blendenöffnung"
 
-#: ../src/exif.c:364
+#: ../src/exif.c:358
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: ../src/exif.c:365 ../src/exif-common.c:556
+#: ../src/exif.c:359 ../src/exif-common.c:568
 msgid "Exposure bias"
 msgstr "Belichtungs-Bias"
 
-#: ../src/exif.c:366
+#: ../src/exif.c:360
 msgid "Maximum aperture"
 msgstr "Maximale Blende"
 
-#: ../src/exif.c:367 ../src/exif-common.c:560
+#: ../src/exif.c:361 ../src/exif-common.c:572
 msgid "Subject distance"
 msgstr "Objektentfernung"
 
-#: ../src/exif.c:368
+#: ../src/exif.c:362
 msgid "Metering mode"
 msgstr "Messmethode"
 
-#: ../src/exif.c:369
+#: ../src/exif.c:363
 msgid "Light source"
 msgstr "Lichtquelle"
 
-#: ../src/exif.c:370 ../src/exif-common.c:561
+#: ../src/exif.c:364 ../src/exif-common.c:573
 msgid "Flash"
 msgstr "Blitz"
 
-#: ../src/exif.c:371 ../src/exif-common.c:558
+#: ../src/exif.c:365 ../src/exif-common.c:570
 msgid "Focal length"
 msgstr "Brennweite"
 
+#: ../src/exif.c:366
+msgid "Subject area"
+msgstr ""
+
+#: ../src/exif.c:367
+msgid "MakerNote"
+msgstr ""
+
+#: ../src/exif.c:368
+msgid "UserComment"
+msgstr "Anwenderkommentar"
+
+#: ../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 ""
+
 #: ../src/exif.c:372
-msgid "Subject area"
+msgid "FlashPix version"
 msgstr ""
 
 #: ../src/exif.c:373
-msgid "MakerNote"
-msgstr ""
-
-#: ../src/exif.c:374
-msgid "UserComment"
-msgstr "Anwenderkommentar"
-
-#: ../src/exif.c:375
-msgid "Subsecond time"
-msgstr ""
-
-#: ../src/exif.c:376
-msgid "Subsecond time original"
-msgstr ""
-
-#: ../src/exif.c:377
-msgid "Subsecond time digitized"
-msgstr ""
-
-#: ../src/exif.c:378
-msgid "FlashPix version"
-msgstr ""
-
-#: ../src/exif.c:379
 msgid "Colorspace"
 msgstr "Farbraum"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: ../src/exif.c:381 ../src/preferences.c:2235
+#: ../src/exif.c:375 ../src/preferences.c:2344
 msgid "Width"
 msgstr "Breite"
 
-#: ../src/exif.c:382 ../src/preferences.c:2237
+#: ../src/exif.c:376 ../src/preferences.c:2346
 msgid "Height"
 msgstr "Höhe"
 
-#: ../src/exif.c:383
+#: ../src/exif.c:377
 msgid "Audio data"
 msgstr "Audiodaten"
 
+#: ../src/exif.c:378
+msgid "ExifR98 extension"
+msgstr "ExifR98-Erweiterung"
+
+#: ../src/exif.c:379
+msgid "Flash strength"
+msgstr "Blitzstärke"
+
+#: ../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 "ExifR98 extension"
-msgstr "ExifR98-Erweiterung"
-
-#: ../src/exif.c:385
-msgid "Flash strength"
-msgstr "Blitzstärke"
+msgid "Subject location"
+msgstr ""
 
 #: ../src/exif.c:386
-msgid "Spatial frequency response"
-msgstr ""
+msgid "Sensor type"
+msgstr "Sensortyp"
 
 #: ../src/exif.c:387
-msgid "X Pixel density"
+msgid "Source type"
 msgstr ""
 
 #: ../src/exif.c:388
-msgid "Y Pixel density"
-msgstr ""
+msgid "Scene type"
+msgstr "Szenentyp"
 
 #: ../src/exif.c:389
-msgid "Pixel density units"
-msgstr ""
-
-#: ../src/exif.c:390
-msgid "Subject location"
-msgstr ""
-
-#: ../src/exif.c:392
-msgid "Sensor type"
-msgstr "Sensortyp"
-
-#: ../src/exif.c:393
-msgid "Source type"
-msgstr ""
-
-#: ../src/exif.c:394
-msgid "Scene type"
-msgstr "Szenentyp"
-
-#: ../src/exif.c:395
 msgid "Color filter array pattern"
 msgstr ""
 
 #. 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 "Belichtungsart"
+
+#: ../src/exif.c:393
+msgid "White balance"
+msgstr "Weißabgleich"
+
+#: ../src/exif.c:394
+msgid "Digital zoom ratio"
+msgstr ""
+
+#: ../src/exif.c:395
+msgid "Focal length (35mm)"
+msgstr "35mm-Brennweite"
+
+#: ../src/exif.c:396
+msgid "Scene capture type"
+msgstr ""
+
 #: ../src/exif.c:397
-msgid "Render process"
+msgid "Gain control"
 msgstr ""
 
 #: ../src/exif.c:398
-msgid "Exposure mode"
-msgstr "Belichtungsart"
-
-#: ../src/exif.c:399
-msgid "White balance"
-msgstr "Weißabgleich"
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../src/exif.c:399 ../src/preferences.c:1991
+msgid "Saturation"
+msgstr "Sättigung"
 
 #: ../src/exif.c:400
-msgid "Digital zoom ratio"
-msgstr ""
-
-#: ../src/exif.c:401
-msgid "Focal length (35mm)"
-msgstr "35mm-Brennweite"
-
-#: ../src/exif.c:402
-msgid "Scene capture type"
-msgstr ""
-
-#: ../src/exif.c:403
-msgid "Gain control"
-msgstr ""
-
-#: ../src/exif.c:404
-msgid "Contrast"
-msgstr "Kontrast"
-
-#: ../src/exif.c:405
-msgid "Saturation"
-msgstr "Sättigung"
-
-#: ../src/exif.c:406
 msgid "Sharpness"
 msgstr "Schärfe"
 
-#: ../src/exif.c:407
+#: ../src/exif.c:401
 msgid "Device setting"
 msgstr "Geräteeinstellung"
 
-#: ../src/exif.c:408
+#: ../src/exif.c:402
 msgid "Subject range"
 msgstr "Objectentfernung"
 
-#: ../src/exif.c:409
+#: ../src/exif.c:403
 msgid "Image serial number"
 msgstr "Bild-Seriennummer"
 
-#: ../src/exif-common.c:337
+#: ../src/exif-common.c:349
 msgid "infinity"
 msgstr "unendlich"
 
-#: ../src/exif-common.c:366
+#: ../src/exif-common.c:378
 msgid "mode:"
 msgstr "Modus:"
 
-#: ../src/exif-common.c:370 ../src/trash.c:205
+#: ../src/exif-common.c:382 ../src/trash.c:213
 msgid "on"
 msgstr "ein"
 
-#: ../src/exif-common.c:373 ../src/trash.c:210
+#: ../src/exif-common.c:385 ../src/trash.c:218
 msgid "off"
 msgstr "aus"
 
-#: ../src/exif-common.c:382
+#: ../src/exif-common.c:394
 msgid "not detected by strobe"
 msgstr "ohne Anpassung"
 
-#: ../src/exif-common.c:383
+#: ../src/exif-common.c:395
 msgid "detected by strobe"
 msgstr "mit Anpassung"
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: ../src/exif-common.c:388
+#: ../src/exif-common.c:400
 msgid "red-eye reduction"
 msgstr "Rote Augen-Effekt vermindern"
 
-#: ../src/exif-common.c:408
+#: ../src/exif-common.c:420
 msgid "dot"
 msgstr "Punkt"
 
-#: ../src/exif-common.c:441
+#: ../src/exif-common.c:453
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: ../src/exif-common.c:449
+#: ../src/exif-common.c:461
 msgid "embedded"
 msgstr "enthalten"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Above Sea Level"
 msgstr "Über Normalnull"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Below Sea Level"
 msgstr "Unter Normalnull"
 
-#: ../src/exif-common.c:552
+#: ../src/exif-common.c:564
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/exif-common.c:559
+#: ../src/exif-common.c:571
 msgid "Focal length 35mm"
 msgstr "35mm-Brennweite"
 
-#: ../src/exif-common.c:562
+#: ../src/exif-common.c:574
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: ../src/exif-common.c:563
+#: ../src/exif-common.c:575
 msgid "Color profile"
 msgstr "Farbprofil"
 
-#: ../src/exif-common.c:564
+#: ../src/exif-common.c:576
 msgid "GPS position"
 msgstr "GPS-Position"
 
-#: ../src/exif-common.c:565
+#: ../src/exif-common.c:577
 msgid "GPS altitude"
 msgstr "GPS-Höhe"
 
-#: ../src/exif-common.c:566
+#: ../src/exif-common.c:578
 msgid "File size"
 msgstr "Dateigröße"
 
-#: ../src/exif-common.c:567
+#: ../src/exif-common.c:579
 msgid "File date"
 msgstr "Dateidatum"
 
-#: ../src/exif-common.c:568
+#: ../src/exif-common.c:580
 msgid "File mode"
 msgstr "Dateirechte"
 
-#: ../src/filedata.c:101
+#: ../src/filedata.c:109
 #, c-format
 msgid "%d bytes"
 msgstr "%d Byte"
 
-#: ../src/filedata.c:105
+#: ../src/filedata.c:113
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f kB"
 
-#: ../src/filedata.c:109
+#: ../src/filedata.c:117
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../src/filedata.c:114
+#: ../src/filedata.c:122
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../src/filedata.c:2458
+#: ../src/filedata.c:2488
 msgid "file or directory does not exist"
 msgstr "Datei oder Verzeichnis existiert nicht"
 
-#: ../src/filedata.c:2464
+#: ../src/filedata.c:2494
 msgid "destination already exists"
 msgstr "Ziel existiert bereits"
 
-#: ../src/filedata.c:2470
-msgid "destination can't be overwritten"
-msgstr "Ziel kann nicht überschrieben werden"
-
-#: ../src/filedata.c:2476
-msgid "destination directory is not writable"
-msgstr "Zielverzeichnis ist nicht schreibbar"
-
-#: ../src/filedata.c:2482
-msgid "destination directory does not exist"
-msgstr "Zielverzeichnis existiert nicht"
-
-#: ../src/filedata.c:2488
-msgid "source directory is not writable"
-msgstr "Quellverzeichnis ist nicht schreibbar"
-
-#: ../src/filedata.c:2494
-msgid "no read permission"
-msgstr "keine Leserechte"
-
 #: ../src/filedata.c:2500
+msgid "destination can't be overwritten"
+msgstr "Ziel kann nicht überschrieben werden"
+
+#: ../src/filedata.c:2506
+msgid "destination directory is not writable"
+msgstr "Zielverzeichnis ist nicht schreibbar"
+
+#: ../src/filedata.c:2512
+msgid "destination directory does not exist"
+msgstr "Zielverzeichnis existiert nicht"
+
+#: ../src/filedata.c:2518
+msgid "source directory is not writable"
+msgstr "Quellverzeichnis ist nicht schreibbar"
+
+#: ../src/filedata.c:2524
+msgid "no read permission"
+msgstr "keine Leserechte"
+
+#: ../src/filedata.c:2530
 msgid "file is readonly"
 msgstr "Datei ist schreibgeschützt"
 
-#: ../src/filedata.c:2506
+#: ../src/filedata.c:2536
 msgid "destination already exists and will be overwritten"
 msgstr "Ziel existiert bereits und wird überschrieben"
 
-#: ../src/filedata.c:2512
+#: ../src/filedata.c:2542
 msgid "source and destination are the same"
 msgstr "Quelle und Ziel sind gleich"
 
-#: ../src/filedata.c:2518
+#: ../src/filedata.c:2548
 msgid "source and destination have different extension"
 msgstr "Quelle und Ziel haben unterschiedliche Dateierweiterung"
 
-#: ../src/filedata.c:2524
+#: ../src/filedata.c:2554
 msgid "there are unsaved metadata changes for the file"
 msgstr "es gibt ungespeicherte Metadatenänderungen für die Datei"
 
-#: ../src/filedata.c:2530
+#: ../src/filedata.c:2560
 msgid "another destination file has the same filename"
 msgstr "Eine andere Zieldatei hat den selben Dateinamen"
 
-#: ../src/fullscreen.c:234 ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368 ../src/preferences.c:1547
+#: ../src/fullscreen.c:242 ../src/layout_util.c:1571 ../src/layout_util.c:1572
+#: ../src/layout_util.c:1573 ../src/preferences.c:1596
 msgid "Full screen"
 msgstr "Vollbildmodus"
 
-#: ../src/fullscreen.c:403
+#: ../src/fullscreen.c:413
 msgid "Full size"
 msgstr "Vollbild"
 
-#: ../src/fullscreen.c:411
+#: ../src/fullscreen.c:421
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../src/fullscreen.c:417
+#: ../src/fullscreen.c:427
 msgid "Screen"
 msgstr "Bild"
 
-#: ../src/fullscreen.c:651
+#: ../src/fullscreen.c:661
 msgid "Determined by Window Manager"
 msgstr "vom Fenster-Manager festgelegt"
 
-#: ../src/fullscreen.c:652
+#: ../src/fullscreen.c:662
 msgid "Active screen"
 msgstr "Aktives Bild"
 
-#: ../src/fullscreen.c:654
+#: ../src/fullscreen.c:664
 msgid "Active monitor"
 msgstr "Aktiver Monitor"
 
-#: ../src/histogram.c:113
+#: ../src/histogram.c:121
 msgid "Log Histogram on Red"
 msgstr "Log. Histogramm für Rot"
 
-#: ../src/histogram.c:114
+#: ../src/histogram.c:122
 msgid "Log Histogram on Green"
 msgstr "Log. Histogramm für Grün"
 
-#: ../src/histogram.c:115
+#: ../src/histogram.c:123
 msgid "Log Histogram on Blue"
 msgstr "Log. Histogramm für Blau"
 
-#: ../src/histogram.c:116
+#: ../src/histogram.c:124
 msgid "Log Histogram on RGB"
 msgstr "Log. Histogramm für RGB"
 
-#: ../src/histogram.c:117
+#: ../src/histogram.c:125
 msgid "Log Histogram on value"
 msgstr "Log. Histogramm für Wert"
 
-#: ../src/histogram.c:122
+#: ../src/histogram.c:130
 msgid "Linear Histogram on Red"
 msgstr "Lineares Histogramm für Rot"
 
-#: ../src/histogram.c:123
+#: ../src/histogram.c:131
 msgid "Linear Histogram on Green"
 msgstr "Lineares Histogramm für Grün"
 
-#: ../src/histogram.c:124
+#: ../src/histogram.c:132
 msgid "Linear Histogram on Blue"
 msgstr "Lineares Histogramm für Blau"
 
-#: ../src/histogram.c:125
+#: ../src/histogram.c:133
 msgid "Linear Histogram on RGB"
 msgstr "Lineares Histogramm für RGB"
 
-#: ../src/histogram.c:126
+#: ../src/histogram.c:134
 msgid "Linear Histogram on value"
 msgstr "Lineares Histogramm für Wert"
 
-#: ../src/history_list.c:131
+#: ../src/history_list.c:140
 #, c-format
 msgid "Unable to write history lists to: %s\n"
 msgstr ""
 "Fehler beim Schreiben der Chronikliste:\n"
 "%s\n"
 
-#: ../src/image.c:161
+#: ../src/image.c:169
 #, c-format
 msgid " (Collection %s)"
 msgstr " (Sammlung %s)"
 
-#: ../src/image_load_jpeg.c:177
+#: ../src/image_load_jpeg.c:163
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Fehler bei der Interpretation der JPEG-Bilddatei (%s)"
 
-#: ../src/img-view.c:1253 ../src/layout_image.c:483 ../src/layout_util.c:1333
-#: ../src/layout_util.c:1334 ../src/layout_util.c:1349
-#: ../src/layout_util.c:1350 ../src/pan-view.c:2602
+#: ../src/img-view.c:1263 ../src/layout_image.c:659 ../src/layout_util.c:1538
+#: ../src/layout_util.c:1539 ../src/layout_util.c:1554
+#: ../src/layout_util.c:1555 ../src/pan-view/pan-view.c:2621
 msgid "Zoom _in"
 msgstr "Ver_größern"
 
-#: ../src/img-view.c:1254 ../src/layout_image.c:484 ../src/layout_util.c:1335
-#: ../src/layout_util.c:1336 ../src/layout_util.c:1351
-#: ../src/layout_util.c:1352 ../src/pan-view.c:2604
+#: ../src/img-view.c:1264 ../src/layout_image.c:660 ../src/layout_util.c:1540
+#: ../src/layout_util.c:1541 ../src/layout_util.c:1556
+#: ../src/layout_util.c:1557 ../src/pan-view/pan-view.c:2623
 msgid "Zoom _out"
 msgstr "Ver_kleinern"
 
-#: ../src/img-view.c:1255 ../src/layout_image.c:485 ../src/layout_util.c:1337
-#: ../src/layout_util.c:1338 ../src/layout_util.c:1353
-#: ../src/layout_util.c:1354 ../src/pan-view.c:2606
+#: ../src/img-view.c:1265 ../src/layout_image.c:661 ../src/layout_util.c:1542
+#: ../src/layout_util.c:1543 ../src/layout_util.c:1558
+#: ../src/layout_util.c:1559 ../src/pan-view/pan-view.c:2625
 msgid "Zoom _1:1"
 msgstr "_Originalgröße"
 
-#: ../src/img-view.c:1256 ../src/layout_image.c:486
+#: ../src/img-view.c:1266 ../src/layout_image.c:662
 msgid "Fit image to _window"
 msgstr "In _Fenster einpassen"
 
-#: ../src/img-view.c:1264 ../src/layout_image.c:495 ../src/layout_util.c:1331
+#: ../src/img-view.c:1274 ../src/layout_image.c:671 ../src/layout_util.c:1536
 msgid "Set as _wallpaper"
 msgstr "Als _Hindergrundbild verwenden"
 
-#: ../src/img-view.c:1269 ../src/layout_image.c:502
+#: ../src/img-view.c:1279 ../src/layout_image.c:678
 msgid "_Go to directory view"
 msgstr "_Gehe zur Verzeichnisansicht"
 
-#: ../src/img-view.c:1282 ../src/layout_image.c:523
+#: ../src/img-view.c:1292 ../src/layout_image.c:699
 msgid "_Stop slideshow"
 msgstr "Diashow be_enden"
 
-#: ../src/img-view.c:1285 ../src/layout_image.c:526
+#: ../src/img-view.c:1295 ../src/layout_image.c:702
 msgid "Continue slides_how"
 msgstr "Diashow _fortsetzen"
 
-#: ../src/img-view.c:1290 ../src/img-view.c:1298 ../src/layout_image.c:531
-#: ../src/layout_image.c:538
+#: ../src/img-view.c:1300 ../src/img-view.c:1308 ../src/layout_image.c:707
+#: ../src/layout_image.c:714
 msgid "Pause slides_how"
 msgstr "Diashow an_halten"
 
-#: ../src/img-view.c:1296 ../src/layout_image.c:537
+#: ../src/img-view.c:1306 ../src/layout_image.c:713
 msgid "_Start slideshow"
 msgstr "Diashow _starten"
 
-#: ../src/img-view.c:1304 ../src/layout_image.c:548 ../src/pan-view.c:2675
+#: ../src/img-view.c:1314 ../src/layout_image.c:724
+#: ../src/pan-view/pan-view.c:2694
 msgid "Exit _full screen"
 msgstr "_Vollbildmodus verlassen"
 
-#: ../src/img-view.c:1308 ../src/layout_image.c:544 ../src/pan-view.c:2679
+#: ../src/img-view.c:1318 ../src/layout_image.c:720
+#: ../src/pan-view/pan-view.c:2698
 msgid "_Full screen"
 msgstr "_Vollbildmodus"
 
-#: ../src/img-view.c:1312 ../src/layout_util.c:1316 ../src/pan-view.c:2683
+#: ../src/img-view.c:1322 ../src/layout_util.c:1521
+#: ../src/pan-view/pan-view.c:2702
 msgid "C_lose window"
 msgstr "Fenster s_chließen"
 
-#: ../src/layout.c:358 ../src/view_file.c:613
+#: ../src/layout.c:372 ../src/view_file.c:649
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: ../src/layout.c:428
+#: ../src/layout.c:442
 msgid " Slideshow"
 msgstr " Diashow"
 
-#: ../src/layout.c:432
+#: ../src/layout.c:446
 msgid " Paused"
 msgstr " Pausiert"
 
-#: ../src/layout.c:448
+#: ../src/layout.c:462
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
 msgstr "%s, %d Dateien (%s, %d)%s"
 
-#: ../src/layout.c:455
+#: ../src/layout.c:469
 #, c-format
 msgid "%s, %d files%s"
 msgstr "%s, %d Dateien%s"
 
-#: ../src/layout.c:460
+#: ../src/layout.c:474
 #, c-format
 msgid "%d files%s"
 msgstr "%d Dateien%s"
 
-#: ../src/layout.c:506
+#: ../src/layout.c:520
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(keine Leserechte) %s Byte"
 
-#: ../src/layout.c:510
+#: ../src/layout.c:524
 #, c-format
 msgid "( ? x ? ) %s bytes"
 msgstr "( ? x ? ) %s Byte"
 
-#: ../src/layout.c:518
+#: ../src/layout.c:532
 #, c-format
 msgid "( %d x %d ) %s bytes"
 msgstr "( %d x %d ) %s Byte"
 
-#: ../src/layout.c:1243 ../src/layout_config.c:58
+#: ../src/layout.c:618
+msgid "Select sort order"
+msgstr "Sortierreigenfolge wählen"
+
+#: ../src/layout.c:623
+msgid "Folder contents (files selected)"
+msgstr "Inhalt des Verzeichnis (Selektierte Dateien)"
+
+#: ../src/layout.c:632
+msgid "(Image dimensions) Image size"
+msgstr "(Bild-Dimensionen) Bildgröße"
+
+#: ../src/layout.c:642
+msgid "Image zoom level"
+msgstr "Zoom-Einstellung"
+
+#. expand only in small format
+#: ../src/layout.c:650
+msgid "[Pixel x,y coord]: (Pixel R,G,B value)"
+msgstr ""
+
+#: ../src/layout.c:1266 ../src/layout_config.c:67
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../src/layout.c:1865
+#: ../src/layout.c:1893
 msgid "Window options and layout"
 msgstr "Fensteroptionen und Layout"
 
-#: ../src/layout.c:1924
+#: ../src/layout.c:1958
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: ../src/layout.c:1926
+#: ../src/layout.c:1960
 msgid "Home path (empty to use your home directory)"
 msgstr "Anfangsverzeichnis (leer lassen für $HOME)"
 
-#: ../src/layout.c:1934
+#: ../src/layout.c:1968
 msgid "Use current"
 msgstr "Aktuelles benutzen"
 
-#: ../src/layout.c:1937
+#: ../src/layout.c:1971
 msgid "Show date in directories list view"
 msgstr "Zeige Datum in der Verzeichnis-Listenansicht"
 
-#: ../src/layout.c:1940
+#: ../src/layout.c:1974
 msgid "Exit program when this window is closed"
 msgstr "Verlasse das Programm wenn das Fenster geschlossen wird"
 
-#: ../src/layout.c:1943
+#: ../src/layout.c:1977
 msgid "Start-up directory:"
 msgstr "Startverzeichnis:"
 
-#: ../src/layout.c:1945
+#: ../src/layout.c:1979
 msgid "No change"
 msgstr "Keine Änderung"
 
-#: ../src/layout.c:1948
+#: ../src/layout.c:1982
 msgid "Restore last path"
 msgstr "Letzten Pfad wiederherstellen "
 
-#: ../src/layout.c:1951
+#: ../src/layout.c:1985
 msgid "Home path"
 msgstr "Anfangsverzeichnis"
 
-#: ../src/layout.c:1955 ../src/print.c:3365 ../src/print.c:3372
+#: ../src/layout.c:1989 ../src/print.c:3374 ../src/print.c:3381
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/layout.c:2198
+#: ../src/layout.c:2232
 msgid "Invalid geometry\n"
 msgstr "Ungültige Geometrie\n"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:1666 ../src/ui_pathsel.c:1173
+#: ../src/layout_config.c:67 ../src/preferences.c:1715 ../src/ui_pathsel.c:1182
 msgid "Files"
 msgstr "Dateien"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:92 ../src/preferences.c:1433
-#: ../src/print.c:123
+#: ../src/layout_config.c:67 ../src/preferences.c:107 ../src/preferences.c:1480
+#: ../src/print.c:132
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/layout_config.c:349
+#: ../src/layout_config.c:358
 msgid "(drag to change order)"
 msgstr "(ziehen zum Ändern der Reihenfolge)"
 
-#: ../src/layout_image.c:553
+#: ../src/layout_image.c:727
+msgid "_Animate"
+msgstr "_Animieren"
+
+#: ../src/layout_image.c:731
 msgid "Hide file _list"
 msgstr "Datei_liste verbergen"
 
-#: ../src/layout_image.c:1616
+#: ../src/layout_image.c:1859
 #, c-format
 msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 msgstr "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 
-#: ../src/layout_image.c:1624
+#: ../src/layout_image.c:1867
 #, c-format
 msgid "[%*s,%*s]: RGB(---,---,---)"
 msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: ../src/layout_util.c:1269
+#: ../src/layout_util.c:1474
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/layout_util.c:1270
+#: ../src/layout_util.c:1475
 msgid "_Go"
 msgstr "_Gehe"
 
-#: ../src/layout_util.c:1271 ../src/menu.c:109
+#: ../src/layout_util.c:1476 ../src/menu.c:117
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/layout_util.c:1272
+#: ../src/layout_util.c:1477
 msgid "_Select"
 msgstr "_Auswahl"
 
-#: ../src/layout_util.c:1273 ../src/menu.c:284
+#: ../src/layout_util.c:1478 ../src/menu.c:292
 msgid "_Orientation"
 msgstr "_Ausrichtung"
 
-#: ../src/layout_util.c:1274
+#: ../src/layout_util.c:1479
 msgid "E_xternal Editors"
 msgstr "E_xterne Editoren"
 
-#: ../src/layout_util.c:1275
+#: ../src/layout_util.c:1480
 msgid "P_references"
 msgstr "_Einstellungen"
 
-#: ../src/layout_util.c:1277
+#: ../src/layout_util.c:1482
 msgid "_Files and Folders"
 msgstr "_Dateien und Verzeichnisse"
 
-#: ../src/layout_util.c:1278
+#: ../src/layout_util.c:1483
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/layout_util.c:1279
+#: ../src/layout_util.c:1484
 msgid "_Color Management"
 msgstr "_Farbverwaltung"
 
-#: ../src/layout_util.c:1280
+#: ../src/layout_util.c:1485
 msgid "_Connected Zoom"
 msgstr "_Verbundenes zoomen"
 
-#: ../src/layout_util.c:1281
+#: ../src/layout_util.c:1486
 msgid "Spli_t"
 msgstr "Auf_teilen"
 
-#: ../src/layout_util.c:1282
+#: ../src/layout_util.c:1487
 msgid "Stere_o"
 msgstr "Stere_o"
 
-#: ../src/layout_util.c:1283 ../src/layout_util.c:1399
+#: ../src/layout_util.c:1488 ../src/layout_util.c:1605
 msgid "Image _Overlay"
 msgstr "_Anzeige im Bild"
 
-#: ../src/layout_util.c:1284
+#: ../src/layout_util.c:1489
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1491
 msgid "_First Image"
 msgstr "_Erstes Bild"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1491
 msgid "First Image"
 msgstr "Erstes Bild"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1492 ../src/layout_util.c:1493
+#: ../src/layout_util.c:1494
 msgid "_Previous Image"
 msgstr "_Vorheriges Bild"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1492 ../src/layout_util.c:1493
+#: ../src/layout_util.c:1494
 msgid "Previous Image"
 msgstr "Vorheriges Bild"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1495 ../src/layout_util.c:1496
+#: ../src/layout_util.c:1497
 msgid "_Next Image"
 msgstr "_Nächstes Bild"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1495 ../src/layout_util.c:1496
+#: ../src/layout_util.c:1497
 msgid "Next Image"
 msgstr "Nächstes Bild"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1498
 msgid "_Last Image"
 msgstr "_Letztes Bild"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1498
 msgid "Last Image"
 msgstr "Letztes Bild"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1499
 msgid "_Back"
 msgstr "_Zurück"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1499
 msgid "Back"
 msgstr "Zurück"
 
-#: ../src/layout_util.c:1295
+#: ../src/layout_util.c:1500
 msgid "_Home"
 msgstr "_Anfang"
 
-#: ../src/layout_util.c:1295 ../src/options.c:156 ../src/ui_bookmark.c:549
-#: ../src/ui_pathsel.c:1045
+#: ../src/layout_util.c:1500 ../src/options.c:170 ../src/ui_bookmark.c:566
+#: ../src/ui_pathsel.c:1054
 msgid "Home"
 msgstr "Anfang"
 
-#: ../src/layout_util.c:1296
+#: ../src/layout_util.c:1501
 msgid "_Up"
 msgstr "Hoch"
 
-#: ../src/layout_util.c:1296
+#: ../src/layout_util.c:1501
 msgid "Up"
 msgstr "Hoch"
 
-#: ../src/layout_util.c:1298
+#: ../src/layout_util.c:1503
 msgid "New _window"
 msgstr "_Neues Fenster"
 
-#: ../src/layout_util.c:1298
+#: ../src/layout_util.c:1503
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1504
 msgid "_New collection"
 msgstr "Neue Sa_mmlung"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1504
 msgid "New collection"
 msgstr "Neue Sammlung"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1505
 msgid "_Open collection..."
 msgstr "S_ammlung öffnen"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1505
 msgid "Open collection..."
 msgstr "Sammlung öffnen ..."
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1506
 msgid "Open recen_t"
 msgstr "_Letzte Sammlung öffnen"
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1506
 msgid "Open recent"
 msgstr "Letzte Sammlung öffnen"
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1507
 msgid "_Search..."
 msgstr "_Suchen..."
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1507
 msgid "Search..."
 msgstr "Suchen ..."
 
-#: ../src/layout_util.c:1303
+#: ../src/layout_util.c:1508
 msgid "Find duplicates..."
 msgstr "Duplikate suchen ..."
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1509
 msgid "Pa_n view"
 msgstr "Ansicht als _Panel"
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1509
 msgid "Pan view"
 msgstr "Ansicht als Panel"
 
-#: ../src/layout_util.c:1305
+#: ../src/layout_util.c:1510
 msgid "_Print..."
 msgstr "D_rucken..."
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1511
 msgid "N_ew folder..."
 msgstr "Neues _Verzeichnis..."
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1511
 msgid "New folder..."
 msgstr "Neues Verzeichnis ..."
 
-#: ../src/layout_util.c:1307
+#: ../src/layout_util.c:1512
 msgid "Copy..."
 msgstr "Kopieren ..."
 
-#: ../src/layout_util.c:1308
+#: ../src/layout_util.c:1513
 msgid "Move..."
 msgstr "Verschieben ..."
 
-#: ../src/layout_util.c:1309
+#: ../src/layout_util.c:1514
 msgid "Rename..."
 msgstr "Umbenennen ..."
 
-#: ../src/layout_util.c:1310 ../src/layout_util.c:1311
-#: ../src/layout_util.c:1312
+#: ../src/layout_util.c:1515 ../src/layout_util.c:1516
+#: ../src/layout_util.c:1517
 msgid "Delete..."
 msgstr "Löschen ..."
 
-#: ../src/layout_util.c:1313 ../src/view_file.c:603
+#: ../src/layout_util.c:1518 ../src/view_file.c:633
 msgid "Enable file _grouping"
 msgstr "Gruppierung von Dateien _einschalten"
 
-#: ../src/layout_util.c:1313
+#: ../src/layout_util.c:1518
 msgid "Enable file grouping"
 msgstr "Gruppierung von Dateien einschalten"
 
-#: ../src/layout_util.c:1314 ../src/view_file.c:605
+#: ../src/layout_util.c:1519 ../src/view_file.c:635
 msgid "Disable file groupi_ng"
 msgstr "Gruppierung von Dateien _ausschalten"
 
-#: ../src/layout_util.c:1314
+#: ../src/layout_util.c:1519
 msgid "Disable file grouping"
 msgstr "Gruppierung von Dateien ausschalten"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1520
 msgid "_Copy path to clipboard"
 msgstr "Pfad in die Zwischenablage _kopieren"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1520
 msgid "Copy path to clipboard"
 msgstr "Pfad in die Zwischenablage kopieren"
 
-#: ../src/layout_util.c:1316
+#: ../src/layout_util.c:1521
 msgid "Close window"
 msgstr "Fenster schließen"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1522
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1522
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/layout_util.c:1318 ../src/menu.c:226
+#: ../src/layout_util.c:1523 ../src/menu.c:234
 msgid "_Rotate clockwise"
 msgstr "Um 90° nach _rechts drehen"
 
-#: ../src/layout_util.c:1318
+#: ../src/layout_util.c:1523
 msgid "Rotate clockwise"
 msgstr "Um 90° nach rechts drehen"
 
-#: ../src/layout_util.c:1319 ../src/menu.c:229
+#: ../src/layout_util.c:1524 ../src/menu.c:237
 msgid "Rotate _counterclockwise"
 msgstr "Um 90° nach _links drehen"
 
-#: ../src/layout_util.c:1319
+#: ../src/layout_util.c:1524
 msgid "Rotate counterclockwise"
 msgstr "Um 90° nach links drehen"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1525
 msgid "Rotate 1_80"
 msgstr "Drehen um _180°"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1525
 msgid "Rotate 180"
 msgstr "Um 180° drehen"
 
-#: ../src/layout_util.c:1321 ../src/menu.c:235
+#: ../src/layout_util.c:1526 ../src/menu.c:243
 msgid "_Mirror"
 msgstr "S_piegeln"
 
-#: ../src/layout_util.c:1321
+#: ../src/layout_util.c:1526
 msgid "Mirror"
 msgstr "Spiegeln"
 
-#: ../src/layout_util.c:1322 ../src/menu.c:238
+#: ../src/layout_util.c:1527 ../src/menu.c:246
 msgid "_Flip"
 msgstr "_Wenden"
 
-#: ../src/layout_util.c:1322
+#: ../src/layout_util.c:1527
 msgid "Flip"
 msgstr "Wenden"
 
-#: ../src/layout_util.c:1323 ../src/menu.c:241
+#: ../src/layout_util.c:1528 ../src/menu.c:249
 msgid "_Original state"
 msgstr "_Originalzustand"
 
-#: ../src/layout_util.c:1323
+#: ../src/layout_util.c:1528
 msgid "Original state"
 msgstr "Originalversion"
 
-#: ../src/layout_util.c:1324
+#: ../src/layout_util.c:1529
 msgid "Select _all"
 msgstr "_Alles auswählen"
 
-#: ../src/layout_util.c:1325
+#: ../src/layout_util.c:1530
 msgid "Select _none"
 msgstr "_Nichts auswählen"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1531
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1531
 msgid "Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1532
 msgid "P_references..."
 msgstr "_Einstellungen..."
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1532
 msgid "Preferences..."
 msgstr "Einstellungen ..."
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1533
 msgid "Configure _Editors..."
 msgstr "Editoren einrichten"
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1533
 msgid "Configure Editors..."
 msgstr "Bearbeitungsprogramme einrichten ..."
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1534
 msgid "_Configure this window..."
 msgstr "Dieses Fenster einrichten"
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1534
 msgid "Configure this window..."
 msgstr "Dieses Fenster einrichten ..."
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1535
 msgid "_Thumbnail maintenance..."
 msgstr "_Vorschaubilder+Metadaten"
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1535
 msgid "Thumbnail maintenance..."
 msgstr "Vorschaubilder verwalten ..."
 
-#: ../src/layout_util.c:1331
+#: ../src/layout_util.c:1536
 msgid "Set as wallpaper"
 msgstr "Als Hindergrundbild verwenden"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1537
 msgid "_Save metadata"
 msgstr "Metadaten _speichern"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1537
 msgid "Save metadata"
 msgstr "Metadaten speichern"
 
-#: ../src/layout_util.c:1333 ../src/layout_util.c:1334
+#: ../src/layout_util.c:1538 ../src/layout_util.c:1539
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: ../src/layout_util.c:1335 ../src/layout_util.c:1336
+#: ../src/layout_util.c:1540 ../src/layout_util.c:1541
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: ../src/layout_util.c:1337 ../src/layout_util.c:1338
+#: ../src/layout_util.c:1542 ../src/layout_util.c:1543
 msgid "Zoom 1:1"
 msgstr "Originalgröße"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1544 ../src/layout_util.c:1545
+#: ../src/layout_util.c:1560 ../src/layout_util.c:1561
 msgid "_Zoom to fit"
 msgstr "In _Fenster einpassen"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
+#: ../src/layout_util.c:1544 ../src/layout_util.c:1545
 msgid "Zoom to fit"
 msgstr "Zoomen zum einpassen"
 
-#: ../src/layout_util.c:1341 ../src/layout_util.c:1357
+#: ../src/layout_util.c:1546 ../src/layout_util.c:1562
 msgid "Fit _Horizontally"
 msgstr "_Horizontal einpassen"
 
-#: ../src/layout_util.c:1341
+#: ../src/layout_util.c:1546
 msgid "Fit Horizontally"
 msgstr "Horizontal einpassen"
 
-#: ../src/layout_util.c:1342 ../src/layout_util.c:1358
+#: ../src/layout_util.c:1547 ../src/layout_util.c:1563
 msgid "Fit _Vertically"
 msgstr "_Vertikal einpassen"
 
-#: ../src/layout_util.c:1342
+#: ../src/layout_util.c:1547
 msgid "Fit Vertically"
 msgstr "Vertikal einpassen"
 
-#: ../src/layout_util.c:1343 ../src/layout_util.c:1359
+#: ../src/layout_util.c:1548 ../src/layout_util.c:1564
 msgid "Zoom _2:1"
 msgstr "Zoom _2:1"
 
-#: ../src/layout_util.c:1343
+#: ../src/layout_util.c:1548
 msgid "Zoom 2:1"
 msgstr "Zoom 2:1"
 
-#: ../src/layout_util.c:1344 ../src/layout_util.c:1360
+#: ../src/layout_util.c:1549 ../src/layout_util.c:1565
 msgid "Zoom _3:1"
 msgstr "Zoom _3:1"
 
-#: ../src/layout_util.c:1344
+#: ../src/layout_util.c:1549
 msgid "Zoom 3:1"
 msgstr "Zoom 3:1"
 
-#: ../src/layout_util.c:1345 ../src/layout_util.c:1361
+#: ../src/layout_util.c:1550 ../src/layout_util.c:1566
 msgid "Zoom _4:1"
 msgstr "Zoom _4:1"
 
-#: ../src/layout_util.c:1345
+#: ../src/layout_util.c:1550
 msgid "Zoom 4:1"
 msgstr "Zoom 4:1"
 
-#: ../src/layout_util.c:1346 ../src/layout_util.c:1362
+#: ../src/layout_util.c:1551 ../src/layout_util.c:1567
 msgid "Zoom 1:2"
 msgstr "Zoom 1:2"
 
-#: ../src/layout_util.c:1347 ../src/layout_util.c:1363
+#: ../src/layout_util.c:1552 ../src/layout_util.c:1568
 msgid "Zoom 1:3"
 msgstr "Zoom 1:3"
 
-#: ../src/layout_util.c:1348 ../src/layout_util.c:1364
+#: ../src/layout_util.c:1553 ../src/layout_util.c:1569
 msgid "Zoom 1:4"
 msgstr "Zoom 1:4"
 
-#: ../src/layout_util.c:1349 ../src/layout_util.c:1350
+#: ../src/layout_util.c:1554 ../src/layout_util.c:1555
 msgid "Connected Zoom in"
 msgstr "Alle vergrößern"
 
-#: ../src/layout_util.c:1351 ../src/layout_util.c:1352
+#: ../src/layout_util.c:1556 ../src/layout_util.c:1557
 msgid "Connected Zoom out"
 msgstr "Alle verkleinern"
 
-#: ../src/layout_util.c:1353 ../src/layout_util.c:1354
+#: ../src/layout_util.c:1558 ../src/layout_util.c:1559
 msgid "Connected Zoom 1:1"
 msgstr "Alle auf Originalgröße zoomen"
 
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1560 ../src/layout_util.c:1561
 msgid "Connected Zoom to fit"
 msgstr "Alle einpassen"
 
-#: ../src/layout_util.c:1357
+#: ../src/layout_util.c:1562
 msgid "Connected Fit Horizontally"
 msgstr "Alle horizontal einpassen"
 
-#: ../src/layout_util.c:1358
+#: ../src/layout_util.c:1563
 msgid "Connected Fit Vertically"
 msgstr "Alle vertikal einpassen"
 
-#: ../src/layout_util.c:1359
+#: ../src/layout_util.c:1564
 msgid "Connected Zoom 2:1"
 msgstr "Alle auf 2:1 zoomen"
 
-#: ../src/layout_util.c:1360
+#: ../src/layout_util.c:1565
 msgid "Connected Zoom 3:1"
 msgstr "Alle auf 3:1 zoomen"
 
-#: ../src/layout_util.c:1361
+#: ../src/layout_util.c:1566
 msgid "Connected Zoom 4:1"
 msgstr "Alle auf 4:1 zoomen"
 
-#: ../src/layout_util.c:1362
+#: ../src/layout_util.c:1567
 msgid "Connected Zoom 1:2"
 msgstr "Alle auf 1:2 zoomen"
 
-#: ../src/layout_util.c:1363
+#: ../src/layout_util.c:1568
 msgid "Connected Zoom 1:3"
 msgstr "Alle auf 1:3 zoomen"
 
-#: ../src/layout_util.c:1364
+#: ../src/layout_util.c:1569
 msgid "Connected Zoom 1:4"
 msgstr "Alle auf 1:4 zoomen"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1570
 msgid "_View in new window"
 msgstr "In _neuem Fenster anzeigen"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1570
 msgid "View in new window"
 msgstr "In neuem Fenster anzeigen"
 
-#: ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368
+#: ../src/layout_util.c:1571 ../src/layout_util.c:1572
+#: ../src/layout_util.c:1573
 msgid "F_ull screen"
 msgstr "_Vollbildmodus"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1574 ../src/layout_util.c:1575
 msgid "_Leave full screen"
 msgstr "Vollbild _verlassen"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1574 ../src/layout_util.c:1575
 msgid "Leave full screen"
 msgstr "Vollbild verlassen"
 
-#: ../src/layout_util.c:1371
+#: ../src/layout_util.c:1576
 msgid "_Cycle through overlay modes"
 msgstr "Verschiedene Ü_berlagerungsanzeigen umschalten"
 
-#: ../src/layout_util.c:1371
+#: ../src/layout_util.c:1576
 msgid "Cycle through Overlay modes"
 msgstr "Verschiedene Überlagerungsanzeigen umschalten"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1577
 msgid "Cycle through histogram ch_annels"
 msgstr "Verschiedene Histogramm_kanäle umschalten"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1577
 msgid "Cycle through histogram channels"
 msgstr "Verschiedene Histogrammkanäle umschalten"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1578
 msgid "Cycle through histogram mo_des"
 msgstr "Verschiedene Histogram_modi umschalten"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1578
 msgid "Cycle through histogram modes"
 msgstr "Verschiedene Histogrammodi umschalten"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1579
 msgid "_Hide file list"
 msgstr "Datei_liste verbergen"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1579
 msgid "Hide file list"
 msgstr "Dateiliste verbergen"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1580
 msgid "_Pause slideshow"
 msgstr "Diashow unterbrechen"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1580
 msgid "Pause slideshow"
 msgstr "Diashow anhalten"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1581
 msgid "_Refresh"
 msgstr "Dateiliste a_ktualisieren"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1581
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1582
 msgid "_Contents"
 msgstr "_Inhalt"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1582
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1583
 msgid "_Keyboard shortcuts"
 msgstr "_Tastenkürzel"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1583
 msgid "Keyboard shortcuts"
 msgstr "Tastenkürzel"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1584
+msgid "_Keyboard map"
+msgstr ""
+
+#: ../src/layout_util.c:1584
+msgid "Keyboard map"
+msgstr ""
+
+#: ../src/layout_util.c:1585
 msgid "_Release notes"
 msgstr "_Versionsinformationen"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1585
 msgid "Release notes"
 msgstr "Versionsinformationen"
 
-#: ../src/layout_util.c:1380
+#: ../src/layout_util.c:1586
 msgid "_About"
 msgstr "_Über Geeqie"
 
-#: ../src/layout_util.c:1380 ../src/preferences.c:2392
+#: ../src/layout_util.c:1586 ../src/preferences.c:2507
 msgid "About"
 msgstr "Über Geeqie"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1587
 msgid "_Log Window"
 msgstr "Protokollfenster"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1587
 msgid "Log Window"
 msgstr "Protokollfenster"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1588
 msgid "_Exif window"
 msgstr "_EXIF-Fenster"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1588
 msgid "Exif window"
 msgstr "EXIF-Fenster"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1589
 msgid "_Cycle through stereo modes"
 msgstr "Verschiedene _Stereomodi umschalten"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1589
 msgid "Cycle through stereo modes"
 msgstr "Verschiedene Stereomodi umschalten"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1594
 msgid "Show _Thumbnails"
 msgstr "Vorschaubilder anzeigen"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1594
 msgid "Show Thumbnails"
 msgstr "Vorschaubilder anzeigen"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1595
 msgid "Show _Marks"
 msgstr "Zeige Markierungen"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1595
 msgid "Show Marks"
 msgstr "Zeige Markierungen"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1596
 msgid "Pi_xel Info"
 msgstr "Pi_xelinformationen"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1596
 msgid "Show Pixel Info"
 msgstr "Zeige Pixelinformationen"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1597
 msgid "_Float file list"
 msgstr "_Dateiliste als eigenständiges Fenster"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1597
 msgid "Float file list"
 msgstr "Dateiliste als eigenständiges Fenster"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1598
 msgid "Hide tool_bar"
 msgstr "Werk_zeugleiste verbergen"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1598
 msgid "Hide toolbar"
 msgstr "Werkzeugleiste verbergen"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1599
 msgid "_Info sidebar"
 msgstr "_Informationsseitenleiste"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1599
 msgid "Info sidebar"
 msgstr "Informationsseitenleiste"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1600
 msgid "Sort _manager"
 msgstr "Sortier_manager"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1600
 msgid "Sort manager"
 msgstr "Sortiermanager"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1601
 msgid "Toggle _slideshow"
 msgstr "Dia_show ein-/ausschalten"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1601
 msgid "Toggle slideshow"
 msgstr "Diashow ein-/ausschalten"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1602
 msgid "Use _color profiles"
 msgstr "_Farbverwaltung verwenden"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1602
 msgid "Use color profiles"
 msgstr "Farbverwaltung verwenden"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1603
 msgid "Use profile from _image"
 msgstr "Farbprofil des Bildes verwenden"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1603
 msgid "Use profile from image"
 msgstr "Farbprofil des Bildes verwenden"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1604
 msgid "Toggle _grayscale"
 msgstr "_Graustufen ein-/ausschalten"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1604
 msgid "Toggle grayscale"
 msgstr "Graustufen ein-/ausschalten"
 
-#: ../src/layout_util.c:1399
+#: ../src/layout_util.c:1605
 msgid "Image Overlay"
 msgstr "Anzeige im Bild"
 
-#: ../src/layout_util.c:1400
+#: ../src/layout_util.c:1606
 msgid "_Show Histogram"
 msgstr "_Zeige Histogramm"
 
-#: ../src/layout_util.c:1400
+#: ../src/layout_util.c:1606
 msgid "Show Histogram"
 msgstr "Zeige Histogramm"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1607
+msgid "Rectangular Selection"
+msgstr "Rechteckige Auswahl"
+
+#: ../src/layout_util.c:1608
+msgid "GIF _animation"
+msgstr ""
+
+#: ../src/layout_util.c:1608
+msgid "Toggle GIF animation"
+msgstr ""
+
+#: ../src/layout_util.c:1609
+msgid "_Exif rotate"
+msgstr ""
+
+#: ../src/layout_util.c:1609
+msgid "Exif rotate"
+msgstr "Drehen nach Exif"
+
+#: ../src/layout_util.c:1613
 msgid "Image _List"
 msgstr "Bild_liste"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1613
 msgid "View Images as List"
 msgstr "Zeige Bilder als Liste"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1614
 msgid "I_cons"
 msgstr "I_cons"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1614
 msgid "View Images as Icons"
 msgstr "Zeige Bilder als Vorschaubilder"
 
-#: ../src/layout_util.c:1409
+#: ../src/layout_util.c:1618
 msgid "Folder Li_st"
 msgstr "Verzeichnis_liste"
 
-#: ../src/layout_util.c:1409
+#: ../src/layout_util.c:1618
 msgid "View Folders as List"
 msgstr "Zeige Verzeichnis als Liste"
 
-#: ../src/layout_util.c:1410
+#: ../src/layout_util.c:1619
 msgid "Folder T_ree"
 msgstr "Verzeichnis_baum"
 
-#: ../src/layout_util.c:1410
+#: ../src/layout_util.c:1619
 msgid "View Folders as Tree"
 msgstr "Verzeichnis als Baum anzeigen"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1623
 msgid "_Horizontal"
 msgstr "_Übereinander"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1623
 msgid "Split Horizontal"
 msgstr "Zwei Ansichten übereinander"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1624
 msgid "_Vertical"
 msgstr "_Nebeneinander"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1624
 msgid "Split Vertical"
 msgstr "Zwei Ansichten nebeneinander"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1625
 msgid "_Quad"
 msgstr "Vierfach"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1625
 msgid "Split Quad"
 msgstr "Vier Ansichten"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1626
 msgid "_Single"
 msgstr "_Einzeln"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1626
 msgid "Split Single"
 msgstr "Einzelne Ansicht"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1630
 msgid "Input _0: sRGB"
 msgstr "Profil _0: sRGB"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1630
 msgid "Input 0: sRGB"
 msgstr "Profil 0: sRGB"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1631
 msgid "Input _1: AdobeRGB compatible"
 msgstr "Profil _1: AdobeRGB-kompatibel"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1631
 msgid "Input 1: AdobeRGB compatible"
 msgstr "Profil 1: AdobeRGB kompatibel"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1632
 msgid "Input _2"
 msgstr "Profil _2"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1632
 msgid "Input 2"
 msgstr "Profil 2"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1633
 msgid "Input _3"
 msgstr "Profil _3"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1633
 msgid "Input 3"
 msgstr "Profil 3"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1634
 msgid "Input _4"
 msgstr "Profil _4"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1634
 msgid "Input 4"
 msgstr "Profil 4"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1635
 msgid "Input _5"
 msgstr "Profil _5"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1635
 msgid "Input 5"
 msgstr "Profil 5"
 
-#: ../src/layout_util.c:1430
+#: ../src/layout_util.c:1639
 msgid "Histogram on Red"
 msgstr "Histogramm für Rot"
 
-#: ../src/layout_util.c:1431
+#: ../src/layout_util.c:1640
 msgid "Histogram on Green"
 msgstr "Histogramm für Grün"
 
-#: ../src/layout_util.c:1432
+#: ../src/layout_util.c:1641
 msgid "Histogram on Blue"
 msgstr "Histogramm für Blau"
 
-#: ../src/layout_util.c:1433
+#: ../src/layout_util.c:1642
 msgid "Histogram on RGB"
 msgstr "Histogramm für RGB"
 
-#: ../src/layout_util.c:1434
+#: ../src/layout_util.c:1643
 msgid "Histogram on Value"
 msgstr "Histogramm für Wert"
 
-#: ../src/layout_util.c:1438
+#: ../src/layout_util.c:1647
 msgid "Linear Histogram"
 msgstr "Lineares Histogramm"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1648
 msgid "_Log Histogram"
 msgstr "_Log. Histogramm"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1648
 msgid "Log Histogram"
 msgstr "Log. Histogramm"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1652
 msgid "_Auto"
 msgstr "_Auto"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1652
 msgid "Stereo Auto"
 msgstr "Automatisches Stereo"
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1653
 msgid "_Side by Side"
 msgstr "_Nebeneinander"
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1653
 msgid "Stereo Side by Side"
 msgstr "Stereo nebeneinander"
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1654
 msgid "_Cross"
 msgstr ""
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1654
 msgid "Stereo Cross"
 msgstr ""
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1655
 msgid "_Off"
 msgstr "Aus"
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1655
 msgid "Stereo Off"
 msgstr "Stereo aus"
 
-#: ../src/layout_util.c:1735
+#: ../src/layout_util.c:1951
 #, c-format
 msgid "Mark _%d"
 msgstr "Markierung _%d"
 
-#: ../src/layout_util.c:1736 ../src/view_file.c:540
+#: ../src/layout_util.c:1952 ../src/view_file.c:570
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Setze Markierung %d"
 
-#: ../src/layout_util.c:1736
+#: ../src/layout_util.c:1952
 #, c-format
 msgid "Set mark %d"
 msgstr "Setze Markierung %d"
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:541
+#: ../src/layout_util.c:1953 ../src/view_file.c:571
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Entfe_rne Markierung %d"
 
-#: ../src/layout_util.c:1737
+#: ../src/layout_util.c:1953
 #, c-format
 msgid "Reset mark %d"
 msgstr "Markierung %d zurücksetzen"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739 ../src/view_file.c:542
+#: ../src/layout_util.c:1954 ../src/layout_util.c:1955 ../src/view_file.c:572
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Markierung %d umschal_ten"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739
+#: ../src/layout_util.c:1954 ../src/layout_util.c:1955
 #, c-format
 msgid "Toggle mark %d"
 msgstr "Selektierung für Markierung %d umschalten"
 
-#: ../src/layout_util.c:1740
+#: ../src/layout_util.c:1956
 #, c-format
 msgid "Se_lect mark %d"
 msgstr "Markierung %d auswählen"
 
-#: ../src/layout_util.c:1740 ../src/layout_util.c:1741
+#: ../src/layout_util.c:1956 ../src/layout_util.c:1957
 #, c-format
 msgid "Select mark %d"
 msgstr "Markierung %d selektieren"
 
-#: ../src/layout_util.c:1741 ../src/view_file.c:543
+#: ../src/layout_util.c:1957 ../src/view_file.c:573
 #, c-format
 msgid "_Select mark %d"
 msgstr "Wähle Bilder mit Markierung %d aus"
 
-#: ../src/layout_util.c:1742 ../src/view_file.c:544
+#: ../src/layout_util.c:1958 ../src/view_file.c:574
 #, c-format
 msgid "_Add mark %d"
 msgstr "Füge Bilder mit Markierung %d zur Auswahl hinzu"
 
-#: ../src/layout_util.c:1742
+#: ../src/layout_util.c:1958
 #, c-format
 msgid "Add mark %d"
 msgstr "Markierung %d hinzufügen"
 
-#: ../src/layout_util.c:1743 ../src/view_file.c:545
+#: ../src/layout_util.c:1959 ../src/view_file.c:575
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "Schnittmenge mit Markierung %d wählen"
 
-#: ../src/layout_util.c:1743
+#: ../src/layout_util.c:1959
 #, c-format
 msgid "Intersection with mark %d"
 msgstr "Schnittmenge mit Markierung %d bilden"
 
-#: ../src/layout_util.c:1744 ../src/view_file.c:546
+#: ../src/layout_util.c:1960 ../src/view_file.c:576
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "Bilder mit Markierung %d abwählen"
 
-#: ../src/layout_util.c:1744
+#: ../src/layout_util.c:1960
 #, c-format
 msgid "Unselect mark %d"
 msgstr "Markierung %d abwählen"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:1961
 #, c-format
 msgid "_Filter mark %d"
 msgstr "Nach Markierung %d _filtern"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:1961
 #, c-format
 msgid "Filter mark %d"
 msgstr "Nach Markierung %d filtern"
 
-#: ../src/layout_util.c:2127
+#: ../src/layout_util.c:2343
 #, c-format
 msgid "Number of files with unsaved metadata: %d"
 msgstr "Anzahl Dateien mit ungesicherten Metadaten: %d"
 
-#: ../src/layout_util.c:2133
+#: ../src/layout_util.c:2349
 msgid "No unsaved metadata"
 msgstr "Keine ungespeicherten Metadaten"
 
-#: ../src/layout_util.c:2180
+#: ../src/layout_util.c:2396
 #, c-format
 msgid ""
 "Image profile: %s\n"
@@ -3107,26 +3175,26 @@
 "Bildprofil: %s\n"
 "Bildschirmprofil: %s"
 
-#: ../src/layout_util.c:2188
+#: ../src/layout_util.c:2404
 msgid "Click to enable color management"
 msgstr "Klicken um Farbverwaltung einzuschalten"
 
-#: ../src/layout_util.c:2193
+#: ../src/layout_util.c:2409
 msgid "Color profiles not supported"
 msgstr "Farbprofil nicht unterstützt"
 
-#: ../src/layout_util.c:2215
+#: ../src/layout_util.c:2431
 #, c-format
 msgid "Input _%d: %s"
 msgstr "Input _%d: %s"
 
 #. something went badly wrong
-#: ../src/lirc.c:197
+#: ../src/lirc.c:209
 #, c-format
 msgid "disconnected from LIRC\n"
 msgstr "Von LIRC getrennt\n"
 
-#: ../src/lirc.c:222
+#: ../src/lirc.c:234
 #, c-format
 msgid ""
 "could not read LIRC config file\n"
@@ -3137,11 +3205,11 @@
 "bitte lies in der Dokumentation von LIRC wie\n"
 "eine Konfiguration erzeugt werden kann\n"
 
-#: ../src/logwindow.c:76
+#: ../src/logwindow.c:84
 msgid "Log"
 msgstr "Protokoll"
 
-#: ../src/main.c:321
+#: ../src/main.c:330
 #, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
@@ -3150,65 +3218,65 @@
 "Aufruf: %s [Optionen] [Pfad]\n"
 "\n"
 
-#: ../src/main.c:322
+#: ../src/main.c:331
 msgid "valid options are:\n"
 msgstr "Gültige Optionen sind:\n"
 
-#: ../src/main.c:323
+#: ../src/main.c:332
 msgid "  +t, --with-tools                 force show of tools\n"
 msgstr "  +t, --with-tools                 Anzeige der Werkzeuge erzwingen\n"
 
-#: ../src/main.c:324
+#: ../src/main.c:333
 msgid "  -t, --without-tools              force hide of tools\n"
 msgstr "  -t, --without-tools              Verbergen der Werkzeuge erzwingen\n"
 
-#: ../src/main.c:325
+#: ../src/main.c:334
 msgid "  -f, --fullscreen                 start in full screen mode\n"
 msgstr "  -f, -fullscreen                 Starte im Vollbildmodus\n"
 
-#: ../src/main.c:326
+#: ../src/main.c:335
 msgid "  -s, --slideshow                  start in slideshow mode\n"
 msgstr "  -s, --slideshow                  Starte im Diashowmodus\n"
 
-#: ../src/main.c:327
+#: ../src/main.c:336
 msgid ""
 "  -l, --list [files] [collections] open collection window for command line\n"
 msgstr ""
 "  -l, --list [dateien] [Sammlung] Neue Sammlung mit angegebenen Bildern "
 "erstellen\n"
 
-#: ../src/main.c:328
+#: ../src/main.c:337
 msgid "      --blank                      start with blank file list\n"
 msgstr "      --blank                      mit leerer Dateiliste starten\n"
 
-#: ../src/main.c:329
+#: ../src/main.c:338
 msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
 msgstr ""
 "      --geometry=XxY+XOFF+YOFF     Setze die Hauptfenstergröße und -"
 "position\n"
 
-#: ../src/main.c:330
+#: ../src/main.c:339
 msgid ""
 "  -r, --remote                     send following commands to open window\n"
 msgstr ""
 "  -r, --remote                     Sende angegebene Befehle an offenes "
 "Fenster\n"
 
-#: ../src/main.c:331
+#: ../src/main.c:340
 msgid "  -rh,--remote-help                print remote command list\n"
 msgstr ""
 "  -rh,--remote-help                Anzeige der Befehle zur externen "
 "Steuerung\n"
 
-#: ../src/main.c:333
+#: ../src/main.c:342
 msgid "      --debug[=level]              turn on debug output\n"
 msgstr "      --debug[=Stufe]              Diagnoseausgabe einschalten\n"
 
-#: ../src/main.c:335
+#: ../src/main.c:344
 msgid "  -v, --version                    print version info\n"
 msgstr "  -v, --version                    Zeige Versionsnummer\n"
 
-#: ../src/main.c:336
+#: ../src/main.c:345
 msgid ""
 "  -h, --help                       show this message\n"
 "\n"
@@ -3216,7 +3284,7 @@
 "  -h, --help                       Diese Meldung\n"
 "\n"
 
-#: ../src/main.c:349
+#: ../src/main.c:358
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
@@ -3225,11 +3293,11 @@
 "Ungültig oder ignoriert: %s\n"
 "Benutzen Sie --help für Optionen\n"
 
-#: ../src/main.c:378
+#: ../src/main.c:387
 msgid "Invalid or ignored remote options: "
 msgstr "Ungültige oder ignorierte Fernsteueroption:"
 
-#: ../src/main.c:387
+#: ../src/main.c:396
 msgid ""
 "\n"
 "Use --remote-help for valid remote options.\n"
@@ -3237,24 +3305,24 @@
 "\n"
 "Benutze --remote-help für die gültigen Fernsteueroptionen.\n"
 
-#: ../src/main.c:489
+#: ../src/main.c:498
 #, c-format
 msgid "Creating %s dir:%s\n"
 msgstr "Erstelle %s Verzeichnis: %s\n"
 
-#: ../src/main.c:493
+#: ../src/main.c:502
 #, c-format
 msgid "Could not create dir:%s\n"
 msgstr ""
 "Fehler beim Anlegen des Verzeichnisses:\n"
 "%s\n"
 
-#: ../src/main.c:545
+#: ../src/main.c:554
 #, c-format
 msgid "error saving file: %s\n"
 msgstr "Fehler beim Speichern der Datei: %s\n"
 
-#: ../src/main.c:564
+#: ../src/main.c:573
 #, c-format
 msgid ""
 "error saving file: %s\n"
@@ -3263,441 +3331,442 @@
 "Fehler beim Speichern der Datei: %s\n"
 "Fehler: %s\n"
 
-#: ../src/main.c:672
+#: ../src/main.c:681
 msgid "exit"
 msgstr "beenden"
 
-#: ../src/main.c:677
+#: ../src/main.c:686
 #, c-format
 msgid "Quit %s"
 msgstr "Beende %s"
 
-#: ../src/main.c:679
+#: ../src/main.c:688
 msgid "Collections have been modified. Quit anyway?"
 msgstr ""
 "Sammlungen wurden verändert.\n"
 "Trotzdem beenden?"
 
-#: ../src/main.c:885 ../src/remote.c:601
+#: ../src/main.c:894 ../src/remote.c:620
 msgid "Command line"
 msgstr "Befehlszeile"
 
-#: ../src/menu.c:133
+#: ../src/menu.c:141
 msgid "Sort by size"
 msgstr "Sortieren nach Größe"
 
-#: ../src/menu.c:136
+#: ../src/menu.c:144
 msgid "Sort by date"
 msgstr "Sortieren nach Datum"
 
-#: ../src/menu.c:139
+#: ../src/menu.c:147
 msgid "Sort by file creation date"
 msgstr "Sortieren nach Dateierstellungszeitpunkt"
 
-#: ../src/menu.c:142
+#: ../src/menu.c:150
 msgid "Sort by Exif-date"
 msgstr "Sortieren nach E_xif-Datum"
 
-#: ../src/menu.c:145
+#: ../src/menu.c:153
 msgid "Unsorted"
 msgstr "Unsortiert"
 
-#: ../src/menu.c:148
+#: ../src/menu.c:156
 msgid "Sort by path"
 msgstr "Sortieren nach Pfad"
 
-#: ../src/menu.c:151
+#: ../src/menu.c:159
 msgid "Sort by number"
 msgstr "Sortieren nach Zahl"
 
-#: ../src/menu.c:155
+#: ../src/menu.c:163
 msgid "Sort by name"
 msgstr "Sortieren nach Name"
 
-#: ../src/menu.c:207
+#: ../src/menu.c:215
 msgid "Sort"
 msgstr "Sortieren"
 
-#: ../src/menu.c:232
+#: ../src/menu.c:240
 msgid "Rotate _180"
 msgstr "Drehen um _180°"
 
-#: ../src/metadata.c:1599
+#: ../src/metadata.c:1638
 msgid "People"
 msgstr "Menschen"
 
-#: ../src/metadata.c:1600
+#: ../src/metadata.c:1639
 msgid "Family"
 msgstr "Familie"
 
-#: ../src/metadata.c:1601
+#: ../src/metadata.c:1640
 msgid "Free time"
 msgstr "Freizeit"
 
-#: ../src/metadata.c:1602
+#: ../src/metadata.c:1641
 msgid "Children"
 msgstr "Kinder"
 
-#: ../src/metadata.c:1603
+#: ../src/metadata.c:1642
 msgid "Sport"
 msgstr "Sport"
 
-#: ../src/metadata.c:1604
+#: ../src/metadata.c:1643
 msgid "Culture"
 msgstr "Kultur"
 
-#: ../src/metadata.c:1605
+#: ../src/metadata.c:1644
 msgid "Festival"
 msgstr "Fest"
 
-#: ../src/metadata.c:1606
+#: ../src/metadata.c:1645
 msgid "Nature"
 msgstr "Natur"
 
-#: ../src/metadata.c:1607
+#: ../src/metadata.c:1646
 msgid "Animal"
 msgstr "Tier"
 
-#: ../src/metadata.c:1608
+#: ../src/metadata.c:1647
 msgid "Bird"
 msgstr "Vogel"
 
-#: ../src/metadata.c:1609
+#: ../src/metadata.c:1648
 msgid "Insect"
 msgstr "Insekt"
 
-#: ../src/metadata.c:1610
+#: ../src/metadata.c:1649
 msgid "Pets"
 msgstr "Haustier"
 
-#: ../src/metadata.c:1611
+#: ../src/metadata.c:1650
 msgid "Wildlife"
 msgstr "Wildtier"
 
-#: ../src/metadata.c:1612
+#: ../src/metadata.c:1651
 msgid "Zoo"
 msgstr "Zoo"
 
-#: ../src/metadata.c:1613
+#: ../src/metadata.c:1652
 msgid "Plant"
 msgstr "Pflanze"
 
-#: ../src/metadata.c:1614
+#: ../src/metadata.c:1653
 msgid "Tree"
 msgstr "Baum"
 
-#: ../src/metadata.c:1615
+#: ../src/metadata.c:1654
 msgid "Flower"
 msgstr "Blume"
 
-#: ../src/metadata.c:1616
+#: ../src/metadata.c:1655
 msgid "Water"
 msgstr "Wasser"
 
-#: ../src/metadata.c:1617
+#: ../src/metadata.c:1656
 msgid "River"
 msgstr "Fluß"
 
-#: ../src/metadata.c:1618
+#: ../src/metadata.c:1657
 msgid "Lake"
 msgstr "See"
 
-#: ../src/metadata.c:1619
+#: ../src/metadata.c:1658
 msgid "Sea"
 msgstr "Meer"
 
-#: ../src/metadata.c:1620 ../src/print.c:375
+#: ../src/metadata.c:1659 ../src/print.c:384
 msgid "Landscape"
 msgstr "Querformat"
 
-#: ../src/metadata.c:1621
+#: ../src/metadata.c:1660
 msgid "Art"
 msgstr "Kunst"
 
-#: ../src/metadata.c:1622
+#: ../src/metadata.c:1661
 msgid "Statue"
 msgstr "Statue"
 
-#: ../src/metadata.c:1623
+#: ../src/metadata.c:1662
 msgid "Painting"
 msgstr "Gemälde"
 
-#: ../src/metadata.c:1624 ../src/metadata.c:1638
+#: ../src/metadata.c:1663 ../src/metadata.c:1677
 msgid "Historic"
 msgstr "Historisch"
 
-#: ../src/metadata.c:1625 ../src/metadata.c:1639
+#: ../src/metadata.c:1664 ../src/metadata.c:1678
 msgid "Modern"
 msgstr "Modern"
 
-#: ../src/metadata.c:1626
+#: ../src/metadata.c:1665
 msgid "City"
 msgstr "Stadt"
 
-#: ../src/metadata.c:1627
+#: ../src/metadata.c:1666
 msgid "Park"
 msgstr "Park"
 
-#: ../src/metadata.c:1628
+#: ../src/metadata.c:1667
 msgid "Street"
 msgstr "Straße"
 
-#: ../src/metadata.c:1629
+#: ../src/metadata.c:1668
 msgid "Square"
 msgstr "Platz"
 
-#: ../src/metadata.c:1630
+#: ../src/metadata.c:1669
 msgid "Architecture"
 msgstr "Architektur"
 
-#: ../src/metadata.c:1631
+#: ../src/metadata.c:1670
 msgid "Buildings"
 msgstr "Bauwerk"
 
-#: ../src/metadata.c:1632
+#: ../src/metadata.c:1671
 msgid "House"
 msgstr "Haus"
 
-#: ../src/metadata.c:1633
+#: ../src/metadata.c:1672
 msgid "Cathedral"
 msgstr "Kathedrale"
 
-#: ../src/metadata.c:1634
+#: ../src/metadata.c:1673
 msgid "Palace"
 msgstr "Palast"
 
-#: ../src/metadata.c:1635
+#: ../src/metadata.c:1674
 msgid "Castle"
 msgstr "Schloß"
 
-#: ../src/metadata.c:1636
+#: ../src/metadata.c:1675
 msgid "Bridge"
 msgstr "Brücke"
 
-#: ../src/metadata.c:1637
+#: ../src/metadata.c:1676
 msgid "Interior"
 msgstr "Einrichtung"
 
-#: ../src/metadata.c:1640
+#: ../src/metadata.c:1679
 msgid "Places"
 msgstr "Plätze"
 
-#: ../src/metadata.c:1641
+#: ../src/metadata.c:1680
 msgid "Conditions"
 msgstr "Bedingungen"
 
-#: ../src/metadata.c:1642
+#: ../src/metadata.c:1681
 msgid "Night"
 msgstr "Nacht"
 
-#: ../src/metadata.c:1643
+#: ../src/metadata.c:1682
 msgid "Lights"
 msgstr "Lichter"
 
-#: ../src/metadata.c:1644
+#: ../src/metadata.c:1683
 msgid "Reflections"
 msgstr "Reflektionen"
 
-#: ../src/metadata.c:1645
+#: ../src/metadata.c:1684
 msgid "Sun"
 msgstr "Sonne"
 
-#: ../src/metadata.c:1646
+#: ../src/metadata.c:1685
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../src/metadata.c:1647
+#: ../src/metadata.c:1686
 msgid "Fog"
 msgstr "Nebel"
 
-#: ../src/metadata.c:1648
+#: ../src/metadata.c:1687
 msgid "Rain"
 msgstr "Regen"
 
-#: ../src/metadata.c:1649
+#: ../src/metadata.c:1688
 msgid "Clouds"
 msgstr "Wolken"
 
-#: ../src/metadata.c:1650
+#: ../src/metadata.c:1689
 msgid "Snow"
 msgstr "Schnee"
 
-#: ../src/metadata.c:1651
+#: ../src/metadata.c:1690
 msgid "Sunny weather"
 msgstr "Sonniges Wetter"
 
-#: ../src/metadata.c:1652
+#: ../src/metadata.c:1691
 msgid "Photo"
 msgstr "Photo"
 
-#: ../src/metadata.c:1653
+#: ../src/metadata.c:1692
 msgid "Edited"
 msgstr "Bearbeitet"
 
-#: ../src/metadata.c:1654
+#: ../src/metadata.c:1693
 msgid "Detail"
 msgstr "Ausschnitt"
 
-#: ../src/metadata.c:1655
+#: ../src/metadata.c:1694
 msgid "Macro"
 msgstr "Großaufnahme"
 
-#: ../src/metadata.c:1656 ../src/print.c:374
+#: ../src/metadata.c:1695 ../src/print.c:383
 msgid "Portrait"
 msgstr "Hochformat"
 
-#: ../src/metadata.c:1657
+#: ../src/metadata.c:1696
 msgid "Black and White"
 msgstr "Schwarzweiß"
 
-#: ../src/metadata.c:1658
+#: ../src/metadata.c:1697
 msgid "Perspective"
 msgstr "Perspektive"
 
-#: ../src/options.c:158 ../src/ui_bookmark.c:560
+#: ../src/options.c:172 ../src/ui_bookmark.c:577
 msgid "Desktop"
 msgstr "Desktop"
 
-#: ../src/pan-view.c:423
+#: ../src/pan-view/pan-view.c:439
 #, c-format
 msgid "%d images, %s"
 msgstr "%d Bilder, %s"
 
-#: ../src/pan-view.c:433
+#: ../src/pan-view/pan-view.c:449
 #, c-format
 msgid "The pan view does not support the folder \"%s\"."
 msgstr "Der Pan-View unterstützt das Verzeichnis \"%s\"."
 
-#: ../src/pan-view.c:434
+#: ../src/pan-view/pan-view.c:450
 msgid "Folder not supported"
 msgstr "Verzeichnis nicht unterstützt"
 
-#: ../src/pan-view.c:986 ../src/pan-view.c:1002
+#: ../src/pan-view/pan-view.c:1002 ../src/pan-view/pan-view.c:1018
 msgid "Reading image data..."
 msgstr "Lese Bilddaten ..."
 
-#: ../src/pan-view.c:1061
+#: ../src/pan-view/pan-view.c:1077
 msgid "Sorting images..."
 msgstr "Sortiere Bilder ..."
 
-#: ../src/pan-view.c:1365 ../src/print.c:2599
+#: ../src/pan-view/pan-view.c:1384 ../src/print.c:2608
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: ../src/pan-view.c:1367 ../src/pan-view.c:2183 ../src/preferences.c:1551
+#: ../src/pan-view/pan-view.c:1386 ../src/pan-view/pan-view.c:2202
+#: ../src/preferences.c:1600
 msgid "Location:"
 msgstr "Position:"
 
-#: ../src/pan-view.c:1369 ../src/pan-view.c:1735
+#: ../src/pan-view/pan-view.c:1388 ../src/pan-view/pan-view.c:1754
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../src/pan-view.c:1371 ../src/preferences.c:1377 ../src/print.c:3212
-#: ../src/print.c:3417
+#: ../src/pan-view/pan-view.c:1390 ../src/preferences.c:1424
+#: ../src/print.c:3221 ../src/print.c:3426
 msgid "Size:"
 msgstr "Größe:"
 
-#: ../src/pan-view.c:1473
+#: ../src/pan-view/pan-view.c:1492
 msgid "path found"
 msgstr "Pfad gefunden"
 
-#: ../src/pan-view.c:1473
+#: ../src/pan-view/pan-view.c:1492
 msgid "filename found"
 msgstr "Dateiname gefunden"
 
-#: ../src/pan-view.c:1521
+#: ../src/pan-view/pan-view.c:1540
 msgid "partial match"
 msgstr "teilweise Übereinstimmung"
 
-#: ../src/pan-view.c:1732 ../src/pan-view.c:1765
+#: ../src/pan-view/pan-view.c:1751 ../src/pan-view/pan-view.c:1784
 msgid "no match"
 msgstr "keine Übereinstimmung"
 
-#: ../src/pan-view.c:2071 ../src/search.c:2169
+#: ../src/pan-view/pan-view.c:2090 ../src/search.c:2196
 msgid "Folder not found"
 msgstr "Verzeichnis nicht vorhanden"
 
-#: ../src/pan-view.c:2072
+#: ../src/pan-view/pan-view.c:2091
 msgid "The entered path is not a folder"
 msgstr "Der eingegebene Pfad ist kein Verzeichnis"
 
-#: ../src/pan-view.c:2167
+#: ../src/pan-view/pan-view.c:2186
 msgid "Pan View"
 msgstr "Ansicht als Panel"
 
-#: ../src/pan-view.c:2192
+#: ../src/pan-view/pan-view.c:2211
 msgid "Timeline"
 msgstr "Zeitlinie"
 
-#: ../src/pan-view.c:2193
+#: ../src/pan-view/pan-view.c:2212
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../src/pan-view.c:2195
+#: ../src/pan-view/pan-view.c:2214
 msgid "Folders (flower)"
 msgstr "Verzeichnisse (Blume)"
 
-#: ../src/pan-view.c:2196
+#: ../src/pan-view/pan-view.c:2215
 msgid "Grid"
 msgstr "Gitter"
 
-#: ../src/pan-view.c:2205
+#: ../src/pan-view/pan-view.c:2224
 msgid "Dots"
 msgstr "Punkte"
 
-#: ../src/pan-view.c:2206
+#: ../src/pan-view/pan-view.c:2225
 msgid "No Images"
 msgstr "Keine Bilder"
 
-#: ../src/pan-view.c:2207
+#: ../src/pan-view/pan-view.c:2226
 msgid "Small Thumbnails"
 msgstr "Kleine Vorschaubilder"
 
-#: ../src/pan-view.c:2208
+#: ../src/pan-view/pan-view.c:2227
 msgid "Normal Thumbnails"
 msgstr "Normale Vorschaubilder"
 
-#: ../src/pan-view.c:2209
+#: ../src/pan-view/pan-view.c:2228
 msgid "Large Thumbnails"
 msgstr "Große Vorschaubilder"
 
-#: ../src/pan-view.c:2210 ../src/pan-view.c:2665
+#: ../src/pan-view/pan-view.c:2229 ../src/pan-view/pan-view.c:2684
 msgid "1:10 (10%)"
 msgstr "1:10 (10%)"
 
-#: ../src/pan-view.c:2211 ../src/pan-view.c:2661
+#: ../src/pan-view/pan-view.c:2230 ../src/pan-view/pan-view.c:2680
 msgid "1:4 (25%)"
 msgstr "1:4 (25%)"
 
-#: ../src/pan-view.c:2212 ../src/pan-view.c:2657
+#: ../src/pan-view/pan-view.c:2231 ../src/pan-view/pan-view.c:2676
 msgid "1:3 (33%)"
 msgstr "1:3 (33%)"
 
-#: ../src/pan-view.c:2213 ../src/pan-view.c:2653
+#: ../src/pan-view/pan-view.c:2232 ../src/pan-view/pan-view.c:2672
 msgid "1:2 (50%)"
 msgstr "1:2 (50%)"
 
-#: ../src/pan-view.c:2214
+#: ../src/pan-view/pan-view.c:2233
 msgid "1:1 (100%)"
 msgstr "1:1 (100%)"
 
-#: ../src/pan-view.c:2262
+#: ../src/pan-view/pan-view.c:2281
 msgid "Find:"
 msgstr "Suchen:"
 
-#: ../src/pan-view.c:2313
+#: ../src/pan-view/pan-view.c:2332
 msgid "Find"
 msgstr "Suchen"
 
-#: ../src/pan-view.c:2380
+#: ../src/pan-view/pan-view.c:2399
 msgid "Pan View Performance"
 msgstr "Optimierung der Panel-Ansicht"
 
-#: ../src/pan-view.c:2387
+#: ../src/pan-view/pan-view.c:2406
 msgid "Pan view performance may be poor."
 msgstr "Die Ansicht als Panel kann langsam sein."
 
-#: ../src/pan-view.c:2388
+#: ../src/pan-view/pan-view.c:2407
 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 "
@@ -3708,131 +3777,131 @@
 "Optionen eingeschaltet sein müssen um eine Geschwindigkeitsveränderung zu "
 "erreichen."
 
-#: ../src/pan-view.c:2396 ../src/preferences.c:1380
+#: ../src/pan-view/pan-view.c:2415 ../src/preferences.c:1427
 msgid "Cache thumbnails"
 msgstr "Vorschaubilder speichern"
 
-#: ../src/pan-view.c:2398
+#: ../src/pan-view/pan-view.c:2417
 msgid "Use shared thumbnail cache"
 msgstr "gemeinsamen Speicher für Vorschaubilder verwenden"
 
-#: ../src/pan-view.c:2404
+#: ../src/pan-view/pan-view.c:2423
 msgid "Do not show this dialog again"
 msgstr "Diesen Dialog nicht mehr zeigen"
 
-#: ../src/pan-view.c:2633
+#: ../src/pan-view/pan-view.c:2652
 msgid "Sort by E_xif date"
 msgstr "Sortieren nach E_xif-Datum"
 
-#: ../src/pan-view.c:2639
+#: ../src/pan-view/pan-view.c:2658
 msgid "_Show Exif information"
 msgstr "_Zeige Exifinformationen"
 
-#: ../src/pan-view.c:2641
+#: ../src/pan-view/pan-view.c:2660
 msgid "Show im_age"
 msgstr "Zeige Bild"
 
-#: ../src/pan-view.c:2645
+#: ../src/pan-view/pan-view.c:2664
 msgid "_None"
 msgstr "Nichts"
 
-#: ../src/pan-view.c:2649
+#: ../src/pan-view/pan-view.c:2668
 msgid "_Full size"
 msgstr "_Volle Größe"
 
-#: ../src/preferences.c:91
+#: ../src/preferences.c:106
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/preferences.c:93
+#: ../src/preferences.c:108
 msgid "RAW Image"
 msgstr "Rohbild"
 
-#: ../src/preferences.c:446
+#: ../src/preferences.c:493
 msgid "Nearest (worst, but fastest)"
 msgstr "Sparsam (schlecht, aber schnell)"
 
-#: ../src/preferences.c:448
+#: ../src/preferences.c:495
 msgid "Tiles"
 msgstr "Kacheln"
 
-#: ../src/preferences.c:450
+#: ../src/preferences.c:497
 msgid "Bilinear"
 msgstr "Bilinear"
 
-#: ../src/preferences.c:452
+#: ../src/preferences.c:499
 msgid "Hyper (best, but slowest)"
 msgstr "Hyper (sehr gut, aber langsam)"
 
-#: ../src/preferences.c:517 ../src/print.c:380
+#: ../src/preferences.c:564 ../src/print.c:389
 msgid "Custom"
 msgstr "Eigenes"
 
-#: ../src/preferences.c:600
+#: ../src/preferences.c:647
 msgid "Single image"
 msgstr "Einzelnes Bild"
 
-#: ../src/preferences.c:602
+#: ../src/preferences.c:649
 msgid "Anaglyph Red-Cyan"
 msgstr ""
 
-#: ../src/preferences.c:604
+#: ../src/preferences.c:651
 msgid "Anaglyph Green-Magenta"
 msgstr ""
 
-#: ../src/preferences.c:606
+#: ../src/preferences.c:653
 msgid "Anaglyph Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:608
+#: ../src/preferences.c:655
 msgid "Anaglyph Gray Red-Cyan"
 msgstr ""
 
-#: ../src/preferences.c:610
+#: ../src/preferences.c:657
 msgid "Anaglyph Gray Green-Magenta"
 msgstr ""
 
-#: ../src/preferences.c:612
+#: ../src/preferences.c:659
 msgid "Anaglyph Gray Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:614
+#: ../src/preferences.c:661
 msgid "Anaglyph Dubois Red-Cyan"
 msgstr ""
 
-#: ../src/preferences.c:616
+#: ../src/preferences.c:663
 msgid "Anaglyph Dubois Green-Magenta"
 msgstr ""
 
-#: ../src/preferences.c:618
+#: ../src/preferences.c:665
 msgid "Anaglyph Dubois Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:621
+#: ../src/preferences.c:668
 msgid "Side by Side"
 msgstr "Nebeneinander"
 
-#: ../src/preferences.c:622
+#: ../src/preferences.c:669
 msgid "Side by Side Half size"
 msgstr "Nebeneinander, halbiert"
 
-#: ../src/preferences.c:629
+#: ../src/preferences.c:676
 msgid "Top - Bottom"
 msgstr "Oben - Unten"
 
-#: ../src/preferences.c:630
+#: ../src/preferences.c:677
 msgid "Top - Bottom Half size"
 msgstr "Oben- Unten, halbiert"
 
-#: ../src/preferences.c:639 ../src/preferences.c:2233
+#: ../src/preferences.c:686 ../src/preferences.c:2342
 msgid "Fixed position"
 msgstr "Feste Position"
 
-#: ../src/preferences.c:936 ../src/preferences.c:939
+#: ../src/preferences.c:983 ../src/preferences.c:986
 msgid "Reset filters"
 msgstr "Filter entfernen"
 
-#: ../src/preferences.c:940
+#: ../src/preferences.c:987
 msgid ""
 "This will reset the file filters to the defaults.\n"
 "Continue?"
@@ -3840,21 +3909,21 @@
 "Die Filter werden auf die Standardeinstellungen zurückgesetzt.\n"
 "Fortfahren?"
 
-#: ../src/preferences.c:967 ../src/preferences.c:970
+#: ../src/preferences.c:1014 ../src/preferences.c:1017
 msgid "Clear trash"
 msgstr "Papierkorb leeren"
 
-#: ../src/preferences.c:971
+#: ../src/preferences.c:1018
 msgid "This will remove the trash contents."
 msgstr ""
 "Der gesamte Inhalt des Papierkorbes im folgenden\n"
 "Verzeichnis wird gelöscht."
 
-#: ../src/preferences.c:1015 ../src/preferences.c:1018
+#: ../src/preferences.c:1062 ../src/preferences.c:1065
 msgid "Reset image overlay template string"
 msgstr "Zurücksetzen der Anzeige im Bild"
 
-#: ../src/preferences.c:1019
+#: ../src/preferences.c:1066
 msgid ""
 "This will reset the image overlay template string to the default.\n"
 "Continue?"
@@ -3863,21 +3932,21 @@
 "zurückgesetzt.\n"
 "Fortfahren?"
 
-#: ../src/preferences.c:1372
+#: ../src/preferences.c:1419
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/preferences.c:1378 ../src/preferences.c:1438
+#: ../src/preferences.c:1425 ../src/preferences.c:1485
 msgid "Quality:"
 msgstr "Qualität:"
 
-#: ../src/preferences.c:1386
+#: ../src/preferences.c:1433
 msgid "Use standard thumbnail cache, shared with other applications"
 msgstr ""
 "Benutzen des Standard-Zwischenspeicher für Vorschaubilder, der mit anderen "
 "Anwendungen geteilt wird"
 
-#: ../src/preferences.c:1392
+#: ../src/preferences.c:1439
 msgid ""
 "Store thumbnails in '.thumbnails' folder, local to image folder (non-"
 "standard)"
@@ -3885,173 +3954,173 @@
 "Vorschaubilder im '.thumbnails'-Verzeichnis innerhalb des Bildverzeichnis "
 "speichern (kein Standard)"
 
-#: ../src/preferences.c:1395
+#: ../src/preferences.c:1442
 msgid "Use EXIF thumbnails when available (EXIF thumbnails may be outdated)"
 msgstr ""
 "Benutze EXIF-Vorschaubilder wenn vorhanden (EXIF-Vorschaubilder könnten "
 "veraltet sein)"
 
-#: ../src/preferences.c:1398
+#: ../src/preferences.c:1445
 msgid "Slide show"
 msgstr "Diashow"
 
-#: ../src/preferences.c:1401
+#: ../src/preferences.c:1448
 msgid "Delay between image change:"
 msgstr "Pause zwischen dem Bildwechsel:"
 
-#: ../src/preferences.c:1401
+#: ../src/preferences.c:1448
 msgid "seconds"
 msgstr "Sekunden"
 
-#: ../src/preferences.c:1407
+#: ../src/preferences.c:1454
 msgid "Random"
 msgstr "Zufall"
 
-#: ../src/preferences.c:1408
+#: ../src/preferences.c:1455
 msgid "Repeat"
 msgstr "Wiederholung"
 
-#: ../src/preferences.c:1410
+#: ../src/preferences.c:1457
 msgid "Image loading and caching"
 msgstr "Laden der Bilder und Zwischenspeicher"
 
-#: ../src/preferences.c:1412
+#: ../src/preferences.c:1459
 msgid "Decoded image cache size (Mb):"
 msgstr "Zwischenspeichergröße für dekodierte Bilder (MB):"
 
-#: ../src/preferences.c:1414
+#: ../src/preferences.c:1461
 msgid "Preload next image"
 msgstr "Lade nächstes Bild im Hintergrund"
 
-#: ../src/preferences.c:1417
+#: ../src/preferences.c:1464
 msgid "Refresh on file change"
 msgstr "Dateiliste bei Änderung aktualisieren"
 
-#: ../src/preferences.c:1435
+#: ../src/preferences.c:1482
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/preferences.c:1441
+#: ../src/preferences.c:1488
 msgid "Use GPU acceleration via Clutter library"
 msgstr "GPU-Beschleunigung via Clutter-Library benutzen"
 
-#: ../src/preferences.c:1445
+#: ../src/preferences.c:1492
 msgid "Two pass rendering (apply HQ zoom and color correction in second pass)"
 msgstr ""
 "Bildberechnung in zwei Durchgängen (Hohe Qualität und Farbkorrektur im "
 "zweiten Durchgang)"
 
-#: ../src/preferences.c:1448
+#: ../src/preferences.c:1495
 msgid "Allow enlargement of image for zoom to fit"
 msgstr "Bild wenn nötig auch vergrößern, damit Zoomstufe erreicht werden kann"
 
-#: ../src/preferences.c:1452
+#: ../src/preferences.c:1499
 msgid "Limit image size when autofitting (%):"
 msgstr "Größe begrenzen bei automatischer Anpassung (%):"
 
-#: ../src/preferences.c:1460
+#: ../src/preferences.c:1507
 msgid "Zoom increment:"
 msgstr "Zoomstufen:"
 
-#: ../src/preferences.c:1465
+#: ../src/preferences.c:1512
 msgid "When new image is selected:"
 msgstr "Wenn neues Bild ausgewählt wird:"
 
-#: ../src/preferences.c:1469
+#: ../src/preferences.c:1516
 msgid "Zoom to original size"
 msgstr "Zu Ausgangsgröße zoomen"
 
-#: ../src/preferences.c:1472
+#: ../src/preferences.c:1519
 msgid "Fit image to window"
 msgstr "In Fenster einpassen"
 
-#: ../src/preferences.c:1475
+#: ../src/preferences.c:1522
 msgid "Leave Zoom at previous setting"
 msgstr "Zoom bei vorheriger Einstellung belassen"
 
-#: ../src/preferences.c:1481
+#: ../src/preferences.c:1528
 msgid "Scroll to top left corner"
 msgstr "Zur linken, oberen Ecke des Bildes bewegen"
 
-#: ../src/preferences.c:1484
+#: ../src/preferences.c:1531
 msgid "Scroll to image center"
 msgstr "Zur Bildmitte bewegen"
 
-#: ../src/preferences.c:1487
+#: ../src/preferences.c:1534
 msgid "Keep the region from previous image"
 msgstr "Ausschnitt des vorherigen Bildes beibehalten"
 
-#: ../src/preferences.c:1492
+#: ../src/preferences.c:1539
 msgid "Appearance"
 msgstr "Bildansicht"
 
-#: ../src/preferences.c:1494
+#: ../src/preferences.c:1541
 msgid "Use custom border color in window mode"
 msgstr "Angepaßte Rahmenfarbe im Fenstermodus verwenden"
 
-#: ../src/preferences.c:1497
+#: ../src/preferences.c:1544
 msgid "Use custom border color in fullscreen mode"
 msgstr "Angepaßte Rahmenfarbe im Vollbildmodus verwenden"
 
-#: ../src/preferences.c:1500
+#: ../src/preferences.c:1547
 msgid "Border color"
 msgstr "Rahmenfarbe"
 
-#: ../src/preferences.c:1503
+#: ../src/preferences.c:1550
 msgid "Convenience"
 msgstr "Nützliches"
 
-#: ../src/preferences.c:1505
-msgid "Auto rotate image using Exif information"
-msgstr "Automatisch gemäß Exif-Daten drehen"
-
-#: ../src/preferences.c:1508
+#: ../src/preferences.c:1552
 msgid "Auto rotate proofs using Exif information"
 msgstr "Vorschau automatisch gemäß Exif-Daten drehen"
 
-#: ../src/preferences.c:1525
+#: ../src/preferences.c:1569
 msgid "Windows"
 msgstr "Fenster"
 
-#: ../src/preferences.c:1527
+#: ../src/preferences.c:1571
 msgid "State"
 msgstr "Status"
 
-#: ../src/preferences.c:1529
+#: ../src/preferences.c:1573
 msgid "Remember window positions"
 msgstr "Fensterpositionen merken"
 
-#: ../src/preferences.c:1531
+#: ../src/preferences.c:1576
+msgid "Use saved window positions also for new windows"
+msgstr ""
+
+#: ../src/preferences.c:1580
 msgid "Remember tool state (float/hidden)"
 msgstr "Werkzeugstatus merken (schwebend/verborgen)"
 
-#: ../src/preferences.c:1536
+#: ../src/preferences.c:1585
 msgid "Fit window to image when tools are hidden/floating"
 msgstr "Bild in Fenster einpassen, wenn Werkzeuge verborgen/schwebend sind"
 
-#: ../src/preferences.c:1540
+#: ../src/preferences.c:1589
 msgid "Limit size when auto-sizing window (%):"
 msgstr "Größe begrenzen bei automat. Anpassung (%):"
 
-#: ../src/preferences.c:1555
+#: ../src/preferences.c:1604
 msgid "Smooth image flip"
 msgstr ""
 "Glatter Bildwechsel (nächstes Bild erst anzeigen, wenn es komplett geladen "
 "ist)"
 
-#: ../src/preferences.c:1557
+#: ../src/preferences.c:1606
 msgid "Disable screen saver"
 msgstr "Bildschirmschoner deaktivieren"
 
-#: ../src/preferences.c:1561
+#: ../src/preferences.c:1610
 msgid "Overlay Screen Display"
 msgstr "Anzeige im Bild"
 
-#: ../src/preferences.c:1563
+#: ../src/preferences.c:1612
 msgid "Image overlay template"
 msgstr "Schablone für die Anzeige im Bild"
 
-#: ../src/preferences.c:1576
+#: ../src/preferences.c:1625
 msgid ""
 "<i>%name%</i> results in the filename of the picture.\n"
 "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>"
@@ -4090,79 +4159,83 @@
 "Eine leere Zeile wird entfernt. Das erlaubt es, Zeilen hinzuzufügen, die "
 "komplett verschwinden, wenn keine Daten verfügbar sind.\n"
 
-#: ../src/preferences.c:1593 ../src/print.c:3210
+#: ../src/preferences.c:1642 ../src/print.c:3219
 msgid "Font"
 msgstr "Schrift"
 
 # Nicht klar, warum das übersetzt werden soll...
-#: ../src/preferences.c:1605 ../src/print.c:3400
+#: ../src/preferences.c:1654 ../src/print.c:3409
 msgid "Text"
 msgstr "Text"
 
-#: ../src/preferences.c:1610
+#: ../src/preferences.c:1659
 msgid "Background"
 msgstr "Hintergrund"
 
-#: ../src/preferences.c:1616 ../src/preferences.c:1792
-#: ../src/preferences.c:2162
+#: ../src/preferences.c:1665 ../src/preferences.c:1843
+#: ../src/preferences.c:2271
 msgid "Defaults"
 msgstr "Standardeinstellungen"
 
-#: ../src/preferences.c:1670
+#: ../src/preferences.c:1719
 msgid "Show hidden files or folders"
 msgstr "Zeige versteckte Dateien und Verzeichnisse"
 
-#: ../src/preferences.c:1672
+#: ../src/preferences.c:1721
 msgid "Show parent folder (..)"
 msgstr "Zeige übergeordnetes Verzeichnis (..)"
 
-#: ../src/preferences.c:1674
+#: ../src/preferences.c:1723
 msgid "Case sensitive sort"
 msgstr "Groß- und Kleinschreibung beim Sortieren beachten"
 
-#: ../src/preferences.c:1676
+#: ../src/preferences.c:1725
+msgid "Natural sort order"
+msgstr ""
+
+#: ../src/preferences.c:1727
 msgid "Disable file extension checks"
 msgstr "Prüfung der Dateiendung abschalten"
 
-#: ../src/preferences.c:1679
+#: ../src/preferences.c:1730
 msgid "Disable File Filtering"
 msgstr "Dateifilter abschalten"
 
-#: ../src/preferences.c:1683
+#: ../src/preferences.c:1734
 msgid "Grouping sidecar extensions"
 msgstr "Gruppiere \"Sidecar\"-Erweiterungen"
 
-#: ../src/preferences.c:1690
+#: ../src/preferences.c:1741
 msgid "File types"
 msgstr "Dateitypen"
 
-#: ../src/preferences.c:1712
+#: ../src/preferences.c:1763
 msgid "Filter"
 msgstr "Filter"
 
-#: ../src/preferences.c:1747
+#: ../src/preferences.c:1798
 msgid "Class"
 msgstr "Klasse"
 
-#: ../src/preferences.c:1764
+#: ../src/preferences.c:1815
 msgid "Writable"
 msgstr "Schreibbar"
 
-#: ../src/preferences.c:1775
+#: ../src/preferences.c:1826
 msgid "Sidecar is allowed"
 msgstr "\"Sidecars\" erlaubt"
 
-#: ../src/preferences.c:1821
+#: ../src/preferences.c:1872
 msgid "Metadata writing process"
 msgstr "Vorgehen zum Speichern der Metadaten"
 
-#: ../src/preferences.c:1823
+#: ../src/preferences.c:1874
 msgid "Warning: Geeqie is built without Exiv2. Some options are disabled."
 msgstr ""
 "Warnung: Geeqie wurde ohne Exiv2 übersetzt. Manche Einstellungsmöglichkeiten "
 "sind abgeschaltet."
 
-#: ../src/preferences.c:1825
+#: ../src/preferences.c:1876
 msgid ""
 "Metadata are written in the following order. The process ends after first "
 "success."
@@ -4170,7 +4243,7 @@
 "Metadaten werden in der folgenden Reihenfolge geschrieben. Der erste "
 "erfolgreiche Vorgang beendet das Schreiben."
 
-#: ../src/preferences.c:1828
+#: ../src/preferences.c:1879
 msgid ""
 "1) Save metadata in image files, resp. sidecar files, according to the XMP "
 "standard"
@@ -4178,23 +4251,23 @@
 "1) Speichere Metadaten im Bild resp. in \"Sidecar\"-Dateien nach dem XMP-"
 "Standard"
 
-#: ../src/preferences.c:1834
+#: ../src/preferences.c:1885
 msgid ""
 "2) Save metadata in '.metadata' folder, local to image folder (non-standard)"
 msgstr ""
 "2) Speichere Metadaten im '.metadata'-Verzeichnis innerhalb des "
 "Bilderverzeichnis (kein Standard)"
 
-#: ../src/preferences.c:1837
+#: ../src/preferences.c:1888
 #, c-format
 msgid "3) Save metadata in Geeqie private directory '%s'"
 msgstr "3) Speichere Metadaten in Geeqies eigenem Verzeichnis '%s'"
 
-#: ../src/preferences.c:1843
+#: ../src/preferences.c:1894
 msgid "Step 1: Write to image files"
 msgstr "Schritt 1: Speichern im Bild"
 
-#: ../src/preferences.c:1851
+#: ../src/preferences.c:1902
 msgid ""
 "Store metadata also in legacy IPTC tags (converted according to IPTC4XMP "
 "standard)"
@@ -4202,19 +4275,19 @@
 "Speichere Metadaten zusätzlich in passenden IPTC-Tags (Nach IPTC4XMP-"
 "Standard umgewandelt)"
 
-#: ../src/preferences.c:1854
+#: ../src/preferences.c:1905
 msgid "Warn if the image files are unwritable"
 msgstr "Warne wenn die Bilddatei unbeschreibbar ist"
 
-#: ../src/preferences.c:1857
+#: ../src/preferences.c:1908
 msgid "Ask before writing to image files"
 msgstr "Frage nach bevor in eine Bilddatei geschrieben wird"
 
-#: ../src/preferences.c:1860
+#: ../src/preferences.c:1911
 msgid "Step 2 and 3: write to Geeqie private files"
 msgstr "Schritt 2 und 3: Speichern in Geeqies eigenen Dateien"
 
-#: ../src/preferences.c:1865
+#: ../src/preferences.c:1916
 msgid ""
 "Use GQview legacy metadata format (supports only keywords and comments) "
 "instead of XMP"
@@ -4222,12 +4295,12 @@
 "Benutze zu GQview kompatibles Metadatenformat (unterstützt nur "
 "Schlüsselwörter und Kommentare) anstelle XMP"
 
-#: ../src/preferences.c:1869
+#: ../src/preferences.c:1920
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
 # Gefällt mir noch nicht
-#: ../src/preferences.c:1870
+#: ../src/preferences.c:1921
 msgid ""
 "Write the same description tags (keywords, comment, etc.) to all grouped "
 "sidecars"
@@ -4235,250 +4308,262 @@
 "Speichere die selben Tags (Schlüsselwörter, Kommentare, ...) in alle "
 "gruppierten Dateien"
 
-#: ../src/preferences.c:1873
+#: ../src/preferences.c:1924
 msgid "Allow keywords to differ only in case"
 msgstr ""
 "Erlaube, daß Schlüsselworte sich nur in Groß-/Kleinschreibung unterscheiden"
 
-#: ../src/preferences.c:1876
+#: ../src/preferences.c:1927
 msgid "Write altered image orientation to the metadata"
 msgstr "Schreibe geänderte Bildausrichtung in die Metadaten"
 
-#: ../src/preferences.c:1882
+#: ../src/preferences.c:1933
 msgid "Auto-save options"
 msgstr "Optionen zum automatischen Speichern"
 
-#: ../src/preferences.c:1884
+#: ../src/preferences.c:1935
 msgid "Write metadata after timeout"
 msgstr "Schreibe Metadaten nach einer Zeitüberschreitung"
 
-#: ../src/preferences.c:1890
+#: ../src/preferences.c:1941
 msgid "Timeout (seconds):"
 msgstr "Zeitüberschreitung (in Sekunden):"
 
-#: ../src/preferences.c:1893
+#: ../src/preferences.c:1944
 msgid "Write metadata on image change"
 msgstr "Schreibe Metadaten beim Wechseln des Bildes"
 
-#: ../src/preferences.c:1896
+#: ../src/preferences.c:1947
 msgid "Write metadata on directory change"
 msgstr "Schreibe Metadaten beim Wechseln des Verzeichnisses"
 
-#: ../src/preferences.c:1910
+#: ../src/preferences.c:1987
+msgid "Perceptual"
+msgstr ""
+
+#: ../src/preferences.c:1989
+msgid "Relative Colorimetric"
+msgstr ""
+
+#: ../src/preferences.c:1993
+msgid "Absolute Colorimetric"
+msgstr ""
+
+#: ../src/preferences.c:2018
 msgid "Color management"
 msgstr "Farbverwaltung"
 
-#: ../src/preferences.c:1912
+#: ../src/preferences.c:2020
 msgid "Input profiles"
 msgstr "Quellprofil"
 
-#: ../src/preferences.c:1920
+#: ../src/preferences.c:2028
 msgid "Type"
 msgstr "Type"
 
-#: ../src/preferences.c:1923
+#: ../src/preferences.c:2031
 msgid "Menu name"
 msgstr "Menüname"
 
-#: ../src/preferences.c:1926
+#: ../src/preferences.c:2034
 msgid "File"
 msgstr "Datei"
 
-#: ../src/preferences.c:1934
+#: ../src/preferences.c:2042
 #, c-format
 msgid "Input %d:"
 msgstr "Profil %d:"
 
-#: ../src/preferences.c:1950 ../src/preferences.c:1970
+#: ../src/preferences.c:2058 ../src/preferences.c:2078
 msgid "Select color profile"
 msgstr "Farbprofil wählen"
 
-#: ../src/preferences.c:1958
+#: ../src/preferences.c:2066
 msgid "Screen profile"
 msgstr "Bildschirmprofil "
 
-#: ../src/preferences.c:1962
+#: ../src/preferences.c:2070
 msgid "Use system screen profile if available"
 msgstr "Benutze Bildschirmprofil des Systems wenn verfügbar"
 
-#: ../src/preferences.c:1967
+#: ../src/preferences.c:2075
 msgid "Screen:"
 msgstr "Bildschirmprofil:"
 
-#: ../src/preferences.c:1989 ../src/preferences.c:2030
+#: ../src/preferences.c:2081
+msgid "Render Intent:"
+msgstr ""
+
+#: ../src/preferences.c:2101 ../src/preferences.c:2142
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: ../src/preferences.c:1991 ../src/utilops.c:1998
+#: ../src/preferences.c:2103 ../src/utilops.c:2136
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/preferences.c:1993
+#: ../src/preferences.c:2105
 msgid "Confirm file delete"
 msgstr "Dateilöschung bestätigen"
 
-#: ../src/preferences.c:1995
+#: ../src/preferences.c:2107
 msgid "Enable Delete key"
 msgstr "Entfernen-Taste zum Löschen verwenden"
 
-#: ../src/preferences.c:1998
+#: ../src/preferences.c:2110
 msgid "Safe delete"
 msgstr "Papierkorb verwenden"
 
-#: ../src/preferences.c:2016
+#: ../src/preferences.c:2128
 msgid "Maximum size:"
 msgstr "maximale Größe:"
 
-#: ../src/preferences.c:2016
+#: ../src/preferences.c:2128
 msgid "MB"
 msgstr "MB"
 
-#: ../src/preferences.c:2018
+#: ../src/preferences.c:2130
 msgid "Set to 0 for unlimited size"
 msgstr "Auf 0 setzen für unbeschränkte Größe"
 
-#: ../src/preferences.c:2019
+#: ../src/preferences.c:2131
 msgid "View"
 msgstr "Ansicht"
 
-#: ../src/preferences.c:2032
-msgid "Rectangular selection in icon view"
-msgstr "rechteckige Auswahl in der Icon-Ansicht (bei Verwendung der Tastatur)"
-
-#: ../src/preferences.c:2035
+#: ../src/preferences.c:2144
 msgid "Descend folders in tree view"
 msgstr "Verzeichnisstruktur beim Start lesen"
 
-#: ../src/preferences.c:2038
+#: ../src/preferences.c:2147
 msgid "In place renaming"
 msgstr "schnelles Umbenennen (ohne Dialogfenster)"
 
-#: ../src/preferences.c:2041
-msgid "Open recent list maximum size"
-msgstr "Maximale Anzahl der kürzlich geöffneten Files"
-
-#: ../src/preferences.c:2044
+#: ../src/preferences.c:2150
+msgid "List directory view uses single click to enter"
+msgstr ""
+
+#: ../src/preferences.c:2153
+msgid "Recent folder list maximum size"
+msgstr ""
+
+#: ../src/preferences.c:2156
 msgid "Drag'n drop icon size"
 msgstr "Größe der Vorschau beim Klicken und Ziehen"
 
-#: ../src/preferences.c:2047
+#: ../src/preferences.c:2159
 msgid "Navigation"
 msgstr "Steuerung"
 
-#: ../src/preferences.c:2049
+#: ../src/preferences.c:2161
 msgid "Progressive keyboard scrolling"
 msgstr "beschleunigtes Scrollen bei Verwendung der Pfeiltasten"
 
-#: ../src/preferences.c:2051
+#: ../src/preferences.c:2163
+msgid "Keyboard scrolling step multiplier:"
+msgstr ""
+
+#: ../src/preferences.c:2165
 msgid "Mouse wheel scrolls image"
 msgstr ""
 "Mausrad scrollt Bild vertikal statt Bildwechsel (Bildwechsel mit Shift)"
 
-#: ../src/preferences.c:2054
-msgid "Similarities"
-msgstr "Ähnlichkeiten"
-
-#: ../src/preferences.c:2056
-msgid "Custom similarity threshold:"
-msgstr "Eigene Ähnlichkeitsschwelle für die Suche nach gleichen Bildern:"
-
-#: ../src/preferences.c:2058
-msgid "Rotation invariant duplicate check"
-msgstr "Dreh-invarianter Duplikat-Check"
-
-#: ../src/preferences.c:2062
+#: ../src/preferences.c:2167
+msgid "Navigation by left or middle click on image"
+msgstr ""
+
+#: ../src/preferences.c:2171
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../src/preferences.c:2064
+#: ../src/preferences.c:2173
 msgid "Debug level:"
 msgstr "Debuglevel:"
 
-#: ../src/preferences.c:2082
+#: ../src/preferences.c:2191
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../src/preferences.c:2084
+#: ../src/preferences.c:2193
 msgid "Accelerators"
 msgstr "Tastaturkürzel"
 
-#: ../src/preferences.c:2103
+#: ../src/preferences.c:2212
 msgid "Action"
 msgstr "Aktion"
 
-#: ../src/preferences.c:2125
+#: ../src/preferences.c:2234
 msgid "KEY"
 msgstr "SCHLÜSSEL"
 
-#: ../src/preferences.c:2136
+#: ../src/preferences.c:2245
 msgid "Tooltip"
 msgstr ""
 
-#: ../src/preferences.c:2167
+#: ../src/preferences.c:2276
 msgid "Reset selected"
 msgstr "Auswahl zurücksetzen"
 
-#: ../src/preferences.c:2183
+#: ../src/preferences.c:2292
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../src/preferences.c:2185 ../src/preferences.c:2188
+#: ../src/preferences.c:2294 ../src/preferences.c:2297
 msgid "Windowed stereo mode"
 msgstr "Fenster-Stereo-Modi"
 
-#: ../src/preferences.c:2192 ../src/preferences.c:2217
+#: ../src/preferences.c:2301 ../src/preferences.c:2326
 msgid "Mirror left image"
 msgstr "Linkes Bild spiegeln"
 
-#: ../src/preferences.c:2195 ../src/preferences.c:2220
+#: ../src/preferences.c:2304 ../src/preferences.c:2329
 msgid "Flip left image"
 msgstr "Linkes Bild wenden"
 
-#: ../src/preferences.c:2198 ../src/preferences.c:2223
+#: ../src/preferences.c:2307 ../src/preferences.c:2332
 msgid "Mirror right image"
 msgstr "Rechtes Bild spiegeln"
 
-#: ../src/preferences.c:2201 ../src/preferences.c:2226
+#: ../src/preferences.c:2310 ../src/preferences.c:2335
 msgid "Flip right image"
 msgstr "Rechtes Bild wenden"
 
-#: ../src/preferences.c:2203 ../src/preferences.c:2228
+#: ../src/preferences.c:2312 ../src/preferences.c:2337
 msgid "Swap left and right images"
 msgstr "Linkes und rechtes Bild vertauschen"
 
-#: ../src/preferences.c:2205 ../src/preferences.c:2230
+#: ../src/preferences.c:2314 ../src/preferences.c:2339
 msgid "Disable stereo mode on single image source"
 msgstr "Stereo-Modi bei einzelner Bilddatei abschalten"
 
-#: ../src/preferences.c:2208 ../src/preferences.c:2214
+#: ../src/preferences.c:2317 ../src/preferences.c:2323
 msgid "Fullscreen stereo mode"
 msgstr "Stereo-Vollbildmodus"
 
-#: ../src/preferences.c:2209
+#: ../src/preferences.c:2318
 msgid "Use different settings for fullscreen"
 msgstr "Unterschiedliche Einstellungen für Vollbild verwenden"
 
-#: ../src/preferences.c:2239
+#: ../src/preferences.c:2348
 msgid "Left X"
 msgstr "Links X"
 
-#: ../src/preferences.c:2241
+#: ../src/preferences.c:2350
 msgid "Left Y"
 msgstr "Links Y"
 
-#: ../src/preferences.c:2243
+#: ../src/preferences.c:2352
 msgid "Right X"
 msgstr "Rechts X"
 
-#: ../src/preferences.c:2245
+#: ../src/preferences.c:2354
 msgid "Right Y"
 msgstr "Rechts Y"
 
-#: ../src/preferences.c:2261
+#: ../src/preferences.c:2370
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/preferences.c:2409
+#: ../src/preferences.c:2524
 #, c-format
 msgid ""
 "%s %s\n"
@@ -4499,85 +4584,85 @@
 "\n"
 "Freigegeben unter der GNU General Public License"
 
-#: ../src/preferences.c:2428
+#: ../src/preferences.c:2543
 msgid "Credits..."
 msgstr "Mitwirkende..."
 
-#: ../src/print.c:124
+#: ../src/print.c:133
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../src/print.c:125
+#: ../src/print.c:134
 msgid "All"
 msgstr "alles"
 
-#: ../src/print.c:136
+#: ../src/print.c:145
 msgid "One image per page"
 msgstr "ein Bild je Seite"
 
-#: ../src/print.c:137
+#: ../src/print.c:146
 msgid "Proof sheet"
 msgstr "Prüfausdruck"
 
-#: ../src/print.c:150
+#: ../src/print.c:159
 msgid "Default printer"
 msgstr "Standarddrucker"
 
-#: ../src/print.c:151
+#: ../src/print.c:160
 msgid "Custom printer"
 msgstr "Spezieller Drucker"
 
-#: ../src/print.c:152
+#: ../src/print.c:161
 msgid "PostScript file"
 msgstr "PostScript-Datei"
 
-#: ../src/print.c:153
+#: ../src/print.c:162
 msgid "Image file"
 msgstr "Bild-Datei"
 
-#: ../src/print.c:167
+#: ../src/print.c:176
 msgid "jpeg, low quality"
 msgstr "jpeg, niedrige Qualität"
 
-#: ../src/print.c:168
+#: ../src/print.c:177
 msgid "jpeg, normal quality"
 msgstr "jpeg, mittlere Qualität"
 
-#: ../src/print.c:169
+#: ../src/print.c:178
 msgid "jpeg, high quality"
 msgstr "jpeg, hohe Qualität"
 
-#: ../src/print.c:365 ../src/print.c:3212
+#: ../src/print.c:374 ../src/print.c:3221
 msgid "points"
 msgstr "Punkte"
 
-#: ../src/print.c:366
+#: ../src/print.c:375
 msgid "millimeters"
 msgstr "mm"
 
-#: ../src/print.c:367
+#: ../src/print.c:376
 msgid "centimeters"
 msgstr "cm"
 
-#: ../src/print.c:368
+#: ../src/print.c:377
 msgid "inches"
 msgstr "Zoll"
 
-#: ../src/print.c:369
+#: ../src/print.c:378
 msgid "picas"
 msgstr "Pica"
 
-#: ../src/print.c:381
+#: ../src/print.c:390
 msgid "Letter"
 msgstr "Letter"
 
 #. in 8.5 x 11
-#: ../src/print.c:382
+#: ../src/print.c:391
 msgid "Legal"
 msgstr "Legal"
 
 #. in 8.5 x 14
-#: ../src/print.c:383
+#: ../src/print.c:392
 msgid "Executive"
 msgstr "Executive"
 
@@ -4593,60 +4678,60 @@
 #. mm 250 x 353
 #. mm 176 x 250
 #. mm 125 x 176
-#: ../src/print.c:395
+#: ../src/print.c:404
 msgid "Envelope #10"
 msgstr "Umschlag #10"
 
 #. in 4.125 x 9.5
-#: ../src/print.c:396
+#: ../src/print.c:405
 msgid "Envelope #9"
 msgstr "Umschlag #9"
 
 #. in 3.875 x 8.875
-#: ../src/print.c:397
+#: ../src/print.c:406
 msgid "Envelope C4"
 msgstr "Umschlag C4"
 
 #. mm 229 x 324
-#: ../src/print.c:398
+#: ../src/print.c:407
 msgid "Envelope C5"
 msgstr "Umschlag C5"
 
 #. mm 162 x 229
-#: ../src/print.c:399
+#: ../src/print.c:408
 msgid "Envelope C6"
 msgstr "Umschlag C6"
 
 #. mm 114 x 162
-#: ../src/print.c:400
+#: ../src/print.c:409
 msgid "Photo 6x4"
 msgstr "Foto 6x4 (Zoll)"
 
 #. in 6   x 4
-#: ../src/print.c:401
+#: ../src/print.c:410
 msgid "Photo 8x10"
 msgstr "Foto 8x10 (Zoll)"
 
 #. in 8   x 10
-#: ../src/print.c:402
+#: ../src/print.c:411
 msgid "Postcard"
 msgstr "Postcard"
 
 #. mm 100 x 148
-#: ../src/print.c:403
+#: ../src/print.c:412
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: ../src/print.c:559
+#: ../src/print.c:568
 #, c-format
 msgid "page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../src/print.c:751
+#: ../src/print.c:760
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../src/print.c:1059
+#: ../src/print.c:1068
 #, c-format
 msgid ""
 "Unable to open pipe for writing.\n"
@@ -4655,147 +4740,147 @@
 "Fehler beim Öffnen der Pipe zum Schreiben.\n"
 "%s"
 
-#: ../src/print.c:1074 ../src/print.c:1466 ../src/ui_pathsel.c:423
+#: ../src/print.c:1083 ../src/print.c:1475 ../src/ui_pathsel.c:432
 #, c-format
 msgid "A file with name %s already exists."
 msgstr "Datei %s existiert bereits."
 
-#: ../src/print.c:1089 ../src/print.c:1521
+#: ../src/print.c:1098 ../src/print.c:1530
 #, c-format
 msgid "Failure writing to file %s"
 msgstr "Fehler beim Schreiben der Datei %s"
 
-#: ../src/print.c:1144 ../src/print.c:1181 ../src/print.c:1217
-#: ../src/print.c:1334 ../src/print.c:1407
+#: ../src/print.c:1153 ../src/print.c:1190 ../src/print.c:1226
+#: ../src/print.c:1343 ../src/print.c:1416
 msgid "SIGPIPE error writing to printer."
 msgstr "SIGPIPE-Fehler beim Drucken."
 
-#: ../src/print.c:1942
+#: ../src/print.c:1951
 #, c-format
 msgid "Page %d"
 msgstr "Seite %d"
 
-#: ../src/print.c:1964 ../src/print.c:1969
+#: ../src/print.c:1973 ../src/print.c:1978
 msgid "Printing error"
 msgstr "Druckerfehler"
 
-#: ../src/print.c:1968
+#: ../src/print.c:1977
 #, c-format
 msgid "An error occured printing to %s."
 msgstr "Fehler beim Drucken zu %s"
 
-#: ../src/print.c:1972
+#: ../src/print.c:1981
 msgid "Details"
 msgstr "Details"
 
-#: ../src/print.c:2587 ../src/print.c:3341
+#: ../src/print.c:2596 ../src/print.c:3350
 msgid "Print"
 msgstr "Drucken"
 
-#: ../src/print.c:2591
+#: ../src/print.c:2600
 #, c-format
 msgid "Printing %d pages to %s."
 msgstr "Drucke %d Seiten zu %s"
 
-#: ../src/print.c:2691
+#: ../src/print.c:2700
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/print.c:2766
+#: ../src/print.c:2775
 msgid "Units:"
 msgstr "Einheit:"
 
-#: ../src/print.c:2810
+#: ../src/print.c:2819
 msgid "Orientation:"
 msgstr "Orientierung:"
 
-#: ../src/print.c:2942
+#: ../src/print.c:2951
 msgid "Destination:"
 msgstr "Ziel:"
 
-#: ../src/print.c:2990
+#: ../src/print.c:2999
 msgid "<printer name>"
 msgstr "<Druckername>"
 
-#: ../src/print.c:3079
+#: ../src/print.c:3088
 msgid "Unlimited"
 msgstr "unbegrenzt"
 
-#: ../src/print.c:3197
+#: ../src/print.c:3206
 msgid "Show"
 msgstr "Zusätzliche Drucktexte"
 
-#: ../src/print.c:3368
+#: ../src/print.c:3377
 msgid "Source"
 msgstr "Quelle"
 
-#: ../src/print.c:3380
+#: ../src/print.c:3389
 msgid "Image size:"
 msgstr "Bildgröße:"
 
-#: ../src/print.c:3384
+#: ../src/print.c:3393
 msgid "Proof size:"
 msgstr "Bildgröße:"
 
-#: ../src/print.c:3410
+#: ../src/print.c:3419
 msgid "Paper"
 msgstr "Papier"
 
-#: ../src/print.c:3433
+#: ../src/print.c:3442
 msgid "Margins"
 msgstr "Ränder"
 
-#: ../src/print.c:3435
+#: ../src/print.c:3444
 msgid "Left:"
 msgstr "links:"
 
-#: ../src/print.c:3438
+#: ../src/print.c:3447
 msgid "Right:"
 msgstr "rechts:"
 
-#: ../src/print.c:3441
+#: ../src/print.c:3450
 msgid "Top:"
 msgstr "oben:"
 
-#: ../src/print.c:3444
+#: ../src/print.c:3453
 msgid "Bottom:"
 msgstr "unten:"
 
-#: ../src/print.c:3453
+#: ../src/print.c:3462
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../src/print.c:3459
+#: ../src/print.c:3468
 msgid "Custom printer:"
 msgstr "Spezieller Drucker:"
 
-#: ../src/print.c:3468
+#: ../src/print.c:3477
 msgid "File:"
 msgstr "Datei:"
 
-#: ../src/print.c:3477
+#: ../src/print.c:3486
 msgid "File format:"
 msgstr "Dateityp:"
 
-#: ../src/print.c:3482
+#: ../src/print.c:3491
 msgid "DPI:"
 msgstr "DPI:"
 
-#: ../src/print.c:3490
+#: ../src/print.c:3499
 msgid "Remember print settings"
 msgstr "Druckeinstellungen merken"
 
-#: ../src/rcfile.c:81
+#: ../src/rcfile.c:91
 #, c-format
 msgid "Option %s ignored: %s\n"
 msgstr "Option %s ignoriert: %s\n"
 
-#: ../src/rcfile.c:468
+#: ../src/rcfile.c:512
 #, c-format
 msgid "error saving config file: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: %s\n"
 
-#: ../src/rcfile.c:526
+#: ../src/rcfile.c:570
 #, c-format
 msgid ""
 "error saving config file: %s\n"
@@ -4805,116 +4890,120 @@
 "Fehler: %s\n"
 
 #. short, long                  callback,               extra, prefer, parameter, description
-#: ../src/remote.c:640
+#: ../src/remote.c:659
 msgid "next image"
 msgstr "nächstes Bild"
 
-#: ../src/remote.c:641
+#: ../src/remote.c:660
 msgid "previous image"
 msgstr "vorheriges Bild"
 
-#: ../src/remote.c:642
+#: ../src/remote.c:661
 msgid "first image"
 msgstr "erstes Bild"
 
-#: ../src/remote.c:643
+#: ../src/remote.c:662
 msgid "last image"
 msgstr "letztes Bild"
 
-#: ../src/remote.c:644
+#: ../src/remote.c:663
 msgid "toggle full screen"
 msgstr "Vollbildmodus umschalten"
 
-#: ../src/remote.c:645
+#: ../src/remote.c:664
 msgid "start full screen"
 msgstr "Vollbild ein"
 
-#: ../src/remote.c:646
+#: ../src/remote.c:665
 msgid "stop full screen"
 msgstr "Vollbild aus"
 
-#: ../src/remote.c:647
+#: ../src/remote.c:666
 msgid "toggle slide show"
 msgstr "Diashowmodus umschalten"
 
-#: ../src/remote.c:648
+#: ../src/remote.c:667
 msgid "start slide show"
 msgstr "Diashow ein"
 
-#: ../src/remote.c:649
+#: ../src/remote.c:668
 msgid "stop slide show"
 msgstr "Diashow aus"
 
-#: ../src/remote.c:650
+#: ../src/remote.c:669
 msgid "<FOLDER>"
 msgstr "<VERZEICHNIS>"
 
-#: ../src/remote.c:650
+#: ../src/remote.c:669
 msgid "start recursive slide show in FOLDER"
 msgstr "starte rekursive Diashow in VERZEICHNIS"
 
-#: ../src/remote.c:651
+#: ../src/remote.c:670
 msgid "<[N][.M]>"
 msgstr "<[N][.M]>"
 
-#: ../src/remote.c:651
+#: ../src/remote.c:670
 msgid "set slide show delay to N.M seconds"
 msgstr "Diashowverzögerung auf N.M Sekunden setzen"
 
-#: ../src/remote.c:652
+#: ../src/remote.c:671
 msgid "show tools"
 msgstr "Werkzeuge anzeigen"
 
-#: ../src/remote.c:653
+#: ../src/remote.c:672
 msgid "hide tools"
 msgstr "Werkzeuge verbergen"
 
-#: ../src/remote.c:654
+#: ../src/remote.c:673
 msgid "quit"
 msgstr "beenden"
 
-#: ../src/remote.c:655 ../src/remote.c:656 ../src/remote.c:657
-#: ../src/remote.c:658 ../src/remote.c:659 ../src/remote.c:661
+#: ../src/remote.c:674 ../src/remote.c:675 ../src/remote.c:676
+#: ../src/remote.c:677 ../src/remote.c:679 ../src/remote.c:681
 msgid "<FILE>"
 msgstr "<DATEI>"
 
-#: ../src/remote.c:655
+#: ../src/remote.c:674
 msgid "load configuration from FILE"
 msgstr "Lade Konfiguration aus FILE"
 
-#: ../src/remote.c:656
+#: ../src/remote.c:675
 msgid "get list of sidecars of FILE"
 msgstr "Liste der \"Sidecars\" der DATEI zurückgeben"
 
-#: ../src/remote.c:657
+#: ../src/remote.c:676
 msgid "get destination path of FILE"
 msgstr "Zielpfad der DATEI zurückgeben"
 
-#: ../src/remote.c:658
+#: ../src/remote.c:677
 msgid "open FILE"
 msgstr "öffne DATEI"
 
-#: ../src/remote.c:659
+#: ../src/remote.c:678
+msgid "print filename of current image"
+msgstr ""
+
+#: ../src/remote.c:679
 msgid "open FILE in new window"
 msgstr "DATEI in neuem Fenster öffnen"
 
-#: ../src/remote.c:660
+#: ../src/remote.c:680
 msgid "clear command line collection list"
 msgstr "Kommandozeilensammlungen löschen"
 
-#: ../src/remote.c:661
+#: ../src/remote.c:681
 msgid "add FILE to command line collection list"
 msgstr "Füge Datei zu Kommandozeilensammlung hinzu"
 
-#: ../src/remote.c:662
+#: ../src/remote.c:682
 msgid "bring the Geeqie window to the top"
 msgstr "Geeqie-Fenster nach oben bringen"
 
-#: ../src/remote.c:727
+#: ../src/remote.c:747
 msgid "Remote command list:\n"
 msgstr "Fernsteuerbefehle:\n"
 
-#: ../src/remote.c:746
+#: ../src/remote.c:766
 msgid ""
 "\n"
 "  All other command line parameters are used as plain files if they exists.\n"
@@ -4923,209 +5012,213 @@
 "  Alle weiteren Kommandozeilenparameter werden als Dateien angesehen wenn "
 "sie existieren.\n"
 
-#: ../src/remote.c:796
+#: ../src/remote.c:816
 #, c-format
 msgid "Remote %s not running, starting..."
 msgstr "Entfernter %s läuft nicht. Starte ihn ..."
 
-#: ../src/remote.c:932
+#: ../src/remote.c:952
 msgid "Remote not available\n"
 msgstr "Fernbedienung nicht möglich\n"
 
-#: ../src/search.c:212
+#: ../src/search.c:221
 msgid "folder"
 msgstr "im Verzeichnis"
 
-#: ../src/search.c:213
+#: ../src/search.c:222
 msgid "comments"
 msgstr "Kommentare"
 
-#: ../src/search.c:214
+#: ../src/search.c:223
 msgid "results"
 msgstr "in den letzten Suchergebnissen"
 
-#: ../src/search.c:218 ../src/search.c:243
+#: ../src/search.c:227 ../src/search.c:252
 msgid "contains"
 msgstr "beinhaltet"
 
-#: ../src/search.c:219
+#: ../src/search.c:228
 msgid "is"
 msgstr "ist"
 
-#: ../src/search.c:223 ../src/search.c:230
+#: ../src/search.c:232 ../src/search.c:239
 msgid "equal to"
 msgstr "gleich"
 
-#: ../src/search.c:224
+#: ../src/search.c:233
 msgid "less than"
 msgstr "kleiner als"
 
-#: ../src/search.c:225
+#: ../src/search.c:234
 msgid "greater than"
 msgstr "größer als"
 
-#: ../src/search.c:226 ../src/search.c:233
+#: ../src/search.c:235 ../src/search.c:242
 msgid "between"
 msgstr "zwischen"
 
-#: ../src/search.c:231
+#: ../src/search.c:240
 msgid "before"
 msgstr "vor"
 
-#: ../src/search.c:232
+#: ../src/search.c:241
 msgid "after"
 msgstr "nach"
 
-#: ../src/search.c:237
+#: ../src/search.c:246
 msgid "match all"
 msgstr "wovon alle vorkommen müssen"
 
-#: ../src/search.c:238
+#: ../src/search.c:247
 msgid "match any"
 msgstr "wovon mind. 1 davon vorkommt"
 
-#: ../src/search.c:239
+#: ../src/search.c:248
 msgid "exclude"
 msgstr "welche nicht vorkommen dürfen"
 
-#: ../src/search.c:244
+#: ../src/search.c:253
 msgid "miss"
 msgstr "enthält nicht"
 
-#: ../src/search.c:295
+#: ../src/search.c:304
 #, c-format
 msgid "%s, %d files (%s, %d)"
 msgstr "%s, %d Dateien (%s, %d)"
 
-#: ../src/search.c:300
+#: ../src/search.c:309
 #, c-format
 msgid "%s, %d files"
 msgstr "%s, %d Dateien"
 
-#: ../src/search.c:318
+#: ../src/search.c:327
 msgid "Searching..."
 msgstr "Suche..."
 
-#: ../src/search.c:2120
+#: ../src/search.c:2147
 msgid "File not found"
 msgstr "Datei nicht vorhanden"
 
-#: ../src/search.c:2121
+#: ../src/search.c:2148
 msgid "Please enter an existing file for image content."
 msgstr "Bitte wählen Sie eine vorhandene Datei für die Ähnlichkeitssuche"
 
-#: ../src/search.c:2170
+#: ../src/search.c:2197
 msgid "Please enter an existing folder to search."
 msgstr "Bitte wählen Sie ein vorhandenes Verzeichnis für die Suche."
 
-#: ../src/search.c:2588
+#: ../src/search.c:2615
 msgid "Image search"
 msgstr "Bilder suchen"
 
-#: ../src/search.c:2618
+#: ../src/search.c:2645
 msgid "Search:"
 msgstr "Suche:"
 
-#: ../src/search.c:2632
+#: ../src/search.c:2659
 msgid "Recurse"
 msgstr "rekursiv"
 
-#: ../src/search.c:2637
+#: ../src/search.c:2664
 msgid "File name"
 msgstr "Dateiname"
 
-#: ../src/search.c:2643 ../src/search.c:2738
+#: ../src/search.c:2670 ../src/search.c:2767
 msgid "Match case"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../src/search.c:2648
+#: ../src/search.c:2675
 msgid "File size is"
 msgstr "Dateigröße ist"
 
-#: ../src/search.c:2655 ../src/search.c:2671 ../src/search.c:2690
+#: ../src/search.c:2682 ../src/search.c:2698 ../src/search.c:2719
 msgid "and"
 msgstr "und"
 
-#: ../src/search.c:2661
+#: ../src/search.c:2688
 msgid "File date is"
 msgstr "Dateidatum ist"
 
-#: ../src/search.c:2679
+#: ../src/search.c:2703
+msgid "Exif date"
+msgstr "Exif-Datum"
+
+#: ../src/search.c:2708
 msgid "Image dimensions are"
 msgstr "Bildgröße ist"
 
-#: ../src/search.c:2700
+#: ../src/search.c:2729
 msgid "Image content is"
 msgstr "Bildinhalt ist"
 
-#: ../src/search.c:2706
+#: ../src/search.c:2735
 #, no-c-format
 msgid "% similar to"
 msgstr "% ähnlich zu"
 
-#: ../src/search.c:2788
+#: ../src/search.c:2817
 msgid "Rank"
 msgstr "Nr."
 
-#: ../src/secure_save.c:397
+#: ../src/secure_save.c:406
 msgid "Cannot read the file"
 msgstr "Datei kann nicht gelesen werden"
 
-#: ../src/secure_save.c:399
+#: ../src/secure_save.c:408
 msgid "Cannot get file status"
 msgstr "Dateistatus kann nicht gelesen werden"
 
-#: ../src/secure_save.c:401
+#: ../src/secure_save.c:410
 msgid "Cannot access the file"
 msgstr "Auf Datei kann nicht zugegriffen werden"
 
-#: ../src/secure_save.c:403
+#: ../src/secure_save.c:412
 msgid "Cannot create temp file"
 msgstr "Temporäre Datei kann nicht erzeugt werden"
 
-#: ../src/secure_save.c:405
+#: ../src/secure_save.c:414
 msgid "Cannot rename the file"
 msgstr "Datei kann nicht umbenannt werden"
 
-#: ../src/secure_save.c:407
+#: ../src/secure_save.c:416
 msgid "File saving disabled by option"
 msgstr "Speichern der Datei durch Option abgeschaltet"
 
-#: ../src/secure_save.c:409
+#: ../src/secure_save.c:418
 msgid "Out of memory"
 msgstr "Kein Hauptspeicher mehr verfügbar"
 
-#: ../src/secure_save.c:411
+#: ../src/secure_save.c:420
 msgid "Cannot write the file"
 msgstr "Die Datei kann nicht geschrieben werden"
 
-#: ../src/secure_save.c:415
+#: ../src/secure_save.c:424
 msgid "Secure file saving error"
 msgstr "Sichers Speichern der Datei fehlgeschlagen"
 
-#: ../src/thumb.c:392
+#: ../src/thumb.c:400
 msgid "Thumbnail image in cache failed to load, trying to recreate.\n"
 msgstr ""
 "Laden des Vorschaubildes ist fehlgeschlagen, versuche es neu zu erstellen.\n"
 
-#: ../src/trash.c:80 ../src/utilops.c:2461 ../src/utilops.c:2472
-#: ../src/utilops.c:2529
+#: ../src/trash.c:88 ../src/utilops.c:2601 ../src/utilops.c:2612
+#: ../src/utilops.c:2669
 msgid "Delete failed"
 msgstr "Fehler beim Löschen"
 
-#: ../src/trash.c:81
+#: ../src/trash.c:89
 msgid "Unable to remove old file from trash folder"
 msgstr "Fehler beim Löschen einer alter Dateien aus dem Papierkorb."
 
-#: ../src/trash.c:138
+#: ../src/trash.c:146
 msgid "Could not create folder"
 msgstr "Fehler beim Erstellen des Verzeichnisses"
 
-#: ../src/trash.c:160
+#: ../src/trash.c:168
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../src/trash.c:170
+#: ../src/trash.c:178
 #, c-format
 msgid ""
 "Unable to access or create the trash folder.\n"
@@ -5134,20 +5227,20 @@
 "Fehler beim Erstellen oder Zugreifen auf  das Papierkorb-Verzeichnis:\n"
 "%s"
 
-#: ../src/trash.c:174
+#: ../src/trash.c:182
 msgid "Turn off safe delete"
 msgstr "Verwendung des Papierkorbes abschalten"
 
-#: ../src/trash.c:193
+#: ../src/trash.c:201
 msgid "Deletion by external command"
 msgstr "Löschen mit externem Kommando"
 
-#: ../src/trash.c:201
+#: ../src/trash.c:209
 #, c-format
 msgid " (max. %d MB)"
 msgstr " (max. %d MB)"
 
-#: ../src/trash.c:205
+#: ../src/trash.c:213
 #, c-format
 msgid ""
 "Safe delete: %s%s\n"
@@ -5156,40 +5249,40 @@
 "Sichers Löschen: %s%s\n"
 "Müll: %s"
 
-#: ../src/trash.c:210
+#: ../src/trash.c:218
 #, c-format
 msgid "Safe delete: %s"
 msgstr "Papierkorb verwenden: %s"
 
-#: ../src/ui_bookmark.c:130 ../src/ui_bookmark.c:193
+#: ../src/ui_bookmark.c:139 ../src/ui_bookmark.c:202
 msgid "New Bookmark"
 msgstr "Neues Lesezeichen"
 
-#: ../src/ui_bookmark.c:276 ../src/ui_bookmark.c:282
+#: ../src/ui_bookmark.c:285 ../src/ui_bookmark.c:291
 msgid "Edit Bookmark"
 msgstr "Lesezeichen bearbeiten"
 
-#: ../src/ui_bookmark.c:297
+#: ../src/ui_bookmark.c:306
 msgid "Path:"
 msgstr "Pfad:"
 
-#: ../src/ui_bookmark.c:306
+#: ../src/ui_bookmark.c:315
 msgid "Icon:"
 msgstr "Icon:"
 
-#: ../src/ui_bookmark.c:312
+#: ../src/ui_bookmark.c:321
 msgid "Select icon"
 msgstr "Icon-Auswahl"
 
-#: ../src/ui_bookmark.c:405
+#: ../src/ui_bookmark.c:414
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: ../src/ui_bookmark.c:411
+#: ../src/ui_bookmark.c:420
 msgid "_Remove"
 msgstr "Ent_fernen"
 
-#: ../src/ui_fileops.c:67
+#: ../src/ui_fileops.c:76
 msgid ""
 "One or more filenames are not encoded with the preferred locale character "
 "set.\n"
@@ -5197,12 +5290,12 @@
 "Ein oder mehrere Dateinamen sind nicht mit der bevorzugten Zeichenkodierung "
 "kodiert.\n"
 
-#: ../src/ui_fileops.c:68
+#: ../src/ui_fileops.c:77
 #, c-format
 msgid "Operations on, and display of these files with %s may not succeed.\n"
 msgstr "Bearbeiten und Anzeigen der Dateien mit %s könnte fehlschlagen.\n"
 
-#: ../src/ui_fileops.c:70
+#: ../src/ui_fileops.c:79
 msgid ""
 "If your filenames are not encoded in utf-8, try setting the environment "
 "variable G_BROKEN_FILENAMES=1\n"
@@ -5210,16 +5303,16 @@
 "Wenn Deine Dateinamen nicht UTF-8-kodiert sind, versuche die "
 "Umgebungsvariable G_BROKEN_FILENAMES auf 1 zu setzen\n"
 
-#: ../src/ui_fileops.c:72
+#: ../src/ui_fileops.c:81
 #, c-format
 msgid "It appears G_BROKEN_FILENAMES is set to %s\n"
 msgstr "G_BROKEN_FILENAMES scheint auf %s gesetzt zu sein\n"
 
-#: ../src/ui_fileops.c:74
+#: ../src/ui_fileops.c:83
 msgid "It appears G_BROKEN_FILENAMES is not set\n"
 msgstr "G_BROKEN_FILENAMES scheint nicht gesetzt zu sein\n"
 
-#: ../src/ui_fileops.c:76
+#: ../src/ui_fileops.c:85
 #, c-format
 msgid ""
 "The locale appears to be set to \"%s\"\n"
@@ -5228,7 +5321,7 @@
 "Die Lokalisierung scheint auf \"%s\" gesetzt zu sein\n"
 "(Durch LANG-Umgebungsvariable gesetzt)\n"
 
-#: ../src/ui_fileops.c:81
+#: ../src/ui_fileops.c:90
 msgid ""
 "\n"
 "Preferred encoding appears to be UTF-8, however the file:\n"
@@ -5236,25 +5329,25 @@
 "\n"
 "Vorgezogene Kodierung scheint UTF-8 zu sein aber die Datei\n"
 
-#: ../src/ui_fileops.c:82 ../src/ui_fileops.c:85 ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:91 ../src/ui_fileops.c:94 ../src/ui_fileops.c:96
 msgid "[name not displayable]"
 msgstr "[Name nicht anzeigbar]"
 
-#: ../src/ui_fileops.c:85
+#: ../src/ui_fileops.c:94
 #, c-format
 msgid "\"%s\" is encoded in valid UTF-8."
 msgstr "\"%s\" ist UTF-8-kodiert."
 
-#: ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:96
 #, c-format
 msgid "\"%s\" is not encoded in valid UTF-8."
 msgstr "\"%s\" ist nicht UTF-8-kodiert."
 
-#: ../src/ui_fileops.c:92 ../src/ui_fileops.c:97
+#: ../src/ui_fileops.c:101 ../src/ui_fileops.c:106
 msgid "Filename encoding locale mismatch"
 msgstr "Dateinamenkodierung stimmt nicht mit den Locale-Einstellungen überein"
 
-#: ../src/ui_help.c:110
+#: ../src/ui_help.c:119
 #, c-format
 msgid ""
 "Unable to load:\n"
@@ -5263,33 +5356,33 @@
 "Fehler beim Laden der Datei:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:424 ../src/ui_pathsel.c:430 ../src/utilops.c:2160
-#: ../src/utilops.c:2187 ../src/utilops.c:2653
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2300
+#: ../src/utilops.c:2327 ../src/utilops.c:2793
 msgid "Rename failed"
 msgstr "Umbenennen fehlgeschlagen"
 
-#: ../src/ui_pathsel.c:429
+#: ../src/ui_pathsel.c:438
 #, c-format
 msgid "Failed to rename %s to %s."
 msgstr "Fehler beim Umbenennen der Datei %s nach %s"
 
-#: ../src/ui_pathsel.c:625 ../src/ui_pathsel.c:633
+#: ../src/ui_pathsel.c:634 ../src/ui_pathsel.c:642
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/ui_pathsel.c:627 ../src/ui_pathsel.c:637
+#: ../src/ui_pathsel.c:636 ../src/ui_pathsel.c:646
 msgid "Add _Bookmark"
 msgstr "Lesezeichen hin_zufügen"
 
-#: ../src/ui_pathsel.c:635
+#: ../src/ui_pathsel.c:644
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/ui_pathsel.c:742 ../src/ui_pathsel.c:1047 ../src/utilops.c:2687
+#: ../src/ui_pathsel.c:751 ../src/ui_pathsel.c:1056 ../src/utilops.c:2827
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-#: ../src/ui_pathsel.c:752
+#: ../src/ui_pathsel.c:761
 #, c-format
 msgid ""
 "Unable to create folder:\n"
@@ -5298,35 +5391,35 @@
 "Fehler beim Anlegen des Verzeichnisses:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:753
+#: ../src/ui_pathsel.c:762
 msgid "Error creating folder"
 msgstr "Fehler beim Anlegen des Verzeichnisses"
 
-#: ../src/ui_pathsel.c:978
+#: ../src/ui_pathsel.c:987
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../src/ui_pathsel.c:1050
+#: ../src/ui_pathsel.c:1059
 msgid "Show hidden"
 msgstr "versteckte Objekte anzeigen"
 
-#: ../src/ui_pathsel.c:1134
+#: ../src/ui_pathsel.c:1143
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/ui_tabcomp.c:924
+#: ../src/ui_tabcomp.c:933
 msgid "Select path"
 msgstr "Verzeichnis-/Dateiauswahl"
 
-#: ../src/ui_tabcomp.c:940
+#: ../src/ui_tabcomp.c:949
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/uri_utils.c:35
+#: ../src/uri_utils.c:43
 msgid "Drag and Drop failed"
 msgstr "Drag&Drop fehlgeschlagen"
 
-#: ../src/utilops.c:547
+#: ../src/utilops.c:590
 msgid ""
 "\n"
 " Continue multiple file operation?"
@@ -5334,11 +5427,11 @@
 "\n"
 " Mit mehreren Dateioperationen fortfahren?"
 
-#: ../src/utilops.c:554 ../src/utilops.c:987
+#: ../src/utilops.c:597 ../src/utilops.c:1030
 msgid "Co_ntinue"
 msgstr "_Fortsetzen"
 
-#: ../src/utilops.c:731
+#: ../src/utilops.c:774
 #, c-format
 msgid ""
 "Removal of folder contents failed at this file:\n"
@@ -5349,7 +5442,7 @@
 "\n"
 "%s"
 
-#: ../src/utilops.c:875
+#: ../src/utilops.c:918
 #, c-format
 msgid ""
 "%s\n"
@@ -5358,103 +5451,107 @@
 "%s\n"
 "Externes Kommando kann nicht gestartet werden.\n"
 
-#: ../src/utilops.c:955
+#. 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:998 ../src/utilops.c:1150
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s ist kein Verzeichnis"
 
-#: ../src/utilops.c:985
+#: ../src/utilops.c:1028
 msgid "Really continue?"
 msgstr "Wirklich fortfahren?"
 
-#: ../src/utilops.c:999
+#: ../src/utilops.c:1042 ../src/utilops.c:1155
 msgid "This operation can't continue:"
 msgstr "Die Operation kann nicht weitergeführt werden:"
 
-#: ../src/utilops.c:1377 ../src/utilops.c:1490 ../src/utilops.c:1874
+#: ../src/utilops.c:1492 ../src/utilops.c:1605 ../src/utilops.c:2012
 msgid "Discard changes"
 msgstr "Änderungen verwerfen"
 
-#: ../src/utilops.c:1378 ../src/utilops.c:1491 ../src/utilops.c:1824
-#: ../src/utilops.c:1840
+#: ../src/utilops.c:1493 ../src/utilops.c:1606 ../src/utilops.c:1962
+#: ../src/utilops.c:1978
 msgid "File details"
 msgstr "Details der Datei"
 
-#: ../src/utilops.c:1400 ../src/utilops.c:1498
+#: ../src/utilops.c:1515 ../src/utilops.c:1613
 msgid "Sidecars"
 msgstr "\"Sidecars\""
 
-#: ../src/utilops.c:1402
+#: ../src/utilops.c:1517
 msgid "Write to file"
 msgstr "In Datei schreiben"
 
-#: ../src/utilops.c:1442
+#: ../src/utilops.c:1557
 msgid "Choose the destination folder."
 msgstr "Bitte das Zielverzeichnis auswählen:"
 
-#: ../src/utilops.c:1500
+#: ../src/utilops.c:1615
 msgid "New name"
 msgstr "Neuer Name"
 
-#: ../src/utilops.c:1530
+#: ../src/utilops.c:1652
 msgid "Manual rename"
 msgstr "Von Hand umbenennen"
 
-#: ../src/utilops.c:1535
+#: ../src/utilops.c:1657
 msgid "Original name:"
 msgstr "Originalname:"
 
-#: ../src/utilops.c:1538
+#: ../src/utilops.c:1660
 msgid "New name:"
 msgstr "Neuer Name:"
 
-#: ../src/utilops.c:1551
+#: ../src/utilops.c:1673
 msgid "Auto rename"
 msgstr "automatisches Umbenennen"
 
-#: ../src/utilops.c:1557
+#: ../src/utilops.c:1679
 msgid "Begin text"
 msgstr "Textanfang"
 
-#: ../src/utilops.c:1565 ../src/utilops.c:1597
+#: ../src/utilops.c:1687 ../src/utilops.c:1719
 msgid "Start #"
 msgstr "Anfangsnr. "
 
-#: ../src/utilops.c:1571
+#: ../src/utilops.c:1693
 msgid "End text"
 msgstr "Textende"
 
-#: ../src/utilops.c:1579
+#: ../src/utilops.c:1701
 msgid "Padding:"
 msgstr "Auffüllen:"
 
-#: ../src/utilops.c:1584
+#: ../src/utilops.c:1706
 msgid "Formatted rename"
 msgstr "Formatiertes Umbenennen"
 
-#: ../src/utilops.c:1589
+#: ../src/utilops.c:1711
 msgid "Format (* = original name, ## = numbers)"
 msgstr "Format (* = originaler Name, ## = Nummern)"
 
-#: ../src/utilops.c:1727
+#: ../src/utilops.c:1865
 msgid "Another operation in progress.\n"
 msgstr "Eine andere Operation wird zur Zeit ausgeführt.\n"
 
-#: ../src/utilops.c:1783
+#: ../src/utilops.c:1921
 #, c-format
 msgid "File: '%s'\n"
 msgstr "Datei: '%s'\n"
 
-#: ../src/utilops.c:1788
+#: ../src/utilops.c:1926
 msgid "with sidecar files:\n"
 msgstr "mit \"Sidecar\"-Dateien:\n"
 
-#: ../src/utilops.c:1794
+#: ../src/utilops.c:1932
 #, c-format
 msgid " '%s'\n"
 msgstr "'%s'\n"
 
-#: ../src/utilops.c:1798
+#: ../src/utilops.c:1936
 msgid ""
 "\n"
 "Status: "
@@ -5462,119 +5559,119 @@
 "\n"
 "Status:"
 
-#: ../src/utilops.c:1810
+#: ../src/utilops.c:1948
 msgid "no problem detected"
 msgstr "kein Problem aufgetreten"
 
-#: ../src/utilops.c:1826 ../src/utilops.c:1873
+#: ../src/utilops.c:1964 ../src/utilops.c:2011
 msgid "Exclude file"
 msgstr "Datei ausschließen"
 
-#: ../src/utilops.c:1871 ../src/utilops.c:1896
+#: ../src/utilops.c:2009 ../src/utilops.c:2034
 msgid "Overview of changed metadata"
 msgstr "Übersicht der geänderten Metadaten"
 
-#: ../src/utilops.c:1889
+#: ../src/utilops.c:2027
 #, c-format
 msgid ""
 "The following metadata tags will be written to\n"
 "'%s'."
 msgstr "Die folgenden Metadaten werden nach '%s' gespeichert."
 
-#: ../src/utilops.c:1893
+#: ../src/utilops.c:2031
 #, c-format
 msgid "The following metadata tags will be written to the image file itself."
 msgstr "Die folgenden Metadaten werden ins Bild selbst gespeichert."
 
-#: ../src/utilops.c:1999
+#: ../src/utilops.c:2137
 msgid "Delete files?"
 msgstr "Dateien löschen?"
 
-#: ../src/utilops.c:2000
-msgid "This will delete the following files"
-msgstr "Das wird die folgenden Dateien löschen"
-
-#: ../src/utilops.c:2019
-msgid "Can't write metadata"
-msgstr "Metadaten konnten nicht gespeichert werden"
-
-#: ../src/utilops.c:2042
-msgid "Write metadata"
-msgstr "Metadaten schreiben"
-
-#: ../src/utilops.c:2043
-msgid "Write metadata?"
-msgstr "Metadaten schreiben?"
-
-#: ../src/utilops.c:2044
-msgid "This will write the changed metadata into the following files"
-msgstr "Das wird die geänderten Metadaten in folgende Dateien schreiben"
-
-#: ../src/utilops.c:2046
-msgid "Metadata writing failed"
-msgstr "Speichern der Metadaten fehlgeschlagen"
-
-#: ../src/utilops.c:2065 ../src/utilops.c:2092
-msgid "Move failed"
-msgstr "Verschieben fehlgeschlagen"
-
-#: ../src/utilops.c:2089
-msgid "Move files?"
-msgstr "Dateien verschieben?"
-
-#: ../src/utilops.c:2090
-msgid "This will move the following files"
-msgstr "Das wird folgende Dateien verschieben"
-
-#: ../src/utilops.c:2114 ../src/utilops.c:2141
-msgid "Copy failed"
-msgstr "Kopieren fehlgeschlagen"
-
 #: ../src/utilops.c:2138
+msgid "This will delete the following files"
+msgstr "Das wird die folgenden Dateien löschen"
+
+#: ../src/utilops.c:2157
+msgid "Can't write metadata"
+msgstr "Metadaten konnten nicht gespeichert werden"
+
+#: ../src/utilops.c:2180
+msgid "Write metadata"
+msgstr "Metadaten schreiben"
+
+#: ../src/utilops.c:2181
+msgid "Write metadata?"
+msgstr "Metadaten schreiben?"
+
+#: ../src/utilops.c:2182
+msgid "This will write the changed metadata into the following files"
+msgstr "Das wird die geänderten Metadaten in folgende Dateien schreiben"
+
+#: ../src/utilops.c:2184
+msgid "Metadata writing failed"
+msgstr "Speichern der Metadaten fehlgeschlagen"
+
+#: ../src/utilops.c:2203 ../src/utilops.c:2231
+msgid "Move failed"
+msgstr "Verschieben fehlgeschlagen"
+
+#: ../src/utilops.c:2228
+msgid "Move files?"
+msgstr "Dateien verschieben?"
+
+#: ../src/utilops.c:2229
+msgid "This will move the following files"
+msgstr "Das wird folgende Dateien verschieben"
+
+#: ../src/utilops.c:2253 ../src/utilops.c:2281
+msgid "Copy failed"
+msgstr "Kopieren fehlgeschlagen"
+
+#: ../src/utilops.c:2278
 msgid "Copy files?"
 msgstr "Dateien kopieren?"
 
-#: ../src/utilops.c:2139 ../src/utilops.c:2273
+#: ../src/utilops.c:2279 ../src/utilops.c:2413
 msgid "This will copy the following files"
 msgstr "Das kopiert die folgenden Dateien"
 
-#: ../src/utilops.c:2183 ../src/utilops.c:2649
+#: ../src/utilops.c:2323 ../src/utilops.c:2789
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../src/utilops.c:2184
+#: ../src/utilops.c:2324
 msgid "Rename files?"
 msgstr "Dateien umbenennen?"
 
-#: ../src/utilops.c:2185
+#: ../src/utilops.c:2325
 msgid "This will rename the following files"
 msgstr "Das wird folgende Dateien umbenennen"
 
-#: ../src/utilops.c:2237
+#: ../src/utilops.c:2377
 msgid "Can't run external editor"
 msgstr "Externer Editor kann nicht gestartet werden"
 
-#: ../src/utilops.c:2271
+#: ../src/utilops.c:2411
 msgid "Editor"
 msgstr "Editor"
 
-#: ../src/utilops.c:2272
+#: ../src/utilops.c:2412
 msgid "Run editor?"
 msgstr "Editor starten?"
 
-#: ../src/utilops.c:2275
+#: ../src/utilops.c:2415
 msgid "External command failed"
 msgstr "Ausführung des externen Programms fehlgeschlagen"
 
-#: ../src/utilops.c:2444 ../src/utilops.c:2517
+#: ../src/utilops.c:2584 ../src/utilops.c:2657
 msgid "Delete folder"
 msgstr "Verzeichnis löschen"
 
-#: ../src/utilops.c:2445
+#: ../src/utilops.c:2585
 msgid "Delete symbolic link?"
 msgstr "Symbolische Verknüpfung löschen?"
 
-#: ../src/utilops.c:2447
+#: ../src/utilops.c:2587
 msgid ""
 "This will delete the symbolic link.\n"
 "The folder this link points to will not be deleted."
@@ -5582,11 +5679,11 @@
 "Das löscht den symbolischen Link.\n"
 "Das Verzeichnis, auf das der Link zeigt, wird nicht gelöscht werden."
 
-#: ../src/utilops.c:2449
+#: ../src/utilops.c:2589
 msgid "Link deletion failed"
 msgstr "Löschen der Verknüpfung fehlgeschlagen"
 
-#: ../src/utilops.c:2459
+#: ../src/utilops.c:2599
 #, c-format
 msgid ""
 "Unable to remove folder %s\n"
@@ -5595,16 +5692,16 @@
 "Verzeichnis %s kann nicht gelöscht werden da\n"
 "die Berechtigungen nicht erlauben, in das Verzeichnis zu schreiben."
 
-#: ../src/utilops.c:2471 ../src/utilops.c:2528
+#: ../src/utilops.c:2611 ../src/utilops.c:2668
 #, c-format
 msgid "Unable to list contents of folder %s"
 msgstr "Der Inhalt des Verzeichnis %s kann nicht angezeigt werden"
 
-#: ../src/utilops.c:2485 ../src/utilops.c:2493
+#: ../src/utilops.c:2625 ../src/utilops.c:2633
 msgid "Folder contains subfolders"
 msgstr "Das Verzeichnis enthält Unterverzeichnisse"
 
-#: ../src/utilops.c:2489
+#: ../src/utilops.c:2629
 #, c-format
 msgid ""
 "Unable to delete the folder:\n"
@@ -5620,19 +5717,19 @@
 "Das Verzeichnis enthält Unterverzeichnisse, die zuerst verschoben werden "
 "müssen bevor es gelöscht werden kann."
 
-#: ../src/utilops.c:2497
+#: ../src/utilops.c:2637
 msgid "Subfolders:"
 msgstr "Unterverzeichnisse:"
 
-#: ../src/utilops.c:2518
+#: ../src/utilops.c:2658
 msgid "Delete folder?"
 msgstr "Verzeichnis löschen?"
 
-#: ../src/utilops.c:2519
+#: ../src/utilops.c:2659
 msgid "The folder contains these files:"
 msgstr "Das Verzeichnis enthält diese Dateien:"
 
-#: ../src/utilops.c:2520
+#: ../src/utilops.c:2660
 msgid ""
 "This will delete the folder.\n"
 "The contents of this folder will also be deleted."
@@ -5640,87 +5737,87 @@
 "Das löscht das Verzeichnis.\n"
 "Der Inhalt des Verzeichnis wird auch gelöscht."
 
-#: ../src/utilops.c:2650
+#: ../src/utilops.c:2790
 msgid "Rename folder?"
 msgstr "Verzeichnis umbenennen?"
 
-#: ../src/utilops.c:2651
+#: ../src/utilops.c:2791
 msgid "The folder contains the following files"
 msgstr "Das Verzeichnis enthält die folgenden Dateien"
 
-#: ../src/utilops.c:2697
+#: ../src/utilops.c:2837
 msgid "Create Folder"
 msgstr "Verzeichnis erstellen"
 
-#: ../src/utilops.c:2698
+#: ../src/utilops.c:2838
 msgid "Create folder?"
 msgstr "Verzeichnis löschen?"
 
-#: ../src/utilops.c:2701
+#: ../src/utilops.c:2841
 msgid "Can't create folder"
 msgstr "Verzeichnis konnte nicht erstellt werden"
 
-#: ../src/view_dir.c:397
+#: ../src/view_dir.c:406
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../src/view_dir.c:399
+#: ../src/view_dir.c:408
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../src/view_dir.c:644
+#: ../src/view_dir.c:653
 msgid "_Up to parent"
 msgstr "Ein Verzeichnis _höher"
 
-#: ../src/view_dir.c:649
+#: ../src/view_dir.c:658
 msgid "_Slideshow"
 msgstr "_Diashow"
 
-#: ../src/view_dir.c:651
+#: ../src/view_dir.c:660
 msgid "Slideshow recursive"
 msgstr "Dia_show (rekursiv)"
 
-#: ../src/view_dir.c:655
+#: ../src/view_dir.c:664
 msgid "Find _duplicates..."
 msgstr "Du_plikate suchen..."
 
-#: ../src/view_dir.c:657
+#: ../src/view_dir.c:666
 msgid "Find duplicates recursive..."
 msgstr "Du_plikate rekursiv suchen..."
 
-#: ../src/view_dir.c:662
+#: ../src/view_dir.c:671
 msgid "_New folder..."
 msgstr "Neues _Verzeichnis..."
 
-#: ../src/view_dir.c:676 ../src/view_file.c:619
+#: ../src/view_dir.c:685 ../src/view_file.c:655
 msgid "View as _List"
 msgstr "Als _Liste anzeigen"
 
-#: ../src/view_dir.c:679
+#: ../src/view_dir.c:688
 msgid "View as _Tree"
 msgstr "Als _Baum anzeigen"
 
-#: ../src/view_dir.c:684
+#: ../src/view_dir.c:693
 msgid "Show _hidden files"
 msgstr "Versteckte Dateien anzeigen"
 
-#: ../src/view_dir.c:687 ../src/view_file.c:637
+#: ../src/view_dir.c:696 ../src/view_file.c:673
 msgid "Re_fresh"
 msgstr "A_ktualisieren"
 
-#: ../src/view_file.c:622
+#: ../src/view_file.c:658
 msgid "View as _Icons"
 msgstr "_Iconansicht"
 
-#: ../src/view_file.c:628
+#: ../src/view_file.c:664
 msgid "Show _thumbnails"
 msgstr "_Vorschaubilder anzeigen"
 
-#: ../src/view_file_icon.c:2098 ../src/view_file_list.c:825
+#: ../src/view_file_icon.c:2123 ../src/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[KEINE GRUPPIERUNG]"
 
-#: ../src/view_file_list.c:451
+#: ../src/view_file_list.c:460
 #, c-format
 msgid ""
 "Invalid file name:\n"
@@ -5729,10 +5826,22 @@
 "Ungültiger Dateiname:\n"
 "%s"
 
-#: ../src/view_file_list.c:452
+#: ../src/view_file_list.c:461
 msgid "Error renaming file"
 msgstr "Fehler beim Umbenennen der Datei"
 
-#: ../src/window.c:252
+#: ../src/window.c:261
 msgid "Help"
 msgstr "Hilfe"
+
+#~ msgid "Add keywords"
+#~ msgstr "Schlüsselworte hinzufügen"
+
+#~ msgid "Auto rotate image using Exif information"
+#~ msgstr "Automatisch gemäß Exif-Daten drehen"
+
+#~ msgid "Similarities"
+#~ msgstr "Ähnlichkeiten"
+
+#~ msgid "Rotation invariant duplicate check"
+#~ msgstr "Dreh-invarianter Duplikat-Check"
--- a/po/pl.po	Fri Jan 13 18:10:38 2017 +0200
+++ b/po/pl.po	Wed Apr 26 23:33:20 2017 +0300
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-19 17:35+0100\n"
-"PO-Revision-Date: 2016-05-25 23:55+0200\n"
+"POT-Creation-Date: 2017-01-08 16:31+0100\n"
+"PO-Revision-Date: 2017-01-08 17:41+0100\n"
 "Last-Translator: Tomasz Golinski <tomaszg@math.uwb.edu.pl>\n"
 "Language-Team: \n"
 "Language: pl\n"
@@ -55,170 +55,170 @@
 msgid "UFRaw Batch recursive"
 msgstr "ufraw-batch rekurencyjnie"
 
-#: ../src/advanced_exif.c:328 ../src/cache_maint.c:1111
-#: ../src/preferences.c:94 ../src/preferences.c:1754
+#: ../src/advanced_exif.c:336 ../src/cache_maint.c:1128
+#: ../src/preferences.c:109 ../src/preferences.c:1875
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../src/advanced_exif.c:376 ../src/preferences.c:1668
+#: ../src/advanced_exif.c:384 ../src/preferences.c:1789
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/advanced_exif.c:377
+#: ../src/advanced_exif.c:385
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2642
-#: ../src/dupe.c:3129 ../src/print.c:3199 ../src/search.c:2790
-#: ../src/utilops.c:462 ../src/view_file_list.c:1980
+#: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2650
+#: ../src/dupe.c:3137 ../src/print.c:3208 ../src/search.c:2798
+#: ../src/utilops.c:505 ../src/view_file_list.c:1989
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/advanced_exif.c:379
+#: ../src/advanced_exif.c:387
 msgid "Tag"
 msgstr "Znacznik"
 
-#: ../src/advanced_exif.c:380
+#: ../src/advanced_exif.c:388
 msgid "Format"
 msgstr "Format"
 
-#: ../src/advanced_exif.c:381
+#: ../src/advanced_exif.c:389
 msgid "Elements"
 msgstr "Elementy"
 
 #. default sidebar
-#: ../src/bar.c:167
+#: ../src/bar.c:175
 msgid "Histogram"
 msgstr "Histogram"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:176
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../src/bar.c:169 ../src/search.c:2717
+#: ../src/bar.c:177 ../src/search.c:2725
 msgid "Keywords"
 msgstr "Słowa kluczowe"
 
-#: ../src/bar.c:170 ../src/search.c:2729
+#: ../src/bar.c:178 ../src/search.c:2737
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:179
 msgid "Exif"
 msgstr "Exif"
 
 #. other pre-configured panes
-#: ../src/bar.c:173
+#: ../src/bar.c:181
 msgid "File info"
 msgstr "Informacje o pliku"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:182
 msgid "Location and GPS"
 msgstr "Położenie i GPS"
 
-#: ../src/bar.c:175 ../src/exif.c:348
+#: ../src/bar.c:183 ../src/exif.c:342
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: ../src/bar.c:178 ../src/bar_gps.c:756
+#: ../src/bar.c:186 ../src/bar_gps.c:817
 msgid "GPS Map"
 msgstr "Mapa GPS"
 
-#: ../src/bar.c:297
+#: ../src/bar.c:305
 msgid "Move to _top"
 msgstr "Przesuń na _szczyt"
 
-#: ../src/bar.c:298 ../src/ui_bookmark.c:407
+#: ../src/bar.c:306 ../src/ui_bookmark.c:416
 msgid "Move _up"
 msgstr "Przesuń w _górę"
 
-#: ../src/bar.c:299 ../src/ui_bookmark.c:409
+#: ../src/bar.c:307 ../src/ui_bookmark.c:418
 msgid "Move _down"
 msgstr "Przesuń w _dół"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:308
 msgid "Move to _bottom"
 msgstr "Przesuń na s_pód"
 
-#: ../src/bar.c:302
+#: ../src/bar.c:310
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../src/bar_comment.c:195
+#: ../src/bar_comment.c:203
 msgid "Add text to selected files"
 msgstr "Dodaj tekst do wybranych plików"
 
-#: ../src/bar_comment.c:196
+#: ../src/bar_comment.c:204
 msgid "Replace existing text in selected files"
 msgstr "Zastąp istniejący tekst w zaznaczonych plikach"
 
-#: ../src/bar_exif.c:213
+#: ../src/bar_exif.c:221
 msgid "<empty label, fixme>"
 msgstr ""
 
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559
 msgid "Configure entry"
 msgstr "Skonfiguruj pole"
 
 #. for the pane
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551 ../src/bar_exif.c:624
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559 ../src/bar_exif.c:632
 msgid "Add entry"
 msgstr "Dodaj pole"
 
-#: ../src/bar_exif.c:557
+#: ../src/bar_exif.c:565
 msgid "Key:"
 msgstr "Klucz:"
 
-#: ../src/bar_exif.c:566
+#: ../src/bar_exif.c:574
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/bar_exif.c:575
+#: ../src/bar_exif.c:583
 msgid "Show only if set"
 msgstr "Pokazuj tylko jeśli dostępne"
 
-#: ../src/bar_exif.c:576
+#: ../src/bar_exif.c:584
 msgid "Editable (supported only for XMP)"
 msgstr "Edytowalny (obsługiwane tylko dla XMP)"
 
 #. for the entry
-#: ../src/bar_exif.c:612
+#: ../src/bar_exif.c:620
 #, c-format
 msgid "Configure \"%s\""
 msgstr "Skonfiguruj \"%s\""
 
-#: ../src/bar_exif.c:613 ../src/bar_keywords.c:1189
+#: ../src/bar_exif.c:621 ../src/bar_keywords.c:1198
 #, c-format
 msgid "Remove \"%s\""
 msgstr "Usuń \"%s\""
 
-#: ../src/bar_exif.c:625
+#: ../src/bar_exif.c:633
 msgid "Show hidden entries"
 msgstr "Pokaż ukryte pola"
 
-#: ../src/bar_gps.c:483
+#: ../src/bar_gps.c:544
 #, c-format
 msgid "Zoom %i"
 msgstr "Powiększenie %i"
 
-#: ../src/bar_gps.c:501
+#: ../src/bar_gps.c:562
 #, c-format
 msgid "Zoom level %i"
 msgstr "Skala powiększenia %i"
 
-#: ../src/bar_gps.c:506
+#: ../src/bar_gps.c:567
 msgid "Loading map"
 msgstr "Wczytywanie mapy"
 
-#: ../src/bar_gps.c:572
+#: ../src/bar_gps.c:633
 msgid "Enable markers"
 msgstr "Wyświetl znaczniki"
 
-#: ../src/bar_gps.c:574
+#: ../src/bar_gps.c:635
 msgid "Centre map on marker"
 msgstr "Wyśrodkuj mapę na znaczniku"
 
-#: ../src/bar_gps.c:596
+#: ../src/bar_gps.c:657
 msgid ""
 "Move map centre to marker\n"
 " is disabled"
@@ -226,7 +226,7 @@
 "Przesuwanie środka mapy do znacznika\n"
 "jest wyłączone"
 
-#: ../src/bar_gps.c:601
+#: ../src/bar_gps.c:662
 msgid ""
 "Move map centre to marker\n"
 " is enabled"
@@ -234,130 +234,127 @@
 "Przesuwanie środka mapy do znacznika\n"
 "jest włączone"
 
-#: ../src/bar_gps.c:610
+#: ../src/bar_gps.c:671
 msgid "Map Centreing"
 msgstr "Środkowanie mapy"
 
 #. use the same strings as in layout_util.c
-#: ../src/bar_histogram.c:249 ../src/layout_util.c:1430
+#: ../src/bar_histogram.c:257 ../src/layout_util.c:1603
 msgid "Histogram on _Red"
 msgstr "Histogram cze_rwonego"
 
-#: ../src/bar_histogram.c:250 ../src/layout_util.c:1431
+#: ../src/bar_histogram.c:258 ../src/layout_util.c:1604
 msgid "Histogram on _Green"
 msgstr "Histogram zielone_go"
 
-#: ../src/bar_histogram.c:251 ../src/layout_util.c:1432
+#: ../src/bar_histogram.c:259 ../src/layout_util.c:1605
 msgid "Histogram on _Blue"
 msgstr "Histogram nie_bieskiego"
 
-#: ../src/bar_histogram.c:252 ../src/layout_util.c:1433
+#: ../src/bar_histogram.c:260 ../src/layout_util.c:1606
 msgid "_Histogram on RGB"
 msgstr "_Histogram RGB"
 
-#: ../src/bar_histogram.c:253 ../src/layout_util.c:1434
+#: ../src/bar_histogram.c:261 ../src/layout_util.c:1607
 msgid "Histogram on _Value"
 msgstr "Histogram jasności (HS_V)"
 
-#: ../src/bar_histogram.c:257 ../src/layout_util.c:1438
+#: ../src/bar_histogram.c:265 ../src/layout_util.c:1611
 msgid "Li_near Histogram"
 msgstr "Histogram l_iniowy"
 
-#: ../src/bar_histogram.c:258
+#: ../src/bar_histogram.c:266
 msgid "L_og Histogram"
 msgstr "Histogram _logarytmiczny"
 
-#: ../src/bar_keywords.c:403
+#: ../src/bar_keywords.c:412
 msgid "Add keywords to selected files"
 msgstr "Dodaj słowo kluczowe do zaznaczonych plików"
 
-#: ../src/bar_keywords.c:404
+#: ../src/bar_keywords.c:413
 msgid "Replace existing keywords in selected files"
 msgstr "Zastąp istniejące słowa kluczowa w zaznaczonych plikach"
 
-#: ../src/bar_keywords.c:875
+#: ../src/bar_keywords.c:884
 msgid "Edit keyword"
 msgstr "Edytuj słowo kluczowe"
 
-#: ../src/bar_keywords.c:875
-msgid "Add keywords"
-msgstr "Dodaj słowa kluczowe"
-
-#: ../src/bar_keywords.c:882
+#: ../src/bar_keywords.c:884 ../src/bar_keywords.c:891
+#: ../src/bar_keywords.c:1152
+msgid "New keyword"
+msgstr "Nowe słowo kluczowe"
+
+#: ../src/bar_keywords.c:891
 msgid "Configure keyword"
 msgstr "Skonfiguruj słowo kluczowe"
 
-#: ../src/bar_keywords.c:882 ../src/bar_keywords.c:1143
-msgid "Add keyword"
-msgstr "Dodaj słowo kluczowe"
-
-#: ../src/bar_keywords.c:888
+#: ../src/bar_keywords.c:897
 msgid "Keyword:"
 msgstr "Słowo kluczowe:"
 
-#: ../src/bar_keywords.c:897
+#: ../src/bar_keywords.c:906
 msgid "Keyword type:"
 msgstr "Typ słowa kluczowego:"
 
-#: ../src/bar_keywords.c:899
+#: ../src/bar_keywords.c:908
 msgid "Active keyword"
 msgstr "Aktywne"
 
-#: ../src/bar_keywords.c:902
+#: ../src/bar_keywords.c:911
 msgid "Helper"
 msgstr "Pomocnicze"
 
-#: ../src/bar_keywords.c:1147
+#: ../src/bar_keywords.c:1156
 msgid "Add keyword to all selected images"
 msgstr "Dodaj słowo kluczowe do wszystkich zaznaczonych obrazów"
 
-#: ../src/bar_keywords.c:1167
+#: ../src/bar_keywords.c:1176
 #, c-format
 msgid "Hide \"%s\""
 msgstr "Ukryj \"%s\""
 
-#: ../src/bar_keywords.c:1174
+#: ../src/bar_keywords.c:1183
 #, c-format
 msgid "Mark %d"
 msgstr "Znacznik %d"
 
-#: ../src/bar_keywords.c:1179
+#: ../src/bar_keywords.c:1188
 #, c-format
 msgid "Connect \"%s\" to mark"
 msgstr "Powiąż \"%s\" z znacznikiem"
 
-#: ../src/bar_keywords.c:1186
+#: ../src/bar_keywords.c:1195
 #, c-format
 msgid "Edit \"%s\""
 msgstr "Edytuj \"%s\""
 
-#: ../src/bar_keywords.c:1196
+#: ../src/bar_keywords.c:1205
 #, c-format
 msgid "Disconnect \"%s\" from mark %s"
 msgstr "Usuń powiązanie \"%s\" z znacznikiem %s"
 
 #. for the pane
-#: ../src/bar_keywords.c:1208 ../src/bar_keywords.c:1217
+#: ../src/bar_keywords.c:1217 ../src/bar_keywords.c:1226
 msgid "Expand checked"
 msgstr "Rozwiń zaznaczone"
 
-#: ../src/bar_keywords.c:1209 ../src/bar_keywords.c:1218
+#: ../src/bar_keywords.c:1218 ../src/bar_keywords.c:1227
 msgid "Collapse unchecked"
 msgstr "Zwiń niezaznaczone"
 
-#: ../src/bar_keywords.c:1210 ../src/bar_keywords.c:1219
+#: ../src/bar_keywords.c:1219 ../src/bar_keywords.c:1228
 msgid "Hide unchecked"
 msgstr "Ukryj niezaznaczone"
 
-#: ../src/bar_keywords.c:1211
+#: ../src/bar_keywords.c:1220
 msgid "Show all"
 msgstr "Pokaż wszystko"
 
-#: ../src/bar_keywords.c:1214
+#: ../src/bar_keywords.c:1223
 msgid "On any change"
 msgstr "Przy każdej zmianie"
 
-#: ../src/bar_sort.c:449
+#: ../src/bar_sort.c:457
 #, c-format
 msgid ""
 "The collection:\n"
@@ -368,11 +365,11 @@
 "%s\n"
 "już istnieje."
 
-#: ../src/bar_sort.c:450
+#: ../src/bar_sort.c:458
 msgid "Collection exists"
 msgstr "Kolekcja istnieje"
 
-#: ../src/bar_sort.c:464 ../src/collect.c:1043 ../src/collect-dlg.c:85
+#: ../src/bar_sort.c:472 ../src/collect.c:1051 ../src/collect-dlg.c:93
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
@@ -381,55 +378,56 @@
 "Zapisanie kolekcji nie powiodło się:\n"
 "%s"
 
-#: ../src/bar_sort.c:465 ../src/collect.c:1044 ../src/collect-dlg.c:86
+#: ../src/bar_sort.c:473 ../src/collect.c:1052 ../src/collect-dlg.c:94
 msgid "Save Failed"
 msgstr "Zapis nie powiódł się"
 
-#: ../src/bar_sort.c:500 ../src/bar_sort.c:670
+#: ../src/bar_sort.c:508 ../src/bar_sort.c:678
 msgid "Add Bookmark"
 msgstr "Dodanie zakładki"
 
-#: ../src/bar_sort.c:504
+#: ../src/bar_sort.c:512
 msgid "Add Collection"
 msgstr "Dodaj kolekcję"
 
-#: ../src/bar_sort.c:521 ../src/ui_bookmark.c:288
+#: ../src/bar_sort.c:529 ../src/ui_bookmark.c:297
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/bar_sort.c:597
+#: ../src/bar_sort.c:605
 msgid "Sort Manager"
 msgstr "Menedżer Sortowania"
 
-#: ../src/bar_sort.c:606 ../src/pan-view.c:2194 ../src/ui_pathsel.c:1097
+#: ../src/bar_sort.c:614 ../src/pan-view/pan-view.c:2210
+#: ../src/ui_pathsel.c:1106
 msgid "Folders"
 msgstr "Katalogi"
 
-#: ../src/bar_sort.c:607 ../src/options.c:160
+#: ../src/bar_sort.c:615 ../src/options.c:174
 msgid "Collections"
 msgstr "Kolekcje"
 
-#: ../src/bar_sort.c:615 ../src/utilops.c:2137
+#: ../src/bar_sort.c:623 ../src/utilops.c:2277
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: ../src/bar_sort.c:618 ../src/utilops.c:2088
+#: ../src/bar_sort.c:626 ../src/utilops.c:2227
 msgid "Move"
 msgstr "Przenieś"
 
-#: ../src/bar_sort.c:657
+#: ../src/bar_sort.c:665
 msgid "Add image"
 msgstr "Dodaj obraz"
 
-#: ../src/bar_sort.c:660
+#: ../src/bar_sort.c:668
 msgid "Add selection"
 msgstr "Dodaj zaznaczone"
 
-#: ../src/bar_sort.c:673
+#: ../src/bar_sort.c:681
 msgid "Undo last image"
 msgstr "Cofnij ostatni obraz"
 
-#: ../src/cache.c:163
+#: ../src/cache.c:172
 #, c-format
 msgid ""
 "error saving sim cache data: %s\n"
@@ -438,77 +436,77 @@
 "błąd przy zapisie cache danych podobieństwa: %s\n"
 "błąd: %s\n"
 
-#: ../src/cache_maint.c:110 ../src/cache_maint.c:549 ../src/cache_maint.c:765
-#: ../src/editors.c:1177
+#: ../src/cache_maint.c:120 ../src/cache_maint.c:559 ../src/cache_maint.c:775
+#: ../src/editors.c:1185
 msgid "done"
 msgstr "ukończono"
 
-#: ../src/cache_maint.c:288
+#: ../src/cache_maint.c:298
 msgid "Removing old metadata..."
 msgstr "Usuwanie starych metadanych..."
 
-#: ../src/cache_maint.c:292
+#: ../src/cache_maint.c:302
 msgid "Clearing cached thumbnails..."
 msgstr "Czyszczenie cache miniatur..."
 
-#: ../src/cache_maint.c:296 ../src/cache_maint.c:923
+#: ../src/cache_maint.c:306 ../src/cache_maint.c:933
 msgid "Removing old thumbnails..."
 msgstr "Usuwanie starych miniatur..."
 
-#: ../src/cache_maint.c:299 ../src/cache_maint.c:926
+#: ../src/cache_maint.c:309 ../src/cache_maint.c:936
 msgid "Maintenance"
 msgstr "Zarządzanie"
 
-#: ../src/cache_maint.c:660
+#: ../src/cache_maint.c:670
 msgid "Invalid folder"
 msgstr "Nieprawidłowy folder"
 
-#: ../src/cache_maint.c:661
+#: ../src/cache_maint.c:671
 msgid "The specified folder can not be found."
 msgstr "Wybrany folder nie został znaleziony."
 
-#: ../src/cache_maint.c:692 ../src/cache_maint.c:706 ../src/cache_maint.c:1102
+#: ../src/cache_maint.c:702 ../src/cache_maint.c:716 ../src/cache_maint.c:1119
 msgid "Create thumbnails"
 msgstr "Utwórz miniaturki"
 
-#: ../src/cache_maint.c:700 ../src/cache_maint.c:933
+#: ../src/cache_maint.c:710 ../src/cache_maint.c:943
 msgid "S_tart"
 msgstr "S_tart"
 
-#: ../src/cache_maint.c:713 ../src/preferences.c:1941
+#: ../src/cache_maint.c:723 ../src/preferences.c:2123
 msgid "Folder:"
 msgstr "Katalog:"
 
-#: ../src/cache_maint.c:716
+#: ../src/cache_maint.c:726
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: ../src/cache_maint.c:720
+#: ../src/cache_maint.c:730
 msgid "Include subfolders"
 msgstr "Dołącz podkatalogi"
 
-#: ../src/cache_maint.c:721
+#: ../src/cache_maint.c:731
 msgid "Store thumbnails local to source images"
 msgstr "Zapisuj miniaturki lokalnie"
 
-#: ../src/cache_maint.c:730 ../src/cache_maint.c:942
+#: ../src/cache_maint.c:740 ../src/cache_maint.c:952
 msgid "click start to begin"
 msgstr "kliknij start, aby rozpocząć"
 
-#: ../src/cache_maint.c:869 ../src/editors.c:1103
+#: ../src/cache_maint.c:879 ../src/editors.c:1111
 msgid "running..."
 msgstr "przetwarzanie..."
 
-#: ../src/cache_maint.c:918
+#: ../src/cache_maint.c:928
 msgid "Clearing thumbnails..."
 msgstr "Czyszczenie miniatur..."
 
-#: ../src/cache_maint.c:984 ../src/cache_maint.c:987 ../src/cache_maint.c:1080
-#: ../src/cache_maint.c:1097
+#: ../src/cache_maint.c:994 ../src/cache_maint.c:997 ../src/cache_maint.c:1097
+#: ../src/cache_maint.c:1114
 msgid "Clear cache"
 msgstr "Wyczyść cache"
 
-#: ../src/cache_maint.c:988
+#: ../src/cache_maint.c:998
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
@@ -516,73 +514,73 @@
 "Zostaną usunięte wszystkie miniaturki\n"
 "zapisane na dysku, kontynuować?"
 
-#: ../src/cache_maint.c:1030
+#: ../src/cache_maint.c:1045
 #, c-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
 
-#: ../src/cache_maint.c:1055
+#: ../src/cache_maint.c:1070
 msgid "Cache Maintenance"
 msgstr "Zarządzanie cache miniaturek"
 
-#: ../src/cache_maint.c:1065
+#: ../src/cache_maint.c:1082
 msgid "Cache and Data Maintenance"
 msgstr "Zarządzanie cache i danymi"
 
-#: ../src/cache_maint.c:1069
+#: ../src/cache_maint.c:1086
 msgid "Thumbnail cache"
 msgstr "Cache miniaturek"
 
-#: ../src/cache_maint.c:1075 ../src/cache_maint.c:1092
-#: ../src/cache_maint.c:1117
+#: ../src/cache_maint.c:1092 ../src/cache_maint.c:1109
+#: ../src/cache_maint.c:1134
 msgid "Clean up"
 msgstr "Uporządkuj"
 
-#: ../src/cache_maint.c:1078 ../src/cache_maint.c:1095
+#: ../src/cache_maint.c:1095 ../src/cache_maint.c:1112
 msgid "Remove orphaned or outdated thumbnails."
 msgstr "Usuń porzucone lub nieaktualne miniaturki."
 
-#: ../src/cache_maint.c:1083 ../src/cache_maint.c:1100
+#: ../src/cache_maint.c:1100 ../src/cache_maint.c:1117
 msgid "Delete all cached thumbnails."
 msgstr "Skasuj wszystkie miniaturki z cache."
 
-#: ../src/cache_maint.c:1086
+#: ../src/cache_maint.c:1103
 msgid "Shared thumbnail cache"
 msgstr "Wspołdzielone cache miniaturek"
 
-#: ../src/cache_maint.c:1106
+#: ../src/cache_maint.c:1123
 msgid "Render"
 msgstr "Utwórz"
 
-#: ../src/cache_maint.c:1109
+#: ../src/cache_maint.c:1126
 msgid "Render thumbnails for a specific folder."
 msgstr "Utwórz miniaturki dla wybranego katalogu."
 
-#: ../src/cache_maint.c:1120
+#: ../src/cache_maint.c:1137
 msgid "Remove orphaned keywords and comments."
 msgstr "Usuń porzucone/przestarzałe słowa kluczowe i komentarze."
 
 #. When does this occur ??
-#: ../src/collect.c:331 ../src/image.c:160 ../src/image-overlay.c:532
-#: ../src/image-overlay.c:609
+#: ../src/collect.c:339 ../src/image.c:168 ../src/image-overlay.c:541
+#: ../src/image-overlay.c:618
 msgid "Untitled"
 msgstr "BezNazwy"
 
-#: ../src/collect.c:335
+#: ../src/collect.c:343
 #, c-format
 msgid "Untitled (%d)"
 msgstr "BezNazwy (%d)"
 
-#: ../src/collect.c:968
+#: ../src/collect.c:976
 #, c-format
 msgid "%s - Collection - %s"
 msgstr "%s - Kolekcja - %s"
 
-#: ../src/collect.c:1080 ../src/collect.c:1084
+#: ../src/collect.c:1088 ../src/collect.c:1092
 msgid "Close collection"
 msgstr "Zamknij kolekcję"
 
-#: ../src/collect.c:1085
+#: ../src/collect.c:1093
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
@@ -590,11 +588,11 @@
 "Kolekcja została zmodyfikowana.\n"
 "Czy najpierw zapisać?"
 
-#: ../src/collect.c:1088
+#: ../src/collect.c:1096
 msgid "_Discard"
 msgstr "Pomiń"
 
-#: ../src/collect-dlg.c:59
+#: ../src/collect-dlg.c:67
 #, c-format
 msgid ""
 "Specified path:\n"
@@ -605,67 +603,67 @@
 "%s\n"
 "jest folderem, kolekcje są plikami"
 
-#: ../src/collect-dlg.c:60
+#: ../src/collect-dlg.c:68
 msgid "Invalid filename"
 msgstr "Niepoprawna nazwa pliku"
 
-#: ../src/collect-dlg.c:69
+#: ../src/collect-dlg.c:77
 msgid "Overwrite File"
 msgstr "Nadpisanie Pliku"
 
-#: ../src/collect-dlg.c:74
+#: ../src/collect-dlg.c:82
 msgid "Overwrite existing file?"
 msgstr "Nadpisać instniejący plik?"
 
-#: ../src/collect-dlg.c:76
+#: ../src/collect-dlg.c:84
 msgid "_Overwrite"
 msgstr "Nadpisz"
 
-#: ../src/collect-dlg.c:127
+#: ../src/collect-dlg.c:135
 #, c-format
 msgid "No such file '%s'."
 msgstr "Plik '%s' nie istnieje."
 
-#: ../src/collect-dlg.c:132
+#: ../src/collect-dlg.c:140
 #, c-format
 msgid "'%s' is a directory, not a collection file."
 msgstr "'%s' jest katalogiem, nie plikiem kolekcji."
 
-#: ../src/collect-dlg.c:137
+#: ../src/collect-dlg.c:145
 #, c-format
 msgid "You do not have read permissions on the file '%s'."
 msgstr "Nie masz uprawnień by zapisywać do pliku '%s'."
 
-#: ../src/collect-dlg.c:143
+#: ../src/collect-dlg.c:151
 msgid "Can not open collection file"
 msgstr "Nie mogę utworzyć kolekcji"
 
-#: ../src/collect-dlg.c:195
+#: ../src/collect-dlg.c:203
 msgid "Save collection"
 msgstr "Zapisz kolekcję"
 
-#: ../src/collect-dlg.c:202
-msgid "Open collection"
-msgstr "Otwarcie kolekcji"
-
 #: ../src/collect-dlg.c:210
+msgid "Open collection"
+msgstr "Otwarcie kolekcji"
+
+#: ../src/collect-dlg.c:218
 msgid "Append collection"
 msgstr "Dołącz kolekcji"
 
-#: ../src/collect-dlg.c:211
+#: ../src/collect-dlg.c:219
 msgid "_Append"
 msgstr "Dołącz"
 
-#: ../src/collect-dlg.c:228
+#: ../src/collect-dlg.c:236
 msgid "Collection Files"
 msgstr "Pliki kolekcji"
 
-#: ../src/collect-io.c:348
+#: ../src/collect-io.c:356
 #, c-format
 msgid "failed to open collection (write) \"%s\"\n"
 msgstr "Otworzenie (zapisanie) kolekcji nie powiodło się \"%s\"\n"
 
-#: ../src/collect-io.c:373
+#: ../src/collect-io.c:381
 #, c-format
 msgid ""
 "error saving collection file: %s\n"
@@ -674,178 +672,180 @@
 "błąd przy zapisie pliku kolekcji: %s\n"
 "błąd: %s\n"
 
-#: ../src/collect-table.c:211
+#: ../src/collect-table.c:219
 #, c-format
 msgid "%s, %d images (%s, %d)"
 msgstr "%s, %d plików (%s, %d)"
 
-#: ../src/collect-table.c:218
+#: ../src/collect-table.c:226
 #, c-format
 msgid "%s, %d images"
 msgstr "%s, %d obrazów"
 
-#: ../src/collect-table.c:223 ../src/layout_util.c:1229
-#: ../src/layout_util.c:2153
+#: ../src/collect-table.c:231 ../src/layout_util.c:1401
+#: ../src/layout_util.c:2327
 msgid "Empty"
 msgstr "Pusta"
 
-#: ../src/collect-table.c:237 ../src/dupe.c:1314 ../src/search.c:320
-#: ../src/view_file.c:835 ../src/view_file.c:938
+#: ../src/collect-table.c:245 ../src/dupe.c:1322 ../src/search.c:328
+#: ../src/view_file.c:871 ../src/view_file.c:974
 msgid "Loading thumbs..."
 msgstr "Wczytywanie miniatur..."
 
-#: ../src/collect-table.c:868 ../src/dupe.c:2237 ../src/dupe.c:2550
-#: ../src/layout_util.c:1276 ../src/search.c:996
+#: ../src/collect-table.c:905 ../src/dupe.c:2245 ../src/dupe.c:2558
+#: ../src/layout_util.c:1448 ../src/search.c:1004
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/collect-table.c:870 ../src/dupe.c:2239 ../src/dupe.c:2552
-#: ../src/img-view.c:1268 ../src/layout_image.c:499 ../src/pan-view.c:2617
-#: ../src/search.c:998 ../src/view_file.c:588
+#: ../src/collect-table.c:907 ../src/dupe.c:2247 ../src/dupe.c:2560
+#: ../src/img-view.c:1278 ../src/layout_image.c:666
+#: ../src/pan-view/pan-view.c:2633 ../src/search.c:1006 ../src/view_file.c:618
 msgid "View in _new window"
 msgstr "Podgląd w _nowym oknie"
 
-#: ../src/collect-table.c:873 ../src/dupe.c:2273 ../src/dupe.c:2560
-#: ../src/search.c:1028
+#: ../src/collect-table.c:910 ../src/dupe.c:2281 ../src/dupe.c:2568
+#: ../src/search.c:1036
 msgid "Rem_ove"
 msgstr "_Usuń"
 
-#: ../src/collect-table.c:876
+#: ../src/collect-table.c:913
 msgid "Append from file list"
 msgstr "Dołącz z listy plików"
 
-#: ../src/collect-table.c:878
+#: ../src/collect-table.c:915
 msgid "Append from collection..."
 msgstr "Dołącz z kolekcji..."
 
-#: ../src/collect-table.c:882
+#: ../src/collect-table.c:919
 msgid "_Selection"
 msgstr "Zaznacz"
 
-#: ../src/collect-table.c:884 ../src/dupe.c:2242 ../src/dupe.c:2555
-#: ../src/layout_util.c:1324 ../src/search.c:1001
+#: ../src/collect-table.c:921 ../src/dupe.c:2250 ../src/dupe.c:2563
+#: ../src/layout_util.c:1496 ../src/search.c:1009
 msgid "Select all"
 msgstr "Zaznacz wszystko"
 
-#: ../src/collect-table.c:886 ../src/dupe.c:2244 ../src/dupe.c:2557
-#: ../src/layout_util.c:1325 ../src/search.c:1003
+#: ../src/collect-table.c:923 ../src/dupe.c:2252 ../src/dupe.c:2565
+#: ../src/layout_util.c:1497 ../src/search.c:1011
 msgid "Select none"
 msgstr "Wyczyść zaznaczenie"
 
-#: ../src/collect-table.c:888
+#: ../src/collect-table.c:925
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../src/collect-table.c:900 ../src/dupe.c:2262 ../src/img-view.c:1272
-#: ../src/layout_image.c:507 ../src/layout_util.c:1307 ../src/pan-view.c:2621
-#: ../src/search.c:1017 ../src/view_file.c:592
+#: ../src/collect-table.c:937 ../src/dupe.c:2270 ../src/img-view.c:1282
+#: ../src/layout_image.c:674 ../src/layout_util.c:1479
+#: ../src/pan-view/pan-view.c:2637 ../src/search.c:1025 ../src/view_file.c:622
 msgid "_Copy..."
 msgstr "_Kopiuj..."
 
-#: ../src/collect-table.c:902 ../src/dupe.c:2264 ../src/img-view.c:1273
-#: ../src/layout_image.c:509 ../src/layout_util.c:1308 ../src/pan-view.c:2623
-#: ../src/search.c:1019 ../src/view_file.c:594
+#: ../src/collect-table.c:939 ../src/dupe.c:2272 ../src/img-view.c:1283
+#: ../src/layout_image.c:676 ../src/layout_util.c:1480
+#: ../src/pan-view/pan-view.c:2639 ../src/search.c:1027 ../src/view_file.c:624
 msgid "_Move..."
 msgstr "P_rzenieś..."
 
-#: ../src/collect-table.c:904 ../src/dupe.c:2266 ../src/img-view.c:1274
-#: ../src/layout_image.c:511 ../src/layout_util.c:1309 ../src/pan-view.c:2625
-#: ../src/search.c:1021 ../src/view_dir.c:665 ../src/view_file.c:596
+#: ../src/collect-table.c:941 ../src/dupe.c:2274 ../src/img-view.c:1284
+#: ../src/layout_image.c:678 ../src/layout_util.c:1481
+#: ../src/pan-view/pan-view.c:2641 ../src/search.c:1029 ../src/view_dir.c:674
+#: ../src/view_file.c:626
 msgid "_Rename..."
 msgstr "Zm_ień nazwę..."
 
-#: ../src/collect-table.c:906 ../src/dupe.c:2268 ../src/img-view.c:1275
-#: ../src/layout_image.c:513 ../src/layout_util.c:1310
-#: ../src/layout_util.c:1311 ../src/layout_util.c:1312 ../src/pan-view.c:2627
-#: ../src/search.c:1023 ../src/view_dir.c:667 ../src/view_file.c:598
+#: ../src/collect-table.c:943 ../src/dupe.c:2276 ../src/img-view.c:1285
+#: ../src/layout_image.c:680 ../src/layout_util.c:1482
+#: ../src/layout_util.c:1483 ../src/layout_util.c:1484
+#: ../src/pan-view/pan-view.c:2643 ../src/search.c:1031 ../src/view_dir.c:676
+#: ../src/view_file.c:628
 msgid "_Delete..."
 msgstr "_Usuń..."
 
-#: ../src/collect-table.c:908 ../src/dupe.c:2270 ../src/img-view.c:1276
-#: ../src/layout_image.c:516 ../src/pan-view.c:2629 ../src/search.c:1025
-#: ../src/view_dir.c:670 ../src/view_file.c:600
+#: ../src/collect-table.c:945 ../src/dupe.c:2278 ../src/img-view.c:1286
+#: ../src/layout_image.c:683 ../src/pan-view/pan-view.c:2645
+#: ../src/search.c:1033 ../src/view_dir.c:679 ../src/view_file.c:630
 msgid "_Copy path"
 msgstr "S_kopiuj ścieżkę"
 
-#: ../src/collect-table.c:914
+#: ../src/collect-table.c:951
 msgid "Randomize"
 msgstr "Losowo"
 
-#: ../src/collect-table.c:916 ../src/view_file.c:616
+#: ../src/collect-table.c:953 ../src/view_file.c:652
 msgid "_Sort"
 msgstr "_Uporządkuj"
 
-#: ../src/collect-table.c:919 ../src/view_file.c:632
+#: ../src/collect-table.c:956 ../src/view_file.c:668
 msgid "Show filename _text"
 msgstr "Pokaż nazwę pliku"
 
-#: ../src/collect-table.c:922
+#: ../src/collect-table.c:959
 msgid "_Save collection"
 msgstr "_Zapisz kolekcję"
 
-#: ../src/collect-table.c:924
+#: ../src/collect-table.c:961
 msgid "Save collection _as..."
 msgstr "Zapisz kolekcję jako..."
 
-#: ../src/collect-table.c:927 ../src/layout_util.c:1303
+#: ../src/collect-table.c:964 ../src/layout_util.c:1475 ../src/view_file.c:639
 msgid "_Find duplicates..."
 msgstr "Wyszukaj duplikaty..."
 
-#: ../src/collect-table.c:929 ../src/dupe.c:2259 ../src/layout_util.c:1305
-#: ../src/search.c:1014
+#: ../src/collect-table.c:966 ../src/dupe.c:2267 ../src/layout_util.c:1477
+#: ../src/search.c:1022
 msgid "Print..."
 msgstr "Drukuj..."
 
-#: ../src/collect-table.c:2094 ../src/dupe.c:3319 ../src/img-view.c:1430
+#: ../src/collect-table.c:2155 ../src/dupe.c:3331 ../src/img-view.c:1440
 msgid "Dropped list includes folders."
 msgstr "Upuszczona lista zawiera foldery."
 
-#: ../src/collect-table.c:2096 ../src/dupe.c:3321 ../src/img-view.c:1432
+#: ../src/collect-table.c:2157 ../src/dupe.c:3333 ../src/img-view.c:1442
 msgid "_Add contents"
 msgstr "_Dodaj zawartość"
 
-#: ../src/collect-table.c:2098 ../src/dupe.c:3322 ../src/img-view.c:1433
+#: ../src/collect-table.c:2159 ../src/dupe.c:3334 ../src/img-view.c:1443
 msgid "Add contents _recursive"
 msgstr "Dodaj zawartość _rekurencyjnie"
 
-#: ../src/collect-table.c:2100 ../src/dupe.c:3323 ../src/img-view.c:1434
+#: ../src/collect-table.c:2161 ../src/dupe.c:3335 ../src/img-view.c:1444
 msgid "_Skip folders"
 msgstr "Pomiń katalogi"
 
-#: ../src/collect-table.c:2103 ../src/dupe.c:3325 ../src/img-view.c:1436
-#: ../src/view_dir.c:417
+#: ../src/collect-table.c:2164 ../src/dupe.c:3337 ../src/img-view.c:1446
+#: ../src/view_dir.c:426
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../src/color-man.c:426 ../src/exif.c:233 ../src/exif-common.c:436
+#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:448
 msgid "sRGB"
 msgstr "sRGB"
 
-#: ../src/color-man.c:428
+#: ../src/color-man.c:436
 msgid "Adobe RGB compatible"
 msgstr "Zgodny z Adobe RGB"
 
-#: ../src/color-man.c:445
+#: ../src/color-man.c:453
 msgid "Custom profile"
 msgstr "Własne profile"
 
-#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
+#: ../src/desktop_file.c:83 ../src/desktop_file.c:95 ../src/desktop_file.c:101
 msgid "Can't save"
 msgstr "Nie można zapisać"
 
-#: ../src/desktop_file.c:74
+#: ../src/desktop_file.c:83
 msgid "Please specify file name."
 msgstr "Proszę określić nazwę pliku."
 
-#: ../src/desktop_file.c:86
+#: ../src/desktop_file.c:95
 msgid "Could not create directory"
 msgstr "Nie można utworzyć katalogu"
 
-#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
+#: ../src/desktop_file.c:191 ../src/desktop_file.c:554
 msgid "Desktop file"
 msgstr "Plik desktop"
 
-#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:485
+#: ../src/desktop_file.c:300 ../src/ui_pathsel.c:494
 #, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -854,17 +854,17 @@
 "Nie można usunąć pliku:\n"
 "%s"
 
-#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:486 ../src/utilops.c:1975
-#: ../src/utilops.c:2002 ../src/utilops.c:2522
+#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2113
+#: ../src/utilops.c:2140 ../src/utilops.c:2662
 msgid "File deletion failed"
 msgstr "Usunięcie pliku nie powiodło się"
 
-#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:528
-#: ../src/ui_pathsel.c:536
+#: ../src/desktop_file.c:345 ../src/desktop_file.c:353 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
 msgid "Delete file"
 msgstr "Usuń plik"
 
-#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:534
+#: ../src/desktop_file.c:351 ../src/ui_pathsel.c:543
 #, c-format
 msgid ""
 "About to delete the file:\n"
@@ -873,176 +873,176 @@
 "Usunięcie pliku:\n"
 " %s"
 
-#: ../src/desktop_file.c:374
+#: ../src/desktop_file.c:383
 msgid "new.desktop"
-msgstr ""
-
-#: ../src/desktop_file.c:453
+msgstr "nowy.desktop"
+
+#: ../src/desktop_file.c:467
 msgid "Editors"
 msgstr "Edytory"
 
-#: ../src/desktop_file.c:524
+#: ../src/desktop_file.c:544
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: ../src/desktop_file.c:543 ../src/dupe.c:2648 ../src/dupe.c:3133
-#: ../src/print.c:3201 ../src/search.c:2794 ../src/ui_pathsel.c:1109
-#: ../src/utilops.c:458
+#: ../src/desktop_file.c:563 ../src/dupe.c:2656 ../src/dupe.c:3141
+#: ../src/print.c:3210 ../src/search.c:2802 ../src/ui_pathsel.c:1118
+#: ../src/utilops.c:501
 msgid "Path"
 msgstr "Ścieżka"
 
-#: ../src/dupe.c:100
+#: ../src/dupe.c:108
 msgid "Drop files to compare them."
 msgstr "Upuść pliki, aby je porównać."
 
-#: ../src/dupe.c:104
+#: ../src/dupe.c:112
 #, c-format
 msgid "%d files"
 msgstr "%d plików"
 
-#: ../src/dupe.c:108
+#: ../src/dupe.c:116
 #, c-format
 msgid "%d matches found in %d files"
 msgstr "%d wystąpień w %d plikach"
 
-#: ../src/dupe.c:113
+#: ../src/dupe.c:121
 msgid "[set 1]"
 msgstr "[zbiór 1]"
 
-#: ../src/dupe.c:1440
+#: ../src/dupe.c:1448
 msgid "Reading checksums..."
 msgstr "Odczytywanie sum kontrolnych..."
 
-#: ../src/dupe.c:1473
+#: ../src/dupe.c:1481
 msgid "Reading dimensions..."
 msgstr "Odczytywanie wymiarów..."
 
-#: ../src/dupe.c:1507
+#: ../src/dupe.c:1515
 msgid "Reading similarity data..."
 msgstr "Wczytywanie danych opisujących podobieństwo..."
 
-#: ../src/dupe.c:1543 ../src/dupe.c:1574
+#: ../src/dupe.c:1551 ../src/dupe.c:1582
 msgid "Comparing..."
 msgstr "Porównywanie..."
 
-#: ../src/dupe.c:1554 ../src/pan-view.c:996
+#: ../src/dupe.c:1562 ../src/pan-view/pan-view.c:1012
 msgid "Sorting..."
 msgstr "Sortowanie..."
 
-#: ../src/dupe.c:2246
+#: ../src/dupe.c:2254
 msgid "Select group _1 duplicates"
 msgstr "Wybierz _pierwszą grupę duplikatów"
 
-#: ../src/dupe.c:2248
+#: ../src/dupe.c:2256
 msgid "Select group _2 duplicates"
 msgstr "Wybierz _drugą grupę duplikatów"
 
-#: ../src/dupe.c:2257 ../src/search.c:1012
+#: ../src/dupe.c:2265 ../src/search.c:1020 ../src/view_file.c:642
 msgid "Add to new collection"
 msgstr "Dodaj do nowej kolekcji"
 
-#: ../src/dupe.c:2275 ../src/dupe.c:2562 ../src/search.c:1030
+#: ../src/dupe.c:2283 ../src/dupe.c:2570 ../src/search.c:1038
 msgid "C_lear"
 msgstr "Wyczyść"
 
-#: ../src/dupe.c:2278 ../src/dupe.c:2565
+#: ../src/dupe.c:2286 ../src/dupe.c:2573
 msgid "Close _window"
 msgstr "Zamknij okno"
 
-#: ../src/dupe.c:2438
+#: ../src/dupe.c:2446
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d plików (zbiór 2)"
 
-#: ../src/dupe.c:2643
+#: ../src/dupe.c:2651
 msgid "Name case-insensitive"
 msgstr "Nazwy z uwzględnianiem wielkości liter"
 
-#: ../src/dupe.c:2644 ../src/dupe.c:3130 ../src/preferences.c:1476
-#: ../src/print.c:3205 ../src/search.c:2791 ../src/view_file_list.c:1984
+#: ../src/dupe.c:2652 ../src/dupe.c:3138 ../src/preferences.c:1589
+#: ../src/print.c:3214 ../src/search.c:2799 ../src/view_file_list.c:1993
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../src/dupe.c:2645 ../src/dupe.c:3131 ../src/exif.c:342
-#: ../src/exif-common.c:553 ../src/print.c:3203 ../src/search.c:2792
-#: ../src/view_file_list.c:1988
+#: ../src/dupe.c:2653 ../src/dupe.c:3139 ../src/exif.c:336
+#: ../src/exif-common.c:565 ../src/print.c:3212 ../src/search.c:2800
+#: ../src/view_file_list.c:1997
 msgid "Date"
 msgstr "Data"
 
-#: ../src/dupe.c:2646 ../src/dupe.c:3132 ../src/print.c:3207
-#: ../src/search.c:2793
+#: ../src/dupe.c:2654 ../src/dupe.c:3140 ../src/print.c:3216
+#: ../src/search.c:2801
 msgid "Dimensions"
 msgstr "Wymiary"
 
-#: ../src/dupe.c:2647
+#: ../src/dupe.c:2655
 msgid "Checksum"
 msgstr "Suma kontrolna"
 
-#: ../src/dupe.c:2649
+#: ../src/dupe.c:2657
 msgid "Similarity (high)"
 msgstr "Podobieństwo (wysokie)"
 
-#: ../src/dupe.c:2650
+#: ../src/dupe.c:2658
 msgid "Similarity"
 msgstr "Podobieństwo"
 
-#: ../src/dupe.c:2651
+#: ../src/dupe.c:2659
 msgid "Similarity (low)"
 msgstr "Podobieństwo (niskie)"
 
-#: ../src/dupe.c:2652
+#: ../src/dupe.c:2660
 msgid "Similarity (custom)"
 msgstr "Podobieństwo (dowolne)"
 
-#: ../src/dupe.c:3083
+#: ../src/dupe.c:3091
 msgid "Find duplicates"
 msgstr "Wyszukaj duplikaty"
 
-#: ../src/dupe.c:3165
+#: ../src/dupe.c:3173
 msgid "Compare to:"
 msgstr "Porównaj z:"
 
-#: ../src/dupe.c:3178
+#: ../src/dupe.c:3186
 msgid "Compare by:"
 msgstr "Kryterium porównywania:"
 
-#: ../src/dupe.c:3186 ../src/preferences.c:1316 ../src/search.c:2807
+#: ../src/dupe.c:3194 ../src/preferences.c:1424 ../src/search.c:2815
 msgid "Thumbnails"
 msgstr "Miniaturki"
 
-#: ../src/dupe.c:3193
+#: ../src/dupe.c:3201
 msgid "Compare two file sets"
 msgstr "Porównanie dwóch zbiorów plików"
 
-#: ../src/editors.c:281
+#: ../src/editors.c:289
 #, c-format
 msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
 msgstr ""
 "Plik desktop '%s' nie powinien zawierać rozszerzenia w kluczu Icon: '%s'\n"
 
 #. flash fired (bit 0)
-#: ../src/editors.c:335 ../src/exif.c:226 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:220 ../src/exif-common.c:374
 msgid "yes"
 msgstr "tak"
 
-#: ../src/editors.c:335 ../src/exif.c:225 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:219 ../src/exif-common.c:374
 msgid "no"
 msgstr "nie"
 
-#: ../src/editors.c:507
+#: ../src/editors.c:515
 msgid "stopping..."
 msgstr "zatrzymywanie..."
 
-#: ../src/editors.c:528
+#: ../src/editors.c:536
 msgid "Edit command results"
 msgstr "Edycja wyniku działania polecenia"
 
-#: ../src/editors.c:531
+#: ../src/editors.c:539
 #, c-format
 msgid "Output of %s"
 msgstr "Wyjście %s"
 
-#: ../src/editors.c:1054
+#: ../src/editors.c:1062
 #, c-format
 msgid ""
 "Failed to run command:\n"
@@ -1051,11 +1051,11 @@
 "Nie można uruchomić:\n"
 "%s\n"
 
-#: ../src/editors.c:1181
+#: ../src/editors.c:1189
 msgid "stopped by user"
 msgstr "zatrzymane przez użytkownika"
 
-#: ../src/editors.c:1266
+#: ../src/editors.c:1274
 #, c-format
 msgid ""
 "%s\n"
@@ -1064,2031 +1064,2045 @@
 "%s\n"
 "\"%s\""
 
-#: ../src/editors.c:1268
+#: ../src/editors.c:1276
 msgid "Invalid editor command"
 msgstr "Niepoprawne polecenie edytora"
 
-#: ../src/editors.c:1355
+#: ../src/editors.c:1363
 msgid "Editor template is empty."
 msgstr "Szablon edytora jest pusty."
 
-#: ../src/editors.c:1356
+#: ../src/editors.c:1364
 msgid "Editor template has incorrect syntax."
 msgstr "Szablon edytora ma niepoprawną składnię."
 
-#: ../src/editors.c:1357
+#: ../src/editors.c:1365
 msgid "Editor template uses incompatible macros."
 msgstr "Szablon edytora używa niekompatybilnych makr."
 
-#: ../src/editors.c:1358
+#: ../src/editors.c:1366
 msgid "Can't find matching file type."
 msgstr "Nie mogę znaleźć pasujących typów plików."
 
-#: ../src/editors.c:1359
+#: ../src/editors.c:1367
 msgid "Can't execute external editor."
 msgstr "Nie mogę uruchomić zewnętrznego edytora."
 
-#: ../src/editors.c:1360
+#: ../src/editors.c:1368
 msgid "External editor returned error status."
 msgstr "Zewnętrzny edytor zwrócił błąd."
 
-#: ../src/editors.c:1361
+#: ../src/editors.c:1369
 msgid "File was skipped."
 msgstr "Plik został pominięty."
 
-#: ../src/editors.c:1362
+#: ../src/editors.c:1370
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
-#: ../src/exif.c:148 ../src/exif.c:161 ../src/exif.c:175 ../src/exif.c:200
-#: ../src/exif.c:317 ../src/exif.c:664 ../src/exif-common.c:338
-#: ../src/exif-common.c:341 ../src/exif-common.c:408
+#: ../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
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../src/exif.c:149
+#: ../src/exif.c:143
 msgid "top left"
 msgstr "górny lewy"
 
-#: ../src/exif.c:150
+#: ../src/exif.c:144
 msgid "top right"
 msgstr "górny prawy"
 
-#: ../src/exif.c:151
+#: ../src/exif.c:145
 msgid "bottom right"
 msgstr "dolny lewy"
 
-#: ../src/exif.c:152
+#: ../src/exif.c:146
 msgid "bottom left"
 msgstr "dolny lewy"
 
-#: ../src/exif.c:153
+#: ../src/exif.c:147
 msgid "left top"
 msgstr "lewy górny"
 
-#: ../src/exif.c:154
+#: ../src/exif.c:148
 msgid "right top"
 msgstr "prawy górny"
 
-#: ../src/exif.c:155
+#: ../src/exif.c:149
 msgid "right bottom"
 msgstr "prawy dolny"
 
-#: ../src/exif.c:156
+#: ../src/exif.c:150
 msgid "left bottom"
 msgstr "lewy dolny"
 
-#: ../src/exif.c:163
+#: ../src/exif.c:157
 msgid "inch"
 msgstr "cal"
 
-#: ../src/exif.c:164
+#: ../src/exif.c:158
 msgid "centimeter"
 msgstr "centymetr"
 
-#: ../src/exif.c:176
+#: ../src/exif.c:170
 msgid "average"
 msgstr "uśredniony"
 
-#: ../src/exif.c:177
+#: ../src/exif.c:171
 msgid "center weighted"
 msgstr "centralnie ważony"
 
-#: ../src/exif.c:178
+#: ../src/exif.c:172
 msgid "spot"
 msgstr "punktowy"
 
-#: ../src/exif.c:179
+#: ../src/exif.c:173
 msgid "multi-spot"
 msgstr "wielopunktowy"
 
-#: ../src/exif.c:180
+#: ../src/exif.c:174
 msgid "multi-segment"
 msgstr "wielosegmentowy"
 
-#: ../src/exif.c:181
+#: ../src/exif.c:175
 msgid "partial"
 msgstr "częściowy"
 
-#: ../src/exif.c:182 ../src/exif.c:220
+#: ../src/exif.c:176 ../src/exif.c:214
 msgid "other"
 msgstr "inny"
 
-#: ../src/exif.c:187 ../src/exif.c:239
+#: ../src/exif.c:181 ../src/exif.c:233
 msgid "not defined"
 msgstr "niezdefiniowany"
 
-#: ../src/exif.c:188 ../src/exif.c:267 ../src/exif.c:274
+#: ../src/exif.c:182 ../src/exif.c:261 ../src/exif.c:268
 msgid "manual"
 msgstr "ręczny"
 
-#: ../src/exif.c:189 ../src/exif.c:260 ../src/exif.c:296 ../src/exif.c:303
-#: ../src/exif.c:310
+#: ../src/exif.c:183 ../src/exif.c:254 ../src/exif.c:290 ../src/exif.c:297
+#: ../src/exif.c:304
 msgid "normal"
 msgstr "zwykły"
 
-#: ../src/exif.c:190
+#: ../src/exif.c:184
 msgid "aperture"
 msgstr "przysłona"
 
-#: ../src/exif.c:191
+#: ../src/exif.c:185
 msgid "shutter"
 msgstr "migawka"
 
-#: ../src/exif.c:192
+#: ../src/exif.c:186
 msgid "creative"
 msgstr "kreatywny"
 
-#: ../src/exif.c:193
+#: ../src/exif.c:187
 msgid "action"
 msgstr "akcja"
 
-#: ../src/exif.c:194 ../src/exif.c:281
+#: ../src/exif.c:188 ../src/exif.c:275
 msgid "portrait"
 msgstr "portret"
 
-#: ../src/exif.c:195 ../src/exif.c:280
+#: ../src/exif.c:189 ../src/exif.c:274
 msgid "landscape"
 msgstr "krajobraz"
 
-#: ../src/exif.c:201
+#: ../src/exif.c:195
 msgid "daylight"
 msgstr "światło dzienne"
 
-#: ../src/exif.c:202
+#: ../src/exif.c:196
 msgid "fluorescent"
 msgstr "fluorescencyjne"
 
-#: ../src/exif.c:203
+#: ../src/exif.c:197
 msgid "tungsten (incandescent)"
 msgstr "żarówka"
 
-#: ../src/exif.c:204
+#: ../src/exif.c:198
 msgid "flash"
 msgstr "lampa błyskowa"
 
-#: ../src/exif.c:205
+#: ../src/exif.c:199
 msgid "fine weather"
 msgstr "dobra pogoda"
 
-#: ../src/exif.c:206
+#: ../src/exif.c:200
 msgid "cloudy weather"
 msgstr "pochmurna pogoda"
 
-#: ../src/exif.c:207
+#: ../src/exif.c:201
 msgid "shade"
 msgstr "cień"
 
-#: ../src/exif.c:208
+#: ../src/exif.c:202
 msgid "daylight fluorescent"
 msgstr "fluorescencyjne o widmie światła dziennego"
 
-#: ../src/exif.c:209
+#: ../src/exif.c:203
 msgid "day white fluorescent"
 msgstr "fluorescencyjne białe o widmie światła dziennego"
 
-#: ../src/exif.c:210
+#: ../src/exif.c:204
 msgid "cool white fluorescent"
 msgstr "fluorescencyjne białe zimne"
 
-#: ../src/exif.c:211
+#: ../src/exif.c:205
 msgid "white fluorescent"
 msgstr "fluorescencyjne białe"
 
-#: ../src/exif.c:212
+#: ../src/exif.c:206
 msgid "standard light A"
 msgstr "standardowe oświetlenie A"
 
-#: ../src/exif.c:213
+#: ../src/exif.c:207
 msgid "standard light B"
 msgstr "standardowe oświetlenie B"
 
-#: ../src/exif.c:214
+#: ../src/exif.c:208
 msgid "standard light C"
 msgstr "standardowe oświetlenie C"
 
-#: ../src/exif.c:215
+#: ../src/exif.c:209
 msgid "D55"
 msgstr "D55"
 
-#: ../src/exif.c:216
+#: ../src/exif.c:210
 msgid "D65"
 msgstr "D65"
 
-#: ../src/exif.c:217
+#: ../src/exif.c:211
 msgid "D75"
 msgstr "D75"
 
-#: ../src/exif.c:218
+#: ../src/exif.c:212
 msgid "D50"
 msgstr "D50"
 
-#: ../src/exif.c:219
+#: ../src/exif.c:213
 msgid "ISO studio tungsten"
 msgstr "żarówki studyjne ISO"
 
-#: ../src/exif.c:227
+#: ../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 "yes, detected by strobe"
-msgstr ""
+msgid "uncalibrated"
+msgstr "nieskalibrowaniy"
 
 #: ../src/exif.c:234
-msgid "uncalibrated"
-msgstr "nieskalibrowaniy"
-
-#: ../src/exif.c:240
 msgid "1 chip color area"
 msgstr ""
 
-#: ../src/exif.c:241
+#: ../src/exif.c:235
 msgid "2 chip color area"
 msgstr ""
 
-#: ../src/exif.c:242
+#: ../src/exif.c:236
 msgid "3 chip color area"
 msgstr ""
 
-#: ../src/exif.c:243
+#: ../src/exif.c:237
 msgid "color sequential area"
 msgstr ""
 
+#: ../src/exif.c:238
+msgid "trilinear"
+msgstr "trzyliniowe"
+
+#: ../src/exif.c:239
+msgid "color sequential linear"
+msgstr ""
+
 #: ../src/exif.c:244
-msgid "trilinear"
-msgstr "trzyliniowe"
-
-#: ../src/exif.c:245
-msgid "color sequential linear"
+msgid "digital still camera"
 msgstr ""
 
-#: ../src/exif.c:250
-msgid "digital still camera"
+#: ../src/exif.c:249
+msgid "direct photo"
 msgstr ""
 
 #: ../src/exif.c:255
-msgid "direct photo"
-msgstr ""
-
-#: ../src/exif.c:261
 msgid "custom"
 msgstr "własne"
 
-#: ../src/exif.c:266 ../src/exif.c:273 ../src/exif-common.c:376
+#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:388
 msgid "auto"
 msgstr "automatyczne"
 
-#: ../src/exif.c:268
+#: ../src/exif.c:262
 msgid "auto bracket"
 msgstr "Automatyczny bracketing"
 
-#: ../src/exif.c:279
+#: ../src/exif.c:273
 msgid "standard"
 msgstr "standard"
 
-#: ../src/exif.c:282
+#: ../src/exif.c:276
 msgid "night scene"
 msgstr "scena nocna"
 
-#: ../src/exif.c:287
+#: ../src/exif.c:281
 msgid "none"
 msgstr "brak"
 
-#: ../src/exif.c:288
+#: ../src/exif.c:282
 msgid "low gain up"
 msgstr ""
 
-#: ../src/exif.c:289
+#: ../src/exif.c:283
 msgid "high gain up"
 msgstr ""
 
-#: ../src/exif.c:290
+#: ../src/exif.c:284
 msgid "low gain down"
 msgstr ""
 
-#: ../src/exif.c:291
+#: ../src/exif.c:285
 msgid "high gain down"
 msgstr ""
 
-#: ../src/exif.c:297 ../src/exif.c:311
+#: ../src/exif.c:291 ../src/exif.c:305
 msgid "soft"
 msgstr "miękka"
 
-#: ../src/exif.c:298 ../src/exif.c:312
+#: ../src/exif.c:292 ../src/exif.c:306
 msgid "hard"
 msgstr "mocna"
 
-#: ../src/exif.c:304
+#: ../src/exif.c:298
 msgid "low"
 msgstr "niska"
 
-#: ../src/exif.c:305
+#: ../src/exif.c:299
 msgid "high"
 msgstr "wysokie"
 
-#: ../src/exif.c:318
+#: ../src/exif.c:312
 msgid "macro"
 msgstr "makro"
 
-#: ../src/exif.c:319
+#: ../src/exif.c:313
 msgid "close"
 msgstr "blisko"
 
-#: ../src/exif.c:320
+#: ../src/exif.c:314
 msgid "distant"
 msgstr "daleko"
 
-#: ../src/exif.c:330
+#: ../src/exif.c:324
 msgid "Image Width"
 msgstr "Szerokość obrazu"
 
-#: ../src/exif.c:331
+#: ../src/exif.c:325
 msgid "Image Height"
 msgstr "Wysokość obrazu"
 
-#: ../src/exif.c:332
+#: ../src/exif.c:326
 msgid "Bits per Sample/Pixel"
 msgstr "Bity na próbkę/piksel"
 
-#: ../src/exif.c:333
+#: ../src/exif.c:327
 msgid "Compression"
 msgstr "Kompresja"
 
-#: ../src/exif.c:334
+#: ../src/exif.c:328
 msgid "Image description"
 msgstr "Opis obrazu"
 
-#: ../src/exif.c:335
+#: ../src/exif.c:329
 msgid "Camera make"
 msgstr "Model aparatu"
 
-#: ../src/exif.c:336
+#: ../src/exif.c:330
 msgid "Camera model"
 msgstr "Model aparatu fotograficznego"
 
-#: ../src/exif.c:337
+#: ../src/exif.c:331
 msgid "Orientation"
 msgstr "Orientacja"
 
-#: ../src/exif.c:338
+#: ../src/exif.c:332
 msgid "X resolution"
 msgstr "Rozdzielczość X"
 
-#: ../src/exif.c:339
+#: ../src/exif.c:333
 msgid "Y Resolution"
 msgstr "Rozdzielczość Y"
 
-#: ../src/exif.c:340
+#: ../src/exif.c:334
 msgid "Resolution units"
 msgstr "Jednkostka rozdzielczości"
 
-#: ../src/exif.c:341
+#: ../src/exif.c:335
 msgid "Firmware"
 msgstr "Firmware"
 
-#: ../src/exif.c:343
+#: ../src/exif.c:337
 msgid "White point"
 msgstr "Punkt bieli"
 
-#: ../src/exif.c:344
+#: ../src/exif.c:338
 msgid "Primary chromaticities"
 msgstr ""
 
-#: ../src/exif.c:345
+#: ../src/exif.c:339
 msgid "YCbCy coefficients"
 msgstr ""
 
-#: ../src/exif.c:346
+#: ../src/exif.c:340
 msgid "YCbCr positioning"
 msgstr ""
 
-#: ../src/exif.c:347
+#: ../src/exif.c:341
 msgid "Black white reference"
 msgstr ""
 
-#: ../src/exif.c:349
+#: ../src/exif.c:343
 msgid "SubIFD Exif offset"
 msgstr ""
 
 #. subIFD follows
-#: ../src/exif.c:351
+#: ../src/exif.c:345
 msgid "Exposure time (seconds)"
 msgstr "Czas ekspozycji (sekundy)"
 
-#: ../src/exif.c:352
+#: ../src/exif.c:346
 msgid "FNumber"
 msgstr "Przysłona"
 
-#: ../src/exif.c:353
+#: ../src/exif.c:347
 msgid "Exposure program"
 msgstr "Program ekspozycji"
 
-#: ../src/exif.c:354
+#: ../src/exif.c:348
 msgid "Spectral Sensitivity"
 msgstr ""
 
-#: ../src/exif.c:355 ../src/exif.c:391 ../src/exif-common.c:557
+#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:569
 msgid "ISO sensitivity"
 msgstr "Czułość ISO"
 
-#: ../src/exif.c:356
+#: ../src/exif.c:350
 msgid "Optoelectric conversion factor"
 msgstr ""
 
-#: ../src/exif.c:357
+#: ../src/exif.c:351
 msgid "Exif version"
 msgstr "Wersja Exif"
 
-#: ../src/exif.c:358
+#: ../src/exif.c:352
 msgid "Date original"
 msgstr "Data oryginału"
 
-#: ../src/exif.c:359
+#: ../src/exif.c:353
 msgid "Date digitized"
 msgstr "Data digitalizacji"
 
-#: ../src/exif.c:360
+#: ../src/exif.c:354
 msgid "Pixel format"
 msgstr "Format piksela"
 
-#: ../src/exif.c:361
+#: ../src/exif.c:355
 msgid "Compression ratio"
 msgstr "Poziom kompresji"
 
-#: ../src/exif.c:362 ../src/exif-common.c:554
+#: ../src/exif.c:356 ../src/exif-common.c:566
 msgid "Shutter speed"
 msgstr "Szybkość migawki"
 
-#: ../src/exif.c:363 ../src/exif-common.c:555
+#: ../src/exif.c:357 ../src/exif-common.c:567
 msgid "Aperture"
 msgstr "Przysłona"
 
-#: ../src/exif.c:364
+#: ../src/exif.c:358
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../src/exif.c:365 ../src/exif-common.c:556
+#: ../src/exif.c:359 ../src/exif-common.c:568
 msgid "Exposure bias"
 msgstr "Korekta ekspozycji"
 
+#: ../src/exif.c:360
+msgid "Maximum aperture"
+msgstr "Maksymalna otwór przysłony"
+
+#: ../src/exif.c:361 ../src/exif-common.c:572
+msgid "Subject distance"
+msgstr "Odległość przedmiotu"
+
+#: ../src/exif.c:362
+msgid "Metering mode"
+msgstr "Metoda pomiaru"
+
+#: ../src/exif.c:363
+msgid "Light source"
+msgstr "Źródło światła"
+
+#: ../src/exif.c:364 ../src/exif-common.c:573
+msgid "Flash"
+msgstr "Lampa błyskowa"
+
+#: ../src/exif.c:365 ../src/exif-common.c:570
+msgid "Focal length"
+msgstr "Ogniskowa"
+
 #: ../src/exif.c:366
-msgid "Maximum aperture"
-msgstr "Maksymalna otwór przysłony"
-
-#: ../src/exif.c:367 ../src/exif-common.c:560
-msgid "Subject distance"
-msgstr "Odległość przedmiotu"
+msgid "Subject area"
+msgstr "Powierzchnia przedmiotu"
+
+#: ../src/exif.c:367
+msgid "MakerNote"
+msgstr ""
 
 #: ../src/exif.c:368
-msgid "Metering mode"
-msgstr "Metoda pomiaru"
+msgid "UserComment"
+msgstr "Komentarz użytkownika"
 
 #: ../src/exif.c:369
-msgid "Light source"
-msgstr "Źródło światła"
-
-#: ../src/exif.c:370 ../src/exif-common.c:561
-msgid "Flash"
-msgstr "Lampa błyskowa"
-
-#: ../src/exif.c:371 ../src/exif-common.c:558
-msgid "Focal length"
-msgstr "Ogniskowa"
+msgid "Subsecond time"
+msgstr ""
+
+#: ../src/exif.c:370
+msgid "Subsecond time original"
+msgstr ""
+
+#: ../src/exif.c:371
+msgid "Subsecond time digitized"
+msgstr ""
 
 #: ../src/exif.c:372
-msgid "Subject area"
-msgstr "Powierzchnia przedmiotu"
+msgid "FlashPix version"
+msgstr ""
 
 #: ../src/exif.c:373
-msgid "MakerNote"
-msgstr ""
-
-#: ../src/exif.c:374
-msgid "UserComment"
-msgstr "Komentarz użytkownika"
-
-#: ../src/exif.c:375
-msgid "Subsecond time"
-msgstr ""
-
-#: ../src/exif.c:376
-msgid "Subsecond time original"
-msgstr ""
-
-#: ../src/exif.c:377
-msgid "Subsecond time digitized"
-msgstr ""
-
-#: ../src/exif.c:378
-msgid "FlashPix version"
-msgstr ""
-
-#: ../src/exif.c:379
 msgid "Colorspace"
 msgstr "Przestrzeń kolorów"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: ../src/exif.c:381 ../src/preferences.c:2171
+#: ../src/exif.c:375 ../src/preferences.c:2360
 msgid "Width"
 msgstr "Szerokość"
 
-#: ../src/exif.c:382 ../src/preferences.c:2173
+#: ../src/exif.c:376 ../src/preferences.c:2362
 msgid "Height"
 msgstr "Wysokość"
 
-#: ../src/exif.c:383
+#: ../src/exif.c:377
 msgid "Audio data"
 msgstr "Dane audio"
 
-#: ../src/exif.c:384
+#: ../src/exif.c:378
 msgid "ExifR98 extension"
 msgstr ""
 
-#: ../src/exif.c:385
+#: ../src/exif.c:379
 msgid "Flash strength"
 msgstr "Siła lampy błyskowej"
 
-#: ../src/exif.c:386
+#: ../src/exif.c:380
 msgid "Spatial frequency response"
 msgstr ""
 
-#: ../src/exif.c:387
+#: ../src/exif.c:381
 msgid "X Pixel density"
 msgstr ""
 
-#: ../src/exif.c:388
+#: ../src/exif.c:382
 msgid "Y Pixel density"
 msgstr ""
 
-#: ../src/exif.c:389
+#: ../src/exif.c:383
 msgid "Pixel density units"
 msgstr ""
 
-#: ../src/exif.c:390
+#: ../src/exif.c:384
 msgid "Subject location"
 msgstr ""
 
-#: ../src/exif.c:392
+#: ../src/exif.c:386
 msgid "Sensor type"
 msgstr "Typ sensora"
 
-#: ../src/exif.c:393
+#: ../src/exif.c:387
 msgid "Source type"
 msgstr "Źródło"
 
-#: ../src/exif.c:394
+#: ../src/exif.c:388
 msgid "Scene type"
 msgstr "Typ sceny"
 
-#: ../src/exif.c:395
+#: ../src/exif.c:389
 msgid "Color filter array pattern"
 msgstr "Wzór siatki kolorów filtra"
 
 #. 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 "Tryb ekspozycji"
+
+#: ../src/exif.c:393
+msgid "White balance"
+msgstr "Balans bieli"
+
+#: ../src/exif.c:394
+msgid "Digital zoom ratio"
+msgstr "Zoom cyfrowy"
+
+#: ../src/exif.c:395
+msgid "Focal length (35mm)"
+msgstr "Ogniskowa (35mm)"
+
+#: ../src/exif.c:396
+msgid "Scene capture type"
+msgstr "Typ fotografowanej sceny"
+
 #: ../src/exif.c:397
-msgid "Render process"
+msgid "Gain control"
 msgstr ""
 
 #: ../src/exif.c:398
-msgid "Exposure mode"
-msgstr "Tryb ekspozycji"
-
-#: ../src/exif.c:399
-msgid "White balance"
-msgstr "Balans bieli"
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: ../src/exif.c:399 ../src/preferences.c:1997
+msgid "Saturation"
+msgstr "Saturacja"
 
 #: ../src/exif.c:400
-msgid "Digital zoom ratio"
-msgstr "Zoom cyfrowy"
-
-#: ../src/exif.c:401
-msgid "Focal length (35mm)"
-msgstr "Ogniskowa (35mm)"
-
-#: ../src/exif.c:402
-msgid "Scene capture type"
-msgstr "Typ fotografowanej sceny"
-
-#: ../src/exif.c:403
-msgid "Gain control"
-msgstr ""
-
-#: ../src/exif.c:404
-msgid "Contrast"
-msgstr "Kontrast"
-
-#: ../src/exif.c:405
-msgid "Saturation"
-msgstr "Saturacja"
-
-#: ../src/exif.c:406
 msgid "Sharpness"
 msgstr "Ostrość"
 
-#: ../src/exif.c:407
+#: ../src/exif.c:401
 msgid "Device setting"
 msgstr "Ustawienia urządzenia"
 
-#: ../src/exif.c:408
+#: ../src/exif.c:402
 msgid "Subject range"
 msgstr ""
 
-#: ../src/exif.c:409
+#: ../src/exif.c:403
 msgid "Image serial number"
 msgstr "Numer seryjny obrazu"
 
-#: ../src/exif-common.c:337
+#: ../src/exif-common.c:349
 msgid "infinity"
 msgstr "nieskończoność"
 
-#: ../src/exif-common.c:366
+#: ../src/exif-common.c:378
 msgid "mode:"
 msgstr "tryb:"
 
-#: ../src/exif-common.c:370 ../src/trash.c:205
+#: ../src/exif-common.c:382 ../src/trash.c:213
 msgid "on"
 msgstr "włączony"
 
-#: ../src/exif-common.c:373 ../src/trash.c:210
+#: ../src/exif-common.c:385 ../src/trash.c:218
 msgid "off"
 msgstr "wyłączony"
 
-#: ../src/exif-common.c:382
+#: ../src/exif-common.c:394
 msgid "not detected by strobe"
 msgstr ""
 
-#: ../src/exif-common.c:383
+#: ../src/exif-common.c:395
 msgid "detected by strobe"
 msgstr ""
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: ../src/exif-common.c:388
+#: ../src/exif-common.c:400
 msgid "red-eye reduction"
 msgstr "redukcja efektu czerwonych oczu"
 
-#: ../src/exif-common.c:408
+#: ../src/exif-common.c:420
 msgid "dot"
 msgstr "punktów"
 
-#: ../src/exif-common.c:441
+#: ../src/exif-common.c:453
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: ../src/exif-common.c:449
+#: ../src/exif-common.c:461
 msgid "embedded"
 msgstr "osadzony"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Above Sea Level"
 msgstr "Powyżej poziomu morza"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Below Sea Level"
 msgstr "Poniżej poziomu morza"
 
-#: ../src/exif-common.c:552
+#: ../src/exif-common.c:564
 msgid "Camera"
 msgstr "Aparat fotograficzny"
 
-#: ../src/exif-common.c:559
+#: ../src/exif-common.c:571
 msgid "Focal length 35mm"
 msgstr "Ogniskowa 35mm"
 
-#: ../src/exif-common.c:562
+#: ../src/exif-common.c:574
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: ../src/exif-common.c:563
+#: ../src/exif-common.c:575
 msgid "Color profile"
 msgstr "Profil koloru"
 
-#: ../src/exif-common.c:564
+#: ../src/exif-common.c:576
 msgid "GPS position"
 msgstr "Pozycja wg GPS"
 
-#: ../src/exif-common.c:565
+#: ../src/exif-common.c:577
 msgid "GPS altitude"
 msgstr "Wysokość wg GPS"
 
-#: ../src/exif-common.c:566
+#: ../src/exif-common.c:578
 msgid "File size"
 msgstr "Rozmiar pliku"
 
-#: ../src/exif-common.c:567
+#: ../src/exif-common.c:579
 msgid "File date"
 msgstr "Czas utworzenia pliku"
 
-#: ../src/exif-common.c:568
+#: ../src/exif-common.c:580
 msgid "File mode"
 msgstr "Tryb pliku"
 
-#: ../src/filedata.c:101
+#: ../src/filedata.c:109
 #, c-format
 msgid "%d bytes"
 msgstr "%d bajtów"
 
-#: ../src/filedata.c:105
+#: ../src/filedata.c:113
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../src/filedata.c:109
+#: ../src/filedata.c:117
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../src/filedata.c:114
+#: ../src/filedata.c:122
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../src/filedata.c:2458
+#: ../src/filedata.c:2488
 msgid "file or directory does not exist"
 msgstr "plik lub katalog nie istnieją"
 
-#: ../src/filedata.c:2464
+#: ../src/filedata.c:2494
 msgid "destination already exists"
 msgstr "cel już istnieje"
 
-#: ../src/filedata.c:2470
-msgid "destination can't be overwritten"
-msgstr "cel nie może być nadpisany"
-
-#: ../src/filedata.c:2476
-msgid "destination directory is not writable"
-msgstr "docelowy katalog nie jest zapisywalny"
-
-#: ../src/filedata.c:2482
-msgid "destination directory does not exist"
-msgstr "docelowy katalog nie istnieje"
-
-#: ../src/filedata.c:2488
-msgid "source directory is not writable"
-msgstr "katalog źródłowy nie istnieje"
-
-#: ../src/filedata.c:2494
-msgid "no read permission"
-msgstr "brak uprawnień do odczytu"
-
 #: ../src/filedata.c:2500
+msgid "destination can't be overwritten"
+msgstr "cel nie może być nadpisany"
+
+#: ../src/filedata.c:2506
+msgid "destination directory is not writable"
+msgstr "docelowy katalog nie jest zapisywalny"
+
+#: ../src/filedata.c:2512
+msgid "destination directory does not exist"
+msgstr "docelowy katalog nie istnieje"
+
+#: ../src/filedata.c:2518
+msgid "source directory is not writable"
+msgstr "katalog źródłowy nie istnieje"
+
+#: ../src/filedata.c:2524
+msgid "no read permission"
+msgstr "brak uprawnień do odczytu"
+
+#: ../src/filedata.c:2530
 msgid "file is readonly"
 msgstr "plik jest tylko do odczytu"
 
-#: ../src/filedata.c:2506
+#: ../src/filedata.c:2536
 msgid "destination already exists and will be overwritten"
 msgstr "cel już istnieje i zostanie nadpisany"
 
-#: ../src/filedata.c:2512
+#: ../src/filedata.c:2542
 msgid "source and destination are the same"
 msgstr "źródło i cel są takie same"
 
-#: ../src/filedata.c:2518
+#: ../src/filedata.c:2548
 msgid "source and destination have different extension"
 msgstr "źródło i cel mają różne rozszerzenia"
 
-#: ../src/filedata.c:2524
+#: ../src/filedata.c:2554
 msgid "there are unsaved metadata changes for the file"
 msgstr "istnieją nie zapisane metadane dla tego pliku"
 
-#: ../src/filedata.c:2530
+#: ../src/filedata.c:2560
 msgid "another destination file has the same filename"
 msgstr "inny plik docelowy ma taką samą nazwę"
 
-#: ../src/fullscreen.c:234 ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368 ../src/preferences.c:1489
+#: ../src/fullscreen.c:242 ../src/layout_util.c:1538 ../src/layout_util.c:1539
+#: ../src/layout_util.c:1540 ../src/preferences.c:1602
 msgid "Full screen"
 msgstr "Pełny ekran"
 
-#: ../src/fullscreen.c:403
+#: ../src/fullscreen.c:413
 msgid "Full size"
 msgstr "Pełny rozmiar"
 
-#: ../src/fullscreen.c:411
+#: ../src/fullscreen.c:421
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../src/fullscreen.c:417
+#: ../src/fullscreen.c:427
 msgid "Screen"
 msgstr "Ekran"
 
-#: ../src/fullscreen.c:651
+#: ../src/fullscreen.c:661
 msgid "Determined by Window Manager"
 msgstr "Ustalone przez menedżer okien"
 
-#: ../src/fullscreen.c:652
+#: ../src/fullscreen.c:662
 msgid "Active screen"
 msgstr "Aktywny ekran"
 
-#: ../src/fullscreen.c:654
+#: ../src/fullscreen.c:664
 msgid "Active monitor"
 msgstr "Aktywny monitor"
 
-#: ../src/histogram.c:113
+#: ../src/histogram.c:121
 msgid "Log Histogram on Red"
 msgstr "Logarytmiczny histogram czerwonego"
 
-#: ../src/histogram.c:114
+#: ../src/histogram.c:122
 msgid "Log Histogram on Green"
 msgstr "Logarytmiczny histogram zielonego"
 
-#: ../src/histogram.c:115
+#: ../src/histogram.c:123
 msgid "Log Histogram on Blue"
 msgstr "Logarytmiczny histogram niebieskiego"
 
-#: ../src/histogram.c:116
+#: ../src/histogram.c:124
 msgid "Log Histogram on RGB"
 msgstr "Logarytmiczny histogram RGB"
 
-#: ../src/histogram.c:117
+#: ../src/histogram.c:125
 msgid "Log Histogram on value"
 msgstr "Logarytmiczny histogram jasności (HSV)"
 
-#: ../src/histogram.c:122
+#: ../src/histogram.c:130
 msgid "Linear Histogram on Red"
 msgstr "Liniowy histogram czerwonego"
 
-#: ../src/histogram.c:123
+#: ../src/histogram.c:131
 msgid "Linear Histogram on Green"
 msgstr "Liniowy histogram zielonego"
 
-#: ../src/histogram.c:124
+#: ../src/histogram.c:132
 msgid "Linear Histogram on Blue"
 msgstr "Liniowy histogram niebieskiego"
 
-#: ../src/histogram.c:125
+#: ../src/histogram.c:133
 msgid "Linear Histogram on RGB"
 msgstr "Liniowy histogram RGB"
 
-#: ../src/histogram.c:126
+#: ../src/histogram.c:134
 msgid "Linear Histogram on value"
 msgstr "Liniowy histogram jasności (HSV)"
 
-#: ../src/history_list.c:131
+#: ../src/history_list.c:139
 #, c-format
 msgid "Unable to write history lists to: %s\n"
 msgstr "Nie można zapisać list historii w: %s\n"
 
-#: ../src/image.c:161
+#: ../src/image.c:169
 #, c-format
 msgid " (Collection %s)"
 msgstr "(Kolekcja %s)"
 
-#: ../src/image_load_jpeg.c:177
+#: ../src/image_load_jpeg.c:163
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Bład interpretacji pliku JPEG (%s)"
 
-#: ../src/img-view.c:1253 ../src/layout_image.c:483 ../src/layout_util.c:1333
-#: ../src/layout_util.c:1334 ../src/layout_util.c:1349
-#: ../src/layout_util.c:1350 ../src/pan-view.c:2602
+#: ../src/img-view.c:1263 ../src/layout_image.c:650 ../src/layout_util.c:1505
+#: ../src/layout_util.c:1506 ../src/layout_util.c:1521
+#: ../src/layout_util.c:1522 ../src/pan-view/pan-view.c:2618
 msgid "Zoom _in"
 msgstr "Pow_iększ"
 
-#: ../src/img-view.c:1254 ../src/layout_image.c:484 ../src/layout_util.c:1335
-#: ../src/layout_util.c:1336 ../src/layout_util.c:1351
-#: ../src/layout_util.c:1352 ../src/pan-view.c:2604
+#: ../src/img-view.c:1264 ../src/layout_image.c:651 ../src/layout_util.c:1507
+#: ../src/layout_util.c:1508 ../src/layout_util.c:1523
+#: ../src/layout_util.c:1524 ../src/pan-view/pan-view.c:2620
 msgid "Zoom _out"
 msgstr "Po_mniejsz"
 
-#: ../src/img-view.c:1255 ../src/layout_image.c:485 ../src/layout_util.c:1337
-#: ../src/layout_util.c:1338 ../src/layout_util.c:1353
-#: ../src/layout_util.c:1354 ../src/pan-view.c:2606
+#: ../src/img-view.c:1265 ../src/layout_image.c:652 ../src/layout_util.c:1509
+#: ../src/layout_util.c:1510 ../src/layout_util.c:1525
+#: ../src/layout_util.c:1526 ../src/pan-view/pan-view.c:2622
 msgid "Zoom _1:1"
 msgstr "Skala _1:1"
 
-#: ../src/img-view.c:1256 ../src/layout_image.c:486
+#: ../src/img-view.c:1266 ../src/layout_image.c:653
 msgid "Fit image to _window"
 msgstr "Dopasowanie obrazu do _okna"
 
-#: ../src/img-view.c:1264 ../src/layout_image.c:495 ../src/layout_util.c:1331
+#: ../src/img-view.c:1274 ../src/layout_image.c:662 ../src/layout_util.c:1503
 msgid "Set as _wallpaper"
 msgstr "Usta_w jako tapetę"
 
-#: ../src/img-view.c:1269 ../src/layout_image.c:502
+#: ../src/img-view.c:1279 ../src/layout_image.c:669
 msgid "_Go to directory view"
 msgstr "Przejdź do widoku katalogu"
 
-#: ../src/img-view.c:1282 ../src/layout_image.c:523
+#: ../src/img-view.c:1292 ../src/layout_image.c:690
 msgid "_Stop slideshow"
 msgstr "_Zatrzymaj pokaz slajdów"
 
-#: ../src/img-view.c:1285 ../src/layout_image.c:526
+#: ../src/img-view.c:1295 ../src/layout_image.c:693
 msgid "Continue slides_how"
 msgstr "Kontyn_uuj pokaz slajdów"
 
-#: ../src/img-view.c:1290 ../src/img-view.c:1298 ../src/layout_image.c:531
-#: ../src/layout_image.c:538
+#: ../src/img-view.c:1300 ../src/img-view.c:1308 ../src/layout_image.c:698
+#: ../src/layout_image.c:705
 msgid "Pause slides_how"
 msgstr "W_strzymaj pokaz slajdów"
 
-#: ../src/img-view.c:1296 ../src/layout_image.c:537
+#: ../src/img-view.c:1306 ../src/layout_image.c:704
 msgid "_Start slideshow"
 msgstr "Rozpo_cznij pokaz slajdów"
 
-#: ../src/img-view.c:1304 ../src/layout_image.c:548 ../src/pan-view.c:2675
+#: ../src/img-view.c:1314 ../src/layout_image.c:715
+#: ../src/pan-view/pan-view.c:2691
 msgid "Exit _full screen"
 msgstr "Opuść tryb pełnoekranowy"
 
-#: ../src/img-view.c:1308 ../src/layout_image.c:544 ../src/pan-view.c:2679
+#: ../src/img-view.c:1318 ../src/layout_image.c:711
+#: ../src/pan-view/pan-view.c:2695
 msgid "_Full screen"
 msgstr "Pełny ekran"
 
-#: ../src/img-view.c:1312 ../src/layout_util.c:1316 ../src/pan-view.c:2683
+#: ../src/img-view.c:1322 ../src/layout_util.c:1488
+#: ../src/pan-view/pan-view.c:2699
 msgid "C_lose window"
 msgstr "Zamknij okno"
 
-#: ../src/layout.c:358 ../src/view_file.c:613
+#: ../src/layout.c:367 ../src/view_file.c:649
 msgid "Ascending"
 msgstr "Rosnąco"
 
-#: ../src/layout.c:428
+#: ../src/layout.c:437
 msgid " Slideshow"
 msgstr " Slajdy"
 
-#: ../src/layout.c:432
+#: ../src/layout.c:441
 msgid " Paused"
 msgstr " Zatrzymane"
 
-#: ../src/layout.c:448
+#: ../src/layout.c:457
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
 msgstr "%s, %d plików (%s, %d)%s"
 
-#: ../src/layout.c:455
+#: ../src/layout.c:464
 #, c-format
 msgid "%s, %d files%s"
 msgstr "%s, %d plików%s"
 
-#: ../src/layout.c:460
+#: ../src/layout.c:469
 #, c-format
 msgid "%d files%s"
 msgstr "%d plików%s"
 
-#: ../src/layout.c:506
+#: ../src/layout.c:515
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(brak uprawnień do odczytu) %s bajtów"
 
-#: ../src/layout.c:510
+#: ../src/layout.c:519
 #, c-format
 msgid "( ? x ? ) %s bytes"
 msgstr "( ? x ? ) %s bajtów"
 
-#: ../src/layout.c:518
+#: ../src/layout.c:527
 #, c-format
 msgid "( %d x %d ) %s bytes"
 msgstr "( %d x %d ) %s bajtów"
 
-#: ../src/layout.c:1243 ../src/layout_config.c:58
+#: ../src/layout.c:1252 ../src/layout_config.c:67
 msgid "Tools"
 msgstr "Narzędzia"
 
-#: ../src/layout.c:1865
+#: ../src/layout.c:1879
 msgid "Window options and layout"
 msgstr "Ustawienia okna i jego ułożenia"
 
-#: ../src/layout.c:1924
+#: ../src/layout.c:1944
 msgid "General options"
 msgstr "Ogólne"
 
-#: ../src/layout.c:1926
+#: ../src/layout.c:1946
 msgid "Home path (empty to use your home directory)"
 msgstr "Katalog startowy (zostaw puste by ustawić twój katalog domowy)"
 
-#: ../src/layout.c:1934
+#: ../src/layout.c:1954
 msgid "Use current"
 msgstr "Wykorzystaj bieżący"
 
-#: ../src/layout.c:1937
+#: ../src/layout.c:1957
 msgid "Show date in directories list view"
 msgstr "Pokaż datę przy widoku katalogu jako listy "
 
-#: ../src/layout.c:1940
+#: ../src/layout.c:1960
 msgid "Exit program when this window is closed"
 msgstr "Zamknij program po zamknięciu tego okna"
 
-#: ../src/layout.c:1943
+#: ../src/layout.c:1963
 msgid "Start-up directory:"
 msgstr "Katalog startowy:"
 
-#: ../src/layout.c:1945
+#: ../src/layout.c:1965
 msgid "No change"
 msgstr "Bez zmian"
 
-#: ../src/layout.c:1948
+#: ../src/layout.c:1968
 msgid "Restore last path"
 msgstr "Użyj ostatniej ścieżki"
 
-#: ../src/layout.c:1951
+#: ../src/layout.c:1971
 msgid "Home path"
 msgstr "Katalog domowy"
 
-#: ../src/layout.c:1955 ../src/print.c:3365 ../src/print.c:3372
+#: ../src/layout.c:1975 ../src/print.c:3374 ../src/print.c:3381
 msgid "Layout"
 msgstr "Ułożenie"
 
-#: ../src/layout.c:2198
+#: ../src/layout.c:2218
 msgid "Invalid geometry\n"
 msgstr "Nieprawidłowa geometria\n"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:1602
-#: ../src/ui_pathsel.c:1173
+#: ../src/layout_config.c:67 ../src/preferences.c:1721 ../src/ui_pathsel.c:1182
 msgid "Files"
 msgstr "Pliki"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:92 ../src/preferences.c:1375
-#: ../src/print.c:123
+#: ../src/layout_config.c:67 ../src/preferences.c:107 ../src/preferences.c:1483
+#: ../src/print.c:132
 msgid "Image"
 msgstr "Obraz"
 
-#: ../src/layout_config.c:349
+#: ../src/layout_config.c:358
 msgid "(drag to change order)"
-msgstr "(przeciągnij aby zmienić kolejność)"
-
-#: ../src/layout_image.c:553
+msgstr "(przeciągnij, aby zmienić kolejność)"
+
+#: ../src/layout_image.c:718
+msgid "_Animate"
+msgstr "_Animacja"
+
+#: ../src/layout_image.c:722
 msgid "Hide file _list"
 msgstr "Ukrycie _listy plików"
 
-#: ../src/layout_image.c:1616
+#: ../src/layout_image.c:1786
 #, c-format
 msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 msgstr "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 
-#: ../src/layout_image.c:1624
+#: ../src/layout_image.c:1794
 #, c-format
 msgid "[%*s,%*s]: RGB(---,---,---)"
 msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: ../src/layout_util.c:1269
+#: ../src/layout_util.c:1441
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/layout_util.c:1270
+#: ../src/layout_util.c:1442
 msgid "_Go"
 msgstr "Idź do"
 
-#: ../src/layout_util.c:1271 ../src/menu.c:109
+#: ../src/layout_util.c:1443 ../src/menu.c:117
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/layout_util.c:1272
+#: ../src/layout_util.c:1444
 msgid "_Select"
 msgstr "Zaznaczenie"
 
-#: ../src/layout_util.c:1273 ../src/menu.c:284
+#: ../src/layout_util.c:1445 ../src/menu.c:292
 msgid "_Orientation"
 msgstr "Orientacja"
 
-#: ../src/layout_util.c:1274
+#: ../src/layout_util.c:1446
 msgid "E_xternal Editors"
 msgstr "Zewnętrzne edytory"
 
-#: ../src/layout_util.c:1275
+#: ../src/layout_util.c:1447
 msgid "P_references"
 msgstr "P_referencje..."
 
-#: ../src/layout_util.c:1277
+#: ../src/layout_util.c:1449
 msgid "_Files and Folders"
 msgstr "Pliki i katalogi"
 
-#: ../src/layout_util.c:1278
+#: ../src/layout_util.c:1450
 msgid "_Zoom"
 msgstr "Skalowanie"
 
-#: ../src/layout_util.c:1279
+#: ../src/layout_util.c:1451
 msgid "_Color Management"
 msgstr "Zarządzanie kolorami"
 
-#: ../src/layout_util.c:1280
+#: ../src/layout_util.c:1452
 msgid "_Connected Zoom"
 msgstr "Powiązana zmiana skali"
 
-#: ../src/layout_util.c:1281
+#: ../src/layout_util.c:1453
 msgid "Spli_t"
 msgstr "Podziel"
 
-#: ../src/layout_util.c:1282
+#: ../src/layout_util.c:1454
 msgid "Stere_o"
 msgstr "Stere_o"
 
-#: ../src/layout_util.c:1283 ../src/layout_util.c:1399
+#: ../src/layout_util.c:1455 ../src/layout_util.c:1572
 msgid "Image _Overlay"
-msgstr ""
-
-#: ../src/layout_util.c:1284
+msgstr "_Nakładka"
+
+#: ../src/layout_util.c:1456
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1458
 msgid "_First Image"
 msgstr "Pierwszy obraz"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1458
 msgid "First Image"
 msgstr "Pierwszy obraz"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1459 ../src/layout_util.c:1460
+#: ../src/layout_util.c:1461
 msgid "_Previous Image"
 msgstr "_Poprzedni obraz"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1459 ../src/layout_util.c:1460
+#: ../src/layout_util.c:1461
 msgid "Previous Image"
 msgstr "_Poprzedni obraz"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1462 ../src/layout_util.c:1463
+#: ../src/layout_util.c:1464
 msgid "_Next Image"
 msgstr "_Następny obraz"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1462 ../src/layout_util.c:1463
+#: ../src/layout_util.c:1464
 msgid "Next Image"
 msgstr "_Następny obraz"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1465
 msgid "_Last Image"
 msgstr "_Ostatni obraz"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1465
 msgid "Last Image"
 msgstr "_Ostatni obraz"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1466
 msgid "_Back"
 msgstr "_Powrót"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1466
 msgid "Back"
 msgstr "Powrót"
 
-#: ../src/layout_util.c:1295
+#: ../src/layout_util.c:1467
 msgid "_Home"
 msgstr "Położenie początkowe"
 
-#: ../src/layout_util.c:1295 ../src/options.c:156 ../src/ui_bookmark.c:549
-#: ../src/ui_pathsel.c:1045
+#: ../src/layout_util.c:1467 ../src/options.c:170 ../src/ui_bookmark.c:566
+#: ../src/ui_pathsel.c:1054
 msgid "Home"
 msgstr "Położenie początkowe"
 
-#: ../src/layout_util.c:1296
+#: ../src/layout_util.c:1468
 msgid "_Up"
-msgstr ""
-
-#: ../src/layout_util.c:1296
+msgstr "W _górę"
+
+#: ../src/layout_util.c:1468
 msgid "Up"
-msgstr ""
-
-#: ../src/layout_util.c:1298
+msgstr "W górę"
+
+#: ../src/layout_util.c:1470
 msgid "New _window"
 msgstr "No_we okno"
 
-#: ../src/layout_util.c:1298
+#: ../src/layout_util.c:1470
 msgid "New window"
 msgstr "No_we okno"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1471
 msgid "_New collection"
 msgstr "_Nowa kolekcja"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1471
 msgid "New collection"
 msgstr "_Nowa kolekcja"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1472
 msgid "_Open collection..."
 msgstr "Otwórz kolekcję..."
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1472
 msgid "Open collection..."
 msgstr "Otwórz kolekcję..."
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1473
 msgid "Open recen_t"
 msgstr "Otwó_rz ostatni"
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1473
 msgid "Open recent"
 msgstr "Otwó_rz ostatni"
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1474
 msgid "_Search..."
 msgstr "Szukaj..."
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1474
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: ../src/layout_util.c:1303
+#: ../src/layout_util.c:1475
 msgid "Find duplicates..."
 msgstr "Wyszukaj duplikaty..."
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1476
 msgid "Pa_n view"
 msgstr ""
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1476
 msgid "Pan view"
 msgstr ""
 
-#: ../src/layout_util.c:1305
+#: ../src/layout_util.c:1477
 msgid "_Print..."
 msgstr "Drukuj..."
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1478
 msgid "N_ew folder..."
 msgstr "Nowy katalog..."
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1478
 msgid "New folder..."
 msgstr "Nowy katalog..."
 
-#: ../src/layout_util.c:1307
+#: ../src/layout_util.c:1479
 msgid "Copy..."
 msgstr "_Kopiuj..."
 
-#: ../src/layout_util.c:1308
+#: ../src/layout_util.c:1480
 msgid "Move..."
 msgstr "P_rzenieś..."
 
-#: ../src/layout_util.c:1309
+#: ../src/layout_util.c:1481
 msgid "Rename..."
 msgstr "Zm_ień nazwę..."
 
-#: ../src/layout_util.c:1310 ../src/layout_util.c:1311
-#: ../src/layout_util.c:1312
+#: ../src/layout_util.c:1482 ../src/layout_util.c:1483
+#: ../src/layout_util.c:1484
 msgid "Delete..."
 msgstr "_Usuń..."
 
-#: ../src/layout_util.c:1313 ../src/view_file.c:603
+#: ../src/layout_util.c:1485 ../src/view_file.c:633
 msgid "Enable file _grouping"
 msgstr "Włącz _grupowanie plików"
 
-#: ../src/layout_util.c:1313
+#: ../src/layout_util.c:1485
 msgid "Enable file grouping"
 msgstr "Włącz grupowanie plików"
 
-#: ../src/layout_util.c:1314 ../src/view_file.c:605
+#: ../src/layout_util.c:1486 ../src/view_file.c:635
 msgid "Disable file groupi_ng"
 msgstr "Wyłącz grupowanie plików"
 
-#: ../src/layout_util.c:1314
+#: ../src/layout_util.c:1486
 msgid "Disable file grouping"
 msgstr "Wyłącz grupowanie plików"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1487
 msgid "_Copy path to clipboard"
 msgstr "S_kopiuj ścieżkę do schowka"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1487
 msgid "Copy path to clipboard"
 msgstr "Kopiuj ścieżkę do schowka"
 
-#: ../src/layout_util.c:1316
+#: ../src/layout_util.c:1488
 msgid "Close window"
 msgstr "Zamknij okno"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1489
 msgid "_Quit"
 msgstr "Zakończ"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1489
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../src/layout_util.c:1318 ../src/menu.c:226
+#: ../src/layout_util.c:1490 ../src/menu.c:234
 msgid "_Rotate clockwise"
 msgstr "Obróć _zgodnie z zegarem"
 
-#: ../src/layout_util.c:1318
+#: ../src/layout_util.c:1490
 msgid "Rotate clockwise"
 msgstr "Obróć zgodnie ze wskazówkami zegara"
 
-#: ../src/layout_util.c:1319 ../src/menu.c:229
+#: ../src/layout_util.c:1491 ../src/menu.c:237
 msgid "Rotate _counterclockwise"
 msgstr "Obróć _przeciwnie do zegara"
 
-#: ../src/layout_util.c:1319
+#: ../src/layout_util.c:1491
 msgid "Rotate counterclockwise"
 msgstr "Obróć przeciwnie do wskazówek zegara"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1492
 msgid "Rotate 1_80"
 msgstr "Obróć o 1_80"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1492
 msgid "Rotate 180"
 msgstr "Obróć o 180"
 
-#: ../src/layout_util.c:1321 ../src/menu.c:235
+#: ../src/layout_util.c:1493 ../src/menu.c:243
 msgid "_Mirror"
 msgstr "Odbicie _lustrzane"
 
-#: ../src/layout_util.c:1321
+#: ../src/layout_util.c:1493
 msgid "Mirror"
 msgstr "Odbicie lustrzane"
 
-#: ../src/layout_util.c:1322 ../src/menu.c:238
+#: ../src/layout_util.c:1494 ../src/menu.c:246
 msgid "_Flip"
 msgstr "O_dbij w pionie"
 
-#: ../src/layout_util.c:1322
+#: ../src/layout_util.c:1494
 msgid "Flip"
 msgstr "Odbij w pionie"
 
-#: ../src/layout_util.c:1323 ../src/menu.c:241
+#: ../src/layout_util.c:1495 ../src/menu.c:249
 msgid "_Original state"
 msgstr "_Oryginalna orientacja"
 
-#: ../src/layout_util.c:1323
+#: ../src/layout_util.c:1495
 msgid "Original state"
 msgstr "Oryginalna orientacja"
 
-#: ../src/layout_util.c:1324
+#: ../src/layout_util.c:1496
 msgid "Select _all"
 msgstr "Zazn_acz wszystko"
 
-#: ../src/layout_util.c:1325
+#: ../src/layout_util.c:1497
 msgid "Select _none"
 msgstr "Odz_nacz"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1498
 msgid "_Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1498
 msgid "Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1499
 msgid "P_references..."
 msgstr "P_referencje..."
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1499
 msgid "Preferences..."
 msgstr "Preferencje..."
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1500
 msgid "Configure _Editors..."
 msgstr "Konfiguruj _Edytory..."
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1500
 msgid "Configure Editors..."
 msgstr "Konfiguruj Edytory..."
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1501
 msgid "_Configure this window..."
 msgstr "Konfiguruj to okno..."
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1501
 msgid "Configure this window..."
 msgstr "Konfiguruj to okno..."
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1502
 msgid "_Thumbnail maintenance..."
 msgstr "Zarządzanie minia_turkami..."
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1502
 msgid "Thumbnail maintenance..."
 msgstr "Zarządzanie miniaturkami..."
 
-#: ../src/layout_util.c:1331
+#: ../src/layout_util.c:1503
 msgid "Set as wallpaper"
 msgstr "Ustaw jako tapetę"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1504
 msgid "_Save metadata"
 msgstr "Zapi_sz metadane"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1504
 msgid "Save metadata"
 msgstr "Zapisz metadane"
 
-#: ../src/layout_util.c:1333 ../src/layout_util.c:1334
+#: ../src/layout_util.c:1505 ../src/layout_util.c:1506
 msgid "Zoom in"
 msgstr "Powiększ"
 
-#: ../src/layout_util.c:1335 ../src/layout_util.c:1336
+#: ../src/layout_util.c:1507 ../src/layout_util.c:1508
 msgid "Zoom out"
 msgstr "Pomniejsz"
 
-#: ../src/layout_util.c:1337 ../src/layout_util.c:1338
+#: ../src/layout_util.c:1509 ../src/layout_util.c:1510
 msgid "Zoom 1:1"
 msgstr "Skala 1:1"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1511 ../src/layout_util.c:1512
+#: ../src/layout_util.c:1527 ../src/layout_util.c:1528
 msgid "_Zoom to fit"
 msgstr "Dopasuj do okna"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
+#: ../src/layout_util.c:1511 ../src/layout_util.c:1512
 msgid "Zoom to fit"
 msgstr "Dopasuj do okna"
 
-#: ../src/layout_util.c:1341 ../src/layout_util.c:1357
+#: ../src/layout_util.c:1513 ../src/layout_util.c:1529
 msgid "Fit _Horizontally"
 msgstr "Dopasuj w poziomie"
 
-#: ../src/layout_util.c:1341
+#: ../src/layout_util.c:1513
 msgid "Fit Horizontally"
 msgstr "Dopasuj w poziomie"
 
-#: ../src/layout_util.c:1342 ../src/layout_util.c:1358
+#: ../src/layout_util.c:1514 ../src/layout_util.c:1530
 msgid "Fit _Vertically"
 msgstr "Dopasuj w pionie"
 
-#: ../src/layout_util.c:1342
+#: ../src/layout_util.c:1514
 msgid "Fit Vertically"
 msgstr "Dopasuj w pionie"
 
-#: ../src/layout_util.c:1343 ../src/layout_util.c:1359
+#: ../src/layout_util.c:1515 ../src/layout_util.c:1531
 msgid "Zoom _2:1"
 msgstr "Skala _2:1"
 
-#: ../src/layout_util.c:1343
+#: ../src/layout_util.c:1515
 msgid "Zoom 2:1"
 msgstr "Skala 2:1"
 
-#: ../src/layout_util.c:1344 ../src/layout_util.c:1360
+#: ../src/layout_util.c:1516 ../src/layout_util.c:1532
 msgid "Zoom _3:1"
 msgstr "Skala _3:1"
 
-#: ../src/layout_util.c:1344
+#: ../src/layout_util.c:1516
 msgid "Zoom 3:1"
 msgstr "Skala 3:1"
 
-#: ../src/layout_util.c:1345 ../src/layout_util.c:1361
+#: ../src/layout_util.c:1517 ../src/layout_util.c:1533
 msgid "Zoom _4:1"
 msgstr "Skala _4:1"
 
-#: ../src/layout_util.c:1345
+#: ../src/layout_util.c:1517
 msgid "Zoom 4:1"
 msgstr "Skala 4:1"
 
-#: ../src/layout_util.c:1346 ../src/layout_util.c:1362
+#: ../src/layout_util.c:1518 ../src/layout_util.c:1534
 msgid "Zoom 1:2"
 msgstr "Skala _1:2"
 
-#: ../src/layout_util.c:1347 ../src/layout_util.c:1363
+#: ../src/layout_util.c:1519 ../src/layout_util.c:1535
 msgid "Zoom 1:3"
 msgstr "Skala _1:3"
 
-#: ../src/layout_util.c:1348 ../src/layout_util.c:1364
+#: ../src/layout_util.c:1520 ../src/layout_util.c:1536
 msgid "Zoom 1:4"
 msgstr "Skala _1:4"
 
-#: ../src/layout_util.c:1349 ../src/layout_util.c:1350
+#: ../src/layout_util.c:1521 ../src/layout_util.c:1522
 msgid "Connected Zoom in"
 msgstr "Powiązane powiększenie"
 
-#: ../src/layout_util.c:1351 ../src/layout_util.c:1352
+#: ../src/layout_util.c:1523 ../src/layout_util.c:1524
 msgid "Connected Zoom out"
 msgstr "Powiązane zmniejszenie"
 
-#: ../src/layout_util.c:1353 ../src/layout_util.c:1354
+#: ../src/layout_util.c:1525 ../src/layout_util.c:1526
 msgid "Connected Zoom 1:1"
 msgstr "Ustaw powiązane powiększenie 1:1"
 
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1527 ../src/layout_util.c:1528
 msgid "Connected Zoom to fit"
 msgstr "Powiązane dopasowanie do okna"
 
-#: ../src/layout_util.c:1357
+#: ../src/layout_util.c:1529
 msgid "Connected Fit Horizontally"
 msgstr "Powiązane dopasowanie w poziomie"
 
-#: ../src/layout_util.c:1358
+#: ../src/layout_util.c:1530
 msgid "Connected Fit Vertically"
 msgstr "Powiązane dopasowanie w pionie"
 
-#: ../src/layout_util.c:1359
+#: ../src/layout_util.c:1531
 msgid "Connected Zoom 2:1"
 msgstr "Ustaw powiązane powiększenie 2:1"
 
-#: ../src/layout_util.c:1360
+#: ../src/layout_util.c:1532
 msgid "Connected Zoom 3:1"
 msgstr "Ustaw powiązane powiększenie 3:1"
 
-#: ../src/layout_util.c:1361
+#: ../src/layout_util.c:1533
 msgid "Connected Zoom 4:1"
 msgstr "Ustaw powiązane powiększenie 4:1"
 
-#: ../src/layout_util.c:1362
+#: ../src/layout_util.c:1534
 msgid "Connected Zoom 1:2"
 msgstr "Ustaw powiązane powiększenie 1:2"
 
-#: ../src/layout_util.c:1363
+#: ../src/layout_util.c:1535
 msgid "Connected Zoom 1:3"
 msgstr "Ustaw powiązane powiększenie 1:3"
 
-#: ../src/layout_util.c:1364
+#: ../src/layout_util.c:1536
 msgid "Connected Zoom 1:4"
 msgstr "Ustaw powiązane powiększenie 1:4"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1537
 msgid "_View in new window"
 msgstr "Podgląd w _nowym oknie"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1537
 msgid "View in new window"
 msgstr "Podgląd w nowym oknie"
 
-#: ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368
+#: ../src/layout_util.c:1538 ../src/layout_util.c:1539
+#: ../src/layout_util.c:1540
 msgid "F_ull screen"
 msgstr "P_ełny ekran"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1541 ../src/layout_util.c:1542
 msgid "_Leave full screen"
 msgstr "Wyłącz pełny ekran"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1541 ../src/layout_util.c:1542
 msgid "Leave full screen"
 msgstr "Wyłącz pełny ekran"
 
-#: ../src/layout_util.c:1371
+#: ../src/layout_util.c:1543
 msgid "_Cycle through overlay modes"
-msgstr ""
-
-#: ../src/layout_util.c:1371
+msgstr "_Przechodzenie pomiędzy trybami nakładki"
+
+#: ../src/layout_util.c:1543
 msgid "Cycle through Overlay modes"
-msgstr ""
-
-#: ../src/layout_util.c:1372
+msgstr "Przechodzenie pomiędzy trybami nakładki"
+
+#: ../src/layout_util.c:1544
 msgid "Cycle through histogram ch_annels"
 msgstr "Przechodzenie pomiędzy k_anałami histogramu"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1544
 msgid "Cycle through histogram channels"
 msgstr "Przechodzenie pomiędzy kanałami histogramu"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1545
 msgid "Cycle through histogram mo_des"
 msgstr "Przechodzenie pomiędzy _trybami histogramu"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1545
 msgid "Cycle through histogram modes"
 msgstr "Przechodzenie pomiędzy trybami histogramu"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1546
 msgid "_Hide file list"
 msgstr "Ukrycie _listy plików"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1546
 msgid "Hide file list"
 msgstr "Ukryj listę plików"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1547
 msgid "_Pause slideshow"
 msgstr "W_strzymaj pokaz slajdów"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1547
 msgid "Pause slideshow"
 msgstr "Wstrzymaj pokaz slajdów"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1548
 msgid "_Refresh"
 msgstr "_Odśwież"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1548
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1549
 msgid "_Contents"
 msgstr "Indeks"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1549
 msgid "Contents"
 msgstr "Zawartość"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1550
 msgid "_Keyboard shortcuts"
 msgstr "Skróty _klawiszowe"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1550
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1551
+msgid "_Keyboard map"
+msgstr "Mapowanie _klawiszy"
+
+#: ../src/layout_util.c:1551
+msgid "Keyboard map"
+msgstr "Mapowanie klawiszy"
+
+#: ../src/layout_util.c:1552
 msgid "_Release notes"
 msgstr "Wydanie"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1552
 msgid "Release notes"
 msgstr "O wydaniu"
 
-#: ../src/layout_util.c:1380
+#: ../src/layout_util.c:1553
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../src/layout_util.c:1380 ../src/preferences.c:2328
+#: ../src/layout_util.c:1553 ../src/preferences.c:2523
 msgid "About"
 msgstr "O progr_amie"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1554
 msgid "_Log Window"
 msgstr "Okno _logów"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1554
 msgid "Log Window"
 msgstr "Okno logów"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1555
 msgid "_Exif window"
 msgstr "Okno danych Exif"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1555
 msgid "Exif window"
 msgstr "Okno danych Exif"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1556
 msgid "_Cycle through stereo modes"
-msgstr ""
-
-#: ../src/layout_util.c:1383
+msgstr "_Przechodzenie pomiędzy trybami stereo"
+
+#: ../src/layout_util.c:1556
 msgid "Cycle through stereo modes"
-msgstr ""
-
-#: ../src/layout_util.c:1388
+msgstr "Przechodzenie pomiędzy trybami stereo"
+
+#: ../src/layout_util.c:1561
 msgid "Show _Thumbnails"
 msgstr "Pokaż _miniaturki"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1561
 msgid "Show Thumbnails"
 msgstr "Pokaż miniaturki"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1562
 msgid "Show _Marks"
 msgstr "Pokaż znaczniki"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1562
 msgid "Show Marks"
 msgstr "Pokaż znaczniki"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1563
 msgid "Pi_xel Info"
 msgstr "Wyświetlanie informacji o pikselach"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1563
 msgid "Show Pixel Info"
 msgstr "Wyświetlaj informacje o pikselach"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1564
 msgid "_Float file list"
 msgstr "Oderwana lista plików"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1564
 msgid "Float file list"
 msgstr "Oderwana lista plików"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1565
 msgid "Hide tool_bar"
 msgstr "Ukryj pasek narzędzi"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1565
 msgid "Hide toolbar"
 msgstr "Ukryj pasek narzędzi"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1566
 msgid "_Info sidebar"
 msgstr "Panel _Informacyjny"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1566
 msgid "Info sidebar"
 msgstr "Panel informacyjny"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1567
 msgid "Sort _manager"
 msgstr "_Menedżer sortowania"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1567
 msgid "Sort manager"
 msgstr "_Menedżer sortowania"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1568
 msgid "Toggle _slideshow"
 msgstr "Przełącz pokaz _slajdów"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1568
 msgid "Toggle slideshow"
 msgstr "Przełącz pokaz _slajdów"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1569
 msgid "Use _color profiles"
 msgstr "Użyj profili kolorów"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1569
 msgid "Use color profiles"
 msgstr "Użyj profili kolorów"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1570
 msgid "Use profile from _image"
 msgstr "Użyj prof_ili z obrazu"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1570
 msgid "Use profile from image"
 msgstr "Użyj profili z obrazu"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1571
 msgid "Toggle _grayscale"
 msgstr "Przełącz na odcienie szarości"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1571
 msgid "Toggle grayscale"
 msgstr "Przełącz skalę szarości"
 
-#: ../src/layout_util.c:1399
+#: ../src/layout_util.c:1572
 msgid "Image Overlay"
-msgstr ""
-
-#: ../src/layout_util.c:1400
+msgstr "_Nakładka"
+
+#: ../src/layout_util.c:1573
 msgid "_Show Histogram"
 msgstr "Pokaż _Histogram"
 
-#: ../src/layout_util.c:1400
+#: ../src/layout_util.c:1573
 msgid "Show Histogram"
 msgstr "Pokaż Histogram"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1577
 msgid "Image _List"
 msgstr "W postaci listy"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1577
 msgid "View Images as List"
 msgstr "Wyświetlanie jako listę"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1578
 msgid "I_cons"
 msgstr "Ikony"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1578
 msgid "View Images as Icons"
 msgstr "Wyświetlanie jako ikony"
 
-#: ../src/layout_util.c:1409
+#: ../src/layout_util.c:1582
 msgid "Folder Li_st"
 msgstr "Katalogi jako lista"
 
-#: ../src/layout_util.c:1409
+#: ../src/layout_util.c:1582
 msgid "View Folders as List"
 msgstr "Pokaż katalogi jako listę"
 
-#: ../src/layout_util.c:1410
+#: ../src/layout_util.c:1583
 msgid "Folder T_ree"
 msgstr "Widok drzewiasty"
 
-#: ../src/layout_util.c:1410
+#: ../src/layout_util.c:1583
 msgid "View Folders as Tree"
 msgstr "Pokaż katalogi jako drzewo"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1587
 msgid "_Horizontal"
 msgstr "W poziomie"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1587
 msgid "Split Horizontal"
 msgstr "Podziel w poziomie"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1588
 msgid "_Vertical"
 msgstr "W pionie"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1588
 msgid "Split Vertical"
 msgstr "Podziel w pionie"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1589
 msgid "_Quad"
 msgstr "Na cztery"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1589
 msgid "Split Quad"
 msgstr "Podziel na cztery"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1590
 msgid "_Single"
 msgstr "Pojedynczy"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1590
 msgid "Split Single"
 msgstr "Bez dzielenia"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1594
 msgid "Input _0: sRGB"
 msgstr "Profil _0: sRGB"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1594
 msgid "Input 0: sRGB"
 msgstr "Profil 0: sRGB"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1595
 msgid "Input _1: AdobeRGB compatible"
 msgstr "Profil _1: zgodny z AdobeRGB"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1595
 msgid "Input 1: AdobeRGB compatible"
 msgstr "Profil 1: zgodny z AdobeRGB"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1596
 msgid "Input _2"
 msgstr "Profil _2"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1596
 msgid "Input 2"
 msgstr "Profil 2"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1597
 msgid "Input _3"
 msgstr "Profil _3"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1597
 msgid "Input 3"
 msgstr "Profil 3"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1598
 msgid "Input _4"
 msgstr "Profil _4"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1598
 msgid "Input 4"
 msgstr "Profil _4"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1599
 msgid "Input _5"
 msgstr "Profil _5"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1599
 msgid "Input 5"
 msgstr "Profil 5"
 
-#: ../src/layout_util.c:1430
+#: ../src/layout_util.c:1603
 msgid "Histogram on Red"
 msgstr "Histogram czerwonego"
 
-#: ../src/layout_util.c:1431
+#: ../src/layout_util.c:1604
 msgid "Histogram on Green"
 msgstr "Histogram zielonego"
 
-#: ../src/layout_util.c:1432
+#: ../src/layout_util.c:1605
 msgid "Histogram on Blue"
 msgstr "Histogram niebieskiego"
 
-#: ../src/layout_util.c:1433
+#: ../src/layout_util.c:1606
 msgid "Histogram on RGB"
 msgstr "_Histogram RGB"
 
-#: ../src/layout_util.c:1434
+#: ../src/layout_util.c:1607
 msgid "Histogram on Value"
 msgstr "Histogram jasności (HSV)"
 
-#: ../src/layout_util.c:1438
+#: ../src/layout_util.c:1611
 msgid "Linear Histogram"
 msgstr "Histogram liniowy"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1612
 msgid "_Log Histogram"
 msgstr "Histogram _logarytmiczny"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1612
 msgid "Log Histogram"
 msgstr "Histogram logarytmiczny"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1616
 msgid "_Auto"
 msgstr "_Automatycznie"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1616
 msgid "Stereo Auto"
 msgstr ""
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1617
 msgid "_Side by Side"
 msgstr ""
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1617
 msgid "Stereo Side by Side"
 msgstr ""
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1618
 msgid "_Cross"
 msgstr ""
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1618
 msgid "Stereo Cross"
 msgstr ""
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1619
 msgid "_Off"
 msgstr ""
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1619
 msgid "Stereo Off"
 msgstr ""
 
-#: ../src/layout_util.c:1735
+#: ../src/layout_util.c:1909
 #, c-format
 msgid "Mark _%d"
 msgstr "Znacznik _%d"
 
-#: ../src/layout_util.c:1736 ../src/view_file.c:540
+#: ../src/layout_util.c:1910 ../src/view_file.c:570
 #, c-format
 msgid "_Set mark %d"
 msgstr "U_staw znacznik %d"
 
-#: ../src/layout_util.c:1736
+#: ../src/layout_util.c:1910
 #, c-format
 msgid "Set mark %d"
 msgstr "Ustaw znacznik %d"
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:541
+#: ../src/layout_util.c:1911 ../src/view_file.c:571
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Usuń znacznik %d"
 
-#: ../src/layout_util.c:1737
+#: ../src/layout_util.c:1911
 #, c-format
 msgid "Reset mark %d"
 msgstr "Usuń znacznik %d"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739 ../src/view_file.c:542
+#: ../src/layout_util.c:1912 ../src/layout_util.c:1913 ../src/view_file.c:572
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Przełącz znacznik %d"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739
+#: ../src/layout_util.c:1912 ../src/layout_util.c:1913
 #, c-format
 msgid "Toggle mark %d"
 msgstr "Przełącz znacznik %d"
 
-#: ../src/layout_util.c:1740
+#: ../src/layout_util.c:1914
 #, c-format
 msgid "Se_lect mark %d"
 msgstr "Wybierz znacznik %d"
 
-#: ../src/layout_util.c:1740 ../src/layout_util.c:1741
+#: ../src/layout_util.c:1914 ../src/layout_util.c:1915
 #, c-format
 msgid "Select mark %d"
 msgstr "Wybierz znacznik %d"
 
-#: ../src/layout_util.c:1741 ../src/view_file.c:543
+#: ../src/layout_util.c:1915 ../src/view_file.c:573
 #, c-format
 msgid "_Select mark %d"
 msgstr "Wybierz znacznik %d"
 
-#: ../src/layout_util.c:1742 ../src/view_file.c:544
+#: ../src/layout_util.c:1916 ../src/view_file.c:574
 #, c-format
 msgid "_Add mark %d"
 msgstr "Dodaj znacznik %d"
 
-#: ../src/layout_util.c:1742
+#: ../src/layout_util.c:1916
 #, c-format
 msgid "Add mark %d"
 msgstr "Dodaj znacznik %d"
 
-#: ../src/layout_util.c:1743 ../src/view_file.c:545
+#: ../src/layout_util.c:1917 ../src/view_file.c:575
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Część wspólna ze znacznikiem %d"
 
-#: ../src/layout_util.c:1743
+#: ../src/layout_util.c:1917
 #, c-format
 msgid "Intersection with mark %d"
 msgstr "Część wspólna ze znacznikiem %d"
 
-#: ../src/layout_util.c:1744 ../src/view_file.c:546
+#: ../src/layout_util.c:1918 ../src/view_file.c:576
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Odznacz znacznik %d"
 
-#: ../src/layout_util.c:1744
+#: ../src/layout_util.c:1918
 #, c-format
 msgid "Unselect mark %d"
 msgstr "Odznacz znacznik %d"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:1919
 #, c-format
 msgid "_Filter mark %d"
 msgstr "_Filtruj znacznik %d"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:1919
 #, c-format
 msgid "Filter mark %d"
 msgstr "Filtruj znacznik %d"
 
-#: ../src/layout_util.c:2127
+#: ../src/layout_util.c:2301
 #, c-format
 msgid "Number of files with unsaved metadata: %d"
 msgstr "Liczba plików z niezapisanymi metadanymi: %d"
 
-#: ../src/layout_util.c:2133
+#: ../src/layout_util.c:2307
 msgid "No unsaved metadata"
 msgstr "Brak niezapisanych metadanych"
 
-#: ../src/layout_util.c:2180
+#: ../src/layout_util.c:2354
 #, c-format
 msgid ""
 "Image profile: %s\n"
@@ -3097,26 +3111,26 @@
 "Profil obrazu: %s\n"
 "Profil ekranu: %s"
 
-#: ../src/layout_util.c:2188
+#: ../src/layout_util.c:2362
 msgid "Click to enable color management"
 msgstr "Kliknij, żeby włączyć zarządzanie kolorem"
 
-#: ../src/layout_util.c:2193
+#: ../src/layout_util.c:2367
 msgid "Color profiles not supported"
 msgstr "Profile koloru nie są wspierane"
 
-#: ../src/layout_util.c:2215
+#: ../src/layout_util.c:2389
 #, c-format
 msgid "Input _%d: %s"
 msgstr "Profil _%d: %s"
 
 #. something went badly wrong
-#: ../src/lirc.c:197
+#: ../src/lirc.c:209
 #, c-format
 msgid "disconnected from LIRC\n"
 msgstr "odłączony od LIRC\n"
 
-#: ../src/lirc.c:222
+#: ../src/lirc.c:234
 #, c-format
 msgid ""
 "could not read LIRC config file\n"
@@ -3127,11 +3141,11 @@
 "proszę przeczytać dokumentację LIRC, żeby  \n"
 "dowiedzieć się, jak utworzyć poprawny plik konfiguracji\n"
 
-#: ../src/logwindow.c:76
+#: ../src/logwindow.c:84
 msgid "Log"
 msgstr "Log"
 
-#: ../src/main.c:321
+#: ../src/main.c:330
 #, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
@@ -3140,65 +3154,65 @@
 "Użycie: %s [opcje] [ścieżka]\n"
 "\n"
 
-#: ../src/main.c:322
+#: ../src/main.c:331
 msgid "valid options are:\n"
 msgstr "poprawnymi opcjami są:\n"
 
-#: ../src/main.c:323
+#: ../src/main.c:332
 msgid "  +t, --with-tools                 force show of tools\n"
 msgstr "  +t, --with-tools                 wymusza wyświetlenie narzędzi\n"
 
-#: ../src/main.c:324
+#: ../src/main.c:333
 msgid "  -t, --without-tools              force hide of tools\n"
 msgstr "  -t, --without-tools              wymusza ukrycie narzędzi\n"
 
-#: ../src/main.c:325
+#: ../src/main.c:334
 msgid "  -f, --fullscreen                 start in full screen mode\n"
 msgstr "  -f, --fullscreen                 uruchamia w trybie pełnoekranowym\n"
 
-#: ../src/main.c:326
+#: ../src/main.c:335
 msgid "  -s, --slideshow                  start in slideshow mode\n"
 msgstr "  -s, --slideshow                  uruchamia w trybie pokazu slajdów\n"
 
-#: ../src/main.c:327
+#: ../src/main.c:336
 msgid ""
 "  -l, --list [files] [collections] open collection window for command line\n"
 msgstr ""
 "  -l, --list [pliki] [kolekcje] otwiera okno kolekcji z plikami z wiersza "
 "poleceń\n"
 
-#: ../src/main.c:328
+#: ../src/main.c:337
 msgid "      --blank                      start with blank file list\n"
 msgstr "      --blank                      uruchom z pustą listą plików\n"
 
-#: ../src/main.c:329
+#: ../src/main.c:338
 msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
 msgstr "      --geometry=XxY+XOFF+YOFF     ustaw położenie głównego okna\n"
 
-#: ../src/main.c:330
+#: ../src/main.c:339
 msgid ""
 "  -r, --remote                     send following commands to open window\n"
 msgstr ""
 "  -r, --remote                     wyślij następujące polecenia do otwartego "
 "okna\n"
 
-#: ../src/main.c:331
+#: ../src/main.c:340
 msgid "  -rh,--remote-help                print remote command list\n"
 msgstr ""
 "  -rh,--remote-help                wyświetl polecenia zdalnego sterowania\n"
 
-#: ../src/main.c:333
+#: ../src/main.c:342
 msgid "      --debug[=level]              turn on debug output\n"
 msgstr ""
 "      --debug[=level]              uaktywnia wyświetlanie komunikatów\n"
 "                                    diagnostycznych\n"
 
-#: ../src/main.c:335
+#: ../src/main.c:344
 msgid "  -v, --version                    print version info\n"
 msgstr ""
 "  -v, --version                    wyświetla informacje na temat wersji\n"
 
-#: ../src/main.c:336
+#: ../src/main.c:345
 msgid ""
 "  -h, --help                       show this message\n"
 "\n"
@@ -3206,43 +3220,43 @@
 "  -h, --help                       wypisuje ten komunikat\n"
 "\n"
 
-#: ../src/main.c:349
+#: ../src/main.c:358
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
 "Use --help for options\n"
 msgstr ""
 "niepoprawna lub zignorowana: %s\n"
-"Użyj --help aby uzyskać informacje o opcjach\n"
-
-#: ../src/main.c:378
+"Użyj --help, aby uzyskać informacje o opcjach\n"
+
+#: ../src/main.c:387
 msgid "Invalid or ignored remote options: "
 msgstr "Niepoprawne lub zignorowane zdalne polecenie: "
 
-#: ../src/main.c:387
+#: ../src/main.c:396
 msgid ""
 "\n"
 "Use --remote-help for valid remote options.\n"
 msgstr ""
 "\n"
-"Użyj --remote-help żeby wyświetlić opcje zdalnego sterowania.\n"
-
-#: ../src/main.c:489
+"Użyj --remote-help, żeby wyświetlić opcje zdalnego sterowania.\n"
+
+#: ../src/main.c:498
 #, c-format
 msgid "Creating %s dir:%s\n"
 msgstr "Tworzenie  katalogu %s:%s\n"
 
-#: ../src/main.c:493
+#: ../src/main.c:502
 #, c-format
 msgid "Could not create dir:%s\n"
 msgstr "Nie można utworzyć katalogu: %s\n"
 
-#: ../src/main.c:545
+#: ../src/main.c:554
 #, c-format
 msgid "error saving file: %s\n"
 msgstr "błąd przy zapisie pliku: %s\n"
 
-#: ../src/main.c:564
+#: ../src/main.c:573
 #, c-format
 msgid ""
 "error saving file: %s\n"
@@ -3251,570 +3265,571 @@
 "błąd przy zapisie pliku: %s\n"
 "błąd: %s\n"
 
-#: ../src/main.c:672
+#: ../src/main.c:681
 msgid "exit"
 msgstr "wyjście"
 
-#: ../src/main.c:677
+#: ../src/main.c:686
 #, c-format
 msgid "Quit %s"
 msgstr "Zakończ %s"
 
-#: ../src/main.c:679
+#: ../src/main.c:688
 msgid "Collections have been modified. Quit anyway?"
 msgstr "Kolekcje zostały zmienione. Mimo to zakończyć?"
 
-#: ../src/main.c:885 ../src/remote.c:601
+#: ../src/main.c:894 ../src/remote.c:611
 msgid "Command line"
 msgstr "Wiersz poleceń"
 
-#: ../src/menu.c:133
+#: ../src/menu.c:141
 msgid "Sort by size"
 msgstr "Uporządkuj według rozmiaru"
 
-#: ../src/menu.c:136
+#: ../src/menu.c:144
 msgid "Sort by date"
 msgstr "Uporządkuj według daty"
 
-#: ../src/menu.c:139
+#: ../src/menu.c:147
 msgid "Sort by file creation date"
 msgstr "Uporządkuj według daty utworzenia"
 
-#: ../src/menu.c:142
+#: ../src/menu.c:150
 msgid "Sort by Exif-date"
 msgstr "Uporządkuj według daty Exif"
 
-#: ../src/menu.c:145
+#: ../src/menu.c:153
 msgid "Unsorted"
 msgstr "Nieuporządkowane"
 
-#: ../src/menu.c:148
+#: ../src/menu.c:156
 msgid "Sort by path"
 msgstr "Uporządkuj według ścieżki"
 
-#: ../src/menu.c:151
+#: ../src/menu.c:159
 msgid "Sort by number"
 msgstr "Uporządkuj według numeru"
 
-#: ../src/menu.c:155
+#: ../src/menu.c:163
 msgid "Sort by name"
 msgstr "Uporządkuj według nazwy"
 
-#: ../src/menu.c:207
+#: ../src/menu.c:215
 msgid "Sort"
 msgstr "Uporządkuj"
 
-#: ../src/menu.c:232
+#: ../src/menu.c:240
 msgid "Rotate _180"
 msgstr "Obróć o _180"
 
-#: ../src/metadata.c:1599
+#: ../src/metadata.c:1638
 msgid "People"
 msgstr "Ludzie"
 
-#: ../src/metadata.c:1600
+#: ../src/metadata.c:1639
 msgid "Family"
 msgstr "Rodzina"
 
-#: ../src/metadata.c:1601
+#: ../src/metadata.c:1640
 msgid "Free time"
 msgstr "Wolny czas"
 
-#: ../src/metadata.c:1602
+#: ../src/metadata.c:1641
 msgid "Children"
 msgstr "Dzieci"
 
-#: ../src/metadata.c:1603
+#: ../src/metadata.c:1642
 msgid "Sport"
 msgstr "Sport"
 
-#: ../src/metadata.c:1604
+#: ../src/metadata.c:1643
 msgid "Culture"
 msgstr "Kultura"
 
-#: ../src/metadata.c:1605
+#: ../src/metadata.c:1644
 msgid "Festival"
 msgstr "Festiwal"
 
-#: ../src/metadata.c:1606
+#: ../src/metadata.c:1645
 msgid "Nature"
 msgstr "Natura"
 
-#: ../src/metadata.c:1607
+#: ../src/metadata.c:1646
 msgid "Animal"
 msgstr "Zwierzę"
 
-#: ../src/metadata.c:1608
+#: ../src/metadata.c:1647
 msgid "Bird"
 msgstr "Ptak"
 
-#: ../src/metadata.c:1609
+#: ../src/metadata.c:1648
 msgid "Insect"
 msgstr "Owady"
 
-#: ../src/metadata.c:1610
+#: ../src/metadata.c:1649
 msgid "Pets"
 msgstr "Zwierzaki"
 
-#: ../src/metadata.c:1611
+#: ../src/metadata.c:1650
 msgid "Wildlife"
 msgstr "Fauna i flora"
 
-#: ../src/metadata.c:1612
+#: ../src/metadata.c:1651
 msgid "Zoo"
 msgstr "Zoo"
 
-#: ../src/metadata.c:1613
+#: ../src/metadata.c:1652
 msgid "Plant"
 msgstr "Roślina"
 
-#: ../src/metadata.c:1614
+#: ../src/metadata.c:1653
 msgid "Tree"
 msgstr "Drzewo"
 
-#: ../src/metadata.c:1615
+#: ../src/metadata.c:1654
 msgid "Flower"
 msgstr "Kwiat"
 
-#: ../src/metadata.c:1616
+#: ../src/metadata.c:1655
 msgid "Water"
 msgstr "Woda"
 
-#: ../src/metadata.c:1617
+#: ../src/metadata.c:1656
 msgid "River"
 msgstr "Rzeka"
 
-#: ../src/metadata.c:1618
+#: ../src/metadata.c:1657
 msgid "Lake"
 msgstr "Jezioro"
 
-#: ../src/metadata.c:1619
+#: ../src/metadata.c:1658
 msgid "Sea"
 msgstr "Morze"
 
-#: ../src/metadata.c:1620 ../src/print.c:375
+#: ../src/metadata.c:1659 ../src/print.c:384
 msgid "Landscape"
 msgstr "Pejzaż"
 
-#: ../src/metadata.c:1621
+#: ../src/metadata.c:1660
 msgid "Art"
 msgstr "Sztuka"
 
-#: ../src/metadata.c:1622
+#: ../src/metadata.c:1661
 msgid "Statue"
 msgstr "Statua"
 
-#: ../src/metadata.c:1623
+#: ../src/metadata.c:1662
 msgid "Painting"
 msgstr "Malowidło"
 
-#: ../src/metadata.c:1624 ../src/metadata.c:1638
+#: ../src/metadata.c:1663 ../src/metadata.c:1677
 msgid "Historic"
 msgstr "Historyczne"
 
-#: ../src/metadata.c:1625 ../src/metadata.c:1639
+#: ../src/metadata.c:1664 ../src/metadata.c:1678
 msgid "Modern"
 msgstr "Nowoczesne"
 
-#: ../src/metadata.c:1626
+#: ../src/metadata.c:1665
 msgid "City"
 msgstr "Miasto"
 
-#: ../src/metadata.c:1627
+#: ../src/metadata.c:1666
 msgid "Park"
 msgstr "Park"
 
-#: ../src/metadata.c:1628
+#: ../src/metadata.c:1667
 msgid "Street"
 msgstr "Ulica"
 
-#: ../src/metadata.c:1629
+#: ../src/metadata.c:1668
 msgid "Square"
 msgstr "Plac"
 
-#: ../src/metadata.c:1630
+#: ../src/metadata.c:1669
 msgid "Architecture"
 msgstr "Architektura"
 
-#: ../src/metadata.c:1631
+#: ../src/metadata.c:1670
 msgid "Buildings"
 msgstr "Budynki"
 
-#: ../src/metadata.c:1632
+#: ../src/metadata.c:1671
 msgid "House"
 msgstr "Dom"
 
-#: ../src/metadata.c:1633
+#: ../src/metadata.c:1672
 msgid "Cathedral"
 msgstr "Katedra"
 
-#: ../src/metadata.c:1634
+#: ../src/metadata.c:1673
 msgid "Palace"
 msgstr "Pałac"
 
-#: ../src/metadata.c:1635
+#: ../src/metadata.c:1674
 msgid "Castle"
 msgstr "Zamek"
 
-#: ../src/metadata.c:1636
+#: ../src/metadata.c:1675
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/metadata.c:1637
+#: ../src/metadata.c:1676
 msgid "Interior"
 msgstr "Wnętrze"
 
-#: ../src/metadata.c:1640
+#: ../src/metadata.c:1679
 msgid "Places"
 msgstr "Miejsca"
 
-#: ../src/metadata.c:1641
+#: ../src/metadata.c:1680
 msgid "Conditions"
 msgstr "Warunki"
 
-#: ../src/metadata.c:1642
+#: ../src/metadata.c:1681
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/metadata.c:1643
+#: ../src/metadata.c:1682
 msgid "Lights"
 msgstr "Światła"
 
-#: ../src/metadata.c:1644
+#: ../src/metadata.c:1683
 msgid "Reflections"
 msgstr "Odbicia"
 
-#: ../src/metadata.c:1645
+#: ../src/metadata.c:1684
 msgid "Sun"
 msgstr "Słońce"
 
-#: ../src/metadata.c:1646
+#: ../src/metadata.c:1685
 msgid "Weather"
 msgstr "Pogoda"
 
-#: ../src/metadata.c:1647
+#: ../src/metadata.c:1686
 msgid "Fog"
 msgstr "Mgła"
 
-#: ../src/metadata.c:1648
+#: ../src/metadata.c:1687
 msgid "Rain"
 msgstr "Deszcz"
 
-#: ../src/metadata.c:1649
+#: ../src/metadata.c:1688
 msgid "Clouds"
 msgstr "Chmury"
 
-#: ../src/metadata.c:1650
+#: ../src/metadata.c:1689
 msgid "Snow"
 msgstr "Śnieg"
 
-#: ../src/metadata.c:1651
+#: ../src/metadata.c:1690
 msgid "Sunny weather"
 msgstr "Słoneczna pogoda"
 
-#: ../src/metadata.c:1652
+#: ../src/metadata.c:1691
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ../src/metadata.c:1653
+#: ../src/metadata.c:1692
 msgid "Edited"
 msgstr "Edytowany"
 
-#: ../src/metadata.c:1654
+#: ../src/metadata.c:1693
 msgid "Detail"
 msgstr "Szczegóły"
 
-#: ../src/metadata.c:1655
+#: ../src/metadata.c:1694
 msgid "Macro"
 msgstr "Makro"
 
-#: ../src/metadata.c:1656 ../src/print.c:374
+#: ../src/metadata.c:1695 ../src/print.c:383
 msgid "Portrait"
 msgstr "Portret"
 
-#: ../src/metadata.c:1657
+#: ../src/metadata.c:1696
 msgid "Black and White"
 msgstr "Biało-czarny"
 
-#: ../src/metadata.c:1658
+#: ../src/metadata.c:1697
 msgid "Perspective"
 msgstr "Perspektywa"
 
-#: ../src/options.c:158 ../src/ui_bookmark.c:560
+#: ../src/options.c:172 ../src/ui_bookmark.c:577
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: ../src/pan-view.c:423
+#: ../src/pan-view/pan-view.c:439
 #, c-format
 msgid "%d images, %s"
 msgstr "%d obrazów, %s"
 
-#: ../src/pan-view.c:433
+#: ../src/pan-view/pan-view.c:449
 #, c-format
 msgid "The pan view does not support the folder \"%s\"."
 msgstr ""
 
-#: ../src/pan-view.c:434
+#: ../src/pan-view/pan-view.c:450
 msgid "Folder not supported"
 msgstr ""
 
-#: ../src/pan-view.c:986 ../src/pan-view.c:1002
+#: ../src/pan-view/pan-view.c:1002 ../src/pan-view/pan-view.c:1018
 msgid "Reading image data..."
 msgstr "Wczytywanie danych obrazu..."
 
-#: ../src/pan-view.c:1061
+#: ../src/pan-view/pan-view.c:1077
 msgid "Sorting images..."
 msgstr "Sortowanie obrazów..."
 
-#: ../src/pan-view.c:1365 ../src/print.c:2599
+#: ../src/pan-view/pan-view.c:1381 ../src/print.c:2608
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: ../src/pan-view.c:1367 ../src/pan-view.c:2183 ../src/preferences.c:1493
+#: ../src/pan-view/pan-view.c:1383 ../src/pan-view/pan-view.c:2199
+#: ../src/preferences.c:1606
 msgid "Location:"
 msgstr "Położenie:"
 
-#: ../src/pan-view.c:1369 ../src/pan-view.c:1735
+#: ../src/pan-view/pan-view.c:1385 ../src/pan-view/pan-view.c:1751
 msgid "Date:"
 msgstr "Data:"
 
-#: ../src/pan-view.c:1371 ../src/preferences.c:1319 ../src/print.c:3212
-#: ../src/print.c:3417
+#: ../src/pan-view/pan-view.c:1387 ../src/preferences.c:1427
+#: ../src/print.c:3221 ../src/print.c:3426
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: ../src/pan-view.c:1473
+#: ../src/pan-view/pan-view.c:1489
 msgid "path found"
 msgstr "znaleziono ścieżkę"
 
-#: ../src/pan-view.c:1473
+#: ../src/pan-view/pan-view.c:1489
 msgid "filename found"
 msgstr "plik znaleziony"
 
-#: ../src/pan-view.c:1521
+#: ../src/pan-view/pan-view.c:1537
 msgid "partial match"
 msgstr "częściowe dopasowanie"
 
-#: ../src/pan-view.c:1732 ../src/pan-view.c:1765
+#: ../src/pan-view/pan-view.c:1748 ../src/pan-view/pan-view.c:1781
 msgid "no match"
 msgstr "brak dopasowania"
 
-#: ../src/pan-view.c:2071 ../src/search.c:2169
+#: ../src/pan-view/pan-view.c:2087 ../src/search.c:2177
 msgid "Folder not found"
 msgstr "Katalog nie został znaleziony"
 
-#: ../src/pan-view.c:2072
+#: ../src/pan-view/pan-view.c:2088
 msgid "The entered path is not a folder"
 msgstr ""
 
-#: ../src/pan-view.c:2167
+#: ../src/pan-view/pan-view.c:2183
 msgid "Pan View"
 msgstr ""
 
-#: ../src/pan-view.c:2192
+#: ../src/pan-view/pan-view.c:2208
 msgid "Timeline"
 msgstr "Linia czasu"
 
-#: ../src/pan-view.c:2193
+#: ../src/pan-view/pan-view.c:2209
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: ../src/pan-view.c:2195
+#: ../src/pan-view/pan-view.c:2211
 msgid "Folders (flower)"
 msgstr "Katalogi (kwiat)"
 
-#: ../src/pan-view.c:2196
+#: ../src/pan-view/pan-view.c:2212
 msgid "Grid"
 msgstr "Siatka"
 
-#: ../src/pan-view.c:2205
+#: ../src/pan-view/pan-view.c:2221
 msgid "Dots"
 msgstr "punkty"
 
-#: ../src/pan-view.c:2206
+#: ../src/pan-view/pan-view.c:2222
 msgid "No Images"
 msgstr "Brak obrazów"
 
-#: ../src/pan-view.c:2207
+#: ../src/pan-view/pan-view.c:2223
 msgid "Small Thumbnails"
 msgstr "Mniejsze miniaturki"
 
-#: ../src/pan-view.c:2208
+#: ../src/pan-view/pan-view.c:2224
 msgid "Normal Thumbnails"
 msgstr "Zwykłe miniaturki"
 
-#: ../src/pan-view.c:2209
+#: ../src/pan-view/pan-view.c:2225
 msgid "Large Thumbnails"
 msgstr "Duże miniaturki"
 
-#: ../src/pan-view.c:2210 ../src/pan-view.c:2665
+#: ../src/pan-view/pan-view.c:2226 ../src/pan-view/pan-view.c:2681
 msgid "1:10 (10%)"
 msgstr "1:10 (10%)"
 
-#: ../src/pan-view.c:2211 ../src/pan-view.c:2661
+#: ../src/pan-view/pan-view.c:2227 ../src/pan-view/pan-view.c:2677
 msgid "1:4 (25%)"
 msgstr "1:4 (25%)"
 
-#: ../src/pan-view.c:2212 ../src/pan-view.c:2657
+#: ../src/pan-view/pan-view.c:2228 ../src/pan-view/pan-view.c:2673
 msgid "1:3 (33%)"
 msgstr "1:3 (33%)"
 
-#: ../src/pan-view.c:2213 ../src/pan-view.c:2653
+#: ../src/pan-view/pan-view.c:2229 ../src/pan-view/pan-view.c:2669
 msgid "1:2 (50%)"
 msgstr "1:2 (50%)"
 
-#: ../src/pan-view.c:2214
+#: ../src/pan-view/pan-view.c:2230
 msgid "1:1 (100%)"
 msgstr "1:1 (100%)"
 
-#: ../src/pan-view.c:2262
+#: ../src/pan-view/pan-view.c:2278
 msgid "Find:"
 msgstr "Znajdź:"
 
-#: ../src/pan-view.c:2313
+#: ../src/pan-view/pan-view.c:2329
 msgid "Find"
 msgstr "Znajdź"
 
-#: ../src/pan-view.c:2380
+#: ../src/pan-view/pan-view.c:2396
 msgid "Pan View Performance"
 msgstr ""
 
-#: ../src/pan-view.c:2387
+#: ../src/pan-view/pan-view.c:2403
 msgid "Pan view performance may be poor."
 msgstr ""
 
-#: ../src/pan-view.c:2388
+#: ../src/pan-view/pan-view.c:2404
 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.c:2396 ../src/preferences.c:1322
+#: ../src/pan-view/pan-view.c:2412 ../src/preferences.c:1430
 msgid "Cache thumbnails"
 msgstr "Cache miniaturek"
 
-#: ../src/pan-view.c:2398
+#: ../src/pan-view/pan-view.c:2414
 msgid "Use shared thumbnail cache"
 msgstr "Użyj współdzielonego cache miniaturek"
 
-#: ../src/pan-view.c:2404
+#: ../src/pan-view/pan-view.c:2420
 msgid "Do not show this dialog again"
 msgstr "Więcej nie pokazuj tego okna"
 
-#: ../src/pan-view.c:2633
+#: ../src/pan-view/pan-view.c:2649
 msgid "Sort by E_xif date"
 msgstr "Sortuj według daty E_xif"
 
-#: ../src/pan-view.c:2639
+#: ../src/pan-view/pan-view.c:2655
 msgid "_Show Exif information"
 msgstr "Pokaż informacje Exif"
 
-#: ../src/pan-view.c:2641
+#: ../src/pan-view/pan-view.c:2657
 msgid "Show im_age"
 msgstr "Pok_aż obraz"
 
-#: ../src/pan-view.c:2645
+#: ../src/pan-view/pan-view.c:2661
 msgid "_None"
 msgstr "Brak"
 
-#: ../src/pan-view.c:2649
+#: ../src/pan-view/pan-view.c:2665
 msgid "_Full size"
 msgstr "Pełny rozmiar"
 
-#: ../src/preferences.c:91
+#: ../src/preferences.c:106
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/preferences.c:93
+#: ../src/preferences.c:108
 msgid "RAW Image"
 msgstr "Obraz RAW"
 
-#: ../src/preferences.c:446
+#: ../src/preferences.c:496
 msgid "Nearest (worst, but fastest)"
 msgstr "Najbliższy sąsiad (najgorsze, lecz najszybsze)"
 
-#: ../src/preferences.c:448
+#: ../src/preferences.c:498
 msgid "Tiles"
 msgstr "Kafle"
 
-#: ../src/preferences.c:450
+#: ../src/preferences.c:500
 msgid "Bilinear"
 msgstr "Dwuliniowe"
 
-#: ../src/preferences.c:452
+#: ../src/preferences.c:502
 msgid "Hyper (best, but slowest)"
 msgstr "Hiper (najlepsze, lecz najwolniejsze)"
 
-#: ../src/preferences.c:517 ../src/print.c:380
+#: ../src/preferences.c:567 ../src/print.c:389
 msgid "Custom"
 msgstr "Własne"
 
-#: ../src/preferences.c:600
+#: ../src/preferences.c:650
 msgid "Single image"
 msgstr "Pojedynczy obraz"
 
-#: ../src/preferences.c:602
+#: ../src/preferences.c:652
 msgid "Anaglyph Red-Cyan"
 msgstr "Anaglif czerwony-cyjan"
 
-#: ../src/preferences.c:604
+#: ../src/preferences.c:654
 msgid "Anaglyph Green-Magenta"
 msgstr "Anaglif zielony-magenta"
 
-#: ../src/preferences.c:606
+#: ../src/preferences.c:656
 msgid "Anaglyph Yellow-Blue"
 msgstr "Anaglif żólty-niebieski"
 
-#: ../src/preferences.c:608
+#: ../src/preferences.c:658
 msgid "Anaglyph Gray Red-Cyan"
 msgstr "Anaglif szary czerwony-cyjan"
 
-#: ../src/preferences.c:610
+#: ../src/preferences.c:660
 msgid "Anaglyph Gray Green-Magenta"
 msgstr "Anaglif szany zielony-magenta"
 
-#: ../src/preferences.c:612
+#: ../src/preferences.c:662
 msgid "Anaglyph Gray Yellow-Blue"
 msgstr "Anaglif szary żólty-niebieski"
 
-#: ../src/preferences.c:614
+#: ../src/preferences.c:664
 msgid "Anaglyph Dubois Red-Cyan"
 msgstr "Anaglif Dubois czerwony-cyjan"
 
-#: ../src/preferences.c:616
+#: ../src/preferences.c:666
 msgid "Anaglyph Dubois Green-Magenta"
 msgstr "Anaglif Dubois zielony-magenta"
 
-#: ../src/preferences.c:618
+#: ../src/preferences.c:668
 msgid "Anaglyph Dubois Yellow-Blue"
 msgstr "Anaglif Dubois żólty-niebieski"
 
-#: ../src/preferences.c:621
+#: ../src/preferences.c:671
 msgid "Side by Side"
 msgstr "Obok siebie"
 
-#: ../src/preferences.c:622
+#: ../src/preferences.c:672
 msgid "Side by Side Half size"
 msgstr "Obok siebie zmniejszone o połowę"
 
-#: ../src/preferences.c:629
+#: ../src/preferences.c:679
 msgid "Top - Bottom"
 msgstr "Jedno nad drugim"
 
-#: ../src/preferences.c:630
+#: ../src/preferences.c:680
 msgid "Top - Bottom Half size"
 msgstr "Jedno nad drugim zmniejszone o połowę"
 
-#: ../src/preferences.c:639 ../src/preferences.c:2169
+#: ../src/preferences.c:689 ../src/preferences.c:2358
 msgid "Fixed position"
 msgstr "Ustalone położenie"
 
-#: ../src/preferences.c:936 ../src/preferences.c:939
+#: ../src/preferences.c:986 ../src/preferences.c:989
 msgid "Reset filters"
 msgstr "Wyzeruj filtry"
 
-#: ../src/preferences.c:940
+#: ../src/preferences.c:990
 msgid ""
 "This will reset the file filters to the defaults.\n"
 "Continue?"
@@ -3822,37 +3837,39 @@
 "Ustawienia filtrów powrócą do wartości domyślnych.\n"
 "Kontynuować?"
 
-#: ../src/preferences.c:967 ../src/preferences.c:970
+#: ../src/preferences.c:1017 ../src/preferences.c:1020
 msgid "Clear trash"
 msgstr "Wyczyść kosz"
 
-#: ../src/preferences.c:971
+#: ../src/preferences.c:1021
 msgid "This will remove the trash contents."
 msgstr "Ta operacja spowoduje usunięcie zawartości kosza"
 
-#: ../src/preferences.c:1015 ../src/preferences.c:1018
+#: ../src/preferences.c:1065 ../src/preferences.c:1068
 msgid "Reset image overlay template string"
-msgstr ""
-
-#: ../src/preferences.c:1019
+msgstr "Zresetuj szablon tekstu nakładki"
+
+#: ../src/preferences.c:1069
 msgid ""
 "This will reset the image overlay template string to the default.\n"
 "Continue?"
 msgstr ""
-
-#: ../src/preferences.c:1314
+"Resetowanie szablonu tekstu nakładki do wartości domyślnej.\n"
+"Kontynuować?"
+
+#: ../src/preferences.c:1422
 msgid "General"
 msgstr "Ogólne"
 
-#: ../src/preferences.c:1320 ../src/preferences.c:1380
+#: ../src/preferences.c:1428 ../src/preferences.c:1488
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: ../src/preferences.c:1328
+#: ../src/preferences.c:1436
 msgid "Use standard thumbnail cache, shared with other applications"
 msgstr "Użyj standardowego cache miniaturek dzielonego z innymi programami"
 
-#: ../src/preferences.c:1334
+#: ../src/preferences.c:1442
 msgid ""
 "Store thumbnails in '.thumbnails' folder, local to image folder (non-"
 "standard)"
@@ -3860,170 +3877,174 @@
 "Zapisuj miniaturki w katalogu '.thumbnails', lokalnie względem katalogu z "
 "obrazami (niestandardowy)"
 
-#: ../src/preferences.c:1337
+#: ../src/preferences.c:1445
 msgid "Use EXIF thumbnails when available (EXIF thumbnails may be outdated)"
 msgstr ""
 "Użyj miniaturek EXIF jeśli są dostępne (miniaturki EXIF mogą być nieaktualne)"
 
-#: ../src/preferences.c:1340
+#: ../src/preferences.c:1448
 msgid "Slide show"
 msgstr "Pokaz slajdów"
 
-#: ../src/preferences.c:1343
+#: ../src/preferences.c:1451
 msgid "Delay between image change:"
 msgstr "Czas między kolejnymi obrazami:"
 
-#: ../src/preferences.c:1343
+#: ../src/preferences.c:1451
 msgid "seconds"
 msgstr "sekund"
 
-#: ../src/preferences.c:1349
+#: ../src/preferences.c:1457
 msgid "Random"
 msgstr "Losowo"
 
-#: ../src/preferences.c:1350
+#: ../src/preferences.c:1458
 msgid "Repeat"
 msgstr "Powtarzanie"
 
-#: ../src/preferences.c:1352
+#: ../src/preferences.c:1460
 msgid "Image loading and caching"
 msgstr "Ładowanie i buforowanie obrazów"
 
-#: ../src/preferences.c:1354
+#: ../src/preferences.c:1462
 msgid "Decoded image cache size (Mb):"
 msgstr "Rozmiar cache obrazów (Mb):"
 
-#: ../src/preferences.c:1356
+#: ../src/preferences.c:1464
 msgid "Preload next image"
 msgstr "Wstępny odczyt następnego obrazu"
 
-#: ../src/preferences.c:1359
+#: ../src/preferences.c:1467
 msgid "Refresh on file change"
 msgstr "Odśwież po zmianie pliku"
 
-#: ../src/preferences.c:1377
+#: ../src/preferences.c:1485
 msgid "Zoom"
 msgstr "Skala"
 
-#: ../src/preferences.c:1383
+#: ../src/preferences.c:1491
 msgid "Use GPU acceleration via Clutter library"
 msgstr "Użyj akceleracji GPU przy pomocy biblioteki Clutter"
 
-#: ../src/preferences.c:1387
+#: ../src/preferences.c:1495
 msgid "Two pass rendering (apply HQ zoom and color correction in second pass)"
 msgstr ""
-"Dwuprzebiegowe renderowanie (stosuje wysokiej jakości skalowanie i korekcję "
+"Renderowanie dwuprzebiegowe (stosuje wysokiej jakości skalowanie i korekcję "
 "kolorów w drugim przebiegu)"
 
-#: ../src/preferences.c:1390
+#: ../src/preferences.c:1498
 msgid "Allow enlargement of image for zoom to fit"
 msgstr "Rozciąganie obrazów przy powiększaniu, aby je dopasować"
 
-#: ../src/preferences.c:1394
+#: ../src/preferences.c:1502
 msgid "Limit image size when autofitting (%):"
 msgstr "Ograniczenie rozmiaru przy automatycznym dopasowaniu okna (%):"
 
-#: ../src/preferences.c:1402
+#: ../src/preferences.c:1510
 msgid "Zoom increment:"
 msgstr "Przyrost powiększenia"
 
-#: ../src/preferences.c:1407
+#: ../src/preferences.c:1515
 msgid "When new image is selected:"
 msgstr "Po wybraniu nowego obrazu:"
 
-#: ../src/preferences.c:1411
+#: ../src/preferences.c:1519
 msgid "Zoom to original size"
 msgstr "Powiększenie do rozmiaru oryginalnego"
 
-#: ../src/preferences.c:1414
+#: ../src/preferences.c:1522
 msgid "Fit image to window"
 msgstr "Dopasuj do okna"
 
-#: ../src/preferences.c:1417
+#: ../src/preferences.c:1525
 msgid "Leave Zoom at previous setting"
 msgstr "Pozostawienie poprzedniego powiększenia"
 
-#: ../src/preferences.c:1423
+#: ../src/preferences.c:1531
 msgid "Scroll to top left corner"
 msgstr "Przewiń do lewej strony"
 
-#: ../src/preferences.c:1426
+#: ../src/preferences.c:1534
 msgid "Scroll to image center"
 msgstr "Ustaw na środku obrazu"
 
-#: ../src/preferences.c:1429
+#: ../src/preferences.c:1537
 msgid "Keep the region from previous image"
 msgstr "Zapamiętaj położenie z poprzedniego obrazu"
 
-#: ../src/preferences.c:1434
+#: ../src/preferences.c:1542
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: ../src/preferences.c:1436
+#: ../src/preferences.c:1544
 msgid "Use custom border color in window mode"
 msgstr "Użyj własnego koloru obramowania w trybie okienkowym"
 
-#: ../src/preferences.c:1439
+#: ../src/preferences.c:1547
 msgid "Use custom border color in fullscreen mode"
 msgstr "Użyj własnego obramowanie w trybie pełnego ekranu"
 
-#: ../src/preferences.c:1442
+#: ../src/preferences.c:1550
 msgid "Border color"
 msgstr "Kolor obramowania"
 
-#: ../src/preferences.c:1445
+#: ../src/preferences.c:1553
 msgid "Convenience"
 msgstr "Usprawnienia"
 
-#: ../src/preferences.c:1447
+#: ../src/preferences.c:1555
 msgid "Auto rotate image using Exif information"
 msgstr "Automatyczne obracanie obrazów na podstawie Exif"
 
-#: ../src/preferences.c:1450
+#: ../src/preferences.c:1558
 msgid "Auto rotate proofs using Exif information"
 msgstr ""
 
-#: ../src/preferences.c:1467
+#: ../src/preferences.c:1575
 msgid "Windows"
 msgstr "Okna"
 
-#: ../src/preferences.c:1469
+#: ../src/preferences.c:1577
 msgid "State"
 msgstr "Stan"
 
-#: ../src/preferences.c:1471
+#: ../src/preferences.c:1579
 msgid "Remember window positions"
 msgstr "Zapamiętanie pozycji okien"
 
-#: ../src/preferences.c:1473
+#: ../src/preferences.c:1582
+msgid "Use saved window positions also for new windows"
+msgstr "Używaj zapamiętanych pozycji okien także do nowych okien"
+
+#: ../src/preferences.c:1586
 msgid "Remember tool state (float/hidden)"
 msgstr "Zapamiętanie stanu narzędzi (oderwane/ukryte)"
 
-#: ../src/preferences.c:1478
+#: ../src/preferences.c:1591
 msgid "Fit window to image when tools are hidden/floating"
 msgstr "Dopasowanie okna do obrazu, jeśli narzędzia są ukryte/oderwane"
 
-#: ../src/preferences.c:1482
+#: ../src/preferences.c:1595
 msgid "Limit size when auto-sizing window (%):"
 msgstr "Ograniczenie rozmiaru przy automatycznym dopasowaniu okna (%):"
 
-#: ../src/preferences.c:1497
+#: ../src/preferences.c:1610
 msgid "Smooth image flip"
 msgstr "Płynne odwracanie obrazu"
 
-#: ../src/preferences.c:1499
+#: ../src/preferences.c:1612
 msgid "Disable screen saver"
 msgstr "Wyłącz wygaszacz ekranu"
 
-#: ../src/preferences.c:1503
+#: ../src/preferences.c:1616
 msgid "Overlay Screen Display"
-msgstr ""
-
-#: ../src/preferences.c:1505
+msgstr "Nakładka"
+
+#: ../src/preferences.c:1618
 msgid "Image overlay template"
-msgstr ""
-
-#: ../src/preferences.c:1518
+msgstr "Szablon tekstu nakładki"
+
+#: ../src/preferences.c:1631
 msgid ""
 "<i>%name%</i> results in the filename of the picture.\n"
 "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>"
@@ -4063,76 +4084,80 @@
 "Jeśli linia jest pusta, to jest usuwana. Umożliwia to dodawanie linii, które "
 "całkowicie znikają, jeśli nie ma dostępnych danych.\n"
 
-#: ../src/preferences.c:1535 ../src/print.c:3210
+#: ../src/preferences.c:1648 ../src/print.c:3219
 msgid "Font"
 msgstr "Czcionka"
 
-#: ../src/preferences.c:1540 ../src/print.c:3400
+#: ../src/preferences.c:1660 ../src/print.c:3409
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/preferences.c:1545
+#: ../src/preferences.c:1665
 msgid "Background"
 msgstr "Tło"
 
-#: ../src/preferences.c:1552 ../src/preferences.c:1728
-#: ../src/preferences.c:2098
+#: ../src/preferences.c:1671 ../src/preferences.c:1849
+#: ../src/preferences.c:2287
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: ../src/preferences.c:1606
+#: ../src/preferences.c:1725
 msgid "Show hidden files or folders"
 msgstr "Pokaż ukryte pliki lub katalogi"
 
-#: ../src/preferences.c:1608
+#: ../src/preferences.c:1727
 msgid "Show parent folder (..)"
 msgstr "Pokaż folder nadrzędny (..)"
 
-#: ../src/preferences.c:1610
+#: ../src/preferences.c:1729
 msgid "Case sensitive sort"
 msgstr "Rozróżnianie wielkość liter podczas sortowania"
 
-#: ../src/preferences.c:1612
+#: ../src/preferences.c:1731
+msgid "Natural sort order"
+msgstr "Naturalny porządek sortowania"
+
+#: ../src/preferences.c:1733
 msgid "Disable file extension checks"
 msgstr "Wyłącz sprawdzanie rozszerzeń"
 
-#: ../src/preferences.c:1615
+#: ../src/preferences.c:1736
 msgid "Disable File Filtering"
 msgstr "Bez filtrowania plików"
 
-#: ../src/preferences.c:1619
+#: ../src/preferences.c:1740
 msgid "Grouping sidecar extensions"
 msgstr "Grupowanie rozszerzeń plików sidecar"
 
-#: ../src/preferences.c:1626
+#: ../src/preferences.c:1747
 msgid "File types"
 msgstr "Typy plików"
 
-#: ../src/preferences.c:1648
+#: ../src/preferences.c:1769
 msgid "Filter"
 msgstr "Filtr"
 
-#: ../src/preferences.c:1683
+#: ../src/preferences.c:1804
 msgid "Class"
 msgstr "Klasa"
 
-#: ../src/preferences.c:1700
+#: ../src/preferences.c:1821
 msgid "Writable"
 msgstr "Zapisywalny"
 
-#: ../src/preferences.c:1711
+#: ../src/preferences.c:1832
 msgid "Sidecar is allowed"
 msgstr "Pliki sidecar dozwolone"
 
-#: ../src/preferences.c:1757
+#: ../src/preferences.c:1878
 msgid "Metadata writing process"
 msgstr "Proces zapisywania metadanych"
 
-#: ../src/preferences.c:1759
+#: ../src/preferences.c:1880
 msgid "Warning: Geeqie is built without Exiv2. Some options are disabled."
 msgstr "Uwaga: Geeqie skompilowane bez Exiv2. Niektóre opcje są wyłączone."
 
-#: ../src/preferences.c:1761
+#: ../src/preferences.c:1882
 msgid ""
 "Metadata are written in the following order. The process ends after first "
 "success."
@@ -4140,7 +4165,7 @@
 "Metadane są zapisywane w następującym porządku. Proces kończy się po "
 "pierwszym sukcesie."
 
-#: ../src/preferences.c:1764
+#: ../src/preferences.c:1885
 msgid ""
 "1) Save metadata in image files, resp. sidecar files, according to the XMP "
 "standard"
@@ -4148,23 +4173,23 @@
 "1) Zapisywanie metadanych w plikach obrazu lub plikach sidecar zgodnie ze "
 "standardem XMP"
 
-#: ../src/preferences.c:1770
+#: ../src/preferences.c:1891
 msgid ""
 "2) Save metadata in '.metadata' folder, local to image folder (non-standard)"
 msgstr ""
 "2) Zapisywanie metadanych w folderze '.metadata' w katalogu z obrazem "
 "(niestandardowe)"
 
-#: ../src/preferences.c:1773
+#: ../src/preferences.c:1894
 #, c-format
 msgid "3) Save metadata in Geeqie private directory '%s'"
 msgstr "3) Zapisywanie metadanych w prywatnym katalogu Geeqie '%s'"
 
-#: ../src/preferences.c:1779
+#: ../src/preferences.c:1900
 msgid "Step 1: Write to image files"
 msgstr "Krok 1: Zapis do plików obrazu"
 
-#: ../src/preferences.c:1787
+#: ../src/preferences.c:1908
 msgid ""
 "Store metadata also in legacy IPTC tags (converted according to IPTC4XMP "
 "standard)"
@@ -4172,19 +4197,19 @@
 "Zapisuj metadane także w starszych tagach IPTC (konwertowane zgodnie ze "
 "standardem IPTC4XMP)"
 
-#: ../src/preferences.c:1790
+#: ../src/preferences.c:1911
 msgid "Warn if the image files are unwritable"
 msgstr "Ostrzegaj, jeśli pliki obrazu są niezapisywalne"
 
-#: ../src/preferences.c:1793
+#: ../src/preferences.c:1914
 msgid "Ask before writing to image files"
 msgstr "Zapytaj przed zapisywaniem do plików obrazu"
 
-#: ../src/preferences.c:1796
+#: ../src/preferences.c:1917
 msgid "Step 2 and 3: write to Geeqie private files"
 msgstr "Krok 2 i 3: Zapis do plików prywatnych Geeqie"
 
-#: ../src/preferences.c:1801
+#: ../src/preferences.c:1922
 msgid ""
 "Use GQview legacy metadata format (supports only keywords and comments) "
 "instead of XMP"
@@ -4192,11 +4217,11 @@
 "Użyj starszego formatu metadanych GQview (obsługuje tylko słowa kluczowe i "
 "komentarze) zamiast XMP"
 
-#: ../src/preferences.c:1805
+#: ../src/preferences.c:1926
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: ../src/preferences.c:1806
+#: ../src/preferences.c:1927
 msgid ""
 "Write the same description tags (keywords, comment, etc.) to all grouped "
 "sidecars"
@@ -4204,248 +4229,277 @@
 "Zapisuj te same tagi opisu (słowa kluczowe, komentarze etc.) do wszystkich "
 "zgrupowanych plików sidecar"
 
-#: ../src/preferences.c:1809
+#: ../src/preferences.c:1930
 msgid "Allow keywords to differ only in case"
 msgstr "Dopuść słowa kluczowe różniące się tylko wielkością liter"
 
-#: ../src/preferences.c:1812
+#: ../src/preferences.c:1933
 msgid "Write altered image orientation to the metadata"
 msgstr "Zapisz zmienioną orientację obrazu do metadanych"
 
-#: ../src/preferences.c:1818
+#: ../src/preferences.c:1939
 msgid "Auto-save options"
 msgstr "Opcje autozapisu"
 
-#: ../src/preferences.c:1820
+#: ../src/preferences.c:1941
 msgid "Write metadata after timeout"
 msgstr "Zapisz metadane po upływie danego czasu"
 
-#: ../src/preferences.c:1826
+#: ../src/preferences.c:1947
 msgid "Timeout (seconds):"
 msgstr "Limit czasu (sekundy):"
 
-#: ../src/preferences.c:1829
+#: ../src/preferences.c:1950
 msgid "Write metadata on image change"
 msgstr "Zapisuj metadane przy zmianie obrazu"
 
-#: ../src/preferences.c:1832
+#: ../src/preferences.c:1953
 msgid "Write metadata on directory change"
 msgstr "Zapisz metadane przy zmianie katalogu"
 
-#: ../src/preferences.c:1846
+#: ../src/preferences.c:1993
+msgid "Perceptual"
+msgstr "Percepcyjny"
+
+#: ../src/preferences.c:1995
+msgid "Relative Colorimetric"
+msgstr "Względny kolorymetryczny"
+
+#: ../src/preferences.c:1999
+msgid "Absolute Colorimetric"
+msgstr "Bezwzględny kolorymetryczny"
+
+#: ../src/preferences.c:2024
 msgid "Color management"
 msgstr "Zarządzanie kolorami"
 
-#: ../src/preferences.c:1848
+#: ../src/preferences.c:2026
 msgid "Input profiles"
 msgstr "Profile wejścia"
 
-#: ../src/preferences.c:1856
+#: ../src/preferences.c:2034
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/preferences.c:1859
+#: ../src/preferences.c:2037
 msgid "Menu name"
 msgstr "Nazwa w menu"
 
-#: ../src/preferences.c:1862
+#: ../src/preferences.c:2040
 msgid "File"
 msgstr "Plik"
 
-#: ../src/preferences.c:1870
+#: ../src/preferences.c:2048
 #, c-format
 msgid "Input %d:"
 msgstr "Profil %d:"
 
-#: ../src/preferences.c:1886 ../src/preferences.c:1906
+#: ../src/preferences.c:2064 ../src/preferences.c:2084
 msgid "Select color profile"
 msgstr "Wybierz profil koloru"
 
-#: ../src/preferences.c:1894
+#: ../src/preferences.c:2072
 msgid "Screen profile"
 msgstr "Profil ekranu"
 
-#: ../src/preferences.c:1898
+#: ../src/preferences.c:2076
 msgid "Use system screen profile if available"
 msgstr "Używaj systemowego profilu ekranu, jeśli jest dostępny"
 
-#: ../src/preferences.c:1903
+#: ../src/preferences.c:2081
 msgid "Screen:"
 msgstr "Ekran:"
 
-#: ../src/preferences.c:1925 ../src/preferences.c:1966
+#: ../src/preferences.c:2087
+msgid "Render Intent:"
+msgstr "Sposób odwzorowania barw:"
+
+#: ../src/preferences.c:2107 ../src/preferences.c:2148
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: ../src/preferences.c:1927 ../src/utilops.c:1998
+#: ../src/preferences.c:2109 ../src/utilops.c:2136
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../src/preferences.c:1929
+#: ../src/preferences.c:2111
 msgid "Confirm file delete"
 msgstr "Potwierdzanie usunięcia pliku"
 
-#: ../src/preferences.c:1931
+#: ../src/preferences.c:2113
 msgid "Enable Delete key"
 msgstr "Aktywny klawisz Delete"
 
-#: ../src/preferences.c:1934
+#: ../src/preferences.c:2116
 msgid "Safe delete"
 msgstr "Bezpieczne usuwanie"
 
-#: ../src/preferences.c:1952
+#: ../src/preferences.c:2134
 msgid "Maximum size:"
 msgstr "Maksymalny rozmiar:"
 
-#: ../src/preferences.c:1952
+#: ../src/preferences.c:2134
 msgid "MB"
 msgstr "MB"
 
-#: ../src/preferences.c:1954
+#: ../src/preferences.c:2136
 msgid "Set to 0 for unlimited size"
 msgstr "Ustaw na 0 dla nieograniczonego rozmiaru"
 
-#: ../src/preferences.c:1955
+#: ../src/preferences.c:2137
 msgid "View"
 msgstr "Widok"
 
-#: ../src/preferences.c:1968
+#: ../src/preferences.c:2150
 msgid "Rectangular selection in icon view"
 msgstr "Zaznaczanie prostokątne w widoku ikon"
 
-#: ../src/preferences.c:1971
+#: ../src/preferences.c:2153
 msgid "Descend folders in tree view"
 msgstr "Odwrotna kolejność katalogów w widoku drzewiastym"
 
-#: ../src/preferences.c:1974
+#: ../src/preferences.c:2156
 msgid "In place renaming"
 msgstr "Zmiana nazwy na miejscu"
 
-#: ../src/preferences.c:1977
+#: ../src/preferences.c:2159
+msgid "List directory view uses single click to enter"
+msgstr "Lista katalogów używa pojedynczego kliknięcia do przejścia"
+
+#: ../src/preferences.c:2162
 msgid "Open recent list maximum size"
 msgstr "Maksymalna ilość ostatnio otwartych obrazów"
 
-#: ../src/preferences.c:1980
+#: ../src/preferences.c:2165
 msgid "Drag'n drop icon size"
-msgstr "Rozmiar ikon przy drag'n drop"
-
-#: ../src/preferences.c:1983
+msgstr "Rozmiar ikon przy przeciąganiu"
+
+#: ../src/preferences.c:2168
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: ../src/preferences.c:1985
+#: ../src/preferences.c:2170
 msgid "Progressive keyboard scrolling"
 msgstr "Przyrostowe przewijanie klawiaturą"
 
-#: ../src/preferences.c:1987
+#: ../src/preferences.c:2172
+msgid "Keyboard scrolling step multiplier:"
+msgstr "Mnożnik przewijania klawiaturą"
+
+#: ../src/preferences.c:2174
 msgid "Mouse wheel scrolls image"
 msgstr "Przewijanie obrazu kółkiem myszy"
 
-#: ../src/preferences.c:1990
+#: ../src/preferences.c:2176
+msgid "Navigation by left or middle click on image"
+msgstr ""
+"Nawigacja przez kliknięcie lewym lub środkowym klawiszem myszy na obrazie"
+
+#: ../src/preferences.c:2179
 msgid "Similarities"
 msgstr "Podobieństwa"
 
-#: ../src/preferences.c:1992
+#: ../src/preferences.c:2181
 msgid "Custom similarity threshold:"
 msgstr "Dowolny próg podobieństwa:"
 
-#: ../src/preferences.c:1994
+#: ../src/preferences.c:2183
 msgid "Rotation invariant duplicate check"
 msgstr "Sprawdzanie duplikatów rotacyjnie niezmiennicze"
 
-#: ../src/preferences.c:1998
+#: ../src/preferences.c:2187
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: ../src/preferences.c:2000
+#: ../src/preferences.c:2189
 msgid "Debug level:"
 msgstr "Poziom debugowania:"
 
-#: ../src/preferences.c:2018
+#: ../src/preferences.c:2207
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: ../src/preferences.c:2020
+#: ../src/preferences.c:2209
 msgid "Accelerators"
 msgstr "Skróty klawiszowe"
 
-#: ../src/preferences.c:2039
+#: ../src/preferences.c:2228
 msgid "Action"
 msgstr "Akcja"
 
-#: ../src/preferences.c:2061
+#: ../src/preferences.c:2250
 msgid "KEY"
-msgstr ""
-
-#: ../src/preferences.c:2072
+msgstr "Klawisz"
+
+#: ../src/preferences.c:2261
 msgid "Tooltip"
 msgstr "Podpowiedź"
 
-#: ../src/preferences.c:2103
+#: ../src/preferences.c:2292
 msgid "Reset selected"
-msgstr ""
-
-#: ../src/preferences.c:2119
+msgstr "Zresetuj wybrane"
+
+#: ../src/preferences.c:2308
 msgid "Stereo"
 msgstr ""
 
-#: ../src/preferences.c:2121 ../src/preferences.c:2124
+#: ../src/preferences.c:2310 ../src/preferences.c:2313
 msgid "Windowed stereo mode"
 msgstr ""
 
-#: ../src/preferences.c:2128 ../src/preferences.c:2153
+#: ../src/preferences.c:2317 ../src/preferences.c:2342
 msgid "Mirror left image"
 msgstr ""
 
-#: ../src/preferences.c:2131 ../src/preferences.c:2156
+#: ../src/preferences.c:2320 ../src/preferences.c:2345
 msgid "Flip left image"
 msgstr ""
 
-#: ../src/preferences.c:2134 ../src/preferences.c:2159
+#: ../src/preferences.c:2323 ../src/preferences.c:2348
 msgid "Mirror right image"
 msgstr ""
 
-#: ../src/preferences.c:2137 ../src/preferences.c:2162
+#: ../src/preferences.c:2326 ../src/preferences.c:2351
 msgid "Flip right image"
 msgstr ""
 
-#: ../src/preferences.c:2139 ../src/preferences.c:2164
+#: ../src/preferences.c:2328 ../src/preferences.c:2353
 msgid "Swap left and right images"
 msgstr ""
 
-#: ../src/preferences.c:2141 ../src/preferences.c:2166
+#: ../src/preferences.c:2330 ../src/preferences.c:2355
 msgid "Disable stereo mode on single image source"
 msgstr ""
 
-#: ../src/preferences.c:2144 ../src/preferences.c:2150
+#: ../src/preferences.c:2333 ../src/preferences.c:2339
 msgid "Fullscreen stereo mode"
 msgstr ""
 
-#: ../src/preferences.c:2145
+#: ../src/preferences.c:2334
 msgid "Use different settings for fullscreen"
-msgstr ""
-
-#: ../src/preferences.c:2175
+msgstr "Używaj osobnych ustawień dla trybu pełnoekranowego"
+
+#: ../src/preferences.c:2364
 msgid "Left X"
 msgstr "Lewy X"
 
-#: ../src/preferences.c:2177
+#: ../src/preferences.c:2366
 msgid "Left Y"
 msgstr "Lewy Y"
 
-#: ../src/preferences.c:2179
+#: ../src/preferences.c:2368
 msgid "Right X"
 msgstr "Prawy X"
 
-#: ../src/preferences.c:2181
+#: ../src/preferences.c:2370
 msgid "Right Y"
 msgstr "Prawy Y"
 
-#: ../src/preferences.c:2197
+#: ../src/preferences.c:2386
 msgid "Preferences"
 msgstr "P_referencje..."
 
-#: ../src/preferences.c:2345
+#: ../src/preferences.c:2540
 #, c-format
 msgid ""
 "%s %s\n"
@@ -4466,87 +4520,87 @@
 "\n"
 "Wydany na warunkach licencji GNU GPL"
 
-#: ../src/preferences.c:2364
+#: ../src/preferences.c:2559
 msgid "Credits..."
 msgstr "Zasługi..."
 
-#: ../src/print.c:124
+#: ../src/print.c:133
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: ../src/print.c:125
+#: ../src/print.c:134
 msgid "All"
 msgstr "Wszystkie"
 
-#: ../src/print.c:136
+#: ../src/print.c:145
 msgid "One image per page"
 msgstr "Jeden obraz na stronie"
 
-#: ../src/print.c:137
+#: ../src/print.c:146
 msgid "Proof sheet"
 msgstr "Wydruk próbny"
 
-#: ../src/print.c:150
+#: ../src/print.c:159
 msgid "Default printer"
 msgstr "Drukarka domyślna"
 
-#: ../src/print.c:151
+#: ../src/print.c:160
 msgid "Custom printer"
 msgstr "Własna drukarka"
 
-#: ../src/print.c:152
+#: ../src/print.c:161
 msgid "PostScript file"
 msgstr "Plik PostScript"
 
-#: ../src/print.c:153
+#: ../src/print.c:162
 msgid "Image file"
 msgstr "Plik obrazu"
 
-#: ../src/print.c:167
+#: ../src/print.c:176
 msgid "jpeg, low quality"
 msgstr "jpeg, niska jakość"
 
-#: ../src/print.c:168
+#: ../src/print.c:177
 msgid "jpeg, normal quality"
 msgstr "jpeg, zwykła jakość"
 
-#: ../src/print.c:169
+#: ../src/print.c:178
 msgid "jpeg, high quality"
 msgstr "jpeg, wysoka jakość"
 
-#: ../src/print.c:365 ../src/print.c:3212
+#: ../src/print.c:374 ../src/print.c:3221
 msgid "points"
 msgstr "punkty"
 
-#: ../src/print.c:366
+#: ../src/print.c:375
 msgid "millimeters"
 msgstr "milimetry"
 
-#: ../src/print.c:367
+#: ../src/print.c:376
 msgid "centimeters"
 msgstr "centymetry"
 
-#: ../src/print.c:368
+#: ../src/print.c:377
 msgid "inches"
 msgstr "cale"
 
-#: ../src/print.c:369
+#: ../src/print.c:378
 msgid "picas"
 msgstr "pica"
 
-#: ../src/print.c:381
+#: ../src/print.c:390
 msgid "Letter"
-msgstr ""
+msgstr "Letter"
 
 #. in 8.5 x 11
-#: ../src/print.c:382
+#: ../src/print.c:391
 msgid "Legal"
-msgstr ""
+msgstr "Legal"
 
 #. in 8.5 x 14
-#: ../src/print.c:383
+#: ../src/print.c:392
 msgid "Executive"
-msgstr ""
+msgstr "Executive"
 
 #. in 7.25x 10.5
 #. mm 841 x 1189
@@ -4560,60 +4614,60 @@
 #. mm 250 x 353
 #. mm 176 x 250
 #. mm 125 x 176
-#: ../src/print.c:395
+#: ../src/print.c:404
 msgid "Envelope #10"
-msgstr ""
+msgstr "Koperta #10"
 
 #. in 4.125 x 9.5
-#: ../src/print.c:396
+#: ../src/print.c:405
 msgid "Envelope #9"
-msgstr ""
+msgstr "Koperta #9"
 
 #. in 3.875 x 8.875
-#: ../src/print.c:397
+#: ../src/print.c:406
 msgid "Envelope C4"
-msgstr ""
+msgstr "Koperta C4"
 
 #. mm 229 x 324
-#: ../src/print.c:398
+#: ../src/print.c:407
 msgid "Envelope C5"
-msgstr ""
+msgstr "Koperta C5"
 
 #. mm 162 x 229
-#: ../src/print.c:399
+#: ../src/print.c:408
 msgid "Envelope C6"
-msgstr ""
+msgstr "Koperta C6"
 
 #. mm 114 x 162
-#: ../src/print.c:400
+#: ../src/print.c:409
 msgid "Photo 6x4"
-msgstr ""
+msgstr "Zdjęcie 10x15"
 
 #. in 6   x 4
-#: ../src/print.c:401
+#: ../src/print.c:410
 msgid "Photo 8x10"
-msgstr ""
+msgstr "Zdjęcie 20x25"
 
 #. in 8   x 10
-#: ../src/print.c:402
+#: ../src/print.c:411
 msgid "Postcard"
 msgstr "Kartka pocztowa"
 
 #. mm 100 x 148
-#: ../src/print.c:403
+#: ../src/print.c:412
 msgid "Tabloid"
-msgstr ""
-
-#: ../src/print.c:559
+msgstr "Tabloid"
+
+#: ../src/print.c:568
 #, c-format
 msgid "page %d of %d"
 msgstr "strona %d z %d"
 
-#: ../src/print.c:751
+#: ../src/print.c:760
 msgid "Preview"
 msgstr "Podgląd"
 
-#: ../src/print.c:1059
+#: ../src/print.c:1068
 #, c-format
 msgid ""
 "Unable to open pipe for writing.\n"
@@ -4622,147 +4676,147 @@
 "Nie można otworzyć strumienia do zapisu.\n"
 "\"%s\""
 
-#: ../src/print.c:1074 ../src/print.c:1466 ../src/ui_pathsel.c:423
+#: ../src/print.c:1083 ../src/print.c:1475 ../src/ui_pathsel.c:432
 #, c-format
 msgid "A file with name %s already exists."
 msgstr "Plik o nazwie %s już istnieje."
 
-#: ../src/print.c:1089 ../src/print.c:1521
+#: ../src/print.c:1098 ../src/print.c:1530
 #, c-format
 msgid "Failure writing to file %s"
 msgstr "Niepowodzenie zapisu do pliku %s"
 
-#: ../src/print.c:1144 ../src/print.c:1181 ../src/print.c:1217
-#: ../src/print.c:1334 ../src/print.c:1407
+#: ../src/print.c:1153 ../src/print.c:1190 ../src/print.c:1226
+#: ../src/print.c:1343 ../src/print.c:1416
 msgid "SIGPIPE error writing to printer."
 msgstr "Błąd SIGPIPE zapisu do drukarki."
 
-#: ../src/print.c:1942
+#: ../src/print.c:1951
 #, c-format
 msgid "Page %d"
 msgstr "Strona %d"
 
-#: ../src/print.c:1964 ../src/print.c:1969
+#: ../src/print.c:1973 ../src/print.c:1978
 msgid "Printing error"
 msgstr "Błąd wydruku"
 
-#: ../src/print.c:1968
+#: ../src/print.c:1977
 #, c-format
 msgid "An error occured printing to %s."
 msgstr "Wystąpił błąd w czasie drukowania na %s."
 
-#: ../src/print.c:1972
+#: ../src/print.c:1981
 msgid "Details"
 msgstr "Szczegóły"
 
-#: ../src/print.c:2587 ../src/print.c:3341
+#: ../src/print.c:2596 ../src/print.c:3350
 msgid "Print"
 msgstr "Drukuj"
 
-#: ../src/print.c:2591
+#: ../src/print.c:2600
 #, c-format
 msgid "Printing %d pages to %s."
 msgstr "Drukowanie %d stron na %s."
 
-#: ../src/print.c:2691
+#: ../src/print.c:2700
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/print.c:2766
+#: ../src/print.c:2775
 msgid "Units:"
 msgstr "Jednostki:"
 
-#: ../src/print.c:2810
+#: ../src/print.c:2819
 msgid "Orientation:"
 msgstr "Ułożenie:"
 
-#: ../src/print.c:2942
+#: ../src/print.c:2951
 msgid "Destination:"
 msgstr "Cel:"
 
-#: ../src/print.c:2990
+#: ../src/print.c:2999
 msgid "<printer name>"
 msgstr "<nazwa drukarki>"
 
-#: ../src/print.c:3079
+#: ../src/print.c:3088
 msgid "Unlimited"
 msgstr "Nieograniczone"
 
-#: ../src/print.c:3197
+#: ../src/print.c:3206
 msgid "Show"
 msgstr "Pokaż"
 
-#: ../src/print.c:3368
+#: ../src/print.c:3377
 msgid "Source"
 msgstr "Źródło"
 
-#: ../src/print.c:3380
+#: ../src/print.c:3389
 msgid "Image size:"
 msgstr "Rozmiar obrazu:"
 
-#: ../src/print.c:3384
+#: ../src/print.c:3393
 msgid "Proof size:"
 msgstr "Rozmiar próbki:"
 
-#: ../src/print.c:3410
+#: ../src/print.c:3419
 msgid "Paper"
 msgstr "Papier"
 
-#: ../src/print.c:3433
+#: ../src/print.c:3442
 msgid "Margins"
 msgstr "Merginesy"
 
-#: ../src/print.c:3435
+#: ../src/print.c:3444
 msgid "Left:"
 msgstr "Lewy:"
 
-#: ../src/print.c:3438
+#: ../src/print.c:3447
 msgid "Right:"
 msgstr "Prawy:"
 
-#: ../src/print.c:3441
+#: ../src/print.c:3450
 msgid "Top:"
 msgstr "Górny:"
 
-#: ../src/print.c:3444
+#: ../src/print.c:3453
 msgid "Bottom:"
 msgstr "Dolny:"
 
-#: ../src/print.c:3453
+#: ../src/print.c:3462
 msgid "Printer"
 msgstr "Drukarka"
 
-#: ../src/print.c:3459
+#: ../src/print.c:3468
 msgid "Custom printer:"
 msgstr "Własna drukarka:"
 
-#: ../src/print.c:3468
+#: ../src/print.c:3477
 msgid "File:"
 msgstr "Plik:"
 
-#: ../src/print.c:3477
+#: ../src/print.c:3486
 msgid "File format:"
 msgstr "Format pliku:"
 
-#: ../src/print.c:3482
+#: ../src/print.c:3491
 msgid "DPI:"
 msgstr "DPI:"
 
-#: ../src/print.c:3490
+#: ../src/print.c:3499
 msgid "Remember print settings"
 msgstr "Zapamiętanie opcji druku"
 
-#: ../src/rcfile.c:81
+#: ../src/rcfile.c:90
 #, c-format
 msgid "Option %s ignored: %s\n"
 msgstr "Opcja %s zignorowana: %s\n"
 
-#: ../src/rcfile.c:468
+#: ../src/rcfile.c:508
 #, c-format
 msgid "error saving config file: %s\n"
 msgstr "błąd przy zapisie pliku konfiguracyjnego: %s\n"
 
-#: ../src/rcfile.c:526
+#: ../src/rcfile.c:566
 #, c-format
 msgid ""
 "error saving config file: %s\n"
@@ -4772,116 +4826,116 @@
 "błąd: %s\n"
 
 #. short, long                  callback,               extra, prefer, parameter, description
-#: ../src/remote.c:640
+#: ../src/remote.c:650
 msgid "next image"
 msgstr "następny obraz"
 
-#: ../src/remote.c:641
+#: ../src/remote.c:651
 msgid "previous image"
 msgstr "poprzedni obraz"
 
-#: ../src/remote.c:642
+#: ../src/remote.c:652
 msgid "first image"
 msgstr "pierwszy obraz"
 
-#: ../src/remote.c:643
+#: ../src/remote.c:653
 msgid "last image"
 msgstr "ostatni obraz"
 
-#: ../src/remote.c:644
+#: ../src/remote.c:654
 msgid "toggle full screen"
 msgstr "przełącz pełny ekran"
 
-#: ../src/remote.c:645
+#: ../src/remote.c:655
 msgid "start full screen"
 msgstr "włącz pełny ekran"
 
-#: ../src/remote.c:646
+#: ../src/remote.c:656
 msgid "stop full screen"
 msgstr "wyłącz pełny ekran"
 
-#: ../src/remote.c:647
+#: ../src/remote.c:657
 msgid "toggle slide show"
 msgstr "przełącz pokaz slajdów"
 
-#: ../src/remote.c:648
+#: ../src/remote.c:658
 msgid "start slide show"
 msgstr "rozpocznij pokaz slajdów"
 
-#: ../src/remote.c:649
+#: ../src/remote.c:659
 msgid "stop slide show"
 msgstr "zatrzymaj pokaz slajdów"
 
-#: ../src/remote.c:650
+#: ../src/remote.c:660
 msgid "<FOLDER>"
 msgstr "<FOLDER>"
 
-#: ../src/remote.c:650
+#: ../src/remote.c:660
 msgid "start recursive slide show in FOLDER"
 msgstr "rozpocznij rekursywny pokaz slajdów w FOLDER-rze"
 
-#: ../src/remote.c:651
+#: ../src/remote.c:661
 msgid "<[N][.M]>"
 msgstr "<[N][.M]>"
 
-#: ../src/remote.c:651
+#: ../src/remote.c:661
 msgid "set slide show delay to N.M seconds"
 msgstr "ustaw opóźnienie slajdów na N.M sekund"
 
-#: ../src/remote.c:652
+#: ../src/remote.c:662
 msgid "show tools"
 msgstr "pokaż narzędzia"
 
-#: ../src/remote.c:653
+#: ../src/remote.c:663
 msgid "hide tools"
 msgstr "Ukryj pasek narzędzi"
 
-#: ../src/remote.c:654
+#: ../src/remote.c:664
 msgid "quit"
 msgstr "zakończ"
 
-#: ../src/remote.c:655 ../src/remote.c:656 ../src/remote.c:657
-#: ../src/remote.c:658 ../src/remote.c:659 ../src/remote.c:661
+#: ../src/remote.c:665 ../src/remote.c:666 ../src/remote.c:667
+#: ../src/remote.c:668 ../src/remote.c:669 ../src/remote.c:671
 msgid "<FILE>"
 msgstr "<PLIK>"
 
-#: ../src/remote.c:655
+#: ../src/remote.c:665
 msgid "load configuration from FILE"
 msgstr "wczytaj konfigurację z PLIK-u"
 
-#: ../src/remote.c:656
+#: ../src/remote.c:666
 msgid "get list of sidecars of FILE"
 msgstr "pobierz listę plików sidecar PLIK-u"
 
-#: ../src/remote.c:657
+#: ../src/remote.c:667
 msgid "get destination path of FILE"
 msgstr "pobierz ścieżkę docelową PLIK-u"
 
-#: ../src/remote.c:658
+#: ../src/remote.c:668
 msgid "open FILE"
 msgstr "otwórz PLIK"
 
-#: ../src/remote.c:659
+#: ../src/remote.c:669
 msgid "open FILE in new window"
 msgstr "otwórz PLIK w nowym oknie"
 
-#: ../src/remote.c:660
+#: ../src/remote.c:670
 msgid "clear command line collection list"
-msgstr ""
-
-#: ../src/remote.c:661
+msgstr "wyczyść kolekcję listy poleceń"
+
+#: ../src/remote.c:671
 msgid "add FILE to command line collection list"
-msgstr ""
-
-#: ../src/remote.c:662
+msgstr "dodaj PLIK do kolekcji listy poleceń"
+
+#: ../src/remote.c:672
 msgid "bring the Geeqie window to the top"
 msgstr "przenieś okno Geeqie na wierzch"
 
-#: ../src/remote.c:727
+#: ../src/remote.c:737
 msgid "Remote command list:\n"
 msgstr "Lista komend zdalnego sterowania:\n"
 
-#: ../src/remote.c:746
+#: ../src/remote.c:756
 msgid ""
 "\n"
 "  All other command line parameters are used as plain files if they exists.\n"
@@ -4890,208 +4944,208 @@
 "  Wszystkie pozostałe parametry linii poleceń są używane jako pliki, jeśli "
 "istnieją.\n"
 
-#: ../src/remote.c:796
+#: ../src/remote.c:806
 #, c-format
 msgid "Remote %s not running, starting..."
 msgstr ""
 
-#: ../src/remote.c:932
+#: ../src/remote.c:942
 msgid "Remote not available\n"
 msgstr ""
 
-#: ../src/search.c:212
+#: ../src/search.c:220
 msgid "folder"
 msgstr "katalog"
 
-#: ../src/search.c:213
+#: ../src/search.c:221
 msgid "comments"
 msgstr "komentarze"
 
-#: ../src/search.c:214
+#: ../src/search.c:222
 msgid "results"
 msgstr "wyniki"
 
-#: ../src/search.c:218 ../src/search.c:243
+#: ../src/search.c:226 ../src/search.c:251
 msgid "contains"
 msgstr "zawiera"
 
-#: ../src/search.c:219
+#: ../src/search.c:227
 msgid "is"
 msgstr "równa"
 
-#: ../src/search.c:223 ../src/search.c:230
+#: ../src/search.c:231 ../src/search.c:238
 msgid "equal to"
-msgstr "równy"
-
-#: ../src/search.c:224
+msgstr "dokładnie"
+
+#: ../src/search.c:232
 msgid "less than"
 msgstr "mniejszy niż"
 
-#: ../src/search.c:225
+#: ../src/search.c:233
 msgid "greater than"
 msgstr "większy niż"
 
-#: ../src/search.c:226 ../src/search.c:233
+#: ../src/search.c:234 ../src/search.c:241
 msgid "between"
 msgstr "pomiędzy"
 
-#: ../src/search.c:231
+#: ../src/search.c:239
 msgid "before"
 msgstr "przed"
 
-#: ../src/search.c:232
+#: ../src/search.c:240
 msgid "after"
 msgstr "po"
 
-#: ../src/search.c:237
+#: ../src/search.c:245
 msgid "match all"
 msgstr "pasują wszystkie"
 
-#: ../src/search.c:238
+#: ../src/search.c:246
 msgid "match any"
 msgstr "pasuje dowolne"
 
-#: ../src/search.c:239
+#: ../src/search.c:247
 msgid "exclude"
 msgstr "z wyjątkiem"
 
-#: ../src/search.c:244
+#: ../src/search.c:252
 msgid "miss"
-msgstr ""
-
-#: ../src/search.c:295
+msgstr "nie zawiera"
+
+#: ../src/search.c:303
 #, c-format
 msgid "%s, %d files (%s, %d)"
 msgstr "%s, %d plików (%s, %d)"
 
-#: ../src/search.c:300
+#: ../src/search.c:308
 #, c-format
 msgid "%s, %d files"
 msgstr "%s, %d plików"
 
-#: ../src/search.c:318
+#: ../src/search.c:326
 msgid "Searching..."
 msgstr "Szukanie..."
 
-#: ../src/search.c:2120
+#: ../src/search.c:2128
 msgid "File not found"
 msgstr "Plik nie został znaleziony"
 
-#: ../src/search.c:2121
+#: ../src/search.c:2129
 msgid "Please enter an existing file for image content."
 msgstr "Proszę podać istniejący plik dla zawartości obrazu."
 
-#: ../src/search.c:2170
+#: ../src/search.c:2178
 msgid "Please enter an existing folder to search."
 msgstr "Proszę podać istniejący folder do wyszukiwania."
 
-#: ../src/search.c:2588
+#: ../src/search.c:2596
 msgid "Image search"
 msgstr "Wyszukiwanie obrazu"
 
-#: ../src/search.c:2618
+#: ../src/search.c:2626
 msgid "Search:"
 msgstr "Szukaj:"
 
-#: ../src/search.c:2632
+#: ../src/search.c:2640
 msgid "Recurse"
 msgstr "Rekursywnie"
 
-#: ../src/search.c:2637
+#: ../src/search.c:2645
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: ../src/search.c:2643 ../src/search.c:2738
+#: ../src/search.c:2651 ../src/search.c:2746
 msgid "Match case"
 msgstr "Uwzględniaj wielkość liter"
 
-#: ../src/search.c:2648
+#: ../src/search.c:2656
 msgid "File size is"
 msgstr "Rozmiar pliku"
 
-#: ../src/search.c:2655 ../src/search.c:2671 ../src/search.c:2690
+#: ../src/search.c:2663 ../src/search.c:2679 ../src/search.c:2698
 msgid "and"
 msgstr "i"
 
-#: ../src/search.c:2661
+#: ../src/search.c:2669
 msgid "File date is"
 msgstr "Data pliku"
 
-#: ../src/search.c:2679
+#: ../src/search.c:2687
 msgid "Image dimensions are"
 msgstr "Wymiary obrazu"
 
-#: ../src/search.c:2700
+#: ../src/search.c:2708
 msgid "Image content is"
 msgstr "Zawartość obrazu"
 
-#: ../src/search.c:2706
+#: ../src/search.c:2714
 #, no-c-format
 msgid "% similar to"
 msgstr "% podobna do"
 
-#: ../src/search.c:2788
+#: ../src/search.c:2796
 msgid "Rank"
 msgstr "Podobieństwo"
 
-#: ../src/secure_save.c:397
+#: ../src/secure_save.c:406
 msgid "Cannot read the file"
 msgstr "Nie można odczytać pliku"
 
-#: ../src/secure_save.c:399
+#: ../src/secure_save.c:408
 msgid "Cannot get file status"
 msgstr "Nie można odczytać stanu pliku"
 
-#: ../src/secure_save.c:401
+#: ../src/secure_save.c:410
 msgid "Cannot access the file"
 msgstr "Brak dostępu do pliku"
 
-#: ../src/secure_save.c:403
+#: ../src/secure_save.c:412
 msgid "Cannot create temp file"
 msgstr "Nie można utworzyć tymczasowego pliku"
 
-#: ../src/secure_save.c:405
+#: ../src/secure_save.c:414
 msgid "Cannot rename the file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: ../src/secure_save.c:407
+#: ../src/secure_save.c:416
 msgid "File saving disabled by option"
 msgstr "Zapisywanie pliku zostało wyłączone w opcjach"
 
-#: ../src/secure_save.c:409
+#: ../src/secure_save.c:418
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ../src/secure_save.c:411
+#: ../src/secure_save.c:420
 msgid "Cannot write the file"
 msgstr "Nie mogę zapisać do pliku"
 
-#: ../src/secure_save.c:415
+#: ../src/secure_save.c:424
 msgid "Secure file saving error"
 msgstr "Błąd bezpiecznego zapisu pliku"
 
-#: ../src/thumb.c:392
+#: ../src/thumb.c:400
 msgid "Thumbnail image in cache failed to load, trying to recreate.\n"
 msgstr "Odczyt miniaturki z cache nie powiódł się, próba odtworzenia.\n"
 
-#: ../src/trash.c:80 ../src/utilops.c:2461 ../src/utilops.c:2472
-#: ../src/utilops.c:2529
+#: ../src/trash.c:88 ../src/utilops.c:2601 ../src/utilops.c:2612
+#: ../src/utilops.c:2669
 msgid "Delete failed"
 msgstr "Usunięcie nie powiodło się"
 
-#: ../src/trash.c:81
+#: ../src/trash.c:89
 msgid "Unable to remove old file from trash folder"
 msgstr "Nie można usunąć starego pliku z kosza"
 
-#: ../src/trash.c:138
+#: ../src/trash.c:146
 msgid "Could not create folder"
 msgstr "Nie można utworzyć katalogu"
 
-#: ../src/trash.c:160
+#: ../src/trash.c:168
 msgid "Permission denied"
 msgstr "Brak dostępu"
 
-#: ../src/trash.c:170
+#: ../src/trash.c:178
 #, c-format
 msgid ""
 "Unable to access or create the trash folder.\n"
@@ -5100,20 +5154,20 @@
 "Błąd podczas dostępu lub podczas tworzenia katalogu:\n"
 "\"%s\""
 
-#: ../src/trash.c:174
+#: ../src/trash.c:182
 msgid "Turn off safe delete"
 msgstr "Wyłącz bezpieczne usuwanie"
 
-#: ../src/trash.c:193
+#: ../src/trash.c:201
 msgid "Deletion by external command"
 msgstr "Usuwanie zewnętrznym poleceniem"
 
-#: ../src/trash.c:201
+#: ../src/trash.c:209
 #, c-format
 msgid " (max. %d MB)"
 msgstr " (maks. %d MB)"
 
-#: ../src/trash.c:205
+#: ../src/trash.c:213
 #, c-format
 msgid ""
 "Safe delete: %s%s\n"
@@ -5122,40 +5176,40 @@
 "Bezpieczne usuwanie: %s%s\n"
 "Kosz: %s"
 
-#: ../src/trash.c:210
+#: ../src/trash.c:218
 #, c-format
 msgid "Safe delete: %s"
 msgstr "Bezpieczne usuwanie: %s"
 
-#: ../src/ui_bookmark.c:130 ../src/ui_bookmark.c:193
+#: ../src/ui_bookmark.c:139 ../src/ui_bookmark.c:202
 msgid "New Bookmark"
 msgstr "Nowa zakładka"
 
-#: ../src/ui_bookmark.c:276 ../src/ui_bookmark.c:282
+#: ../src/ui_bookmark.c:285 ../src/ui_bookmark.c:291
 msgid "Edit Bookmark"
 msgstr "Edycja zakładki"
 
-#: ../src/ui_bookmark.c:297
+#: ../src/ui_bookmark.c:306
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: ../src/ui_bookmark.c:306
+#: ../src/ui_bookmark.c:315
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: ../src/ui_bookmark.c:312
+#: ../src/ui_bookmark.c:321
 msgid "Select icon"
 msgstr "Zaznacz ikonę"
 
-#: ../src/ui_bookmark.c:405
+#: ../src/ui_bookmark.c:414
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: ../src/ui_bookmark.c:411
+#: ../src/ui_bookmark.c:420
 msgid "_Remove"
 msgstr "Usuń"
 
-#: ../src/ui_fileops.c:67
+#: ../src/ui_fileops.c:76
 msgid ""
 "One or more filenames are not encoded with the preferred locale character "
 "set.\n"
@@ -5163,12 +5217,12 @@
 "Jedna lub więcej nazw plików nie jest zapisana przy pomocy prefereowanego "
 "zestawu znaków.\n"
 
-#: ../src/ui_fileops.c:68
+#: ../src/ui_fileops.c:77
 #, c-format
 msgid "Operations on, and display of these files with %s may not succeed.\n"
 msgstr "Wyświetlanie i operacje na tych plikach w %s mogą się nie powieść.\n"
 
-#: ../src/ui_fileops.c:70
+#: ../src/ui_fileops.c:79
 msgid ""
 "If your filenames are not encoded in utf-8, try setting the environment "
 "variable G_BROKEN_FILENAMES=1\n"
@@ -5176,16 +5230,16 @@
 "Jeśli twoje nazwy plików nie są zapisane w utf-8, spróbuj "
 "ustawić zmienną środowiskową G_BROKEN_FILENAMES=1\n"
 
-#: ../src/ui_fileops.c:72
+#: ../src/ui_fileops.c:81
 #, c-format
 msgid "It appears G_BROKEN_FILENAMES is set to %s\n"
 msgstr "Zmienna G_BROKEN_FILENAMES ma wartość %s\n"
 
-#: ../src/ui_fileops.c:74
+#: ../src/ui_fileops.c:83
 msgid "It appears G_BROKEN_FILENAMES is not set\n"
 msgstr "Zmienna G_BROKEN_FILENAMES nie jest ustawiona\n"
 
-#: ../src/ui_fileops.c:76
+#: ../src/ui_fileops.c:85
 #, c-format
 msgid ""
 "The locale appears to be set to \"%s\"\n"
@@ -5194,7 +5248,7 @@
 "Locale ustawione na \"%s\"\n"
 "(ustawione przez zmienną środowiskową LANG)\n"
 
-#: ../src/ui_fileops.c:81
+#: ../src/ui_fileops.c:90
 msgid ""
 "\n"
 "Preferred encoding appears to be UTF-8, however the file:\n"
@@ -5202,25 +5256,25 @@
 "\n"
 "Preferowanym kodowaniem wydaje się być UTF-8, jednak plik:\n"
 
-#: ../src/ui_fileops.c:82 ../src/ui_fileops.c:85 ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:91 ../src/ui_fileops.c:94 ../src/ui_fileops.c:96
 msgid "[name not displayable]"
 msgstr "[nazwa niemożliwa do wyświetlenia]"
 
-#: ../src/ui_fileops.c:85
+#: ../src/ui_fileops.c:94
 #, c-format
 msgid "\"%s\" is encoded in valid UTF-8."
 msgstr "\"%s\" jest poprawnie zapisany w UTF-8."
 
-#: ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:96
 #, c-format
 msgid "\"%s\" is not encoded in valid UTF-8."
 msgstr "\"%s\" nie jest poprawnie zapisany w UTF-8."
 
-#: ../src/ui_fileops.c:92 ../src/ui_fileops.c:97
+#: ../src/ui_fileops.c:101 ../src/ui_fileops.c:106
 msgid "Filename encoding locale mismatch"
 msgstr "Niezgodność kodowania znaków nazwy plików"
 
-#: ../src/ui_help.c:110
+#: ../src/ui_help.c:119
 #, c-format
 msgid ""
 "Unable to load:\n"
@@ -5229,33 +5283,33 @@
 "Nie można wczytać:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:424 ../src/ui_pathsel.c:430 ../src/utilops.c:2160
-#: ../src/utilops.c:2187 ../src/utilops.c:2653
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2300
+#: ../src/utilops.c:2327 ../src/utilops.c:2793
 msgid "Rename failed"
 msgstr "Błąd zmiany nazwy"
 
-#: ../src/ui_pathsel.c:429
+#: ../src/ui_pathsel.c:438
 #, c-format
 msgid "Failed to rename %s to %s."
 msgstr "Zmiana nazwy %s na %s nie powiodła się."
 
-#: ../src/ui_pathsel.c:625 ../src/ui_pathsel.c:633
+#: ../src/ui_pathsel.c:634 ../src/ui_pathsel.c:642
 msgid "_Rename"
 msgstr "Zmień nazwę"
 
-#: ../src/ui_pathsel.c:627 ../src/ui_pathsel.c:637
+#: ../src/ui_pathsel.c:636 ../src/ui_pathsel.c:646
 msgid "Add _Bookmark"
 msgstr "Dodanie zakładki"
 
-#: ../src/ui_pathsel.c:635
+#: ../src/ui_pathsel.c:644
 msgid "_Delete"
 msgstr "Usuń"
 
-#: ../src/ui_pathsel.c:742 ../src/ui_pathsel.c:1047 ../src/utilops.c:2687
+#: ../src/ui_pathsel.c:751 ../src/ui_pathsel.c:1056 ../src/utilops.c:2827
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: ../src/ui_pathsel.c:752
+#: ../src/ui_pathsel.c:761
 #, c-format
 msgid ""
 "Unable to create folder:\n"
@@ -5264,35 +5318,35 @@
 "Błąd tworzenia katalogu:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:753
+#: ../src/ui_pathsel.c:762
 msgid "Error creating folder"
 msgstr "Błąd podczas tworzenia katalogu"
 
-#: ../src/ui_pathsel.c:978
+#: ../src/ui_pathsel.c:987
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/ui_pathsel.c:1050
+#: ../src/ui_pathsel.c:1059
 msgid "Show hidden"
 msgstr "Wyświetlanie ukrytych"
 
-#: ../src/ui_pathsel.c:1134
+#: ../src/ui_pathsel.c:1143
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/ui_tabcomp.c:924
+#: ../src/ui_tabcomp.c:933
 msgid "Select path"
 msgstr "Ustaw ścieżki"
 
-#: ../src/ui_tabcomp.c:940
+#: ../src/ui_tabcomp.c:949
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/uri_utils.c:35
+#: ../src/uri_utils.c:43
 msgid "Drag and Drop failed"
 msgstr "Przeciąganie nie powiodło się"
 
-#: ../src/utilops.c:547
+#: ../src/utilops.c:590
 msgid ""
 "\n"
 " Continue multiple file operation?"
@@ -5300,11 +5354,11 @@
 "\n"
 "Kontynuować operację na wielu plikach?"
 
-#: ../src/utilops.c:554 ../src/utilops.c:987
+#: ../src/utilops.c:597 ../src/utilops.c:1030
 msgid "Co_ntinue"
 msgstr "Ko_ntynuuj"
 
-#: ../src/utilops.c:731
+#: ../src/utilops.c:774
 #, c-format
 msgid ""
 "Removal of folder contents failed at this file:\n"
@@ -5315,7 +5369,7 @@
 "\n"
 "%s"
 
-#: ../src/utilops.c:875
+#: ../src/utilops.c:918
 #, c-format
 msgid ""
 "%s\n"
@@ -5324,103 +5378,107 @@
 "%s\n"
 "Nie można uruchomić zewnętrznego polecenia.\n"
 
-#: ../src/utilops.c:955
+#. 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:998 ../src/utilops.c:1150
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s nie jest katalogiem"
 
-#: ../src/utilops.c:985
+#: ../src/utilops.c:1028
 msgid "Really continue?"
 msgstr "Na pewno kontynuować?"
 
-#: ../src/utilops.c:999
+#: ../src/utilops.c:1042 ../src/utilops.c:1155
 msgid "This operation can't continue:"
 msgstr "Ta operacja nie może być kontynuowana:"
 
-#: ../src/utilops.c:1377 ../src/utilops.c:1490 ../src/utilops.c:1874
+#: ../src/utilops.c:1492 ../src/utilops.c:1605 ../src/utilops.c:2012
 msgid "Discard changes"
 msgstr "Cofnij zmiany"
 
-#: ../src/utilops.c:1378 ../src/utilops.c:1491 ../src/utilops.c:1824
-#: ../src/utilops.c:1840
+#: ../src/utilops.c:1493 ../src/utilops.c:1606 ../src/utilops.c:1962
+#: ../src/utilops.c:1978
 msgid "File details"
 msgstr "Szczegóły pliku"
 
-#: ../src/utilops.c:1400 ../src/utilops.c:1498
+#: ../src/utilops.c:1515 ../src/utilops.c:1613
 msgid "Sidecars"
 msgstr "Pliki sidecar"
 
-#: ../src/utilops.c:1402
+#: ../src/utilops.c:1517
 msgid "Write to file"
 msgstr "Zapisz do pliku"
 
-#: ../src/utilops.c:1442
+#: ../src/utilops.c:1557
 msgid "Choose the destination folder."
 msgstr "Wybierz katalog docelowy."
 
-#: ../src/utilops.c:1500
+#: ../src/utilops.c:1615
 msgid "New name"
 msgstr "Nowa nazwa"
 
-#: ../src/utilops.c:1530
+#: ../src/utilops.c:1652
 msgid "Manual rename"
 msgstr "Ręczna zmiana nazwy"
 
-#: ../src/utilops.c:1535
+#: ../src/utilops.c:1657
 msgid "Original name:"
 msgstr "Pierwotna nazwa:"
 
-#: ../src/utilops.c:1538
+#: ../src/utilops.c:1660
 msgid "New name:"
 msgstr "Nowa nazwa:"
 
-#: ../src/utilops.c:1551
+#: ../src/utilops.c:1673
 msgid "Auto rename"
 msgstr "Automatyczna zmiana nazwy"
 
-#: ../src/utilops.c:1557
+#: ../src/utilops.c:1679
 msgid "Begin text"
 msgstr "Początek tekstu"
 
-#: ../src/utilops.c:1565 ../src/utilops.c:1597
+#: ../src/utilops.c:1687 ../src/utilops.c:1719
 msgid "Start #"
 msgstr "Start #"
 
-#: ../src/utilops.c:1571
+#: ../src/utilops.c:1693
 msgid "End text"
 msgstr "Koniec tekstu"
 
-#: ../src/utilops.c:1579
+#: ../src/utilops.c:1701
 msgid "Padding:"
 msgstr "Ilość cyfr:"
 
-#: ../src/utilops.c:1584
+#: ../src/utilops.c:1706
 msgid "Formatted rename"
 msgstr "Zmiana nazwy wg formatu"
 
-#: ../src/utilops.c:1589
+#: ../src/utilops.c:1711
 msgid "Format (* = original name, ## = numbers)"
 msgstr "Format (* = oryginalna nazwa, ## = numery)"
 
-#: ../src/utilops.c:1727
+#: ../src/utilops.c:1865
 msgid "Another operation in progress.\n"
 msgstr "Inna operacja jest właśnie w toku.\n"
 
-#: ../src/utilops.c:1783
+#: ../src/utilops.c:1921
 #, c-format
 msgid "File: '%s'\n"
 msgstr "Plik: '%s'\n"
 
-#: ../src/utilops.c:1788
+#: ../src/utilops.c:1926
 msgid "with sidecar files:\n"
 msgstr "z plikami sidecar:\n"
 
-#: ../src/utilops.c:1794
+#: ../src/utilops.c:1932
 #, c-format
 msgid " '%s'\n"
 msgstr " '%s'\n"
 
-#: ../src/utilops.c:1798
+#: ../src/utilops.c:1936
 msgid ""
 "\n"
 "Status: "
@@ -5428,19 +5486,19 @@
 "\n"
 "Status: "
 
-#: ../src/utilops.c:1810
+#: ../src/utilops.c:1948
 msgid "no problem detected"
 msgstr "nie wykryto problemów"
 
-#: ../src/utilops.c:1826 ../src/utilops.c:1873
+#: ../src/utilops.c:1964 ../src/utilops.c:2011
 msgid "Exclude file"
 msgstr "Pomiń plik"
 
-#: ../src/utilops.c:1871 ../src/utilops.c:1896
+#: ../src/utilops.c:2009 ../src/utilops.c:2034
 msgid "Overview of changed metadata"
 msgstr "Opis zmienionych metadanych"
 
-#: ../src/utilops.c:1889
+#: ../src/utilops.c:2027
 #, c-format
 msgid ""
 "The following metadata tags will be written to\n"
@@ -5449,100 +5507,100 @@
 "Następujące metadane zostaną zapisane do\n"
 "'%s'."
 
-#: ../src/utilops.c:1893
+#: ../src/utilops.c:2031
 #, c-format
 msgid "The following metadata tags will be written to the image file itself."
 msgstr "Następujące metadane zostaną zapisane do pliku obrazu bezpośrednio."
 
-#: ../src/utilops.c:1999
+#: ../src/utilops.c:2137
 msgid "Delete files?"
 msgstr "Usunąć pliki?"
 
-#: ../src/utilops.c:2000
-msgid "This will delete the following files"
-msgstr "Ta operacja spowoduje usunięcie następujących plików"
-
-#: ../src/utilops.c:2019
-msgid "Can't write metadata"
-msgstr "Nie mogę zapisać metadanych"
-
-#: ../src/utilops.c:2042
-msgid "Write metadata"
-msgstr "Zapisz metadane"
-
-#: ../src/utilops.c:2043
-msgid "Write metadata?"
-msgstr "Zapisać metadane?"
-
-#: ../src/utilops.c:2044
-msgid "This will write the changed metadata into the following files"
-msgstr "Ta operacja zapisze zmienione metadane do następujących plików"
-
-#: ../src/utilops.c:2046
-msgid "Metadata writing failed"
-msgstr "Zapisywanie metadanych nie powiodło się"
-
-#: ../src/utilops.c:2065 ../src/utilops.c:2092
-msgid "Move failed"
-msgstr "Przenoszenie nie powiodło się"
-
-#: ../src/utilops.c:2089
-msgid "Move files?"
-msgstr "Przenieś pliki?"
-
-#: ../src/utilops.c:2090
-msgid "This will move the following files"
-msgstr "Ta operacja spowoduje przeniesienie następujących plików"
-
-#: ../src/utilops.c:2114 ../src/utilops.c:2141
-msgid "Copy failed"
-msgstr "Kopiowanie nie powiodło się"
-
 #: ../src/utilops.c:2138
+msgid "This will delete the following files"
+msgstr "Ta operacja spowoduje usunięcie następujących plików"
+
+#: ../src/utilops.c:2157
+msgid "Can't write metadata"
+msgstr "Nie mogę zapisać metadanych"
+
+#: ../src/utilops.c:2180
+msgid "Write metadata"
+msgstr "Zapisz metadane"
+
+#: ../src/utilops.c:2181
+msgid "Write metadata?"
+msgstr "Zapisać metadane?"
+
+#: ../src/utilops.c:2182
+msgid "This will write the changed metadata into the following files"
+msgstr "Ta operacja zapisze zmienione metadane do następujących plików"
+
+#: ../src/utilops.c:2184
+msgid "Metadata writing failed"
+msgstr "Zapisywanie metadanych nie powiodło się"
+
+#: ../src/utilops.c:2203 ../src/utilops.c:2231
+msgid "Move failed"
+msgstr "Przenoszenie nie powiodło się"
+
+#: ../src/utilops.c:2228
+msgid "Move files?"
+msgstr "Przenieś pliki?"
+
+#: ../src/utilops.c:2229
+msgid "This will move the following files"
+msgstr "Ta operacja spowoduje przeniesienie następujących plików"
+
+#: ../src/utilops.c:2253 ../src/utilops.c:2281
+msgid "Copy failed"
+msgstr "Kopiowanie nie powiodło się"
+
+#: ../src/utilops.c:2278
 msgid "Copy files?"
 msgstr "Kopiować pliki?"
 
-#: ../src/utilops.c:2139 ../src/utilops.c:2273
+#: ../src/utilops.c:2279 ../src/utilops.c:2413
 msgid "This will copy the following files"
 msgstr "Skopiowane zostaną następujące pliki"
 
-#: ../src/utilops.c:2183 ../src/utilops.c:2649
+#: ../src/utilops.c:2323 ../src/utilops.c:2789
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: ../src/utilops.c:2184
+#: ../src/utilops.c:2324
 msgid "Rename files?"
 msgstr "Zmienić nazwę plików?"
 
-#: ../src/utilops.c:2185
+#: ../src/utilops.c:2325
 msgid "This will rename the following files"
 msgstr "Ta operacja spowoduje zmianę nazwy następujących plików"
 
-#: ../src/utilops.c:2237
+#: ../src/utilops.c:2377
 msgid "Can't run external editor"
 msgstr "Nie mogę uruchomić zewnętrznego edytora"
 
-#: ../src/utilops.c:2271
+#: ../src/utilops.c:2411
 msgid "Editor"
 msgstr "Edytor"
 
-#: ../src/utilops.c:2272
+#: ../src/utilops.c:2412
 msgid "Run editor?"
 msgstr "Uruchomić edytor?"
 
-#: ../src/utilops.c:2275
+#: ../src/utilops.c:2415
 msgid "External command failed"
 msgstr "Zewnętrzne polecenie nie powiodło się"
 
-#: ../src/utilops.c:2444 ../src/utilops.c:2517
+#: ../src/utilops.c:2584 ../src/utilops.c:2657
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: ../src/utilops.c:2445
+#: ../src/utilops.c:2585
 msgid "Delete symbolic link?"
 msgstr "Usunąć dowiązanie symboliczne?"
 
-#: ../src/utilops.c:2447
+#: ../src/utilops.c:2587
 msgid ""
 "This will delete the symbolic link.\n"
 "The folder this link points to will not be deleted."
@@ -5550,11 +5608,11 @@
 "Zaraz usuniesz dowiązanie symboliczne.\n"
 "Katalog na który wskazuje to dowiązanie NIE zostanie usunięty."
 
-#: ../src/utilops.c:2449
+#: ../src/utilops.c:2589
 msgid "Link deletion failed"
 msgstr "Usunięcie linku nie powiodło się"
 
-#: ../src/utilops.c:2459
+#: ../src/utilops.c:2599
 #, c-format
 msgid ""
 "Unable to remove folder %s\n"
@@ -5563,16 +5621,16 @@
 "Nie można usunąć katalogu %s\n"
 "Brak uprawnień by zapisywać w tym katalogu."
 
-#: ../src/utilops.c:2471 ../src/utilops.c:2528
+#: ../src/utilops.c:2611 ../src/utilops.c:2668
 #, c-format
 msgid "Unable to list contents of folder %s"
 msgstr "Nie mogę wyświetlić zawartości katalogu %s"
 
-#: ../src/utilops.c:2485 ../src/utilops.c:2493
+#: ../src/utilops.c:2625 ../src/utilops.c:2633
 msgid "Folder contains subfolders"
 msgstr "Katalog zawiera podkatalogi"
 
-#: ../src/utilops.c:2489
+#: ../src/utilops.c:2629
 #, c-format
 msgid ""
 "Unable to delete the folder:\n"
@@ -5588,19 +5646,19 @@
 "Ten katalog zawiera podkatalogi, które musza zostać przeniesione zanim "
 "katalog może zostać usunięty."
 
-#: ../src/utilops.c:2497
+#: ../src/utilops.c:2637
 msgid "Subfolders:"
 msgstr "Podkatalogi:"
 
-#: ../src/utilops.c:2518
+#: ../src/utilops.c:2658
 msgid "Delete folder?"
 msgstr "Usunąć katalog?"
 
-#: ../src/utilops.c:2519
+#: ../src/utilops.c:2659
 msgid "The folder contains these files:"
 msgstr "Ten katalog zawiera następujące pliki:"
 
-#: ../src/utilops.c:2520
+#: ../src/utilops.c:2660
 msgid ""
 "This will delete the folder.\n"
 "The contents of this folder will also be deleted."
@@ -5608,87 +5666,87 @@
 "Zaraz usuniesz katalog.\n"
 "Zawartość tego katalogu TAKŻE zostanie usunięta."
 
-#: ../src/utilops.c:2650
+#: ../src/utilops.c:2790
 msgid "Rename folder?"
 msgstr "Zmienić nazwę katalogu?"
 
-#: ../src/utilops.c:2651
+#: ../src/utilops.c:2791
 msgid "The folder contains the following files"
 msgstr "Katalog zawiera następujące pliki"
 
-#: ../src/utilops.c:2697
+#: ../src/utilops.c:2837
 msgid "Create Folder"
 msgstr "Utwórz katalog"
 
-#: ../src/utilops.c:2698
+#: ../src/utilops.c:2838
 msgid "Create folder?"
 msgstr "Utworzyć katalog?"
 
-#: ../src/utilops.c:2701
+#: ../src/utilops.c:2841
 msgid "Can't create folder"
 msgstr "Nie można utworzyć katalogu"
 
-#: ../src/view_dir.c:397
+#: ../src/view_dir.c:406
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: ../src/view_dir.c:399
+#: ../src/view_dir.c:408
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: ../src/view_dir.c:644
+#: ../src/view_dir.c:653
 msgid "_Up to parent"
 msgstr "W _górę do nadrzędnego"
 
-#: ../src/view_dir.c:649
+#: ../src/view_dir.c:658
 msgid "_Slideshow"
 msgstr "Przeglądanie _slajdowe"
 
-#: ../src/view_dir.c:651
+#: ../src/view_dir.c:660
 msgid "Slideshow recursive"
 msgstr "Rekurencyjne przeglądanie slajdowe"
 
-#: ../src/view_dir.c:655
+#: ../src/view_dir.c:664
 msgid "Find _duplicates..."
 msgstr "Wyszukaj _duplikaty..."
 
-#: ../src/view_dir.c:657
+#: ../src/view_dir.c:666
 msgid "Find duplicates recursive..."
 msgstr "Rekurencyjnie wyszukaj duplikaty..."
 
-#: ../src/view_dir.c:662
+#: ../src/view_dir.c:671
 msgid "_New folder..."
 msgstr "Nowy _folder..."
 
-#: ../src/view_dir.c:676 ../src/view_file.c:619
+#: ../src/view_dir.c:685 ../src/view_file.c:655
 msgid "View as _List"
 msgstr "Wyświetlanie jako _lista"
 
-#: ../src/view_dir.c:679
+#: ../src/view_dir.c:688
 msgid "View as _Tree"
 msgstr "Wyświetlanie jako _drzewo"
 
-#: ../src/view_dir.c:684
+#: ../src/view_dir.c:693
 msgid "Show _hidden files"
 msgstr "Wyświetlanie ukrytych plików"
 
-#: ../src/view_dir.c:687 ../src/view_file.c:637
+#: ../src/view_dir.c:696 ../src/view_file.c:673
 msgid "Re_fresh"
 msgstr "_Odśwież"
 
-#: ../src/view_file.c:622
+#: ../src/view_file.c:658
 msgid "View as _Icons"
 msgstr "Wyświetlanie jako _ikony"
 
-#: ../src/view_file.c:628
+#: ../src/view_file.c:664
 msgid "Show _thumbnails"
 msgstr "Pokaż _miniaturki"
 
-#: ../src/view_file_icon.c:2098 ../src/view_file_list.c:825
+#: ../src/view_file_icon.c:2137 ../src/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[BEZ GRUPOWANIA]"
 
-#: ../src/view_file_list.c:451
+#: ../src/view_file_list.c:460
 #, c-format
 msgid ""
 "Invalid file name:\n"
@@ -5697,10 +5755,13 @@
 "Niepoprawna nazwa pliku:\n"
 "%s"
 
-#: ../src/view_file_list.c:452
+#: ../src/view_file_list.c:461
 msgid "Error renaming file"
 msgstr "Błąd podczas zmiany nazwy pliku"
 
-#: ../src/window.c:252
+#: ../src/window.c:261
 msgid "Help"
 msgstr "Pomo_c"
+
+#~ msgid "Add keywords"
+#~ msgstr "Dodaj słowa kluczowe"
--- a/src/Makefile.am	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/Makefile.am	Wed Apr 26 23:33:20 2017 +0300
@@ -228,6 +228,8 @@
 	search.h	\
 	secure_save.c	\
 	secure_save.h	\
+	shortcuts.c	\
+	shortcuts.h	\
 	similar.c	\
 	similar.h	\
 	slideshow.c	\
--- a/src/bar_gps.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/bar_gps.c	Wed Apr 26 23:33:20 2017 +0300
@@ -761,6 +761,10 @@
 	gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), (gdouble)zoom);
 
 	progress = gtk_progress_bar_new();
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "");
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progress), TRUE);
+#endif
 	state = gtk_label_new("");
 	gtk_label_set_justify(GTK_LABEL(state), GTK_JUSTIFY_CENTER);
 
--- a/src/cache_maint.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/cache_maint.c	Wed Apr 26 23:33:20 2017 +0300
@@ -950,6 +950,9 @@
 
 	cd->progress = gtk_progress_bar_new();
 	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(cd->progress), TRUE);
+#endif
 	gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
 	gtk_widget_show(cd->progress);
 
@@ -1039,11 +1042,8 @@
 {
 	GtkWidget *label;
 	gchar *buf;
-	gchar *path;
 
-	path = g_build_filename(homedir(), subdir, NULL);
-	buf = g_strdup_printf(_("Location: %s"), path);
-	g_free(path);
+	buf = g_strdup_printf(_("Location: %s"), subdir);
 	label = pref_label_new(group, buf);
 	g_free(buf);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
@@ -1058,6 +1058,7 @@
 	GtkWidget *button;
 	GtkWidget *table;
 	GtkSizeGroup *sizegroup;
+	gchar *path;
 
 	if (cache_manager)
 		{
@@ -1102,7 +1103,9 @@
 
 	group = pref_group_new(gd->vbox, FALSE, _("Shared thumbnail cache"), GTK_ORIENTATION_VERTICAL);
 
-	cache_manager_location_label(group, THUMB_FOLDER_GLOBAL);
+	path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, NULL);
+	cache_manager_location_label(group, path);
+	g_free(path);
 
 	table = pref_table_new(group, 2, 2, FALSE, FALSE);
 
--- a/src/collect-table.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/collect-table.c	Wed Apr 26 23:33:20 2017 +0300
@@ -62,14 +62,6 @@
 	CTABLE_COLUMN_COUNT
 };
 
-typedef enum {
-	SELECTION_NONE		= 0,
-	SELECTION_SELECTED	= 1 << 0,
-	SELECTION_PRELIGHT	= 1 << 1,
-	SELECTION_FOCUS		= 1 << 2
-} SelectionType;
-
-
 #define INFO_SELECTED(x) (x->flag_mask & SELECTION_SELECTED)
 
 
@@ -1601,11 +1593,11 @@
  *-------------------------------------------------------------------
  */
 
-static gboolean collection_table_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean collection_table_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	CollectTable *ct = data;
 
-	collection_table_motion_update(ct, (gint)bevent->x, (gint)bevent->y, FALSE);
+	collection_table_motion_update(ct, (gint)event->x, (gint)event->y, FALSE);
 
 	return FALSE;
 }
--- a/src/collect.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/collect.c	Wed Apr 26 23:33:20 2017 +0300
@@ -1219,6 +1219,10 @@
 
 	extra_label = gtk_progress_bar_new();
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(extra_label), 0.0);
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(extra_label), "");
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(extra_label), TRUE);
+#endif
 	gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
 	gtk_widget_show(extra_label);
 
--- a/src/editors.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/editors.c	Wed Apr 26 23:33:20 2017 +0300
@@ -567,6 +567,10 @@
 	vd->progress = gtk_progress_bar_new();
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
 	gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(vd->progress), "");
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(vd->progress), TRUE);
+#endif
 	gtk_widget_show(vd->progress);
 
 	vd->spinner = spinner_new(NULL, SPINNER_SPEED);
--- a/src/filedata.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/filedata.c	Wed Apr 26 23:33:20 2017 +0300
@@ -605,6 +605,7 @@
 	g_free(fd->original_path);
 	g_free(fd->collate_key_name);
 	g_free(fd->collate_key_name_nocase);
+	g_free(fd->extended_extension);
 	if (fd->thumb_pixbuf) g_object_unref(fd->thumb_pixbuf);
 	histmap_free(fd->histmap);
 
@@ -932,6 +933,8 @@
 
 	target->sidecar_files = g_list_remove(target->sidecar_files, sfd);
 	sfd->parent = NULL;
+	g_free(sfd->extended_extension);
+	sfd->extended_extension = NULL;
 
 	file_data_unref(target);
 	file_data_unref(sfd);
@@ -1119,6 +1122,37 @@
 
 	list = g_hash_table_lookup(basename_hash, basename);
 
+	if (!list)
+		{
+		DEBUG_1("TG: basename_hash not found for %s",fd->path);
+		const gchar *parent_extension = registered_extension_from_path(basename);
+
+		if (parent_extension)
+			{
+			DEBUG_1("TG: parent extension %s",parent_extension);
+			gchar *parent_basename = g_strndup(basename, parent_extension - basename);
+			DEBUG_1("TG: parent basename %s",parent_basename);
+			FileData *parent_fd = g_hash_table_lookup(file_data_pool, basename);
+			if (parent_fd)
+				{
+				DEBUG_1("TG: parent fd found");
+				list = g_hash_table_lookup(basename_hash, parent_basename);
+				if (!g_list_find(list, parent_fd))
+					{
+					DEBUG_1("TG: parent fd doesn't fit");
+					g_free(parent_basename);
+					list = NULL;
+					}
+				else
+					{
+					g_free(basename);
+					basename = parent_basename;
+					fd->extended_extension = g_strconcat(parent_extension, fd->extension, NULL);
+					}
+				}
+			}
+		}
+
 	if (!g_list_find(list, fd))
 		{
 		list = g_list_insert_sorted(list, file_data_ref(fd), file_data_sort_by_ext);
@@ -1131,6 +1165,11 @@
 	return list;
 }
 
+static void file_data_basename_hash_insert_cb(gpointer fd, gpointer basename_hash)
+{
+	file_data_basename_hash_insert((GHashTable *)basename_hash, (FileData *)fd);
+}
+
 static void file_data_basename_hash_remove_list(gpointer key, gpointer value, gpointer data)
 {
 	filelist_free((GList *)value);
@@ -1195,6 +1234,7 @@
 	gchar *pathl;
 	GList *dlist = NULL;
 	GList *flist = NULL;
+	GList *xmp_files = NULL;
 	gint (*stat_func)(const gchar *path, struct stat *buf);
 	GHashTable *basename_hash = NULL;
 
@@ -1252,7 +1292,10 @@
 					flist = g_list_prepend(flist, fd);
 					if (fd->sidecar_priority && !fd->disable_grouping)
 						{
-						file_data_basename_hash_insert(basename_hash, fd);
+						if (strcmp(fd->extension, ".xmp") != 0)
+							file_data_basename_hash_insert(basename_hash, fd);
+						else
+							xmp_files = g_list_append(xmp_files, fd);
 						}
 					}
 				}
@@ -1271,6 +1314,12 @@
 
 	g_free(pathl);
 
+	if (xmp_files)
+		{
+		g_list_foreach(xmp_files,file_data_basename_hash_insert_cb,basename_hash);
+		g_list_free(xmp_files);
+		}
+
 	if (dirs) *dirs = dlist;
 
 	if (files)
@@ -1531,22 +1580,29 @@
 	if (!file_data_can_write_sidecar(fd)) return NULL;
 
 	work = fd->parent ? fd->parent->sidecar_files : fd->sidecar_files;
+	gchar *extended_extension = g_strconcat(fd->parent ? fd->parent->extension : fd->extension, ".xmp", NULL);
 	while (work)
 		{
 		FileData *sfd = work->data;
 		work = work->next;
-		if (g_ascii_strcasecmp(sfd->extension, ".xmp") == 0)
+		if (g_ascii_strcasecmp(sfd->extension, ".xmp") == 0 || g_ascii_strcasecmp(sfd->extension, extended_extension) == 0)
 			{
 			sidecar_path = g_strdup(sfd->path);
 			break;
 			}
 		}
+	g_free(extended_extension);
 
 	if (!existing_only && !sidecar_path)
 		{
-		gchar *base = g_strndup(fd->path, fd->extension - fd->path);
-		sidecar_path = g_strconcat(base, ".xmp", NULL);
-		g_free(base);
+		if (options->metadata.sidecar_extended_name)
+			sidecar_path = g_strconcat(fd->path, ".xmp", NULL);
+		else
+			{
+			gchar *base = g_strndup(fd->path, fd->extension - fd->path);
+			sidecar_path = g_strconcat(base, ".xmp", NULL);
+			g_free(base);
+			}
 		}
 
 	return sidecar_path;
@@ -2095,11 +2151,11 @@
 
 static void file_data_update_ci_dest_preserve_ext(FileData *fd, const gchar *dest_path)
 {
-	const gchar *extension = extension_from_path(fd->change->source);
+	const gchar *extension = registered_extension_from_path(fd->change->source);
 	gchar *base = remove_extension_from_path(dest_path);
 	gchar *old_path = fd->change->dest;
 
-	fd->change->dest = g_strconcat(base, extension, NULL);
+	fd->change->dest = g_strconcat(base, fd->extended_extension ? fd->extended_extension : extension, NULL);
 	file_data_update_planned_change_hash(fd, old_path, fd->change->dest);
 
 	g_free(old_path);
@@ -2372,7 +2428,7 @@
 
 		if (!same)
 			{
-			const gchar *dest_ext = extension_from_path(fd->change->dest);
+			const gchar *dest_ext = registered_extension_from_path(fd->change->dest);
 			if (!dest_ext) dest_ext = "";
 			if (!options->file_filter.disable_file_extension_checks)
 				{
--- a/src/filedata.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/filedata.h	Wed Apr 26 23:33:20 2017 +0300
@@ -161,5 +161,6 @@
 gboolean file_data_register_real_time_monitor(FileData *fd);
 gboolean file_data_unregister_real_time_monitor(FileData *fd);
 
+void read_exif_time_data(FileData *file);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/fullscreen.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/fullscreen.c	Wed Apr 26 23:33:20 2017 +0300
@@ -99,7 +99,7 @@
 	fs->hide_mouse_id = g_timeout_add(FULL_SCREEN_HIDE_MOUSE_DELAY, fullscreen_hide_mouse_cb, fs);
 }
 
-static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	FullScreenData *fs = data;
 
--- a/src/image.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/image.c	Wed Apr 26 23:33:20 2017 +0300
@@ -56,6 +56,10 @@
 static void image_click_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
 {
 	ImageWindow *imd = data;
+	if (!options->image_lm_click_nav && event->button == MOUSE_BUTTON_MIDDLE)
+		{
+		imd->mouse_wheel_mode = !imd->mouse_wheel_mode;
+		}
 
 	if (imd->func_button)
 		{
@@ -63,7 +67,7 @@
 		}
 }
 
-static void image_drag_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
+static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer data)
 {
 	ImageWindow *imd = data;
 	gint width, height;
@@ -375,7 +379,7 @@
 
 }
 
-void image_alter_orientation(ImageWindow *imd, AlterType type)
+void image_alter_orientation(ImageWindow *imd, FileData *fd_n, AlterType type)
 {
 	static const gint rotate_90[]    = {1,   6, 7, 8, 5, 2, 3, 4, 1};
 	static const gint rotate_90_cc[] = {1,   8, 5, 6, 7, 4, 1, 2, 3};
@@ -383,37 +387,49 @@
 	static const gint mirror[]       = {1,   2, 1, 4, 3, 6, 5, 8, 7};
 	static const gint flip[]         = {1,   4, 3, 2, 1, 8, 7, 6, 5};
 
+	gint orientation;
 
-	if (!imd || !imd->pr || !imd->image_fd) return;
+	if (!imd || !imd->pr || !imd->image_fd || !fd_n) return;
 
-	if (imd->orientation < 1 || imd->orientation > 8) imd->orientation = 1;
+	orientation = EXIF_ORIENTATION_TOP_LEFT;
+	{
+	if (fd_n->user_orientation)
+		{
+		orientation = fd_n->user_orientation;
+		}
+	else
+		if (options->metadata.write_orientation)
+			{
+			orientation = metadata_read_int(fd_n, ORIENTATION_KEY, EXIF_ORIENTATION_TOP_LEFT);
+			}
+	}
 
 	switch (type)
 		{
 		case ALTER_ROTATE_90:
-			imd->orientation = rotate_90[imd->orientation];
+			orientation = rotate_90[orientation];
 			break;
 		case ALTER_ROTATE_90_CC:
-			imd->orientation = rotate_90_cc[imd->orientation];
+			orientation = rotate_90_cc[orientation];
 			break;
 		case ALTER_ROTATE_180:
-			imd->orientation = rotate_180[imd->orientation];
+			orientation = rotate_180[orientation];
 			break;
 		case ALTER_MIRROR:
-			imd->orientation = mirror[imd->orientation];
+			orientation = mirror[orientation];
 			break;
 		case ALTER_FLIP:
-			imd->orientation = flip[imd->orientation];
+			orientation = flip[orientation];
 			break;
 		case ALTER_NONE:
-			imd->orientation = imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1;
+			orientation = fd_n->exif_orientation ? fd_n->exif_orientation : 1;
 			break;
 		default:
 			return;
 			break;
 		}
 
-	if (imd->orientation != imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1)
+	if (orientation != (fd_n->exif_orientation ? fd_n->exif_orientation : 1))
 		{
 		if (!options->metadata.write_orientation)
 			{
@@ -422,29 +438,33 @@
 			   we must however handle switching metadata.write_orientation on and off, therefore
 			   we just disable referencing new fd's, not unreferencing the old ones
 			*/
-			if (imd->image_fd->user_orientation == 0) file_data_ref(imd->image_fd);
-			imd->image_fd->user_orientation = imd->orientation;
+			if (fd_n->user_orientation == 0) file_data_ref(fd_n);
+			fd_n->user_orientation = orientation;
 			}
 		}
 	else
 		{
-		if (imd->image_fd->user_orientation != 0) file_data_unref(imd->image_fd);
-		imd->image_fd->user_orientation = 0;
+		if (fd_n->user_orientation != 0) file_data_unref(fd_n);
+		fd_n->user_orientation = 0;
 		}
 
 	if (options->metadata.write_orientation)
 		{
 		if (type == ALTER_NONE)
 			{
-			metadata_write_revert(imd->image_fd, ORIENTATION_KEY);
+			metadata_write_revert(fd_n, ORIENTATION_KEY);
 			}
 		else
 			{
-			metadata_write_int(imd->image_fd, ORIENTATION_KEY, imd->orientation);
+			metadata_write_int(fd_n, ORIENTATION_KEY, orientation);
 			}
 		}
 
-	pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
+	if (imd->image_fd == fd_n && !(options->metadata.write_orientation && !options->image.exif_rotate_enable))
+		{
+		imd->orientation = orientation;
+		pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, orientation);
+		}
 }
 
 void image_set_desaturate(ImageWindow *imd, gboolean desaturate)
@@ -977,7 +997,7 @@
 }
 
 void image_set_drag_func(ImageWindow *imd,
-			   void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer),
+			   void (*func)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer),
 			   gpointer data)
 {
 	imd->func_drag = func;
@@ -1070,6 +1090,7 @@
 	   here before it is taken over by the renderer. */
 	if (pixbuf) g_object_ref(pixbuf);
 
+	imd->orientation = EXIF_ORIENTATION_TOP_LEFT;
 	if (imd->image_fd)
 		{
 		if (imd->image_fd->user_orientation)
--- a/src/image.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/image.h	Wed Apr 26 23:33:20 2017 +0300
@@ -36,7 +36,7 @@
 	void (*func)(ImageWindow *, GdkEventButton *event, gpointer),
 	gpointer data);
 void image_set_drag_func(ImageWindow *imd,
-	void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer),
+	void (*func)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer),
 	gpointer data);
 void image_set_scroll_func(ImageWindow *imd,
 	void (*func)(ImageWindow *, GdkEventScroll *event, gpointer),
@@ -85,7 +85,7 @@
 			   gdouble x_align, gdouble y_align);
 void image_get_scroll_center(ImageWindow *imd, gdouble *x, gdouble *y);
 void image_set_scroll_center(ImageWindow *imd, gdouble x, gdouble y);
-void image_alter_orientation(ImageWindow *imd, AlterType type);
+void image_alter_orientation(ImageWindow *imd, FileData *fd, AlterType type);
 void image_set_desaturate(ImageWindow *imd, gboolean desaturate);
 gboolean image_get_desaturate(ImageWindow *imd);
 
--- a/src/img-view.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/img-view.c	Wed Apr 26 23:33:20 2017 +0300
@@ -421,13 +421,13 @@
 		switch (event->keyval)
 			{
 			case 'R': case 'r':
-				image_alter_orientation(imd, ALTER_ROTATE_180);
+				image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_180);
 				break;
 			case 'M': case 'm':
-				image_alter_orientation(imd, ALTER_MIRROR);
+				image_alter_orientation(imd, imd->image_fd, ALTER_MIRROR);
 				break;
 			case 'F': case 'f':
-				image_alter_orientation(imd, ALTER_FLIP);
+				image_alter_orientation(imd, imd->image_fd, ALTER_FLIP);
 				break;
 			case 'G': case 'g':
 				image_set_desaturate(imd, !image_get_desaturate(imd));
@@ -531,10 +531,10 @@
 				view_overlay_toggle(vw);
 				break;
 			case ']':
-				image_alter_orientation(imd, ALTER_ROTATE_90);
+				image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90);
 				break;
 			case '[':
-				image_alter_orientation(imd, ALTER_ROTATE_90_CC);
+				image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90_CC);
 				break;
 			case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
 				if (options->file_ops.enable_delete_key)
@@ -600,7 +600,8 @@
 {
 	ViewWindow *vw = data;
 
-	if (event->state & GDK_CONTROL_MASK)
+	if ((event->state & GDK_CONTROL_MASK) ||
+				(imd->mouse_wheel_mode && !options->image_lm_click_nav))
 		{
 		switch (event->direction)
 			{
@@ -1081,7 +1082,7 @@
 	type = GPOINTER_TO_INT(data);
 
 	if (!vw) return;
-	image_alter_orientation(vw->imd, type);
+	image_alter_orientation(vw->imd, vw->imd->image_fd, type);
 }
 
 static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
--- a/src/layout.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/layout.c	Wed Apr 26 23:33:20 2017 +0300
@@ -46,7 +46,7 @@
 #include "bar.h"
 #include "bar_sort.h"
 #include "preferences.h"
-
+#include "shortcuts.h"
 #ifdef HAVE_LIRC
 #include "lirc.h"
 #endif
@@ -183,6 +183,21 @@
 	return FALSE;
 }
 
+static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer data)
+{
+	LayoutWindow *lw;
+	GList *work;
+
+/* FIXME: this is probably not the correct way to implement this */
+	work = layout_window_list;
+	while (work)
+		{
+		lw = work->data;
+		lw->options.folder_window.vdivider_pos = gtk_paned_get_position(GTK_PANED(widget));
+		work = work->next;
+		}
+}
+
 /*
  *-----------------------------------------------------------------------------
  * menu, toolbar, and dir view
@@ -272,6 +287,8 @@
 static GtkWidget *layout_tool_setup(LayoutWindow *lw)
 {
 	GtkWidget *box;
+	GtkWidget *box_folders;
+	GtkWidget *scd;
 	GtkWidget *menu_bar;
 	GtkWidget *tabcomp;
 	GtkWidget *toolbar;
@@ -300,15 +317,26 @@
 			 G_CALLBACK(layout_path_entry_changed_cb), lw);
 #endif
 
+	box_folders = GTK_WIDGET(gtk_hpaned_new());
+	gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
+
 	lw->vd = vd_new(lw->options.dir_view_type, lw->dir_fd);
 	vd_set_layout(lw->vd, lw);
 	vd_set_select_func(lw->vd, layout_vd_select_cb, lw);
 
 	lw->dir_view = lw->vd->widget;
-
-	gtk_box_pack_start(GTK_BOX(box), lw->dir_view, TRUE, TRUE, 0);
+	gtk_paned_add2(GTK_PANED(box_folders), lw->dir_view);
 	gtk_widget_show(lw->dir_view);
 
+	scd = shortcuts_new_default(lw);
+	gtk_paned_add1(GTK_PANED(box_folders), scd);
+	gtk_paned_set_position(GTK_PANED(box_folders), lw->options.folder_window.vdivider_pos);
+
+	gtk_widget_show(box_folders);
+
+	g_signal_connect(G_OBJECT(box_folders), "notify::position",
+			 G_CALLBACK(layout_box_folders_changed_cb), lw);
+
 	gtk_widget_show(box);
 
 	return box;
@@ -400,6 +428,113 @@
 	return button;
 }
 
+static void layout_zoom_menu_cb(GtkWidget *widget, gpointer data)
+{
+	ZoomMode mode;
+
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
+
+	mode = (ZoomMode)GPOINTER_TO_INT(data);
+	options->image.zoom_mode = mode;
+}
+
+static void layout_scroll_menu_cb(GtkWidget *widget, gpointer data)
+{
+	guint scroll_type;
+
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
+
+	scroll_type = GPOINTER_TO_UINT(data);
+	options->image.scroll_reset_method = scroll_type;
+	image_options_sync();
+}
+
+static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer data)
+{
+	/* destroy the menu */
+	g_object_unref(widget);
+}
+
+static void layout_zoom_button_press_cb(GtkWidget *widget, gpointer data)
+{
+	LayoutWindow *lw = data;
+	GtkWidget *menu;
+	GdkEvent *event;
+	guint32 etime;
+
+	menu = submenu_add_zoom(NULL, G_CALLBACK(layout_zoom_menu_cb),
+			lw, FALSE, FALSE, TRUE, options->image.zoom_mode);
+
+	/* take ownership of menu */
+#ifdef GTK_OBJECT_FLOATING
+	/* GTK+ < 2.10 */
+	g_object_ref(G_OBJECT(menu));
+	gtk_object_sink(GTK_OBJECT(menu));
+#else
+	/* GTK+ >= 2.10 */
+	g_object_ref_sink(G_OBJECT(menu));
+#endif
+
+	menu_item_add_divider(menu);
+
+	menu_item_add_radio(menu, _("Scroll to top left corner"),
+			GUINT_TO_POINTER(SCROLL_RESET_TOPLEFT),
+			options->image.scroll_reset_method == SCROLL_RESET_TOPLEFT,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_TOPLEFT));
+	menu_item_add_radio(menu, _("Scroll to image center"),
+			GUINT_TO_POINTER(SCROLL_RESET_CENTER),
+			options->image.scroll_reset_method == SCROLL_RESET_CENTER,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_CENTER));
+	menu_item_add_radio(menu, _("Keep the region from previous image"),
+			GUINT_TO_POINTER(SCROLL_RESET_NOCHANGE),
+			options->image.scroll_reset_method == SCROLL_RESET_NOCHANGE,
+			G_CALLBACK(layout_scroll_menu_cb),
+			GUINT_TO_POINTER(SCROLL_RESET_NOCHANGE));
+
+	g_signal_connect(G_OBJECT(menu), "selection_done",
+			 G_CALLBACK(layout_zoom_menu_hide_cb), NULL);
+
+	event = gtk_get_current_event();
+	if (event)
+		{
+		etime = gdk_event_get_time(event);
+		gdk_event_free(event);
+		}
+	else
+		{
+		etime = 0;
+		}
+
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, etime);
+}
+
+static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean expand)
+{
+	GtkWidget *button;
+	GtkWidget *frame;
+
+
+	frame = gtk_frame_new(NULL);
+	if (size) gtk_widget_set_size_request(frame, size, -1);
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+
+	gtk_widget_show(frame);
+
+	button = gtk_button_new_with_label("1:1");
+	g_signal_connect(G_OBJECT(button), "clicked",
+			 G_CALLBACK(layout_zoom_button_press_cb), lw);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	gtk_container_add(GTK_CONTAINER(frame), button);
+	gtk_widget_show(button);
+
+	return button;
+}
+
 /*
  *-----------------------------------------------------------------------------
  * status bar
@@ -508,7 +643,7 @@
 		gchar *b;
 
 		text = image_zoom_get_as_text(lw->image);
-		gtk_label_set_text(GTK_LABEL(lw->info_zoom), text);
+		gtk_button_set_label(GTK_BUTTON(lw->info_zoom), text);
 		g_free(text);
 
 		b = image_get_fd(lw->image) ? text_from_size(image_get_fd(lw->image)->size) : g_strdup("0");
@@ -607,6 +742,10 @@
 		}
 	lw->info_progress_bar = gtk_progress_bar_new();
 	gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
+#endif
 	gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
 	gtk_widget_show(lw->info_progress_bar);
 
@@ -634,8 +773,10 @@
 	gtk_widget_show(toolbar_frame);
 	gtk_widget_show(toolbar);
 	gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
-	lw->info_zoom = layout_status_label(NULL, hbox, FALSE, ZOOM_LABEL_WIDTH, FALSE);
-	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Image zoom level"));
+	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_show(lw->info_zoom);
+
 	if (small_format)
 		{
 		hbox = gtk_hbox_new(FALSE, 0);
@@ -1184,7 +1325,7 @@
 		return FALSE;
 		}
 
-	window = gtk_widget_get_window(lw->window);
+	window = gtk_widget_get_window(lw->tools);
 	gdk_window_get_root_origin(window, x, y);
 	*w = gdk_window_get_width(window);
 	*h = gdk_window_get_height(window);
@@ -1204,7 +1345,7 @@
 
 static void layout_tools_geometry_sync(LayoutWindow *lw)
 {
-	layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.x,
+	layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.y,
 				  &lw->options.float_window.w, &lw->options.float_window.h, &lw->options.float_window.vdivider_pos);
 }
 
@@ -1738,7 +1879,7 @@
 void layout_toolbar_toggle(LayoutWindow *lw)
 {
 	if (!layout_valid(&lw)) return;
-	if (!lw->toolbar) return;
+	if (!lw->toolbar[TOOLBAR_MAIN]) return;
 
 	lw->options.toolbar_hidden = !lw->options.toolbar_hidden;
 
@@ -2135,8 +2276,8 @@
 
 	layout_config_parse(lw->options.style, lw->options.order,
 			    &lw->dir_location,  &lw->file_location, &lw->image_location);
-	if (lw->options.dir_view_type >= VIEW_DIR_TYPES_COUNT) lw->options.dir_view_type = 0;
-	if (lw->options.file_view_type >= VIEW_FILE_TYPES_COUNT) lw->options.file_view_type = 0;
+	if (lw->options.dir_view_type > DIRVIEW_LAST) lw->options.dir_view_type = 0;
+	if (lw->options.file_view_type > FILEVIEW_LAST) lw->options.file_view_type = 0;
 
 	/* divider positions */
 
@@ -2273,6 +2414,9 @@
 	WRITE_NL(); WRITE_INT(*layout, main_window.vdivider_pos);
 	WRITE_SEPARATOR();
 
+	WRITE_NL(); WRITE_INT(*layout, folder_window.vdivider_pos);
+	WRITE_SEPARATOR();
+
 	WRITE_NL(); WRITE_INT(*layout, float_window.x);
 	WRITE_NL(); WRITE_INT(*layout, float_window.y);
 	WRITE_NL(); WRITE_INT(*layout, float_window.w);
@@ -2294,6 +2438,8 @@
 	WRITE_NL(); WRITE_UINT(*layout, image_overlay.state);
 	WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_channel);
 	WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_mode);
+
+	WRITE_NL(); WRITE_BOOL(*layout, animate);
 }
 
 
@@ -2345,6 +2491,8 @@
 		if (READ_INT(*layout, main_window.hdivider_pos)) continue;
 		if (READ_INT(*layout, main_window.vdivider_pos)) continue;
 
+		if (READ_INT_CLAMP(*layout, folder_window.vdivider_pos, 1, 1000)) continue;
+
 		if (READ_INT(*layout, float_window.x)) continue;
 		if (READ_INT(*layout, float_window.y)) continue;
 		if (READ_INT(*layout, float_window.w)) continue;
@@ -2363,6 +2511,8 @@
 		if (READ_INT(*layout, image_overlay.histogram_channel)) continue;
 		if (READ_INT(*layout, image_overlay.histogram_mode)) continue;
 
+		if (READ_BOOL(*layout, animate)) continue;
+
 		log_printf("unknown attribute %s = %s\n", option, value);
 		}
 	if (id && strcmp(id, LAYOUT_ID_CURRENT) != 0)
--- a/src/layout_image.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/layout_image.c	Wed Apr 26 23:33:20 2017 +0300
@@ -26,6 +26,7 @@
 #include "color-man.h"
 #include "dnd.h"
 #include "editors.h"
+#include "exif.h"
 #include "filedata.h"
 #include "fullscreen.h"
 #include "image.h"
@@ -34,6 +35,7 @@
 #include "layout.h"
 #include "layout_util.h"
 #include "menu.h"
+#include "metadata.h"
 #include "misc.h"
 #include "pixbuf_util.h"
 #include "pixbuf-renderer.h"
@@ -46,6 +48,7 @@
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
+#define FILE_COLUMN_POINTER 0
 
 static GtkWidget *layout_image_pop_menu(LayoutWindow *lw);
 static void layout_image_set_buttons(LayoutWindow *lw);
@@ -406,11 +409,17 @@
 	return TRUE;
 }
 
-static void layout_image_animate_toggle(LayoutWindow *lw)
+void layout_image_animate_toggle(LayoutWindow *lw)
 {
+	GtkAction *action;
+
 	if (!lw) return;
 
 	lw->options.animate = !lw->options.animate;
+
+	action = gtk_action_group_get_action(lw->action_group, "Animate");
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.animate);
+
 	layout_image_animate_new_file(lw);
 }
 
@@ -476,7 +485,7 @@
 	lw = submenu_item_get_data(widget);
 	type = (AlterType)GPOINTER_TO_INT(data);
 
-	image_alter_orientation(lw->image, type);
+	image_alter_orientation(lw->image, lw->image->image_fd, type);
 }
 
 static void li_pop_menu_new_cb(GtkWidget *widget, gpointer data)
@@ -998,12 +1007,12 @@
 		{
 		image_zoom_adjust_at_point(lw->full_screen->imd, increment, x, y);
 		}
-
-	if (!connect_zoom) return;
+	if (!connect_zoom && !lw->split_mode) return;
 
 	for (i = 0; i < MAX_SPLIT_IMAGES; i++)
 		{
-		if (lw->split_images[i] && lw->split_images[i] != lw->image)
+		if (lw->split_images[i] && lw->split_images[i] != lw->image &&
+						lw->split_images[i]->mouse_wheel_mode)
 			image_zoom_adjust_at_point(lw->split_images[i], increment, x, y);
 		}
 }
@@ -1054,7 +1063,71 @@
 {
 	if (!layout_valid(&lw)) return;
 
-	image_alter_orientation(lw->image, type);
+	GtkTreeModel *store;
+	GList *work;
+	GtkTreeSelection *selection;
+	GtkTreePath *tpath;
+	FileData *fd_n;
+	GtkTreeIter iter;
+	IconData *id;
+
+	if (!lw || !lw->vf) return;
+
+	if (lw->vf->type == FILEVIEW_ICON)
+		{
+		if (!VFICON(lw->vf)->selection) return;
+		work = VFICON(lw->vf)->selection;
+		}
+	else
+		{
+		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(lw->vf->listview));
+		work = gtk_tree_selection_get_selected_rows(selection, &store);
+		}
+
+	while (work)
+		{
+		if (lw->vf->type == FILEVIEW_ICON)
+			{
+			id = work->data;
+			fd_n = id->fd;
+			work = work->next;
+			}
+		else
+			{
+			tpath = work->data;
+			gtk_tree_model_get_iter(store, &iter, tpath);
+			gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
+			work = work->next;
+			}
+
+		image_alter_orientation(lw->image, fd_n, type);
+		}
+}
+
+void layout_image_reset_orientation(LayoutWindow *lw)
+{
+	ImageWindow *imd= lw->image;
+
+	if (!layout_valid(&lw)) return;
+	if (!imd || !imd->pr || !imd->image_fd) return;
+
+	if (imd->orientation < 1 || imd->orientation > 8) imd->orientation = 1;
+
+	if (options->image.exif_rotate_enable)
+		{
+		imd->orientation = metadata_read_int(imd->image_fd, ORIENTATION_KEY, EXIF_ORIENTATION_TOP_LEFT);
+		}
+	else
+		{
+		imd->orientation = 1;
+		}
+
+	if (imd->image_fd->user_orientation != 0)
+		{
+		 imd->orientation = imd->image_fd->user_orientation;
+		}
+
+	pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
 }
 
 void layout_image_set_desaturate(LayoutWindow *lw, gboolean desaturate)
@@ -1599,7 +1672,8 @@
 		}
 
 
-	if (event->state & GDK_CONTROL_MASK)
+	if ((event->state & GDK_CONTROL_MASK) ||
+				(imd->mouse_wheel_mode && !options->image_lm_click_nav))
 		{
 		switch (event->direction)
 			{
@@ -1649,7 +1723,7 @@
 		}
 }
 
-static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data)
+static void layout_image_drag_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data)
 {
 	gint i;
 	LayoutWindow *lw = data;
@@ -1720,7 +1794,7 @@
 
 }
 
-static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data)
+static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data)
 {
 	LayoutWindow *lw = data;
 	gint i = image_idx(lw, imd);
--- a/src/layout_image.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/layout_image.h	Wed Apr 26 23:33:20 2017 +0300
@@ -95,10 +95,11 @@
 gboolean layout_image_slideshow_pause_toggle(LayoutWindow *lw);
 gboolean layout_image_slideshow_paused(LayoutWindow *lw);
 
+void layout_image_animate_toggle(LayoutWindow *lw);
 
 void layout_image_overlay_toggle(LayoutWindow *lw);
 
 void layout_image_notify_cb(FileData *fd, NotifyType type, gpointer data);
-
+void layout_image_reset_orientation(LayoutWindow *lw);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/layout_util.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/layout_util.c	Wed Apr 26 23:33:20 2017 +0300
@@ -394,6 +394,14 @@
 	layout_image_alter_orientation(lw, ALTER_NONE);
 }
 
+static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data)
+{
+	LayoutWindow *lw = data;
+
+	options->image.exif_rotate_enable = gtk_toggle_action_get_active(action);
+	layout_image_reset_orientation(lw);
+}
+
 static void layout_menu_config_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
@@ -629,12 +637,20 @@
 	layout_views_set(lw, lw->options.dir_view_type, (FileViewType) gtk_radio_action_get_current_value(action));
 }
 
-static void layout_menu_view_dir_as_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_view_dir_as_cb(GtkToggleAction *action,  gpointer data)
 {
 	LayoutWindow *lw = data;
 
 	layout_exit_fullscreen(lw);
-	layout_views_set(lw, (DirViewType) gtk_radio_action_get_current_value(action), lw->options.file_view_type);
+
+	if (gtk_toggle_action_get_active(action))
+		{
+		layout_views_set(lw, DIRVIEW_TREE, lw->options.file_view_type);
+		}
+	else
+		{
+		layout_views_set(lw, DIRVIEW_LIST, lw->options.file_view_type);
+		}
 }
 
 static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
@@ -705,6 +721,14 @@
 		}
 }
 
+static void layout_menu_animate_cb(GtkToggleAction *action, gpointer data)
+{
+	LayoutWindow *lw = data;
+
+	if (lw->options.animate == gtk_toggle_action_get_active(action)) return;
+	layout_image_animate_toggle(lw);
+}
+
 static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
@@ -1589,6 +1613,8 @@
   { "ImageOverlay",	NULL,			N_("Image _Overlay"),			NULL,			N_("Image Overlay"),			CB(layout_menu_overlay_cb),	 FALSE },
   { "ImageHistogram",	NULL,			N_("_Show Histogram"),			NULL,			N_("Show Histogram"),			CB(layout_menu_histogram_cb),	 FALSE },
   { "RectangularSelection",	NULL,			N_("Rectangular Selection"),			"<alt>R",			N_("Rectangular Selection"),			CB(layout_menu_rectangular_selection_cb),	 FALSE },
+  { "Animate",	NULL,	N_("GIF _animation"),		"A",			N_("Toggle GIF animation"),			CB(layout_menu_animate_cb),	 FALSE  },
+  { "ExifRotate",	GTK_STOCK_ORIENTATION_PORTRAIT,			N_("_Exif rotate"),  		"<alt>X",		N_("Exif rotate"),			CB(layout_menu_exif_rotate_cb), FALSE },
 };
 
 static GtkRadioActionEntry menu_radio_entries[] = {
@@ -1596,9 +1622,8 @@
   { "ViewIcons",	NULL,			N_("I_cons"),				"<control>I",		N_("View Images as Icons"),		FILEVIEW_ICON }
 };
 
-static GtkRadioActionEntry menu_view_dir_radio_entries[] = {
-  { "FolderList",	NULL,			N_("Folder Li_st"),			"<meta>L",		N_("View Folders as List"), 		DIRVIEW_LIST },
-  { "FolderTree",	NULL,			N_("Folder T_ree"),			"<control>T",		N_("View Folders as Tree"), 		DIRVIEW_TREE },
+static GtkToggleActionEntry menu_view_dir_toggle_entries[] = {
+  { "FolderTree",	NULL,			N_("T_oggle Folder View"),			"<control>T",		N_("Toggle Folders View"), 		CB(layout_menu_view_dir_as_cb),FALSE },
 };
 
 static GtkRadioActionEntry menu_split_radio_entries[] = {
@@ -1706,6 +1731,9 @@
 "        <menuitem action='Mirror'/>"
 "        <menuitem action='Flip'/>"
 "        <menuitem action='AlterNone'/>"
+"        <separator/>"
+"        <menuitem action='ExifRotate'/>"
+"        <separator/>"
 "      </menu>"
 "      <menuitem action='SaveMetadata'/>"
 "      <placeholder name='PropertiesSection'/>"
@@ -1728,7 +1756,6 @@
 "      <placeholder name='WindowSection'/>"
 "      <separator/>"
 "      <menu action='FileDirMenu'>"
-"        <menuitem action='FolderList'/>"
 "        <menuitem action='FolderTree'/>"
 "        <placeholder name='FolderSection'/>"
 "        <separator/>"
@@ -1821,6 +1848,7 @@
 "      <menuitem action='ShowInfoPixel'/>"
 "      <placeholder name='ToolsSection'/>"
 "      <separator/>"
+"      <menuitem action='Animate'/>"
 "      <menuitem action='SlideShow'/>"
 "      <menuitem action='SlideShowPause'/>"
 "      <menuitem action='Refresh'/>"
@@ -1855,6 +1883,7 @@
 "    <toolitem action='FloatTools'/>"
 "  </toolbar>"
 "  <toolbar name='StatusBar'>"
+"    <toolitem action='ExifRotate'/>"
 "    <toolitem action='ShowInfoPixel'/>"
 "    <toolitem action='UseColorProfiles'/>"
 "    <toolitem action='SaveMetadata'/>"
@@ -2152,9 +2181,9 @@
 	gtk_action_group_add_radio_actions(lw->action_group,
 					   menu_split_radio_entries, G_N_ELEMENTS(menu_split_radio_entries),
 					   0, G_CALLBACK(layout_menu_split_cb), lw);
-	gtk_action_group_add_radio_actions(lw->action_group,
-					   menu_view_dir_radio_entries, VIEW_DIR_TYPES_COUNT,
-					   0, G_CALLBACK(layout_menu_view_dir_as_cb), lw);
+	gtk_action_group_add_toggle_actions(lw->action_group,
+					   menu_view_dir_toggle_entries, G_N_ELEMENTS(menu_view_dir_toggle_entries),
+					    lw);
 	gtk_action_group_add_radio_actions(lw->action_group,
 					   menu_color_radio_entries, COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS,
 					   0, G_CALLBACK(layout_color_menu_input_cb), lw);
@@ -2430,7 +2459,7 @@
 	if (!lw->action_group) return;
 
 	action = gtk_action_group_get_action(lw->action_group, "FolderTree");
-	gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.dir_view_type);
 
 	action = gtk_action_group_get_action(lw->action_group, "SplitSingle");
 	gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
@@ -2459,12 +2488,21 @@
 	action = gtk_action_group_get_action(lw->action_group, "SlideShow");
 	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), layout_image_slideshow_active(lw));
 
+	action = gtk_action_group_get_action(lw->action_group, "Animate");
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.animate);
+
 	action = gtk_action_group_get_action(lw->action_group, "ImageOverlay");
 	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), osd_flags != OSD_SHOW_NOTHING);
 
 	action = gtk_action_group_get_action(lw->action_group, "ImageHistogram");
 	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), osd_flags & OSD_SHOW_HISTOGRAM);
 
+	action = gtk_action_group_get_action(lw->action_group, "ExifRotate");
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), options->image.exif_rotate_enable);
+
+	action = gtk_action_group_get_action(lw->action_group, "RectangularSelection");
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), options->collections.rectangular_selection);
+
 	if (osd_flags & OSD_SHOW_HISTOGRAM)
 		{
 		action = gtk_action_group_get_action(lw->action_group, "HistogramChanR");
--- a/src/menu.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/menu.c	Wed Apr 26 23:33:20 2017 +0300
@@ -220,6 +220,80 @@
 	return submenu;
 }
 
+gchar *zoom_type_get_text(ZoomMode method)
+{
+	switch (method)
+		{
+		case ZOOM_RESET_ORIGINAL:
+			return _("Zoom to original size");
+			break;
+		case ZOOM_RESET_FIT_WINDOW:
+			return _("Fit image to window");
+			break;
+		case ZOOM_RESET_NONE:
+			return _("Leave Zoom at previous setting");
+			break;
+		default:
+			return _("Zoom to original size");
+			break;
+		}
+
+	return "";
+}
+
+static GtkWidget *submenu_add_zoom_item(GtkWidget *menu,
+					GCallback func, ZoomMode mode,
+					gboolean show_current, ZoomMode show_mode)
+{
+	GtkWidget *item;
+
+	if (show_current)
+		{
+		item = menu_item_add_radio(menu,
+					   zoom_type_get_text(mode), GINT_TO_POINTER((gint)mode), (mode == show_mode),
+					   func, GINT_TO_POINTER((gint)mode));
+		}
+	else
+		{
+		item = menu_item_add(menu, zoom_type_get_text(mode),
+				     func, GINT_TO_POINTER((gint)mode));
+		}
+
+	return item;
+}
+
+GtkWidget *submenu_add_zoom(GtkWidget *menu, GCallback func, gpointer data,
+			    gboolean include_none, gboolean include_path,
+			    gboolean show_current, ZoomMode mode)
+{
+	GtkWidget *submenu;
+
+	if (!menu)
+		{
+		submenu = gtk_menu_new();
+		g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
+		}
+	else
+		{
+		submenu = menu;
+		}
+
+	submenu_add_zoom_item(submenu, func, ZOOM_RESET_ORIGINAL, show_current, mode);
+	submenu_add_zoom_item(submenu, func, ZOOM_RESET_FIT_WINDOW, show_current, mode);
+	submenu_add_zoom_item(submenu, func, ZOOM_RESET_NONE, show_current, mode);
+
+	if (menu)
+		{
+		GtkWidget *item;
+
+		item = menu_item_add(menu, _("Zoom"), NULL, NULL);
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
+		return item;
+		}
+
+	return submenu;
+}
+
 /*
  *-----------------------------------------------------------------------------
  * altering
--- a/src/menu.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/menu.h	Wed Apr 26 23:33:20 2017 +0300
@@ -31,7 +31,9 @@
 GtkWidget *submenu_add_sort(GtkWidget *menu, GCallback func, gpointer data,
 			    gboolean include_none, gboolean include_path,
 			    gboolean show_current, SortType type);
-
+GtkWidget *submenu_add_zoom(GtkWidget *menu, GCallback func, gpointer data,
+			    gboolean include_none, gboolean include_path,
+			    gboolean show_current, ZoomMode mode);
 gchar *alter_type_get_text(AlterType type);
 GtkWidget *submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data);
 
--- a/src/metadata.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/metadata.c	Wed Apr 26 23:33:20 2017 +0300
@@ -302,7 +302,7 @@
 	g_assert(fd->change);
 
 	if (fd->change->dest &&
-	    strcmp(extension_from_path(fd->change->dest), GQ_CACHE_EXT_METADATA) == 0)
+	    strcmp(registered_extension_from_path(fd->change->dest), GQ_CACHE_EXT_METADATA) == 0)
 		{
 		success = metadata_legacy_write(fd);
 		if (success) metadata_legacy_delete(fd, fd->change->dest);
--- a/src/options.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/options.c	Wed Apr 26 23:33:20 2017 +0300
@@ -77,6 +77,15 @@
 	options->fullscreen.screen = -1;
 
 	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));
+/* alpha channel checkerboard background (same as gimp) */
+	options->image.alpha_color_1.red = 0x009999;
+	options->image.alpha_color_1.green = 0x009999;
+	options->image.alpha_color_1.blue = 0x009999;
+	options->image.alpha_color_2.red = 0x006666;
+	options->image.alpha_color_2.green = 0x006666;
+	options->image.alpha_color_2.blue = 0x006666;
 	options->image.enable_read_ahead = TRUE;
 	options->image.exif_rotate_enable = TRUE;
 	options->image.exif_proof_rotate_enable = TRUE;
@@ -131,6 +140,7 @@
 	options->metadata.confirm_on_dir_change = TRUE;
 	options->metadata.keywords_case_sensitive = FALSE;
 	options->metadata.write_orientation = TRUE;
+	options->metadata.sidecar_extended_name = FALSE;
 
 	options->show_icon_names = TRUE;
 
@@ -227,6 +237,7 @@
 	options->main_window.w = 720;
 	options->main_window.x = 0;
 	options->main_window.y = 0;
+	options->folder_window.vdivider_pos = 100;
 	options->order = g_strdup("123");
 	options->show_directory_date = FALSE;
 	options->show_marks = FALSE;
--- a/src/options.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/options.h	Wed Apr 26 23:33:20 2017 +0300
@@ -89,6 +89,8 @@
 		gboolean use_custom_border_color_in_fullscreen;
 		gboolean use_custom_border_color;
 		GdkColor border_color;
+		GdkColor alpha_color_1;
+		GdkColor alpha_color_2;
 	} image;
 
 	/* thumbnails */
@@ -210,6 +212,7 @@
 		gboolean confirm_on_dir_change;
 		gboolean keywords_case_sensitive;
 		gboolean write_orientation;
+		gboolean sidecar_extended_name;
 	} metadata;
 
 	/* Stereo */
--- a/src/pixbuf-renderer.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/pixbuf-renderer.c	Wed Apr 26 23:33:20 2017 +0300
@@ -1303,9 +1303,9 @@
 		}
 }
 
-static void pr_drag_signal(PixbufRenderer *pr, GdkEventButton *bevent)
+static void pr_drag_signal(PixbufRenderer *pr, GdkEventMotion *event)
 {
-	g_signal_emit(pr, signals[SIGNAL_DRAG], 0, bevent);
+	g_signal_emit(pr, signals[SIGNAL_DRAG], 0, event);
 }
 
 static void pr_update_pixel_signal(PixbufRenderer *pr)
@@ -1954,7 +1954,7 @@
  *-------------------------------------------------------------------
  */
 
-static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	PixbufRenderer *pr;
 	gint accel;
@@ -1967,25 +1967,25 @@
 	 * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
 	gint x, y;
 #if GTK_CHECK_VERSION(3,0,0)
-	device_manager = gdk_display_get_device_manager(gdk_window_get_display(bevent->window));
+	device_manager = gdk_display_get_device_manager(gdk_window_get_display(event->window));
 	device = gdk_device_manager_get_client_pointer(device_manager);
-	gdk_window_get_device_position(bevent->window, device, &x, &y, NULL);
+	gdk_window_get_device_position(event->window, device, &x, &y, NULL);
 #else
-	gdk_window_get_pointer (bevent->window, &x, &y, NULL);
+	gdk_window_get_pointer (event->window, &x, &y, NULL);
 #endif
-	bevent->x = x;
-	bevent->y = y;
+	event->x = x;
+	event->y = y;
 
 	pr = PIXBUF_RENDERER(widget);
 
 	if (pr->scroller_id)
 		{
-		pr->scroller_xpos = bevent->x;
-		pr->scroller_ypos = bevent->y;
+		pr->scroller_xpos = event->x;
+		pr->scroller_ypos = event->y;
 		}
 
-	pr->x_mouse = bevent->x;
-	pr->y_mouse = bevent->y;
+	pr->x_mouse = event->x;
+	pr->y_mouse = event->y;
 	pr_update_pixel_signal(pr);
 
 	if (!pr->in_drag || !gdk_pointer_is_grabbed()) return FALSE;
@@ -1999,7 +1999,7 @@
 		widget_set_cursor(widget, GDK_FLEUR);
 		}
 
-	if (bevent->state & GDK_CONTROL_MASK)
+	if (event->state & GDK_CONTROL_MASK)
 		{
 		accel = PR_PAN_SHIFT_MULTIPLIER;
 		}
@@ -2009,19 +2009,19 @@
 		}
 
 	/* do the scroll */
-	pixbuf_renderer_scroll(pr, (pr->drag_last_x - bevent->x) * accel,
-			       (pr->drag_last_y - bevent->y) * accel);
-
-	pr_drag_signal(pr, bevent);
-
-	pr->drag_last_x = bevent->x;
-	pr->drag_last_y = bevent->y;
+	pixbuf_renderer_scroll(pr, (pr->drag_last_x - event->x) * accel,
+			       (pr->drag_last_y - event->y) * accel);
+
+	pr_drag_signal(pr, event);
+
+	pr->drag_last_x = event->x;
+	pr->drag_last_y = event->y;
 
 	/* This is recommended by the GTK+ documentation, but does not work properly.
 	 * Use deprecated way until GTK+ gets a solution for correct motion hint handling:
 	 * http://bugzilla.gnome.org/show_bug.cgi?id=587714
 	 */
-	/* gdk_event_request_motions (bevent); */
+	/* gdk_event_request_motions (event); */
 	return FALSE;
 }
 
--- a/src/pixbuf-renderer.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/pixbuf-renderer.h	Wed Apr 26 23:33:20 2017 +0300
@@ -29,9 +29,7 @@
 #define IS_PIXBUF_RENDERER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_PIXBUF_RENDERER))
 #define PIXBUF_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_PIXBUF_RENDERER, PixbufRendererClass))
 
-/* alpha channel checkerboard background (same as gimp) */
-#define PR_ALPHA_CHECK1 0x00999999
-#define PR_ALPHA_CHECK2 0x00666666
+/* alpha channel checkerboard (same as gimp) */
 #define PR_ALPHA_CHECK_SIZE 16
 /* when scaling image to below this size, use nearest pixel for scaling
  * (below about 4, the other scale types become slow generating their conversion tables)
@@ -226,7 +224,7 @@
 	void (*update_pixel)(PixbufRenderer *pr);
 
 	void (*render_complete)(PixbufRenderer *pr);
-	void (*drag)(PixbufRenderer *pr, GdkEventButton *event);
+	void (*drag)(PixbufRenderer *pr, GdkEventMotion *event);
 };
 
 
--- a/src/preferences.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/preferences.c	Wed Apr 26 23:33:20 2017 +0300
@@ -297,6 +297,9 @@
 		view_window_colors_update();
 		}
 
+	options->image.alpha_color_1 = c_options->image.alpha_color_1;
+	options->image.alpha_color_2 = c_options->image.alpha_color_2;
+
 	options->fullscreen.screen = c_options->fullscreen.screen;
 	options->fullscreen.clean_flip = c_options->fullscreen.clean_flip;
 	options->fullscreen.disable_saver = c_options->fullscreen.disable_saver;
@@ -316,7 +319,6 @@
 	options->image_overlay.background_blue = c_options->image_overlay.background_blue;
 	options->image_overlay.background_alpha = c_options->image_overlay.background_alpha;
 	options->update_on_time_change = c_options->update_on_time_change;
-	options->image.exif_rotate_enable = c_options->image.exif_rotate_enable;
 	options->image.exif_proof_rotate_enable = c_options->image.exif_proof_rotate_enable;
 
 	options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold;
@@ -335,6 +337,7 @@
 	options->metadata.save_legacy_format = c_options->metadata.save_legacy_format;
 	options->metadata.sync_grouped_files = c_options->metadata.sync_grouped_files;
 	options->metadata.confirm_write = c_options->metadata.confirm_write;
+	options->metadata.sidecar_extended_name = c_options->metadata.sidecar_extended_name;
 	options->metadata.confirm_timeout = c_options->metadata.confirm_timeout;
 	options->metadata.confirm_after_timeout = c_options->metadata.confirm_after_timeout;
 	options->metadata.confirm_on_image_change = c_options->metadata.confirm_on_image_change;
@@ -1510,33 +1513,6 @@
 			     G_CALLBACK(zoom_increment_cb), NULL);
 	gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(spin), GTK_UPDATE_ALWAYS);
 
-	group = pref_group_new(vbox, FALSE, _("When new image is selected:"), GTK_ORIENTATION_HORIZONTAL);
-
-	vbox2 = pref_box_new(group, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-	c_options->image.zoom_mode = options->image.zoom_mode;
-	button = pref_radiobutton_new(vbox2, NULL, _("Zoom to original size"),
-				      (options->image.zoom_mode == ZOOM_RESET_ORIGINAL),
-				      G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_ORIGINAL));
-	button = pref_radiobutton_new(vbox2, button, _("Fit image to window"),
-				      (options->image.zoom_mode == ZOOM_RESET_FIT_WINDOW),
-				      G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_FIT_WINDOW));
-	button = pref_radiobutton_new(vbox2, button, _("Leave Zoom at previous setting"),
-				      (options->image.zoom_mode == ZOOM_RESET_NONE),
-				      G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_NONE));
-
-	vbox2 = pref_box_new(group, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-	c_options->image.scroll_reset_method = options->image.scroll_reset_method;
-	button = pref_radiobutton_new(vbox2, NULL, _("Scroll to top left corner"),
-				      (options->image.scroll_reset_method == SCROLL_RESET_TOPLEFT),
-				      G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_TOPLEFT));
-	button = pref_radiobutton_new(vbox2, button, _("Scroll to image center"),
-				      (options->image.scroll_reset_method == SCROLL_RESET_CENTER),
-				      G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_CENTER));
-	button = pref_radiobutton_new(vbox2, button, _("Keep the region from previous image"),
-				      (options->image.scroll_reset_method == SCROLL_RESET_NOCHANGE),
-				      G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_NOCHANGE));
-
-
 	group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL);
 
 	pref_checkbox_new_int(group, _("Use custom border color in window mode"),
@@ -1548,11 +1524,19 @@
 	pref_color_button_new(group, _("Border color"), &options->image.border_color,
 			      G_CALLBACK(pref_color_button_set_cb), &c_options->image.border_color);
 
+	c_options->image.border_color = options->image.border_color;
+
+	pref_color_button_new(group, _("Alpha channel color 1"), &options->image.alpha_color_1,
+			      G_CALLBACK(pref_color_button_set_cb), &c_options->image.alpha_color_1);
+
+	pref_color_button_new(group, _("Alpha channel color 2"), &options->image.alpha_color_2,
+			      G_CALLBACK(pref_color_button_set_cb), &c_options->image.alpha_color_2);
+
+	c_options->image.alpha_color_1 = options->image.alpha_color_1;
+	c_options->image.alpha_color_2 = options->image.alpha_color_2;
+
 	group = pref_group_new(vbox, FALSE, _("Convenience"), GTK_ORIENTATION_VERTICAL);
 
-	pref_checkbox_new_int(group, _("Auto rotate image using Exif information"),
-			      options->image.exif_rotate_enable, &c_options->image.exif_rotate_enable);
-
 	pref_checkbox_new_int(group, _("Auto rotate proofs using Exif information"),
 			      options->image.exif_proof_rotate_enable, &c_options->image.exif_proof_rotate_enable);
 }
@@ -1912,6 +1896,9 @@
 	pref_checkbox_new_int(hbox, _("Ask before writing to image files"),
 			      options->metadata.confirm_write, &c_options->metadata.confirm_write);
 
+	pref_checkbox_new_int(hbox, _("Create sidecar files named image.ext.xmp (as opposed to image.xmp)"),
+			      options->metadata.sidecar_extended_name, &c_options->metadata.sidecar_extended_name);
+
 	group = pref_group_new(vbox, FALSE, _("Step 2 and 3: write to Geeqie private files"), GTK_ORIENTATION_VERTICAL);
 #ifndef HAVE_EXIV2
 	gtk_widget_set_sensitive(group, FALSE);
@@ -1977,7 +1964,7 @@
 }
 
 static void add_intent_menu(GtkWidget *table, gint column, gint row, const gchar *text,
-			     guint option, guint *option_c)
+			     gint option, gint *option_c)
 {
 	GtkWidget *combo;
 	gint current = 0;
--- a/src/print.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/print.c	Wed Apr 26 23:33:20 2017 +0300
@@ -23,6 +23,7 @@
 #include "print.h"
 
 #include "filedata.h"
+#include "filefilter.h"
 #include "image.h"
 #include "image-load.h"
 #include "pixbuf_util.h"
@@ -1449,7 +1450,7 @@
 		const gchar *ext;
 		gchar *base;
 
-		ext = extension_from_path(pw->output_path);
+		ext = registered_extension_from_path(pw->output_path);
 
 		if (ext)
 			{
--- a/src/rcfile.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/rcfile.c	Wed Apr 26 23:33:20 2017 +0300
@@ -366,6 +366,8 @@
 	WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color);
 	WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color_in_fullscreen);
 	WRITE_NL(); WRITE_COLOR(*options, image.border_color);
+	WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
+	WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
 	WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
 
 	/* Thumbnails Options */
@@ -442,6 +444,7 @@
 	WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_format);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.sync_grouped_files);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_write);
+	WRITE_NL(); WRITE_BOOL(*options, metadata.sidecar_extended_name);
 	WRITE_NL(); WRITE_INT(*options, metadata.confirm_timeout);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_after_timeout);
 	WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_image_change);
@@ -639,6 +642,8 @@
 		if (READ_BOOL(*options, image.use_custom_border_color)) continue;
 		if (READ_BOOL(*options, image.use_custom_border_color_in_fullscreen)) continue;
 		if (READ_COLOR(*options, image.border_color)) continue;
+		if (READ_COLOR(*options, image.alpha_color_1)) continue;
+		if (READ_COLOR(*options, image.alpha_color_2)) continue;
 		if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
 
 		/* Thumbnails options */
@@ -720,6 +725,7 @@
 		if (READ_BOOL(*options, metadata.save_legacy_format)) continue;
 		if (READ_BOOL(*options, metadata.sync_grouped_files)) continue;
 		if (READ_BOOL(*options, metadata.confirm_write)) continue;
+		if (READ_BOOL(*options, metadata.sidecar_extended_name)) continue;
 		if (READ_BOOL(*options, metadata.confirm_after_timeout)) continue;
 		if (READ_INT(*options, metadata.confirm_timeout)) continue;
 		if (READ_BOOL(*options, metadata.confirm_on_image_change)) continue;
--- a/src/remote.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/remote.c	Wed Apr 26 23:33:20 2017 +0300
@@ -51,6 +51,7 @@
 
 static RemoteConnection *remote_client_open(const gchar *path);
 static gint remote_client_send(RemoteConnection *rc, const gchar *text);
+static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data);
 
 
 typedef struct _RemoteClient RemoteClient;
@@ -495,7 +496,7 @@
 	g_idle_add(gr_quit_idle_cb, NULL);
 }
 
-static void gr_file_load(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_file_load_no_raise(const gchar *text, GIOChannel *channel, gpointer data)
 {
 	gchar *filename = expand_tilde(text);
 
@@ -523,12 +524,22 @@
 	g_free(filename);
 }
 
+static void gr_file_load(const gchar *text, GIOChannel *channel, gpointer data)
+{
+	gr_file_load_no_raise(text, channel, data);
+
+	gr_raise(text, channel, data);
+}
+
 static void gr_file_tell(const gchar *text, GIOChannel *channel, gpointer data)
 {
 	LayoutWindow *lw = NULL; /* NULL to force layout_valid() to do some magic */
 	if (!layout_valid(&lw)) return;
 	if (image_get_path(lw->image))
-		printf_term("%s %s\n", GQ_APPNAME, image_get_path(lw->image));
+		{
+		g_io_channel_write_chars(channel, image_get_path(lw->image), -1, NULL, NULL);
+		g_io_channel_write_chars(channel, "\n", -1, NULL, NULL);
+		}
 }
 
 static void gr_config_load(const gchar *text, GIOChannel *channel, gpointer data)
@@ -674,7 +685,8 @@
 	{ NULL, "--config-load:",       gr_config_load,         TRUE,  FALSE, N_("<FILE>"), N_("load configuration from FILE") },
 	{ NULL, "--get-sidecars:",      gr_get_sidecars,        TRUE,  FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
 	{ NULL, "--get-destination:",  	gr_get_destination,     TRUE,  FALSE, N_("<FILE>"), N_("get destination path of FILE") },
-	{ NULL, "file:",                gr_file_load,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE") },
+	{ NULL, "file:",                gr_file_load,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE, bring Geeqie window to the top") },
+	{ NULL, "File:",                gr_file_load_no_raise,  TRUE,  FALSE, N_("<FILE>"), N_("open FILE, do not bring Geeqie window to the top") },
 	{ NULL, "--tell",               gr_file_tell,           FALSE, FALSE, NULL, N_("print filename of current image") },
 	{ NULL, "view:",                gr_file_view,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE in new window") },
 	{ NULL, "--list-clear",         gr_list_clear,          FALSE, FALSE, NULL, N_("clear command line collection list") },
--- a/src/renderer-tiles.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/renderer-tiles.c	Wed Apr 26 23:33:20 2017 +0300
@@ -1272,7 +1272,13 @@
 					 scale_x, scale_y,
 					 interp_type,
 					 255, check_x, check_y,
-					 PR_ALPHA_CHECK_SIZE, PR_ALPHA_CHECK1, PR_ALPHA_CHECK2);
+					 PR_ALPHA_CHECK_SIZE,
+					 ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
+					 (options->image.alpha_color_1.green & 0x00FF00) +
+					 (options->image.alpha_color_1.blue >> 8 & 0x00FF)),
+					 ((options->image.alpha_color_2.red << 8 & 0x00FF0000) +
+					 (options->image.alpha_color_2.green & 0x00FF00) +
+					 (options->image.alpha_color_2.blue >> 8 & 0x00FF)));
 		}
 }
 
--- a/src/search.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/search.c	Wed Apr 26 23:33:20 2017 +0300
@@ -160,6 +160,7 @@
 	GList *search_keyword_list;
 	gchar *search_comment;
 	gboolean   search_comment_match_case;
+	gboolean   search_date_exif;
 
 	MatchType search_type;
 
@@ -1653,6 +1654,7 @@
 	gint width = 0;
 	gint height = 0;
 	gint sim = 0;
+	time_t file_date;
 
 	if (!sd->search_file_list) return FALSE;
 
@@ -1729,11 +1731,21 @@
 		tested = TRUE;
 		match = FALSE;
 
+		if (sd->search_date_exif)
+			{
+			read_exif_time_data(fd);
+			file_date = fd->exifdate;
+			}
+		else
+			{
+			file_date = fd->date;
+			}
+
 		if (sd->match_date == SEARCH_MATCH_EQUAL)
 			{
 			struct tm *lt;
 
-			lt = localtime(&fd->date);
+			lt = localtime(&file_date);
 			match = (lt &&
 				 lt->tm_year == sd->search_date_y - 1900 &&
 				 lt->tm_mon == sd->search_date_m - 1 &&
@@ -1741,11 +1753,11 @@
 			}
 		else if (sd->match_date == SEARCH_MATCH_UNDER)
 			{
-			match = (fd->date < convert_dmy_to_time(sd->search_date_d, sd->search_date_m, sd->search_date_y));
+			match = (file_date < convert_dmy_to_time(sd->search_date_d, sd->search_date_m, sd->search_date_y));
 			}
 		else if (sd->match_date == SEARCH_MATCH_OVER)
 			{
-			match = (fd->date > convert_dmy_to_time(sd->search_date_d, sd->search_date_m, sd->search_date_y) + 60 * 60 * 24 - 1);
+			match = (file_date > convert_dmy_to_time(sd->search_date_d, sd->search_date_m, sd->search_date_y) + 60 * 60 * 24 - 1);
 			}
 		else if (sd->match_date == SEARCH_MATCH_BETWEEN)
 			{
@@ -1760,7 +1772,7 @@
 				{
 				a += 60 * 60 * 24 - 1;
 				}
-			match = MATCH_IS_BETWEEN(fd->date, a, b);
+			match = MATCH_IS_BETWEEN(file_date, a, b);
 			}
 		}
 
@@ -2688,6 +2700,8 @@
 	date_selection_time_set(sd->date_sel_end, time(NULL));
 	gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
 	gtk_widget_show(sd->date_sel_end);
+	pref_checkbox_new_int(hbox, _("Exif date"),
+				sd->search_date_exif, &sd->search_date_exif);
 
 	/* Search for image dimensions */
 	hbox = menu_choice(sd->box_search, &sd->check_dimensions, &sd->menu_dimensions,
@@ -2834,6 +2848,10 @@
 
 	sd->label_progress = gtk_progress_bar_new();
 	gtk_widget_set_size_request(sd->label_progress, 50, -1);
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(sd->label_progress), "");
+	gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(sd->label_progress), TRUE);
+#endif
 	gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
 	gtk_widget_show(sd->label_progress);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/shortcuts.c	Wed Apr 26 23:33:20 2017 +0300
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
+ *
+ * Author: John Ellis
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "main.h"
+#include "shortcuts.h"
+
+#include "layout.h"
+#include "utilops.h"
+#include "ui_bookmark.h"
+#include "ui_fileops.h"
+#include "ui_misc.h"
+
+typedef struct _ShortcutsData ShortcutsData;
+struct _ShortcutsData
+{
+	GtkWidget *vbox;
+	GtkWidget *bookmarks;
+	LayoutWindow *lw;
+
+	FileDialog *dialog;
+	GtkWidget *dialog_name_entry;
+
+	GtkWidget *add_button;
+};
+
+#define SHORTCUTS     "shortcuts"
+
+static void shortcuts_bookmark_select(const gchar *path, gpointer data)
+{
+	ShortcutsData *scd = data;
+
+	layout_set_path(scd->lw, path);
+}
+
+static void shortcuts_add_close(ShortcutsData *scd)
+{
+	if (scd->dialog) file_dialog_close(scd->dialog);
+	scd->dialog_name_entry = NULL;
+	scd->dialog = NULL;
+}
+
+static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data)
+{
+	ShortcutsData *scd = data;
+	const gchar *name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry));
+	gboolean empty_name = (name[0] == '\0');
+
+	name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry));
+
+	if (empty_name)
+		{
+		name = filename_from_path(fd->dest_path);
+		}
+
+	bookmark_list_add(scd->bookmarks, name, fd->dest_path);
+
+	shortcuts_add_close(scd);
+}
+
+static void shortcuts_add_cancel_cb(FileDialog *fd, gpointer data)
+{
+	ShortcutsData *scd = data;
+
+	shortcuts_add_close(scd);
+}
+
+static void shortcuts_add_cb(GtkWidget *button, gpointer data)
+{
+	ShortcutsData *scd = data;
+	GtkWidget *hbox;
+	const gchar *title;
+
+	if (scd->dialog)
+		{
+		gtk_window_present(GTK_WINDOW(GENERIC_DIALOG(scd->dialog)->dialog));
+		return;
+		}
+
+	title = _("Add Shortcut");
+	scd->dialog = file_util_file_dlg(title,
+					"add_shortcuts", button,
+					shortcuts_add_cancel_cb, scd);
+	file_dialog_add_button(scd->dialog, GTK_STOCK_OK, NULL, shortcuts_add_ok_cb, TRUE);
+
+	generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), NULL, title, NULL);
+
+	file_dialog_add_path_widgets(scd->dialog, NULL, NULL, "add_shortcuts", NULL, NULL);
+
+	hbox = pref_box_new(GENERIC_DIALOG(scd->dialog)->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+
+	pref_label_new(hbox, _("Name:"));
+
+	scd->dialog_name_entry = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0);
+	generic_dialog_attach_default(GENERIC_DIALOG(scd->dialog), scd->dialog_name_entry);
+	gtk_widget_show(scd->dialog_name_entry);
+
+	gtk_widget_show(GENERIC_DIALOG(scd->dialog)->dialog);
+}
+
+static void shortcuts_destroy(GtkWidget *widget, gpointer data)
+{
+	ShortcutsData *scd = data;
+
+	shortcuts_add_close(scd);
+
+	g_free(scd);
+}
+
+static GtkWidget *shortcuts_new(LayoutWindow *lw)
+{
+	ShortcutsData *scd;
+	GtkWidget *tbar;
+
+	if (!lw) return NULL;
+
+	scd = g_new0(ShortcutsData, 1);
+
+	scd->lw = lw;
+
+	scd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+	g_object_set_data(G_OBJECT(scd->vbox), "shortcuts_data", scd);
+	g_signal_connect(G_OBJECT(scd->vbox), "destroy",
+			G_CALLBACK(shortcuts_destroy), scd);
+
+	scd->bookmarks = bookmark_list_new(SHORTCUTS, shortcuts_bookmark_select, scd);
+	gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0);
+	gtk_widget_show(scd->bookmarks);
+
+	tbar = pref_toolbar_new(scd->vbox, GTK_TOOLBAR_ICONS);
+
+	scd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE,
+					_("Add Shortcut"),
+					G_CALLBACK(shortcuts_add_cb), scd);
+
+	return scd->vbox;
+}
+
+GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
+{
+	GtkWidget *shortcuts_bar;
+
+	shortcuts_bar = shortcuts_new(lw);
+	gtk_widget_show(shortcuts_bar);
+
+	return shortcuts_bar;
+}
+
+GtkWidget *shortcuts_new_default(LayoutWindow *lw)
+{
+	return shortcuts_new_from_config(lw, NULL, NULL);
+}
+
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/shortcuts.h	Wed Apr 26 23:33:20 2017 +0300
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
+ *
+ * Author: John Ellis
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SHORTCUTS_H
+#define SHORTCUTS_H
+
+GtkWidget *shortcuts_new_default(LayoutWindow *lw);
+
+#endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
--- a/src/typedefs.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/typedefs.h	Wed Apr 26 23:33:20 2017 +0300
@@ -38,12 +38,18 @@
 
 typedef enum {
 	DIRVIEW_LIST,
-	DIRVIEW_TREE
+	DIRVIEW_TREE,
+
+	// Keep this up to date!
+	DIRVIEW_LAST = DIRVIEW_TREE
 } DirViewType;
 
 typedef enum {
 	FILEVIEW_LIST,
-	FILEVIEW_ICON
+	FILEVIEW_ICON,
+
+	// Keep this up to date!
+	FILEVIEW_LAST = FILEVIEW_ICON
 } FileViewType;
 
 #define	CMD_COPY     "geeqie-copy-command.desktop"
@@ -473,7 +479,7 @@
 
 	/* button, scroll functions */
 	void (*func_button)(ImageWindow *, GdkEventButton *event, gpointer);
-	void (*func_drag)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer);
+	void (*func_drag)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer);
 	void (*func_scroll)(ImageWindow *, GdkEventScroll *event, gpointer);
 	void (*func_focus_in)(ImageWindow *, gpointer);
 
@@ -511,6 +517,8 @@
 	gint orientation;
 	gboolean desaturate;
 	gint user_stereo;
+
+	gboolean mouse_wheel_mode;
 };
 
 #define FILEDATA_MARKS_SIZE 6
@@ -530,6 +538,7 @@
 	gchar *path;
 	const gchar *name;
 	const gchar *extension;
+	gchar *extended_extension;
 	gchar *collate_key_name;
 	gchar *collate_key_name_nocase;
 	gint64 size;
@@ -600,6 +609,10 @@
 	} float_window;
 
 	struct {
+		gint vdivider_pos;
+	} folder_window;
+
+	struct {
 		gint w;
 		gint h;
 	} properties_window;
@@ -843,7 +856,19 @@
 	guint select_idle_id; /* event source id */
 };
 
-struct _IconData;
+typedef enum {
+	SELECTION_NONE		= 0,
+	SELECTION_SELECTED	= 1 << 0,
+	SELECTION_PRELIGHT	= 1 << 1,
+	SELECTION_FOCUS		= 1 << 2
+} SelectionType;
+
+typedef struct _IconData IconData;
+struct _IconData
+{
+	SelectionType selected;
+	FileData *fd;
+};
 
 struct _ViewFileInfoIcon
 {
--- a/src/ui_fileops.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/ui_fileops.c	Wed Apr 26 23:33:20 2017 +0300
@@ -41,6 +41,7 @@
 #include "ui_utildlg.h"	/* for locale warning dialog */
 #include "md5-util.h"
 
+#include "filefilter.h"
 /*
  *-----------------------------------------------------------------------------
  * generic file information and manipulation routines (public)
@@ -697,7 +698,7 @@
 	name = filename_from_path(path);
 	if (!name) return NULL;
 
-	ext = extension_from_path(name);
+	ext = registered_extension_from_path(name);
 
 	if (!ext)
 		{
@@ -729,24 +730,14 @@
 
 gchar *remove_level_from_path(const gchar *path)
 {
-	gint p = 0, n = -1;
+	const gchar *base;
 
 	if (!path) return NULL;
 
-	while (path[p])
-		{
-		if (path[p] == G_DIR_SEPARATOR) n = p;
-		p++;
-		}
-	if (n <= 0) n++;
+	base = strrchr(path, G_DIR_SEPARATOR);
+	if (base) return g_strndup(path, strlen(path)-strlen(base));
 
-	return g_strndup(path, (gsize) n);
-}
-
-const gchar *extension_from_path(const gchar *path)
-{
-	if (!path) return NULL;
-	return strrchr(path, '.');
+	return NULL;
 }
 
 gboolean file_extension_match(const gchar *path, const gchar *ext)
@@ -766,18 +757,13 @@
 
 gchar *remove_extension_from_path(const gchar *path)
 {
-	gint p = 0, n = -1;
+	const gchar *reg_ext;
 
 	if (!path) return NULL;
 
-	while (path[p])
-		{
-		if (path[p] == '.') n = p;
-		p++;
-		}
-	if (n < 0) n = p;
+	reg_ext = registered_extension_from_path(path);
 
-	return g_strndup(path, (gsize) n);
+	return g_strndup(path, strlen(path) - (reg_ext == NULL ? 0 : strlen(reg_ext)));
 }
 
 void parse_out_relatives(gchar *path)
--- a/src/ui_fileops.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/ui_fileops.h	Wed Apr 26 23:33:20 2017 +0300
@@ -91,7 +91,6 @@
 const gchar *filename_from_path(const gchar *path);
 gchar *remove_level_from_path(const gchar *path);
 
-const gchar *extension_from_path(const gchar *path);
 gchar *remove_extension_from_path(const gchar *path);
 
 gboolean file_extension_match(const gchar *path, const gchar *ext);
--- a/src/ui_misc.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/ui_misc.c	Wed Apr 26 23:33:20 2017 +0300
@@ -1201,7 +1201,7 @@
 	return handle_size;
 }
 
-static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	SizerData *sd = data;
 	gint x, y;
@@ -1210,8 +1210,8 @@
 
 	if (!sd->in_drag) return FALSE;
 
-	x = sd->press_x - bevent->x_root;
-	y = sd->press_y - bevent->y_root;
+	x = sd->press_x - event->x_root;
+	y = sd->press_y - event->y_root;
 
 	w = sd->press_width;
 	h = sd->press_height;
--- a/src/ui_pathsel.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/ui_pathsel.c	Wed Apr 26 23:33:20 2017 +0300
@@ -353,7 +353,7 @@
 
 	list = g_list_append(list, path);
 
-	gchar **uris = uris_from_filelist(list);
+	gchar **uris = uris_from_pathlist(list);
 	gboolean ret = gtk_selection_data_set_uris(selection_data, uris);
 	if (!ret)
 		{
@@ -786,6 +786,7 @@
 
 		tree_edit_by_path(GTK_TREE_VIEW(dd->d_view), dd->right_click_path, 0, text,
 				  dest_view_rename_cb, dd);
+		gtk_entry_set_text(GTK_ENTRY(dd->entry), path);
 		}
 
 	g_free(path);
--- a/src/utilops.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/utilops.c	Wed Apr 26 23:33:20 2017 +0300
@@ -225,7 +225,7 @@
 		{
 		const gchar *ext;
 
-		ext = extension_from_path(name);
+		ext = registered_extension_from_path(name);
 		if (ext) n -= strlen(ext);
 		}
 
@@ -1205,7 +1205,7 @@
 		parsed = tmp;
 		}
 
-	ext = extension_from_path(name);
+	ext = registered_extension_from_path(name);
 
 	middle = strchr(parsed, '*');
 	if (middle)
--- a/src/view_dir.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/view_dir.h	Wed Apr 26 23:33:20 2017 +0300
@@ -30,8 +30,6 @@
 	DIR_COLUMN_COUNT
 };
 
-#define VIEW_DIR_TYPES_COUNT 2
-
 ViewDir *vd_new(DirViewType type, FileData *dir_fd);
 
 void vd_set_select_func(ViewDir *vdl, void (*func)(ViewDir *vdl, FileData *fd, gpointer data), gpointer data);
--- a/src/view_file.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/view_file.c	Wed Apr 26 23:33:20 2017 +0300
@@ -1083,7 +1083,7 @@
 	if (!refresh)
 		{
 		gchar *base = remove_level_from_path(fd->path);
-		refresh = (strcmp(base, vf->dir_fd->path) == 0);
+		refresh = (g_strcmp0(base, vf->dir_fd->path) == 0);
 		g_free(base);
 		}
 
@@ -1092,14 +1092,14 @@
 		if (!refresh && fd->change->dest)
 			{
 			gchar *dest_base = remove_level_from_path(fd->change->dest);
-			refresh = (strcmp(dest_base, vf->dir_fd->path) == 0);
+			refresh = (g_strcmp0(dest_base, vf->dir_fd->path) == 0);
 			g_free(dest_base);
 			}
 
 		if (!refresh && fd->change->source)
 			{
 			gchar *source_base = remove_level_from_path(fd->change->source);
-			refresh = (strcmp(source_base, vf->dir_fd->path) == 0);
+			refresh = (g_strcmp0(source_base, vf->dir_fd->path) == 0);
 			g_free(source_base);
 			}
 		}
--- a/src/view_file.h	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/view_file.h	Wed Apr 26 23:33:20 2017 +0300
@@ -21,8 +21,6 @@
 #ifndef VIEW_FILE_H
 #define VIEW_FILE_H
 
-#define VIEW_FILE_TYPES_COUNT 2
-
 #define VFLIST(_vf_) ((ViewFileInfoList *)(_vf_->info))
 #define VFICON(_vf_) ((ViewFileInfoIcon *)(_vf_->info))
 
--- a/src/view_file_icon.c	Fri Jan 13 18:10:38 2017 +0200
+++ b/src/view_file_icon.c	Wed Apr 26 23:33:20 2017 +0300
@@ -60,20 +60,6 @@
 	FILE_COLUMN_COUNT
 };
 
-typedef enum {
-	SELECTION_NONE		= 0,
-	SELECTION_SELECTED	= 1 << 0,
-	SELECTION_PRELIGHT	= 1 << 1,
-	SELECTION_FOCUS		= 1 << 2
-} SelectionType;
-
-typedef struct _IconData IconData;
-struct _IconData
-{
-	SelectionType selected;
-	FileData *fd;
-};
-
 static gint vficon_index_by_id(ViewFile *vf, IconData *in_id);
 
 static IconData *vficon_icon_data(ViewFile *vf, FileData *fd)
@@ -1386,12 +1372,12 @@
  *-------------------------------------------------------------------
  */
 
-static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	ViewFile *vf = data;
 	IconData *id;
 
-	id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, NULL);
+	id = vficon_find_data_by_coord(vf, (gint)event->x, (gint)event->y, NULL);
 	tip_update(vf, id);
 
 	return FALSE;