<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/" xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:syn="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/">
  <channel rdf:about="http://blog.gmane.org/gmane.comp.gnome.apps.geeqie.scm">
    <title>gmane.comp.gnome.apps.geeqie.scm</title>
    <link>http://blog.gmane.org/gmane.comp.gnome.apps.geeqie.scm</link>
    <description/>
    <syn:updatePeriod>hourly</syn:updatePeriod>
    <syn:updateFrequency>1</syn:updateFrequency>
    <syn:updateBase>1901-01-01T00:00+00:00</syn:updateBase>
    <items>
      <rdf:Seq>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/852"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/851"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/850"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/849"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/848"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/847"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/846"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/845"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/844"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/843"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/842"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/841"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/840"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/839"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/838"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/837"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/836"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/835"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/834"/>
        <rdf:li rdf:resource="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/833"/>
      </rdf:Seq>
    </items>
    <image rdf:resource="http://gmane.org/img/gmane-25t.png"/>
    <textinput rdf:resource=""/>
  </channel>
  <image rdf:about="http://gmane.org/img/gmane-25t.png">
    <title>Gmane</title>
    <url>http://gmane.org/img/gmane-25t.png</url>
    <link>http://gmane.org</link>
  </image>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/852">
    <title>SF.net SVN: geeqie:[1917] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/852</link>
    <description>&lt;pre&gt;Revision: 1917
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1917&amp;amp;view=rev
Author:   mow
Date:     2010-05-10 11:33:13 +0000 (Mon, 10 May 2010)

Log Message:
-----------
Some small logic mistakes

Use boolean operators for booleans and bitwise otherwise only.

Modified Paths:
--------------
    trunk/src/view_file_icon.c
    trunk/src/view_file_list.c

Modified: trunk/src/view_file_icon.c
===================================================================
--- trunk/src/view_file_icon.c2010-05-10 11:32:56 UTC (rev 1916)
+++ trunk/src/view_file_icon.c2010-05-10 11:33:13 UTC (rev 1917)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1014,11 +1014,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 case MTS_MODE_SET: selected = mark_val;
 break;
-case MTS_MODE_OR: selected = mark_val | selected;
+case MTS_MODE_OR: selected = mark_val || selected;
 break;
-case MTS_MODE_AND: selected = mark_val &amp;amp; selected;
+case MTS_MODE_AND: selected = mark_val &amp;amp;&amp;amp; selected;
 break;
-case MTS_MODE_MINUS: selected = !mark_val &amp;amp; selected;
+case MTS_MODE_MINUS: selected = !mark_val &amp;amp;&amp;amp; selected;
 break;
 }
 

Modified: trunk/src/view_file_list.c
===================================================================
--- trunk/src/view_file_list.c2010-05-10 11:32:56 UTC (rev 1916)
+++ trunk/src/view_file_list.c2010-05-10 11:33:13 UTC (rev 1917)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1610,11 +1610,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 case MTS_MODE_SET: selected = mark_val;
 break;
-case MTS_MODE_OR: selected = mark_val | selected;
+case MTS_MODE_OR: selected = mark_val || selected;
 break;
-case MTS_MODE_AND: selected = mark_val &amp;amp; selected;
+case MTS_MODE_AND: selected = mark_val &amp;amp;&amp;amp; selected;
 break;
-case MTS_MODE_MINUS: selected = !mark_val &amp;amp; selected;
+case MTS_MODE_MINUS: selected = !mark_val &amp;amp;&amp;amp; selected;
 break;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-05-10T11:33:13</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/851">
    <title>SF.net SVN: geeqie:[1916] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/851</link>
    <description>&lt;pre&gt;Revision: 1916
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1916&amp;amp;view=rev
Author:   mow
Date:     2010-05-10 11:32:56 +0000 (Mon, 10 May 2010)

Log Message:
-----------
GTK marks several functions as deprecated

The following functions has been replaced and deprecated by version
2.20:
   - GTK_WIDGET_CAN_FOCUS
   - GTK_WIDGET_DRAWABLE
   - GTK_WIDGET_HAS_FOCUS
   - GTK_WIDGET_HAS_GRAB
   - GTK_WIDGET_IS_SENSITIVE
   - GTK_WIDGET_NO_WINDOW
   - GTK_WIDGET_REALIZED
   - GTK_WIDGET_SENSITIVE
   - GTK_WIDGET_STATE
   - GTK_WIDGET_TOPLEVEL
   - GTK_WIDGET_VISIBLE

Modified Paths:
--------------
    trunk/src/bar.c
    trunk/src/bar_comment.c
    trunk/src/bar_exif.c
    trunk/src/bar_histogram.c
    trunk/src/bar_keywords.c
    trunk/src/bar_sort.c
    trunk/src/cache_maint.c
    trunk/src/cellrenderericon.c
    trunk/src/collect-table.c
    trunk/src/dupe.c
    trunk/src/image.c
    trunk/src/layout.c
    trunk/src/layout_util.c
    trunk/src/logwindow.c
    trunk/src/pan-view.c
    trunk/src/pixbuf-renderer.c
    trunk/src/print.c
    trunk/src/search.c
    trunk/src/ui_misc.c
    trunk/src/ui_tabcomp.c
    trunk/src/ui_tree_edit.c
    trunk/src/ui_utildlg.c
    trunk/src/view_dir_list.c
    trunk/src/view_file.c
    trunk/src/view_file_icon.c

Modified: trunk/src/bar.c
===================================================================
--- trunk/src/bar.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -457,7 +457,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 if (!bd) return;
 
 WRITE_NL(); WRITE_STRING("&amp;lt;bar ");
+#if GTK_CHECK_VERSION(2,20,0)
+write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
+#else
 write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
+#endif
 write_uint_option(outstr, indent, "width", bd-&amp;gt;width);
 WRITE_STRING("&amp;gt;");
 

Modified: trunk/src/bar_comment.c
===================================================================
--- trunk/src/bar_comment.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar_comment.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -141,7 +141,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
 if (!pcd) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_focus(pcd-&amp;gt;comment_view)) return gtk_widget_event(pcd-&amp;gt;comment_view, event);
+#else
 if (GTK_WIDGET_HAS_FOCUS(pcd-&amp;gt;comment_view)) return gtk_widget_event(pcd-&amp;gt;comment_view, event);
+#endif
 
 return FALSE;
 }

Modified: trunk/src/bar_exif.c
===================================================================
--- trunk/src/bar_exif.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar_exif.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -301,7 +301,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
 work = work-&amp;gt;next;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (ee-&amp;gt;editable &amp;amp;&amp;amp; gtk_widget_has_focus(ee-&amp;gt;value_widget)) ret = gtk_widget_event(ee-&amp;gt;value_widget, event);
+#else
 if (ee-&amp;gt;editable &amp;amp;&amp;amp; GTK_WIDGET_HAS_FOCUS(ee-&amp;gt;value_widget)) ret = gtk_widget_event(ee-&amp;gt;value_widget, event);
+#endif
 }
 g_list_free(list);
 return ret;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -396,7 +400,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (entry == new_entry) continue;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_is_drawable(entry) &amp;amp;&amp;amp;
+#else
 if (GTK_WIDGET_DRAWABLE(entry) &amp;amp;&amp;amp; 
+#endif
     gtk_widget_translate_coordinates(pane, entry, x, y, &amp;amp;nx, &amp;amp;ny) &amp;amp;&amp;amp;
     ny &amp;lt; entry-&amp;gt;allocation.height / 2) break;
 pos++;

Modified: trunk/src/bar_histogram.c
===================================================================
--- trunk/src/bar_histogram.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar_histogram.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -61,7 +61,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /* histmap_get is relatively expensive, run it only when we really need it
    and with lower priority than pixbuf_renderer 
    FIXME: this does not work for fullscreen*/
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_is_drawable(phd-&amp;gt;drawing_area))
+#else
 if (GTK_WIDGET_DRAWABLE(phd-&amp;gt;drawing_area))
+#endif
 {
 if (!phd-&amp;gt;idle_id)
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -153,7 +157,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 if (!phd-&amp;gt;pixbuf) return TRUE;
 
 gdk_draw_pixbuf(widget-&amp;gt;window,
+#if GTK_CHECK_VERSION(2,20,0)
+widget-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(widget)],
+#else
 widget-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE (widget)],
+#endif
 phd-&amp;gt;pixbuf,
 0, 0,
 0, 0,

Modified: trunk/src/bar_keywords.c
===================================================================
--- trunk/src/bar_keywords.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar_keywords.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -264,7 +264,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
 if (!pkd) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_focus(pkd-&amp;gt;keyword_view)) return gtk_widget_event(pkd-&amp;gt;keyword_view, event);
+#else
 if (GTK_WIDGET_HAS_FOCUS(pkd-&amp;gt;keyword_view)) return gtk_widget_event(pkd-&amp;gt;keyword_view, event);
+#endif
 
 return FALSE;
 }

Modified: trunk/src/bar_sort.c
===================================================================
--- trunk/src/bar_sort.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/bar_sort.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -724,7 +724,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 if (!sd) return;
 
 WRITE_NL(); WRITE_STRING("&amp;lt;bar_sort ");
+#if GTK_CHECK_VERSION(2,20,0)
+write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
+#else
 write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
+#endif
 WRITE_INT(*sd, mode);
 WRITE_INT(*sd, action);
 WRITE_INT(*sd, selection);

Modified: trunk/src/cache_maint.c
===================================================================
--- trunk/src/cache_maint.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/cache_maint.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -256,7 +256,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 CMData *cm = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_sensitive(cm-&amp;gt;button_close)) return;
+#else
 if (!GTK_WIDGET_SENSITIVE(cm-&amp;gt;button_close)) return;
+#endif
 
 cache_maintain_home_close(cm);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -708,7 +712,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 CleanData *cd = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_sensitive(cd-&amp;gt;button_close)) return;
+#else
 if (!GTK_WIDGET_SENSITIVE(cd-&amp;gt;button_close)) return;
+#endif
 
 cache_manager_render_reset(cd);
 generic_dialog_close(cd-&amp;gt;gd);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -823,7 +831,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 CleanData *cd = data;
 gchar *path;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (cd-&amp;gt;list || !gtk_widget_get_sensitive(cd-&amp;gt;button_start)) return;
+#else
 if (cd-&amp;gt;list || !GTK_WIDGET_SENSITIVE(cd-&amp;gt;button_start)) return;
+#endif
 
 path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd-&amp;gt;entry))));
 parse_out_relatives(path);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -920,7 +932,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 CleanData *cd = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_sensitive(cd-&amp;gt;button_close)) return;
+#else
 if (!GTK_WIDGET_SENSITIVE(cd-&amp;gt;button_close)) return;
+#endif
 
 generic_dialog_close(cd-&amp;gt;gd);
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1033,7 +1049,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 gchar *path;
 FileData *dir_fd;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (cd-&amp;gt;list || !gtk_widget_get_sensitive(cd-&amp;gt;button_start)) return;
+#else
 if (cd-&amp;gt;list || !GTK_WIDGET_SENSITIVE(cd-&amp;gt;button_start)) return;
+#endif
 
 gtk_widget_set_sensitive(cd-&amp;gt;button_start, FALSE);
 gtk_widget_set_sensitive(cd-&amp;gt;button_stop, TRUE);

Modified: trunk/src/cellrenderericon.c
===================================================================
--- trunk/src/cellrenderericon.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/cellrenderericon.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -20,6 +20,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
  */
 
 #include &amp;lt;stdlib.h&amp;gt;
+#include &amp;lt;gtk/gtk.h&amp;gt; /* To define GTK_CHECK_VERSION */
 #include "cellrenderericon.h"
 #include "intl.h"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -646,14 +647,22 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if ((flags &amp;amp; GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_focus(widget))
+#else
 if (GTK_WIDGET_HAS_FOCUS(widget))
+#endif
 state = GTK_STATE_SELECTED;
 else
 state = GTK_STATE_ACTIVE;
 }
 else
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
+#else
 if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE)
+#endif
 state = GTK_STATE_INSENSITIVE;
 else
 state = GTK_STATE_NORMAL;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -756,7 +765,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
                 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (cellicon-&amp;gt;focused &amp;amp;&amp;amp; gtk_widget_has_focus(widget))
+#else
 if (cellicon-&amp;gt;focused &amp;amp;&amp;amp; GTK_WIDGET_HAS_FOCUS(widget))
+#endif
 {
 gtk_paint_focus(widget-&amp;gt;style, window,
 state,

Modified: trunk/src/collect-table.c
===================================================================
--- trunk/src/collect-table.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/collect-table.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -537,7 +537,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 gdk_window_get_pointer(NULL, &amp;amp;x, &amp;amp;y, NULL);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_realized(ct-&amp;gt;tip_window)) gtk_widget_realize(ct-&amp;gt;tip_window);
+#else
 if (!GTK_WIDGET_REALIZED(ct-&amp;gt;tip_window)) gtk_widget_realize(ct-&amp;gt;tip_window);
+#endif
 gtk_window_move(GTK_WINDOW(ct-&amp;gt;tip_window), x + 16, y + 16);
 gtk_widget_show(ct-&amp;gt;tip_window);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1550,7 +1554,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 layout_image_set_collection(NULL, ct-&amp;gt;cd, info);
 }
 }
+#if GTK_CHECK_VERSION(2,20,0)
+else if (!gtk_widget_has_focus(ct-&amp;gt;listview))
+#else
 else if (!GTK_WIDGET_HAS_FOCUS(ct-&amp;gt;listview))
+#endif
 {
 gtk_widget_grab_focus(ct-&amp;gt;listview);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1716,7 +1724,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
      "show_text", ct-&amp;gt;show_text, NULL);
 }
 }
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(ct-&amp;gt;listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct-&amp;gt;listview));
+#else
 if (GTK_WIDGET_REALIZED(ct-&amp;gt;listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct-&amp;gt;listview));
+#endif
 }
 
 row = -1;

Modified: trunk/src/dupe.c
===================================================================
--- trunk/src/dupe.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/dupe.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2216,7 +2216,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 GList *list;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_focus(dw-&amp;gt;second_listview))
+#else
 if (GTK_WIDGET_HAS_FOCUS(dw-&amp;gt;second_listview))
+#endif
 {
 list = dupe_listview_get_selection(dw, dw-&amp;gt;second_listview);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2860,7 +2864,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 GList *slist;
 DupeItem *di = NULL;
 
+#if GTK_CHECK_VERSION(2,20,0)
+on_second = gtk_widget_has_focus(dw-&amp;gt;second_listview);
+#else
 on_second = GTK_WIDGET_HAS_FOCUS(dw-&amp;gt;second_listview);
+#endif
 
 if (on_second)
 {

Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/image.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -905,7 +905,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 ImageWindow *imd = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+image_focus_paint(imd, gtk_widget_has_focus(widget), &amp;amp;event-&amp;gt;area);
+#else
 image_focus_paint(imd, GTK_WIDGET_HAS_FOCUS(widget), &amp;amp;event-&amp;gt;area);
+#endif
 return TRUE;
 }
 

Modified: trunk/src/layout.c
===================================================================
--- trunk/src/layout.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/layout.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1143,7 +1143,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 if (!layout_valid(&amp;amp;lw)) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!lw-&amp;gt;tools || !gtk_widget_get_visible(lw-&amp;gt;tools))
+#else
 if (!lw-&amp;gt;tools || !GTK_WIDGET_VISIBLE(lw-&amp;gt;tools))
+#endif
 {
 /* use the stored values (sort of breaks success return value) */
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1179,7 +1183,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (hide)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(lw-&amp;gt;tools))
+#else
 if (GTK_WIDGET_VISIBLE(lw-&amp;gt;tools))
+#endif
 {
 layout_tools_geometry_sync(lw);
 gtk_widget_hide(lw-&amp;gt;tools);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1187,7 +1195,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 else
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_visible(lw-&amp;gt;tools))
+#else
 if (!GTK_WIDGET_VISIBLE(lw-&amp;gt;tools))
+#endif
 {
 gtk_widget_show(lw-&amp;gt;tools);
 if (lw-&amp;gt;vf) vf_refresh(lw-&amp;gt;vf);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1713,11 +1725,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (lw-&amp;gt;options.toolbar_hidden)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(lw-&amp;gt;toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw-&amp;gt;toolbar[TOOLBAR_MAIN]);
+#else
 if (GTK_WIDGET_VISIBLE(lw-&amp;gt;toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw-&amp;gt;toolbar[TOOLBAR_MAIN]);
+#endif
 }
 else
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_visible(lw-&amp;gt;toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw-&amp;gt;toolbar[TOOLBAR_MAIN]);
+#else
 if (!GTK_WIDGET_VISIBLE(lw-&amp;gt;toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw-&amp;gt;toolbar[TOOLBAR_MAIN]);
+#endif
 }
 }
 

Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/layout_util.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -89,7 +89,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 gint x = 0;
 gint y = 0;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (lw-&amp;gt;path_entry &amp;amp;&amp;amp; gtk_widget_has_focus(lw-&amp;gt;path_entry))
+#else
 if (lw-&amp;gt;path_entry &amp;amp;&amp;amp; GTK_WIDGET_HAS_FOCUS(lw-&amp;gt;path_entry))
+#endif
 {
 if (event-&amp;gt;keyval == GDK_Escape &amp;amp;&amp;amp; lw-&amp;gt;dir_fd)
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -104,7 +108,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 return TRUE;
 }
 }
+#if GTK_CHECK_VERSION(2,20,0)
+if (lw-&amp;gt;vd &amp;amp;&amp;amp; lw-&amp;gt;options.dir_view_type == DIRVIEW_TREE &amp;amp;&amp;amp; gtk_widget_has_focus(lw-&amp;gt;vd-&amp;gt;view) &amp;amp;&amp;amp;
+#else
 if (lw-&amp;gt;vd &amp;amp;&amp;amp; lw-&amp;gt;options.dir_view_type == DIRVIEW_TREE &amp;amp;&amp;amp; GTK_WIDGET_HAS_FOCUS(lw-&amp;gt;vd-&amp;gt;view) &amp;amp;&amp;amp;
+#endif
     !layout_key_match(event-&amp;gt;keyval) &amp;amp;&amp;amp;
     gtk_widget_event(lw-&amp;gt;vd-&amp;gt;view, (GdkEvent *)event))
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -123,7 +131,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 */
 
 if (lw-&amp;gt;image &amp;amp;&amp;amp;
+#if GTK_CHECK_VERSION(2,20,0)
+    (gtk_widget_has_focus(lw-&amp;gt;image-&amp;gt;widget) || (lw-&amp;gt;tools &amp;amp;&amp;amp; widget == lw-&amp;gt;window) || lw-&amp;gt;full_screen) )
+#else
     (GTK_WIDGET_HAS_FOCUS(lw-&amp;gt;image-&amp;gt;widget) || (lw-&amp;gt;tools &amp;amp;&amp;amp; widget == lw-&amp;gt;window) || lw-&amp;gt;full_screen) )
+#endif
 {
 stop_signal = TRUE;
 switch (event-&amp;gt;keyval)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2393,7 +2405,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 static gboolean layout_bar_enabled(LayoutWindow *lw)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+return lw-&amp;gt;bar &amp;amp;&amp;amp; gtk_widget_get_visible(lw-&amp;gt;bar);
+#else
 return lw-&amp;gt;bar &amp;amp;&amp;amp; GTK_WIDGET_VISIBLE(lw-&amp;gt;bar);
+#endif
 }
 
 static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2486,7 +2502,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+return lw-&amp;gt;bar_sort &amp;amp;&amp;amp; gtk_widget_get_visible(lw-&amp;gt;bar_sort);
+#else
 return lw-&amp;gt;bar_sort &amp;amp;&amp;amp; GTK_WIDGET_VISIBLE(lw-&amp;gt;bar_sort);
+#endif
 }
 
 

Modified: trunk/src/logwindow.c
===================================================================
--- trunk/src/logwindow.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/logwindow.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -268,7 +268,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 log_window_insert_text(buffer, &amp;amp;iter, str, logdefs[type].tag);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(text))
+#else
 if (GTK_WIDGET_VISIBLE(text))
+#endif
 {
 GtkTextMark *mark;
 

Modified: trunk/src/pan-view.c
===================================================================
--- trunk/src/pan-view.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/pan-view.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1212,9 +1212,15 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 pr = PIXBUF_RENDERER(pw-&amp;gt;imd-&amp;gt;pr);
 fd = pan_menu_click_fd(pw);
 
+#if GTK_CHECK_VERSION(2,20,0)
+focused = (pw-&amp;gt;fs || gtk_widget_has_focus(GTK_WIDGET(pw-&amp;gt;imd-&amp;gt;widget)));
+on_entry = (gtk_widget_has_focus(pw-&amp;gt;path_entry) ||
+    gtk_widget_has_focus(pw-&amp;gt;search_entry));
+#else
 focused = (pw-&amp;gt;fs || GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(pw-&amp;gt;imd-&amp;gt;widget)));
 on_entry = (GTK_WIDGET_HAS_FOCUS(pw-&amp;gt;path_entry) ||
     GTK_WIDGET_HAS_FOCUS(pw-&amp;gt;search_entry));
+#endif
 
 if (focused)
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1967,7 +1973,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 PanWindow *pw = data;
 gboolean visible;
 
+#if GTK_CHECK_VERSION(2,20,0)
+visible = gtk_widget_get_visible(pw-&amp;gt;search_box);
+#else
 visible = GTK_WIDGET_VISIBLE(pw-&amp;gt;search_box);
+#endif
 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return;
 
 if (visible)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1989,7 +1999,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (enable)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(pw-&amp;gt;search_box))
+#else
 if (GTK_WIDGET_VISIBLE(pw-&amp;gt;search_box))
+#endif
 {
 gtk_widget_grab_focus(pw-&amp;gt;search_entry);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2000,9 +2014,17 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 else
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(pw-&amp;gt;search_entry))
+#else
 if (GTK_WIDGET_VISIBLE(pw-&amp;gt;search_entry))
+#endif
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_focus(pw-&amp;gt;search_entry))
+#else
 if (GTK_WIDGET_HAS_FOCUS(pw-&amp;gt;search_entry))
+#endif
 {
 gtk_widget_grab_focus(GTK_WIDGET(pw-&amp;gt;imd-&amp;gt;widget));
 }

Modified: trunk/src/pixbuf-renderer.c
===================================================================
--- trunk/src/pixbuf-renderer.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/pixbuf-renderer.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -704,9 +704,17 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 static gboolean pixbuf_renderer_expose(GtkWidget *widget, GdkEventExpose *event)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_is_drawable(widget))
+#else
 if (GTK_WIDGET_DRAWABLE(widget))
+#endif
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_has_window(widget))
+#else
 if (!GTK_WIDGET_NO_WINDOW(widget))
+#endif
 {
 if (event-&amp;gt;window != widget-&amp;gt;window)
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -927,18 +935,30 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (it)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+gdk_draw_drawable(pr-&amp;gt;overlay_buffer, box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 gdk_draw_drawable(pr-&amp;gt;overlay_buffer, box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
   it-&amp;gt;pixmap,
   rx - (pr-&amp;gt;x_offset + (it-&amp;gt;x - pr-&amp;gt;x_scroll)),
   ry - (pr-&amp;gt;y_offset + (it-&amp;gt;y - pr-&amp;gt;y_scroll)),
   0, 0, rw, rh);
 gdk_draw_pixbuf(pr-&amp;gt;overlay_buffer,
+#if GTK_CHECK_VERSION(2,20,0)
+box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
 od-&amp;gt;pixbuf,
 rx - px, ry - py,
 0, 0, rw, rh,
 pr-&amp;gt;dither_quality, rx, ry);
+#if GTK_CHECK_VERSION(2,20,0)
+gdk_draw_drawable(od-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 gdk_draw_drawable(od-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
   pr-&amp;gt;overlay_buffer,
   0, 0,
   rx - px, ry - py, rw, rh);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -957,15 +977,27 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 sh = MIN(ry + rh - sy, pr-&amp;gt;tile_height);
 
 gdk_draw_rectangle(pr-&amp;gt;overlay_buffer,
+#if GTK_CHECK_VERSION(2,20,0)
+   box-&amp;gt;style-&amp;gt;bg_gc[gtk_widget_get_state(box)], TRUE,
+#else
    box-&amp;gt;style-&amp;gt;bg_gc[GTK_WIDGET_STATE(box)], TRUE,
+#endif
    0, 0, sw, sh);
 gdk_draw_pixbuf(pr-&amp;gt;overlay_buffer,
+#if GTK_CHECK_VERSION(2,20,0)
+box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
 od-&amp;gt;pixbuf,
 sx - px, sy - py,
 0, 0, sw, sh,
 pr-&amp;gt;dither_quality, sx, sy);
+#if GTK_CHECK_VERSION(2,20,0)
+gdk_draw_drawable(od-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 gdk_draw_drawable(od-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
   pr-&amp;gt;overlay_buffer,
   0, 0,
   sx - px, sy - py, sw, sh);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1423,7 +1455,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 gtk_widget_set_style(widget, style);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(widget)) pr_border_clear(pr);
+#else
 if (GTK_WIDGET_VISIBLE(widget)) pr_border_clear(pr);
+#endif
 }
 
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1690,7 +1726,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 else /* (pr-&amp;gt;zoom == 1.0 || pr-&amp;gt;scale == 1.0) */
 {
 gdk_draw_pixbuf(it-&amp;gt;pixmap,
+#if GTK_CHECK_VERSION(2,20,0)
+box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
 st-&amp;gt;pixbuf,
 rx - st-&amp;gt;x, ry - st-&amp;gt;y,
 rx - it-&amp;gt;x, ry - it-&amp;gt;y,
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2624,7 +2664,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 /* faster, simple, base orientation, no postprocessing */
 gdk_draw_pixbuf(it-&amp;gt;pixmap,
+#if GTK_CHECK_VERSION(2,20,0)
+box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
 pr-&amp;gt;pixbuf,
 it-&amp;gt;x + x, it-&amp;gt;y + y,
 x, y,
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2714,7 +2758,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 pr-&amp;gt;func_post_process(pr, &amp;amp;it-&amp;gt;pixbuf, x, y, w, h, pr-&amp;gt;post_process_user_data);
 
 gdk_draw_pixbuf(it-&amp;gt;pixmap,
+#if GTK_CHECK_VERSION(2,20,0)
+box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
 it-&amp;gt;pixbuf,
 x, y,
 x, y,
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2742,7 +2790,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 box = GTK_WIDGET(pr);
 
+#if GTK_CHECK_VERSION(2,20,0)
+gdk_draw_drawable(box-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[gtk_widget_get_state(box)],
+#else
 gdk_draw_drawable(box-&amp;gt;window, box-&amp;gt;style-&amp;gt;fg_gc[GTK_WIDGET_STATE(box)],
+#endif
   it-&amp;gt;pixmap, x, y,
   pr-&amp;gt;x_offset + (it-&amp;gt;x - pr-&amp;gt;x_scroll) + x, pr-&amp;gt;y_offset + (it-&amp;gt;y - pr-&amp;gt;y_scroll) + y, w, h);
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2862,7 +2914,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 fast = FALSE;
 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(pr))
+#else
 if (GTK_WIDGET_REALIZED(pr))
+#endif
 {
 if (pr_tile_is_visible(pr, qd-&amp;gt;it))
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3848,7 +3904,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 parent = gtk_widget_get_parent(widget);
+#if GTK_CHECK_VERSION(2,20,0)
+if (widget &amp;amp;&amp;amp; gtk_widget_get_can_focus(parent))
+#else
 if (widget &amp;amp;&amp;amp; GTK_WIDGET_CAN_FOCUS(parent))
+#endif
 {
 gtk_widget_grab_focus(parent);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3868,7 +3928,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 return TRUE;
 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gdk_pointer_is_grabbed() &amp;amp;&amp;amp; gtk_widget_has_grab(pr))
+#else
 if (gdk_pointer_is_grabbed() &amp;amp;&amp;amp; GTK_WIDGET_HAS_GRAB(pr))
+#endif
 {
 gtk_grab_remove(widget);
 gdk_pointer_ungrab(bevent-&amp;gt;time);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3984,7 +4048,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 box = GTK_WIDGET(pr);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(box))
+#else
 if (GTK_WIDGET_REALIZED(box))
+#endif
 {
 gdk_window_clear(box-&amp;gt;window);
 pr_overlay_draw(pr, 0, 0, pr-&amp;gt;window_width, pr-&amp;gt;window_height, NULL);

Modified: trunk/src/print.c
===================================================================
--- trunk/src/print.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/print.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1959,7 +1959,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 GtkWidget *label;
 gchar *buf;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(pw-&amp;gt;dialog-&amp;gt;dialog)) parent = pw-&amp;gt;dialog-&amp;gt;dialog;
+#else
 if (GTK_WIDGET_VISIBLE(pw-&amp;gt;dialog-&amp;gt;dialog)) parent = pw-&amp;gt;dialog-&amp;gt;dialog;
+#endif
 
 gd = generic_dialog_new(_("Printing error"), "print_warning",
 parent, TRUE, NULL, NULL);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2481,7 +2485,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 pw-&amp;gt;job_pixbuf = NULL;
 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (pw-&amp;gt;dialog &amp;amp;&amp;amp; !gtk_widget_get_visible(pw-&amp;gt;dialog-&amp;gt;dialog))
+#else
 if (pw-&amp;gt;dialog &amp;amp;&amp;amp; !GTK_WIDGET_VISIBLE(pw-&amp;gt;dialog-&amp;gt;dialog))
+#endif
 {
 g_idle_add_full(G_PRIORITY_HIGH_IDLE, print_job_close_finish_cb, pw, NULL);
 }

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/search.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2361,11 +2361,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 if (visible)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_visible(widget)) gtk_widget_show(widget);
+#else
 if (!GTK_WIDGET_VISIBLE(widget)) gtk_widget_show(widget);
+#endif
 }
 else
 {
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_visible(widget)) gtk_widget_hide(widget);
+#else
 if (GTK_WIDGET_VISIBLE(widget)) gtk_widget_hide(widget);
+#endif
 }
 }
 

Modified: trunk/src/ui_misc.c
===================================================================
--- trunk/src/ui_misc.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/ui_misc.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -551,7 +551,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 GtkWidget *widget = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
+#else
 gtk_widget_set_sensitive(widget, GTK_WIDGET_IS_SENSITIVE(watch));
+#endif
 }
 
 void pref_link_sensitivity(GtkWidget *widget, GtkWidget *watch)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -876,7 +880,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 if (!ds-&amp;gt;window) return;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_has_grab(ds-&amp;gt;window))
+#else
 if (GTK_WIDGET_HAS_GRAB(ds-&amp;gt;window))
+#endif
 {
 gtk_grab_remove(ds-&amp;gt;window);
 gdk_keyboard_ungrab(GDK_CURRENT_TIME);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1289,7 +1297,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (bevent-&amp;gt;button != MOUSE_BUTTON_LEFT) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gdk_pointer_is_grabbed() &amp;amp;&amp;amp; gtk_widget_has_grab(sd-&amp;gt;sizer))
+#else
 if (gdk_pointer_is_grabbed() &amp;amp;&amp;amp; GTK_WIDGET_HAS_GRAB(sd-&amp;gt;sizer))
+#endif
 {
 gtk_grab_remove(sd-&amp;gt;sizer);
 gdk_pointer_ungrab(bevent-&amp;gt;time);

Modified: trunk/src/ui_tabcomp.c
===================================================================
--- trunk/src/ui_tabcomp.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/ui_tabcomp.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -206,7 +206,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 TabCompData *td = data;
 GtkWidget *child;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_visible(widget)) return;
+#else
 if (!GTK_WIDGET_VISIBLE(widget)) return;
+#endif
 
 child = gtk_bin_get_child(GTK_BIN(widget));
 if (GTK_IS_LABEL(child)) {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -646,7 +650,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 if (!td) return;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_has_focus(entry))
+#else
 if (!GTK_WIDGET_HAS_FOCUS(entry))
+#endif
 {
 gtk_widget_grab_focus(entry);
 }

Modified: trunk/src/ui_tree_edit.c
===================================================================
--- trunk/src/ui_tree_edit.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/ui_tree_edit.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -184,7 +184,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 GList *work;
 
 if (!edit_func) return FALSE;
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_visible(tree)) return FALSE;
+#else
 if (!GTK_WIDGET_VISIBLE(tree)) return FALSE;
+#endif
 
 tcolumn = gtk_tree_view_get_column(tree, column);
 if (!tcolumn) return FALSE;

Modified: trunk/src/ui_utildlg.c
===================================================================
--- trunk/src/ui_utildlg.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/ui_utildlg.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -62,7 +62,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 GenericDialog *gd = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (event-&amp;gt;keyval == GDK_Return &amp;amp;&amp;amp; gtk_widget_has_focus(widget)
+#else
 if (event-&amp;gt;keyval == GDK_Return &amp;amp;&amp;amp; GTK_WIDGET_HAS_FOCUS(widget)
+#endif
     &amp;amp;&amp;amp; gd-&amp;gt;default_cb)
 {
 gboolean auto_close;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -234,7 +238,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 GtkWidget *top;
 
 top = gtk_widget_get_toplevel(parent);
+#if GTK_CHECK_VERSION(2,20,0)
+if (GTK_IS_WINDOW(top) &amp;amp;&amp;amp; gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top);
+#else
 if (GTK_IS_WINDOW(top) &amp;amp;&amp;amp; GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top);
+#endif
 }
 
 if (window) gtk_window_set_transient_for(GTK_WINDOW(gd-&amp;gt;dialog), window);

Modified: trunk/src/view_dir_list.c
===================================================================
--- trunk/src/view_dir_list.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/view_dir_list.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -96,7 +96,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 GtkTreeIter iter;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(vd-&amp;gt;view) &amp;amp;&amp;amp; vd_find_row(vd, fd, &amp;amp;iter))
+#else
 if (GTK_WIDGET_REALIZED(vd-&amp;gt;view) &amp;amp;&amp;amp; vd_find_row(vd, fd, &amp;amp;iter))
+#endif
 {
 GtkTreeModel *store;
 GtkTreePath *tpath;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -107,7 +111,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd-&amp;gt;view), tpath, NULL, FALSE);
 gtk_tree_path_free(tpath);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_has_focus(vd-&amp;gt;view)) gtk_widget_grab_focus(vd-&amp;gt;view);
+#else
 if (!GTK_WIDGET_HAS_FOCUS(vd-&amp;gt;view)) gtk_widget_grab_focus(vd-&amp;gt;view);
+#endif
 }
 }
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -331,7 +339,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 return ret;
 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(vd-&amp;gt;view))
+#else
 if (GTK_WIDGET_REALIZED(vd-&amp;gt;view))
+#endif
 {
 gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(vd-&amp;gt;view), 0, 0);
 }

Modified: trunk/src/view_file.c
===================================================================
--- trunk/src/view_file.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/view_file.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -878,7 +878,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 FileData *fd = NULL;
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_realized(vf-&amp;gt;listview))
+#else
 if (!GTK_WIDGET_REALIZED(vf-&amp;gt;listview))
+#endif
 {
 vf_thumb_status(vf, 0.0, NULL);
 return FALSE;

Modified: trunk/src/view_file_icon.c
===================================================================
--- trunk/src/view_file_icon.c2010-02-28 22:55:37 UTC (rev 1915)
+++ trunk/src/view_file_icon.c2010-05-10 11:32:56 UTC (rev 1916)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -431,7 +431,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 gdk_window_get_pointer(NULL, &amp;amp;x, &amp;amp;y, NULL);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_get_realized(VFICON(vf)-&amp;gt;tip_window)) gtk_widget_realize(VFICON(vf)-&amp;gt;tip_window);
+#else
 if (!GTK_WIDGET_REALIZED(VFICON(vf)-&amp;gt;tip_window)) gtk_widget_realize(VFICON(vf)-&amp;gt;tip_window);
+#endif
 gtk_window_move(GTK_WINDOW(VFICON(vf)-&amp;gt;tip_window), x + 16, y + 16);
 gtk_widget_show(VFICON(vf)-&amp;gt;tip_window);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -451,7 +455,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 window = gtk_widget_get_toplevel(vf-&amp;gt;listview);
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_sensitive(window) &amp;amp;&amp;amp;
+#else
 if (GTK_WIDGET_SENSITIVE(window) &amp;amp;&amp;amp;
+#endif
     GTK_WINDOW(window)-&amp;gt;has_focus)
 {
 tip_show(vf);
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1440,7 +1448,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 switch (bevent-&amp;gt;button)
 {
 case MOUSE_BUTTON_LEFT:
+#if GTK_CHECK_VERSION(2,20,0)
+if (!gtk_widget_has_focus(vf-&amp;gt;listview))
+#else
 if (!GTK_WIDGET_HAS_FOCUS(vf-&amp;gt;listview))
+#endif
 {
 gtk_widget_grab_focus(vf-&amp;gt;listview);
 }
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1603,7 +1615,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf-&amp;gt;listview));
 
+#if GTK_CHECK_VERSION(2,20,0)
+if (keep_position &amp;amp;&amp;amp; gtk_widget_get_realized(vf-&amp;gt;listview) &amp;amp;&amp;amp;
+#else
 if (keep_position &amp;amp;&amp;amp; GTK_WIDGET_REALIZED(vf-&amp;gt;listview) &amp;amp;&amp;amp;
+#endif
     gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf-&amp;gt;listview), 0, 0, &amp;amp;tpath, NULL, NULL, NULL))
 {
 GtkTreeIter iter;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1654,7 +1670,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
      NULL);
 }
 }
+#if GTK_CHECK_VERSION(2,20,0)
+if (gtk_widget_get_realized(vf-&amp;gt;listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf-&amp;gt;listview));
+#else
 if (GTK_WIDGET_REALIZED(vf-&amp;gt;listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf-&amp;gt;listview));
+#endif
 }
 
 r = -1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-05-10T11:32:56</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/850">
    <title>SF.net SVN: geeqie:[1915] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/850</link>
    <description>&lt;pre&gt;Revision: 1915
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1915&amp;amp;view=rev
Author:   mow
Date:     2010-02-28 22:55:37 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Add unknown file class to grouping

Modified Paths:
--------------
    trunk/src/filefilter.c
    trunk/src/options.c

Modified: trunk/src/filefilter.c
===================================================================
--- trunk/src/filefilter.c2010-02-28 15:17:12 UTC (rev 1914)
+++ trunk/src/filefilter.c2010-02-28 22:55:37 UTC (rev 1915)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -283,6 +283,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 if (g_ascii_strcasecmp(ext, "%image") == 0) file_class = FORMAT_CLASS_IMAGE;
 else if (g_ascii_strcasecmp(ext, "%raw") == 0) file_class = FORMAT_CLASS_RAWIMAGE;
 else if (g_ascii_strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META;
+else if (g_ascii_strcasecmp(ext, "%unknown") == 0) file_class = FORMAT_CLASS_UNKNOWN;
 
 if (file_class == -1) 
 {

Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c2010-02-28 15:17:12 UTC (rev 1914)
+++ trunk/src/options.c2010-02-28 22:55:37 UTC (rev 1915)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -149,7 +149,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 set_default_image_overlay_template_string(&amp;amp;options-&amp;gt;image_overlay.template_string);
-options-&amp;gt;sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp");
+options-&amp;gt;sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp;%unknown");
 
 options-&amp;gt;shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
 options-&amp;gt;shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-28T22:55:37</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/849">
    <title>SF.net SVN: geeqie:[1914] trunk/src/exif-common.c</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/849</link>
    <description>&lt;pre&gt;Revision: 1914
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1914&amp;amp;view=rev
Author:   mow
Date:     2010-02-28 15:17:12 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
Fix a small issue with strptime

strptime do not initialize all fields. So the undefined fields could end
in crash later on.

Modified Paths:
--------------
    trunk/src/exif-common.c

Modified: trunk/src/exif-common.c
===================================================================
--- trunk/src/exif-common.c2010-02-27 23:31:07 UTC (rev 1913)
+++ trunk/src/exif-common.c2010-02-28 15:17:12 UTC (rev 1914)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -207,6 +207,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 
 /* Convert the stuff into a tm struct */
+memset(&amp;amp;tm, 0, sizeof(tm)); /* Uh, strptime could let garbage in tm! */
 if (text &amp;amp;&amp;amp; strptime(text, "%Y:%m:%d %H:%M:%S", &amp;amp;tm))
 {
 buflen = strftime(buf, sizeof(buf), "%x %X", &amp;amp;tm);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-28T15:17:12</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/848">
    <title>SF.net SVN: geeqie:[1913] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/848</link>
    <description>&lt;pre&gt;Revision: 1913
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1913&amp;amp;view=rev
Author:   zas_
Date:     2010-02-27 23:31:07 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Allow scrollview to grow when generic dialog is resized (ie. Metadata write ? dialog). Do not force scrollbar if not needed.

Modified Paths:
--------------
    trunk/src/ui_utildlg.c
    trunk/src/utilops.c

Modified: trunk/src/ui_utildlg.c
===================================================================
--- trunk/src/ui_utildlg.c2010-02-27 20:35:26 UTC (rev 1912)
+++ trunk/src/ui_utildlg.c2010-02-27 23:31:07 UTC (rev 1913)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -178,7 +178,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 GtkWidget *vbox;
 GtkWidget *label;
 
-hbox = pref_box_new(gd-&amp;gt;vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+hbox = pref_box_new(gd-&amp;gt;vbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 if (icon_stock_id)
 {
 GtkWidget *image;

Modified: trunk/src/utilops.c
===================================================================
--- trunk/src/utilops.c2010-02-27 20:35:26 UTC (rev 1912)
+++ trunk/src/utilops.c2010-02-27 23:31:07 UTC (rev 1913)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -440,7 +440,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 scrolled = gtk_scrolled_window_new(NULL, NULL);
 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
 gtk_widget_show(scrolled);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>zas_-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-27T23:31:07</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/847">
    <title>SF.net SVN: geeqie:[1912] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/847</link>
    <description>&lt;pre&gt;Revision: 1912
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1912&amp;amp;view=rev
Author:   mow
Date:     2010-02-27 20:35:26 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Add the feature to add single keywords to selection

This patch adds a context menu entry to keywords to ad the current
keyword to all selected images.

Modified Paths:
--------------
    trunk/src/bar_keywords.c
    trunk/src/metadata.c
    trunk/src/metadata.h

Modified: trunk/src/bar_keywords.c
===================================================================
--- trunk/src/bar_keywords.c2010-02-27 20:35:09 UTC (rev 1911)
+++ trunk/src/bar_keywords.c2010-02-27 20:35:26 UTC (rev 1912)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1085,6 +1085,62 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 bar_keyword_tree_sync(pkd);
 }
 
+/**
+ * \brief Callback for adding selected keyword to all selected images.
+ */
+static void bar_pane_keywords_add_to_selected_cb(GtkWidget *menu_widget, gpointer data)
+{
+PaneKeywordsData *pkd = data;
+GtkTreeIter iter; /* This is the iter which initial holds the current keyword */
+GtkTreeIter child_iter;
+GtkTreeModel *model;
+GtkTreeModel *keyword_tree;
+GList *list, *work;
+GList *keywords = NULL;
+
+GtkTextBuffer *keyword_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pkd-&amp;gt;keyword_view));
+
+/* Aquire selected keyword */
+if (pkd-&amp;gt;click_tpath)
+{
+gboolean is_keyword = TRUE;
+
+model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd-&amp;gt;keyword_treeview));
+        if (!gtk_tree_model_get_iter(model, &amp;amp;iter, pkd-&amp;gt;click_tpath)) return;
+gtk_tree_model_get(model, &amp;amp;iter, FILTER_KEYWORD_COLUMN_IS_KEYWORD, &amp;amp;is_keyword, -1);
+if (!is_keyword) return;
+}
+else
+return;
+
+keyword_tree = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &amp;amp;child_iter, &amp;amp;iter);
+
+list = keyword_list_pull(pkd-&amp;gt;keyword_view); /* Get the left keyword view */
+
+/* Now set the current image */
+keyword_tree_set(keyword_tree, &amp;amp;child_iter, &amp;amp;list);
+
+keyword_list_push(pkd-&amp;gt;keyword_view, list); /* Set the left keyword view */
+string_list_free(list);
+
+bar_pane_keywords_changed(keyword_buffer, pkd); /* Get list of all keywords in the hierarchy */
+
+gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &amp;amp;child_iter, &amp;amp;iter);
+keywords = keyword_tree_get(keyword_tree, &amp;amp;child_iter);
+
+list = layout_selection_list(pkd-&amp;gt;pane.lw);
+work = list;
+while (work)
+{
+FileData *fd = work-&amp;gt;data;
+work = work-&amp;gt;next;
+metadata_append_list(fd, KEYWORD_KEY, keywords);
+}
+filelist_free(list);
+string_list_free(keywords);
+}
+
 static void bar_pane_keywords_menu_popup(GtkWidget *widget, PaneKeywordsData *pkd, gint x, gint y)
 {
 GtkWidget *menu;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1102,6 +1158,10 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 menu_item_add_divider(menu);
 
+menu_item_add(menu, _("Add keyword to all selected images"), G_CALLBACK(bar_pane_keywords_add_to_selected_cb), pkd);
+
+menu_item_add_divider(menu);
+
 if (pkd-&amp;gt;click_tpath)
 {
 /* for the entry */

Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c2010-02-27 20:35:09 UTC (rev 1911)
+++ trunk/src/metadata.c2010-02-27 20:35:26 UTC (rev 1912)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1244,6 +1244,26 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 }
 }
 
+GList *keyword_tree_get(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr)
+{
+GtkTreeIter iter = *iter_ptr;
+GList *kw_list = NULL;
+
+while (TRUE)
+{
+GtkTreeIter parent;
+
+if (keyword_get_is_keyword(keyword_tree, &amp;amp;iter))
+{
+gchar *name = keyword_get_name(keyword_tree, &amp;amp;iter);
+kw_list = g_list_append(kw_list, name);
+}
+
+if (!gtk_tree_model_iter_parent(keyword_tree, &amp;amp;parent, &amp;amp;iter)) return kw_list;
+iter = parent;
+}
+} // GList *keyword_tree_get(GtkTre...
+
 static void keyword_tree_reset1(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GList **kw_list)
 {
 gchar *found;

Modified: trunk/src/metadata.h
===================================================================
--- trunk/src/metadata.h2010-02-27 20:35:09 UTC (rev 1911)
+++ trunk/src/metadata.h2010-02-27 20:35:26 UTC (rev 1912)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -77,6 +77,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 void keyword_set(GtkTreeStore *keyword_tree, GtkTreeIter *iter, const gchar *name, gboolean is_keyword);
 gboolean keyword_tree_is_set(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GList *kw_list);
 void keyword_tree_set(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr, GList **kw_list);
+GList *keyword_tree_get(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr);
 void keyword_tree_reset(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr, GList **kw_list);
 
 void keyword_delete(GtkTreeStore *keyword_tree, GtkTreeIter *iter_ptr);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-27T20:35:26</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/846">
    <title>SF.net SVN: geeqie:[1911] trunk/src/exif.h</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/846</link>
    <description>&lt;pre&gt;Revision: 1911
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1911&amp;amp;view=rev
Author:   mow
Date:     2010-02-27 20:35:09 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Little macro correction

Modified Paths:
--------------
    trunk/src/exif.h

Modified: trunk/src/exif.h
===================================================================
--- trunk/src/exif.h2010-02-27 20:34:54 UTC (rev 1910)
+++ trunk/src/exif.h2010-02-27 20:35:09 UTC (rev 1911)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -27,7 +27,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 #ifndef __EXIF_H
 #define __EXIF_H
 
-#define EXIF_FORMATTED(x) "formatted."x
+#define EXIF_FORMATTED() "formatted."
 #define EXIF_FORMATTED_LEN (sizeof(EXIF_FORMATTED()) - 1)
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-27T20:35:09</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/845">
    <title>SF.net SVN: geeqie:[1910] trunk/src</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/845</link>
    <description>&lt;pre&gt;Revision: 1910
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1910&amp;amp;view=rev
Author:   mow
Date:     2010-02-27 20:34:54 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
Unifying the datetime output

The output of %date% and %formatted.DateTime% should be equivalent.

Modified Paths:
--------------
    trunk/src/exif-common.c
    trunk/src/filedata.c

Modified: trunk/src/exif-common.c
===================================================================
--- trunk/src/exif-common.c2010-02-17 21:19:22 UTC (rev 1909)
+++ trunk/src/exif-common.c2010-02-27 20:34:54 UTC (rev 1910)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -9,6 +9,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 #  include "config.h"
 #endif
 
+#define _XOPEN_SOURCE
+
 #include &amp;lt;stdio.h&amp;gt;
 #include &amp;lt;string.h&amp;gt;
 #include &amp;lt;fcntl.h&amp;gt;
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -188,6 +190,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 {
 gchar *text = exif_get_data_as_text(exif, "Exif.Photo.DateTimeOriginal");
 gchar *subsec = NULL;
+gchar buf[128];
+gchar *tmp;
+gint buflen;
+struct tm tm;
+GError *error = NULL;
 
 if (text)
 {
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -198,9 +205,30 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 text = exif_get_data_as_text(exif, "Exif.Image.DateTime");
 if (text) subsec = exif_get_data_as_text(exif, "Exif.Photo.SubSecTime");
 }
+
+/* Convert the stuff into a tm struct */
+if (text &amp;amp;&amp;amp; strptime(text, "%Y:%m:%d %H:%M:%S", &amp;amp;tm))
+{
+buflen = strftime(buf, sizeof(buf), "%x %X", &amp;amp;tm);
+if (buflen &amp;gt; 0)
+{
+tmp = g_locale_to_utf8(buf, buflen, NULL, NULL, &amp;amp;error);
+if (error)
+{
+log_printf("Error converting locale strftime to UTF-8: %s\n", error-&amp;gt;message);
+g_error_free(error);
+}
+else
+{
+g_free(text);
+text = g_strdup(tmp);
+}
+}
+}
+
 if (subsec)
 {
-gchar *tmp = text;
+tmp = text;
 text = g_strconcat(tmp, ".", subsec, NULL);
 g_free(tmp);
 g_free(subsec);

Modified: trunk/src/filedata.c
===================================================================
--- trunk/src/filedata.c2010-02-17 21:19:22 UTC (rev 1909)
+++ trunk/src/filedata.c2010-02-27 20:34:54 UTC (rev 1910)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -116,7 +116,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 btime = localtime(&amp;amp;t);
 
 /* the %x warning about 2 digit years is not an error */
-buflen = strftime(buf, sizeof(buf), "%x %H:%M", btime);
+buflen = strftime(buf, sizeof(buf), "%x %X", btime);
 if (buflen &amp;lt; 1) return "";
 
 g_free(ret);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&amp;amp;#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
&lt;/pre&gt;</description>
    <dc:creator>mow-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-27T20:34:54</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/844">
    <title>SF.net SVN: geeqie:[1909] tags/GEEQIE_1_0/</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/844</link>
    <description>&lt;pre&gt;Revision: 1909
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1909&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-17 21:19:22 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
tagging 1.0 release

Added Paths:
-----------
    tags/GEEQIE_1_0/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-17T21:19:22</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/843">
    <title>SF.net SVN: geeqie:[1908] trunk/ChangeLog</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/843</link>
    <description>&lt;pre&gt;Revision: 1908
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1908&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-17 21:05:10 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
updated ChangeLog file

Modified Paths:
--------------
    trunk/ChangeLog

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog2010-02-16 21:18:03 UTC (rev 1907)
+++ trunk/ChangeLog2010-02-17 21:05:10 UTC (rev 1908)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,4 +1,673 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 ------------------------------------------------------------------------
+r1907 | nadvornik | 2010-02-16 22:18:03 +0100 (Tue, 16 Feb 2010) | 2 lines
+
+added 2010 to copyright text
+
+------------------------------------------------------------------------
+r1906 | nadvornik | 2010-02-16 22:10:12 +0100 (Tue, 16 Feb 2010) | 2 lines
+
+updated version string
+
+------------------------------------------------------------------------
+r1905 | zas_ | 2010-02-16 21:07:05 +0100 (Tue, 16 Feb 2010) | 1 line
+
+Restore translators list, removed by revision 1899.
+------------------------------------------------------------------------
+r1904 | zas_ | 2010-02-16 20:55:35 +0100 (Tue, 16 Feb 2010) | 1 line
+
+Update russian translation. Thanks to Denis Silakov.
+------------------------------------------------------------------------
+r1903 | nadvornik | 2010-02-14 23:00:23 +0100 (Sun, 14 Feb 2010) | 4 lines
+
+fixed segfault in exif parser
+
+http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2950617&amp;amp;group_id=222125&amp;amp;atid=1054682
+
+------------------------------------------------------------------------
+r1902 | nadvornik | 2010-02-14 22:35:11 +0100 (Sun, 14 Feb 2010) | 6 lines
+
+fixed reference count
+
+there was a bug in reference count on writting unsaved metadata
+before starting an external editor
+
+
+------------------------------------------------------------------------
+r1901 | nadvornik | 2010-02-07 14:16:35 +0100 (Sun, 07 Feb 2010) | 2 lines
+
+test gnome-doc-tool in configure
+
+------------------------------------------------------------------------
+r1900 | nadvornik | 2010-02-07 13:44:55 +0100 (Sun, 07 Feb 2010) | 2 lines
+
+dropped obsolete sections, gqview changelog moved to wiki
+
+------------------------------------------------------------------------
+r1899 | zas_ | 2010-02-02 21:21:11 +0100 (Tue, 02 Feb 2010) | 9 lines
+
+Brazilian Portuguese translation was updated. 
+
+Thanks to Sergio Cipolla.
+
+References:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567824
+
+
+
+------------------------------------------------------------------------
+r1898 | nadvornik | 2010-01-27 23:27:10 +0100 (Wed, 27 Jan 2010) | 2 lines
+
+czech translation fixes
+
+------------------------------------------------------------------------
+r1897 | zas_ | 2010-01-27 20:58:11 +0100 (Wed, 27 Jan 2010) | 1 line
+
+Update catalan translation, by angel mompo.
+------------------------------------------------------------------------
+r1896 | zas_ | 2010-01-17 14:34:48 +0100 (Sun, 17 Jan 2010) | 1 line
+
+Fix osd zoom level refreshing (it was broken since some times).
+------------------------------------------------------------------------
+r1895 | zas_ | 2010-01-13 20:49:39 +0100 (Wed, 13 Jan 2010) | 5 lines
+
+Update dutch translation. Work in progress.
+
+Patch by Marcel Pol.
+
+
+------------------------------------------------------------------------
+r1894 | mow | 2010-01-11 15:10:49 +0100 (Mon, 11 Jan 2010) | 1 line
+
+Wops, typo...
+------------------------------------------------------------------------
+r1893 | zas_ | 2010-01-10 15:23:29 +0100 (Sun, 10 Jan 2010) | 10 lines
+
+copy_file(): remove incomplete file on error (bug 2890715)
+
+The behavior changed, data is first written to a temporary file,
+which is unlinked in case of error, then the tempfile is renamed
+to the final name.
+Size of buffer was increased from 4k to 16k.
+
+
+
+
+------------------------------------------------------------------------
+r1892 | zas_ | 2010-01-09 12:44:27 +0100 (Sat, 09 Jan 2010) | 1 line
+
+Workaround intltoolize 0.40.6 bug related to LINGUAS, see bug 2817602.
+------------------------------------------------------------------------
+r1891 | zas_ | 2010-01-09 11:37:48 +0100 (Sat, 09 Jan 2010) | 1 line
+
+Log a message when EOVERFLOW error is set by stat() when building files lists. See bug 2876142.
+------------------------------------------------------------------------
+r1890 | zas_ | 2010-01-05 23:28:11 +0100 (Tue, 05 Jan 2010) | 8 lines
+
+Add Serbian translation.
+
+Note there are two *.po files, one for Cyrilic and one for Latin
+letters.
+
+Thanks to Milos Popovic.
+
+
+------------------------------------------------------------------------
+r1889 | zas_ | 2010-01-05 23:26:03 +0100 (Tue, 05 Jan 2010) | 1 line
+
+Update README about translations.
+------------------------------------------------------------------------
+r1888 | zas_ | 2010-01-05 18:49:50 +0100 (Tue, 05 Jan 2010) | 13 lines
+
+Allow to switch to fullscreen mode using LIRC.
+
+Imagine the following situation (which happened to me several times) :
+you want to see photos from your bed or your sofa so you launch geeqie
+and go to the right directory, then you take your remote control and sit
+comfortably far from your keyboard and mouse. And when you want to begin
+to watch photos, you realize you forgot to enable full screen! You have
+to stand up and to go until your computer and come back, whereas you
+could have done it with your remote control.
+
+Patch by Bernard Massot.
+
+
+------------------------------------------------------------------------
+r1887 | zas_ | 2010-01-02 13:38:55 +0100 (Sat, 02 Jan 2010) | 1 line
+
+Get rid of Geeqie version and beta release message. It clutters command line usage, and is not that useful. Suggested by Michal ?\196?\140iha?\197?\153.
+------------------------------------------------------------------------
+r1881 | zas_ | 2009-12-19 13:53:20 +0100 (Sat, 19 Dec 2009) | 9 lines
+
+Fix bug 2917164.
+g_utf8_collate_key_for_filename() don't give sort order one
+may expect. Using g_utf8_collate_key() make things closer
+to many other programs output (ie. ls and gqview).
+
+Thanks to Michael pointing this out.
+
+
+
+------------------------------------------------------------------------
+r1880 | zas_ | 2009-12-19 13:49:19 +0100 (Sat, 19 Dec 2009) | 1 line
+
+Store sort parameters in appropriate variables.
+------------------------------------------------------------------------
+r1879 | zas_ | 2009-12-10 18:48:43 +0100 (Thu, 10 Dec 2009) | 4 lines
+
+Move "Add Keyword" menu item at top of Keywords bar contextual menu.
+
+Suggested by Lars T?\195?\164uber.
+
+------------------------------------------------------------------------
+r1878 | zas_ | 2009-12-10 18:44:31 +0100 (Thu, 10 Dec 2009) | 7 lines
+
+Fix contextual menus in lateral bars.
+
+Use button_release_event instead of button_press_event,
+this makes contextual menus persistent until an option
+is selected or the menu is closed.
+
+
+------------------------------------------------------------------------
+r1877 | zas_ | 2009-12-04 22:01:11 +0100 (Fri, 04 Dec 2009) | 1 line
+
+Some systems do not have SA_SIGINFO (siginfo_t), like GNU/Hurd, so just test if defined or not. Patch by Michal ?\196?\140iha?\197?\153 (Bug ID: 2894271).
+------------------------------------------------------------------------
+r1876 | zas_ | 2009-12-04 21:40:02 +0100 (Fri, 04 Dec 2009) | 1 line
+
+Editors: disable Delete button if a .desktop file is not writeable and disable Edit button when no entry is selected.
+------------------------------------------------------------------------
+r1875 | zas_ | 2009-12-04 20:45:09 +0100 (Fri, 04 Dec 2009) | 1 line
+
+Add Opera to the list of browsers. Patch by Christian Heckendorf (feature request ID: 2908469).
+------------------------------------------------------------------------
+r1874 | nadvornik | 2009-11-28 00:27:35 +0100 (Sat, 28 Nov 2009) | 2 lines
+
+build documentation with gnome-doc-tool in makefile
+
+------------------------------------------------------------------------
+r1873 | nadvornik | 2009-11-22 10:12:22 +0100 (Sun, 22 Nov 2009) | 2 lines
+
+scripts for converting wiki documentation to docbook
+
+------------------------------------------------------------------------
+r1872 | nadvornik | 2009-11-21 21:08:51 +0100 (Sat, 21 Nov 2009) | 5 lines
+
+check gtk_clutter_init return value
+
+https://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2899866&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+
+------------------------------------------------------------------------
+r1871 | nadvornik | 2009-11-18 13:34:30 +0100 (Wed, 18 Nov 2009) | 2 lines
+
+changed https to http in wiki links
+
+------------------------------------------------------------------------
+r1870 | zas_ | 2009-11-13 19:37:31 +0100 (Fri, 13 Nov 2009) | 1 line
+
+Spanish translation was updated. Thanks to Redy Rodriguez.
+------------------------------------------------------------------------
+r1869 | zas_ | 2009-11-07 22:31:23 +0100 (Sat, 07 Nov 2009) | 1 line
+
+Updated spanish translation. Thanks to Redy Rodriguez.
+------------------------------------------------------------------------
+r1868 | mow | 2009-10-13 23:49:42 +0200 (Tue, 13 Oct 2009) | 1 line
+
+German translation update
+------------------------------------------------------------------------
+r1867 | mow | 2009-10-13 23:49:21 +0200 (Tue, 13 Oct 2009) | 8 lines
+
+Add compatibility for GTK 2.18
+
+With 2.18 some functions are deprecated. With geeqie that are two at the
+moment.
+- gtk_tree_view_column_get_cell_renderers - which can be replaced by
+  gtk_cell_layout_get_cells
+- gdk_event_get_graphics_expose - I just commented it as there seems to
+  be no replacement in GTK 2.18
+------------------------------------------------------------------------
+r1866 | nadvornik | 2009-10-10 17:01:41 +0200 (Sat, 10 Oct 2009) | 2 lines
+
+added a workaround for https://bugzilla.gnome.org/show_bug.cgi?id=590692
+
+------------------------------------------------------------------------
+r1865 | nadvornik | 2009-10-10 12:15:23 +0200 (Sat, 10 Oct 2009) | 4 lines
+
+use text renderer for editor-&amp;gt;hidden
+
+The toggle was too confusing because it was not dirrectly editable.
+
+------------------------------------------------------------------------
+r1864 | nadvornik | 2009-10-01 20:40:34 +0200 (Thu, 01 Oct 2009) | 7 lines
+
+ignored multiple directories specified on commandline
+
+IMHO this was inconsistent - specifying one directory had completely
+different effect than specifying two or more directories. Moreover,
+it segfaulted.
+Now only one directory is allowed.
+
+------------------------------------------------------------------------
+r1863 | nadvornik | 2009-10-01 19:37:51 +0200 (Thu, 01 Oct 2009) | 2 lines
+
+fixed tree_store reordering
+
+------------------------------------------------------------------------
+r1862 | nadvornik | 2009-09-28 14:04:35 +0200 (Mon, 28 Sep 2009) | 2 lines
+
+do not cache incomplete thumbnails
+
+------------------------------------------------------------------------
+r1861 | nadvornik | 2009-09-28 11:57:06 +0200 (Mon, 28 Sep 2009) | 2 lines
+
+consider sidecars in layout_image popup menu
+
+------------------------------------------------------------------------
+r1860 | nadvornik | 2009-09-26 13:37:09 +0200 (Sat, 26 Sep 2009) | 6 lines
+
+bar_gps cleanup
+
+- removed the scrollbar
+- do not set decel-rate,
+  https://bugzilla.gnome.org/show_bug.cgi?id=596419
+
+------------------------------------------------------------------------
+r1859 | nadvornik | 2009-09-26 10:47:28 +0200 (Sat, 26 Sep 2009) | 8 lines
+
+print text using pango renderer
+
+- the text is sent to postscript as a bitmap
+- this fixes printing of non-ascii characters
+
+http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2836135&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+
+------------------------------------------------------------------------
+r1858 | nadvornik | 2009-09-25 22:39:15 +0200 (Fri, 25 Sep 2009) | 8 lines
+
+require libchamplain 0.4
+
+- check for libchamplain 0.4
+- dropped libchamplain 0.3.x support
+
+http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2861847&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+
+------------------------------------------------------------------------
+r1857 | nadvornik | 2009-09-24 23:52:44 +0200 (Thu, 24 Sep 2009) | 2 lines
+
+fixed and simplified sidecar grouping code
+
+------------------------------------------------------------------------
+r1856 | nadvornik | 2009-09-24 20:02:29 +0200 (Thu, 24 Sep 2009) | 2 lines
+
+fixed emitting of error signal from image loader
+
+------------------------------------------------------------------------
+r1855 | nadvornik | 2009-09-21 20:48:32 +0200 (Mon, 21 Sep 2009) | 5 lines
+
+fixed pan-view popup menu
+
+- removed wrong callback
+- consider sidecar files in the editor popup
+
+------------------------------------------------------------------------
+r1854 | nadvornik | 2009-09-14 23:25:10 +0200 (Mon, 14 Sep 2009) | 2 lines
+
+fixed selection handling in sidebar
+
+------------------------------------------------------------------------
+r1853 | nadvornik | 2009-09-13 23:08:40 +0200 (Sun, 13 Sep 2009) | 5 lines
+
+fixed editor list in popup menu
+
+- show an editor if any of selected files matches
+- added debug messages
+
+------------------------------------------------------------------------
+r1852 | nadvornik | 2009-09-13 23:03:17 +0200 (Sun, 13 Sep 2009) | 2 lines
+
+fixed incorrect translation
+
+------------------------------------------------------------------------
+r1851 | nadvornik | 2009-09-13 22:00:08 +0200 (Sun, 13 Sep 2009) | 2 lines
+
+fixed filelist refresh
+
+------------------------------------------------------------------------
+r1850 | nadvornik | 2009-09-13 14:33:11 +0200 (Sun, 13 Sep 2009) | 2 lines
+
+preserve histmap on NOTIFY_CHANGE
+
+------------------------------------------------------------------------
+r1849 | nadvornik | 2009-09-13 11:55:21 +0200 (Sun, 13 Sep 2009) | 2 lines
+
+added possibility to use geeqie-rotate as a standalone script
+
+------------------------------------------------------------------------
+r1848 | nadvornik | 2009-09-12 18:37:05 +0200 (Sat, 12 Sep 2009) | 2 lines
+
+strip the "lang=" prefix from exiv2 in all metadata formats
+
+------------------------------------------------------------------------
+r1847 | nadvornik | 2009-09-12 18:03:09 +0200 (Sat, 12 Sep 2009) | 2 lines
+
+simplified template
+
+------------------------------------------------------------------------
+r1846 | nadvornik | 2009-09-12 17:51:37 +0200 (Sat, 12 Sep 2009) | 5 lines
+
+editor fixes
+
+- fixed editor loading order
+- fixed EditorWindow-&amp;gt;modified flag handling
+
+------------------------------------------------------------------------
+r1845 | nadvornik | 2009-09-12 17:31:24 +0200 (Sat, 12 Sep 2009) | 2 lines
+
+fixed reloading of editors
+
+------------------------------------------------------------------------
+r1844 | nadvornik | 2009-09-09 20:16:09 +0200 (Wed, 09 Sep 2009) | 2 lines
+
+advertisment added
+
+------------------------------------------------------------------------
+r1843 | nadvornik | 2009-09-07 22:44:29 +0200 (Mon, 07 Sep 2009) | 5 lines
+
+start_editor_from_filelist_full fixes
+
+fixed return value from start_editor_from_filelist_full()
+call editor_command_parse to detect possible problems early enough
+
+------------------------------------------------------------------------
+r1842 | nadvornik | 2009-09-07 22:04:22 +0200 (Mon, 07 Sep 2009) | 2 lines
+
+fixed list of possible editors in popup menu
+
+------------------------------------------------------------------------
+r1841 | nadvornik | 2009-09-07 21:48:05 +0200 (Mon, 07 Sep 2009) | 5 lines
+
+fixes sidecar file grouping
+
+files with a number in extension were listed twice, it 
+caused problems later
+
+------------------------------------------------------------------------
+r1840 | zas_ | 2009-09-07 10:24:09 +0200 (Mon, 07 Sep 2009) | 1 line
+
+Comment out unused functions, silenting related compilation warnings.
+------------------------------------------------------------------------
+r1839 | zas_ | 2009-09-07 10:18:18 +0200 (Mon, 07 Sep 2009) | 1 line
+
+Remove an unused variable and minor code cleanup.
+------------------------------------------------------------------------
+r1838 | nadvornik | 2009-09-06 16:29:19 +0200 (Sun, 06 Sep 2009) | 2 lines
+
+improved editor loading
+
+------------------------------------------------------------------------
+r1837 | nadvornik | 2009-09-06 16:21:19 +0200 (Sun, 06 Sep 2009) | 2 lines
+
+fixed unnecessary image reloads in color menu
+
+------------------------------------------------------------------------
+r1836 | nadvornik | 2009-09-06 16:01:03 +0200 (Sun, 06 Sep 2009) | 9 lines
+
+load desktop files in idle time
+
+- scanning all desktop files takes a lot of time because of hdd seek
+- this change moves the scanning to idle time
+- the editors appears in the menus some time after startup
+
+https://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2852522&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+
+------------------------------------------------------------------------
+r1835 | nadvornik | 2009-09-06 11:08:37 +0200 (Sun, 06 Sep 2009) | 2 lines
+
+added messages for debugging startup time
+
+------------------------------------------------------------------------
+r1834 | zas_ | 2009-09-05 15:48:21 +0200 (Sat, 05 Sep 2009) | 1 line
+
+Update svn ignore lists.
+------------------------------------------------------------------------
+r1833 | zas_ | 2009-09-04 17:53:04 +0200 (Fri, 04 Sep 2009) | 5 lines
+
+Fix up compilation issues related to libchamplain.
+
+See http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2848469&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+
+------------------------------------------------------------------------
+r1832 | nadvornik | 2009-09-03 22:00:40 +0200 (Thu, 03 Sep 2009) | 2 lines
+
+fixed in-place rename
+
+------------------------------------------------------------------------
+r1831 | nadvornik | 2009-09-03 21:18:20 +0200 (Thu, 03 Sep 2009) | 5 lines
+
+do not reload image on copy, move, rename and external editor
+
+changed files should be detected anyway
+http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2848373&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+------------------------------------------------------------------------
+r1830 | nadvornik | 2009-08-29 01:09:05 +0200 (Sat, 29 Aug 2009) | 2 lines
+
+fixed vd_notify_cb leak
+
+------------------------------------------------------------------------
+r1829 | nadvornik | 2009-08-28 23:01:29 +0200 (Fri, 28 Aug 2009) | 2 lines
+
+improved printing of selection
+
+------------------------------------------------------------------------
+r1828 | nadvornik | 2009-08-28 22:18:46 +0200 (Fri, 28 Aug 2009) | 2 lines
+
+improved the sidecar grouping algorithm
+
+------------------------------------------------------------------------
+r1827 | nadvornik | 2009-08-27 22:23:28 +0200 (Thu, 27 Aug 2009) | 4 lines
+
+fixed toggle_slideshow function
+
+https://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2844302&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+------------------------------------------------------------------------
+r1826 | nadvornik | 2009-08-26 21:19:06 +0200 (Wed, 26 Aug 2009) | 2 lines
+
+updated version message
+
+------------------------------------------------------------------------
+r1825 | nadvornik | 2009-08-26 21:16:02 +0200 (Wed, 26 Aug 2009) | 2 lines
+
+save one unnecessary call to stat_utf8
+
+------------------------------------------------------------------------
+r1824 | nadvornik | 2009-08-26 00:21:46 +0200 (Wed, 26 Aug 2009) | 4 lines
+
+use name as a tooltip of external editor if comment is missing
+
+the hotkey dialog ignores entries with empty tooltip
+
+------------------------------------------------------------------------
+r1823 | nadvornik | 2009-08-25 23:30:50 +0200 (Tue, 25 Aug 2009) | 7 lines
+
+write metadata before another opeation
+
+- this is implemented for copy and external editor
+- the unsaved metadata should survive operations like move or rename
+- saving metadata before delete is pointless
+
+
+------------------------------------------------------------------------
+r1822 | nadvornik | 2009-08-23 16:10:56 +0200 (Sun, 23 Aug 2009) | 4 lines
+
+workaround for xpm loader
+
+https://sourceforge.net/tracker/?func=detail&amp;amp;aid=2824016&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+------------------------------------------------------------------------
+r1821 | nadvornik | 2009-08-23 15:37:15 +0200 (Sun, 23 Aug 2009) | 4 lines
+
+fixed moving and maintenance of std. thumbnails
+
+https://sourceforge.net/tracker/?func=detail&amp;amp;aid=2836224&amp;amp;group_id=222125&amp;amp;atid=1054680
+
+------------------------------------------------------------------------
+r1820 | nadvornik | 2009-08-22 23:58:49 +0200 (Sat, 22 Aug 2009) | 2 lines
+
+remove deleted files from metadata queue
+
+------------------------------------------------------------------------
+r1819 | nadvornik | 2009-08-22 22:20:19 +0200 (Sat, 22 Aug 2009) | 6 lines
+
+fixed sidecar grouping
+
+this fixes grouping of files which differs only
+in upper/lowercase extension. The old code stopped scanning
+when the first file was found.
+
+------------------------------------------------------------------------
+r1818 | nadvornik | 2009-08-18 22:19:23 +0200 (Tue, 18 Aug 2009) | 2 lines
+
+fixed possible crash in exif_item_get_integer
+
+------------------------------------------------------------------------
+r1817 | nadvornik | 2009-08-03 22:47:14 +0200 (Mon, 03 Aug 2009) | 2 lines
+
+updated links
+
+------------------------------------------------------------------------
+r1816 | mow | 2009-08-03 14:34:57 +0200 (Mon, 03 Aug 2009) | 1 line
+
+Fixing libexiv2 bug
+------------------------------------------------------------------------
+r1815 | mow | 2009-08-02 00:37:57 +0200 (Sun, 02 Aug 2009) | 3 lines
+
+Fix a small problem with casefull keywords
+
+In &amp;lt; at &amp;gt;1636 I miss one check for keyword case. Now it should be all fixed.
+------------------------------------------------------------------------
+r1814 | mow | 2009-08-02 00:37:37 +0200 (Sun, 02 Aug 2009) | 1 line
+
+This function is never used anymore: file_maint_removed
+------------------------------------------------------------------------
+r1813 | nadvornik | 2009-07-31 22:46:55 +0200 (Fri, 31 Jul 2009) | 2 lines
+
+updated project status
+
+------------------------------------------------------------------------
+r1812 | nadvornik | 2009-07-31 22:31:56 +0200 (Fri, 31 Jul 2009) | 4 lines
+
+added project web page under version control
+
+
+
+------------------------------------------------------------------------
+r1811 | zas_ | 2009-07-30 19:59:20 +0200 (Thu, 30 Jul 2009) | 1 line
+
+Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS. Make each an alias of other to be sure. issue reported by Martin Proetzsch.
+------------------------------------------------------------------------
+r1810 | nadvornik | 2009-07-29 23:03:38 +0200 (Wed, 29 Jul 2009) | 2 lines
+
+updated czech translation
+
+------------------------------------------------------------------------
+r1809 | nadvornik | 2009-07-29 00:27:24 +0200 (Wed, 29 Jul 2009) | 4 lines
+
+improved scroll on slower machines
+
+patch by Stanislav Brabec
+
+------------------------------------------------------------------------
+r1808 | nadvornik | 2009-07-29 00:14:26 +0200 (Wed, 29 Jul 2009) | 4 lines
+
+do not process sidecar files in bar_gps
+
+patch by Colin Clark
+
+------------------------------------------------------------------------
+r1807 | nadvornik | 2009-07-29 00:03:54 +0200 (Wed, 29 Jul 2009) | 2 lines
+
+run the scripts with /bin/sh
+
+------------------------------------------------------------------------
+r1806 | zas_ | 2009-07-25 10:23:23 +0200 (Sat, 25 Jul 2009) | 1 line
+
+French translation was updated.
+------------------------------------------------------------------------
+r1805 | zas_ | 2009-07-25 10:13:13 +0200 (Sat, 25 Jul 2009) | 1 line
+
+Remove some bashisms from configure.in. Patch by Greg Troxel.
+------------------------------------------------------------------------
+r1804 | zas_ | 2009-07-25 10:00:07 +0200 (Sat, 25 Jul 2009) | 1 line
+
+Romanian translation was completed. Thanks to Sabin Iacob.
+------------------------------------------------------------------------
+r1803 | nadvornik | 2009-07-24 16:07:54 +0200 (Fri, 24 Jul 2009) | 2 lines
+
+update column sizes after toggling thumbnails
+
+------------------------------------------------------------------------
+r1802 | nadvornik | 2009-07-24 15:32:37 +0200 (Fri, 24 Jul 2009) | 2 lines
+
+fixed switching of multiline texts
+
+------------------------------------------------------------------------
+r1801 | nadvornik | 2009-07-24 14:56:54 +0200 (Fri, 24 Jul 2009) | 5 lines
+
+do not try to reload deleted image
+
+deleted image is replaced by the next one from the list, keep
+the old image displayed until the new one is set
+
+------------------------------------------------------------------------
+r1800 | nadvornik | 2009-07-24 14:45:42 +0200 (Fri, 24 Jul 2009) | 6 lines
+
+call gtk_tree_view_columns_autosize only when reall needed
+
+gtk_tree_view_columns_autosize is rather expensive, call it only
+afrer directory change or after user-requested refresh
+
+
+------------------------------------------------------------------------
+r1799 | nadvornik | 2009-07-24 14:21:23 +0200 (Fri, 24 Jul 2009) | 5 lines
+
+do not use cell_data_func
+
+cell_data_func is too slow, store formatted string in the tree_store
+instead
+
+------------------------------------------------------------------------
+r1798 | nadvornik | 2009-07-21 16:17:01 +0200 (Tue, 21 Jul 2009) | 10 lines
+
+fixed destroying of menu data
+
+Make sure that menu destroy functions do not access parent widget
+structures that are already destroyed
+There are 2 ways to achieve this:
+- use g_signal_handlers_disconnect_matched() like in vf_destroy_cb()
+- use separate data structure passed to *_popup_menu_destroy_cb()
+  like in img-view.
+
+
+------------------------------------------------------------------------
+r1797 | mow | 2009-07-18 10:16:54 +0200 (Sat, 18 Jul 2009) | 4 lines
+
+Fix a overrun
+
+data_offset + data_length could be bigger than guint which makes the
+calculation overflow to a value smaller then size.
+------------------------------------------------------------------------
+r1795 | nadvornik | 2009-07-02 19:37:05 +0200 (Thu, 02 Jul 2009) | 2 lines
+
+updated ChangeLog file
+
+------------------------------------------------------------------------
 r1794 | nadvornik | 2009-07-02 19:31:38 +0200 (Thu, 02 Jul 2009) | 2 lines
 
 updated ca.po - submitted by Mecatxis


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-17T21:05:10</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/842">
    <title>SF.net SVN: geeqie:[1907] trunk</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/842</link>
    <description>&lt;pre&gt;Revision: 1907
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1907&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-16 21:18:03 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
added 2010 to copyright text

Modified Paths:
--------------
    trunk/CODING
    trunk/configure.in
    trunk/debian/copyright
    trunk/src/advanced_exif.c
    trunk/src/advanced_exif.h
    trunk/src/bar.c
    trunk/src/bar.h
    trunk/src/bar_comment.c
    trunk/src/bar_comment.h
    trunk/src/bar_exif.c
    trunk/src/bar_exif.h
    trunk/src/bar_gps.c
    trunk/src/bar_gps.h
    trunk/src/bar_histogram.c
    trunk/src/bar_histogram.h
    trunk/src/bar_keywords.c
    trunk/src/bar_keywords.h
    trunk/src/bar_sort.c
    trunk/src/bar_sort.h
    trunk/src/cache-loader.c
    trunk/src/cache-loader.h
    trunk/src/cache.c
    trunk/src/cache.h
    trunk/src/cache_maint.c
    trunk/src/cache_maint.h
    trunk/src/collect-dlg.c
    trunk/src/collect-dlg.h
    trunk/src/collect-io.c
    trunk/src/collect-io.h
    trunk/src/collect-table.c
    trunk/src/collect-table.h
    trunk/src/collect.c
    trunk/src/collect.h
    trunk/src/color-man.c
    trunk/src/color-man.h
    trunk/src/compat.c
    trunk/src/compat.h
    trunk/src/debug.c
    trunk/src/debug.h
    trunk/src/desktop_file.c
    trunk/src/desktop_file.h
    trunk/src/dnd.c
    trunk/src/dnd.h
    trunk/src/dupe.c
    trunk/src/dupe.h
    trunk/src/editors.c
    trunk/src/editors.h
    trunk/src/exif-common.c
    trunk/src/exif-int.h
    trunk/src/exif.c
    trunk/src/exif.h
    trunk/src/exiv2.cc
    trunk/src/filecache.c
    trunk/src/filecache.h
    trunk/src/filedata.c
    trunk/src/filedata.h
    trunk/src/filefilter.c
    trunk/src/filefilter.h
    trunk/src/format_canon.c
    trunk/src/format_canon.h
    trunk/src/format_fuji.c
    trunk/src/format_fuji.h
    trunk/src/format_nikon.c
    trunk/src/format_nikon.h
    trunk/src/format_olympus.c
    trunk/src/format_olympus.h
    trunk/src/format_raw.c
    trunk/src/format_raw.h
    trunk/src/fullscreen.c
    trunk/src/fullscreen.h
    trunk/src/histogram.c
    trunk/src/histogram.h
    trunk/src/history_list.c
    trunk/src/history_list.h
    trunk/src/image-load.c
    trunk/src/image-load.h
    trunk/src/image-overlay.c
    trunk/src/image-overlay.h
    trunk/src/image.c
    trunk/src/image.h
    trunk/src/img-view.c
    trunk/src/img-view.h
    trunk/src/layout.c
    trunk/src/layout.h
    trunk/src/layout_config.c
    trunk/src/layout_config.h
    trunk/src/layout_image.c
    trunk/src/layout_image.h
    trunk/src/layout_util.c
    trunk/src/layout_util.h
    trunk/src/lirc.c
    trunk/src/logwindow.c
    trunk/src/logwindow.h
    trunk/src/main.c
    trunk/src/main.h
    trunk/src/menu.c
    trunk/src/menu.h
    trunk/src/metadata.c
    trunk/src/metadata.h
    trunk/src/misc.c
    trunk/src/misc.h
    trunk/src/options.c
    trunk/src/options.h
    trunk/src/pan-calendar.c
    trunk/src/pan-folder.c
    trunk/src/pan-grid.c
    trunk/src/pan-item.c
    trunk/src/pan-timeline.c
    trunk/src/pan-types.h
    trunk/src/pan-util.c
    trunk/src/pan-view.c
    trunk/src/pan-view.h
    trunk/src/pixbuf-renderer.c
    trunk/src/pixbuf-renderer.h
    trunk/src/pixbuf_util.c
    trunk/src/pixbuf_util.h
    trunk/src/preferences.c
    trunk/src/preferences.h
    trunk/src/print.c
    trunk/src/print.h
    trunk/src/rcfile.c
    trunk/src/rcfile.h
    trunk/src/remote.c
    trunk/src/remote.h
    trunk/src/search.c
    trunk/src/search.h
    trunk/src/secure_save.c
    trunk/src/secure_save.h
    trunk/src/similar.c
    trunk/src/similar.h
    trunk/src/slideshow.c
    trunk/src/slideshow.h
    trunk/src/thumb.c
    trunk/src/thumb.h
    trunk/src/thumb_standard.c
    trunk/src/thumb_standard.h
    trunk/src/trash.c
    trunk/src/trash.h
    trunk/src/typedefs.h
    trunk/src/ui_bookmark.c
    trunk/src/ui_bookmark.h
    trunk/src/ui_fileops.c
    trunk/src/ui_fileops.h
    trunk/src/ui_help.c
    trunk/src/ui_help.h
    trunk/src/ui_menu.c
    trunk/src/ui_menu.h
    trunk/src/ui_misc.c
    trunk/src/ui_misc.h
    trunk/src/ui_pathsel.c
    trunk/src/ui_pathsel.h
    trunk/src/ui_spinner.c
    trunk/src/ui_spinner.h
    trunk/src/ui_tabcomp.c
    trunk/src/ui_tabcomp.h
    trunk/src/ui_tree_edit.c
    trunk/src/ui_tree_edit.h
    trunk/src/ui_utildlg.c
    trunk/src/ui_utildlg.h
    trunk/src/uri_utils.c
    trunk/src/uri_utils.h
    trunk/src/utilops.c
    trunk/src/utilops.h
    trunk/src/view_dir.c
    trunk/src/view_dir.h
    trunk/src/view_dir_list.c
    trunk/src/view_dir_list.h
    trunk/src/view_dir_tree.c
    trunk/src/view_dir_tree.h
    trunk/src/view_file.c
    trunk/src/view_file.h
    trunk/src/view_file_icon.c
    trunk/src/view_file_icon.h
    trunk/src/view_file_list.c
    trunk/src/view_file_list.h
    trunk/src/window.c
    trunk/src/window.h

Modified: trunk/CODING
===================================================================
--- trunk/CODING2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/CODING2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -11,7 +11,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 /*
  *  This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
- *  Copyright (C) 2008 - 2009 The Geeqie Team
+ *  Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  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

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/configure.in2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2,7 +2,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
  -*-
 
 dnl This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
-dnl Copyright (C) 2008 - 2009 The Geeqie Team
+dnl Copyright (C) 2008 - 2010 The Geeqie Team
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -384,7 +384,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 /*
  *  This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
- *  Copyright (C) 2008 - 2009 The Geeqie Team
+ *  Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  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

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/debian/copyright2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -10,7 +10,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 Copyright:
 
-    Copyright (C) 2008 - 2009 The Geeqie Team
+    Copyright (C) 2008 - 2010 The Geeqie Team
     Copyright (C) 2006 John Ellis
 
 License:

Modified: trunk/src/advanced_exif.c
===================================================================
--- trunk/src/advanced_exif.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/advanced_exif.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/advanced_exif.h
===================================================================
--- trunk/src/advanced_exif.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/advanced_exif.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/bar.c
===================================================================
--- trunk/src/bar.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar.h
===================================================================
--- trunk/src/bar.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_comment.c
===================================================================
--- trunk/src/bar_comment.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_comment.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/bar_comment.h
===================================================================
--- trunk/src/bar_comment.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_comment.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_exif.c
===================================================================
--- trunk/src/bar_exif.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_exif.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_exif.h
===================================================================
--- trunk/src/bar_exif.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_exif.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/bar_gps.c
===================================================================
--- trunk/src/bar_gps.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_gps.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Colin Clark
  *

Modified: trunk/src/bar_gps.h
===================================================================
--- trunk/src/bar_gps.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_gps.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_histogram.c
===================================================================
--- trunk/src/bar_histogram.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_histogram.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_histogram.h
===================================================================
--- trunk/src/bar_histogram.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_histogram.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_keywords.c
===================================================================
--- trunk/src/bar_keywords.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_keywords.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/bar_keywords.h
===================================================================
--- trunk/src/bar_keywords.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_keywords.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/bar_sort.c
===================================================================
--- trunk/src/bar_sort.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_sort.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/bar_sort.h
===================================================================
--- trunk/src/bar_sort.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/bar_sort.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache-loader.c
===================================================================
--- trunk/src/cache-loader.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache-loader.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache-loader.h
===================================================================
--- trunk/src/cache-loader.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache-loader.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache.c
===================================================================
--- trunk/src/cache.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache.h
===================================================================
--- trunk/src/cache.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache_maint.c
===================================================================
--- trunk/src/cache_maint.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache_maint.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/cache_maint.h
===================================================================
--- trunk/src/cache_maint.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/cache_maint.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-dlg.c
===================================================================
--- trunk/src/collect-dlg.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-dlg.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-dlg.h
===================================================================
--- trunk/src/collect-dlg.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-dlg.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-io.c
===================================================================
--- trunk/src/collect-io.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-io.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-io.h
===================================================================
--- trunk/src/collect-io.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-io.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-table.c
===================================================================
--- trunk/src/collect-table.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-table.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect-table.h
===================================================================
--- trunk/src/collect-table.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect-table.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect.c
===================================================================
--- trunk/src/collect.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/collect.h
===================================================================
--- trunk/src/collect.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/collect.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/color-man.c
===================================================================
--- trunk/src/color-man.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/color-man.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/color-man.h
===================================================================
--- trunk/src/color-man.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/color-man.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/compat.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *

Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/compat.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *

Modified: trunk/src/debug.c
===================================================================
--- trunk/src/debug.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/debug.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/debug.h
===================================================================
--- trunk/src/debug.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/debug.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/desktop_file.c
===================================================================
--- trunk/src/desktop_file.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/desktop_file.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/desktop_file.h
===================================================================
--- trunk/src/desktop_file.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/desktop_file.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/dnd.c
===================================================================
--- trunk/src/dnd.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/dnd.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/dnd.h
===================================================================
--- trunk/src/dnd.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/dnd.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/dupe.c
===================================================================
--- trunk/src/dupe.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/dupe.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/dupe.h
===================================================================
--- trunk/src/dupe.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/dupe.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/editors.c
===================================================================
--- trunk/src/editors.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/editors.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/editors.h
===================================================================
--- trunk/src/editors.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/editors.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/exif-common.c
===================================================================
--- trunk/src/exif-common.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/exif-common.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
 */
 

Modified: trunk/src/exif-int.h
===================================================================
--- trunk/src/exif-int.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/exif-int.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- *  Copyright (C) 2008 - 2009 The Geeqie Team
+ *  Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Support for Exif file format, originally written by Eric Swalens.

Modified: trunk/src/exif.c
===================================================================
--- trunk/src/exif.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/exif.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- *  Copyright (C) 2008 - 2009 The Geeqie Team
+ *  Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Support for Exif file format, originally written by Eric Swalens.

Modified: trunk/src/exif.h
===================================================================
--- trunk/src/exif.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/exif.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- *  Copyright (C) 2008 - 2009 The Geeqie Team
+ *  Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Support for Exif file format, originally written by Eric Swalens.

Modified: trunk/src/exiv2.cc
===================================================================
--- trunk/src/exiv2.cc2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/exiv2.cc2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/filecache.c
===================================================================
--- trunk/src/filecache.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filecache.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/filecache.h
===================================================================
--- trunk/src/filecache.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filecache.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *

Modified: trunk/src/filedata.c
===================================================================
--- trunk/src/filedata.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filedata.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/filedata.h
===================================================================
--- trunk/src/filedata.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filedata.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/filefilter.c
===================================================================
--- trunk/src/filefilter.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filefilter.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/filefilter.h
===================================================================
--- trunk/src/filefilter.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/filefilter.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/format_canon.c
===================================================================
--- trunk/src/format_canon.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_canon.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/format_canon.h
===================================================================
--- trunk/src/format_canon.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_canon.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/format_fuji.c
===================================================================
--- trunk/src/format_fuji.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_fuji.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Original version 2005 Lars Ellenberg, base on dcraw by David coffin.

Modified: trunk/src/format_fuji.h
===================================================================
--- trunk/src/format_fuji.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_fuji.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Original version 2005 Lars Ellenberg, base on dcraw by David coffin.

Modified: trunk/src/format_nikon.c
===================================================================
--- trunk/src/format_nikon.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_nikon.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Raw NEF jpeg extraction based on nefextract.c by Joseph Heled,

Modified: trunk/src/format_nikon.h
===================================================================
--- trunk/src/format_nikon.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_nikon.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/format_olympus.c
===================================================================
--- trunk/src/format_olympus.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_olympus.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/format_olympus.h
===================================================================
--- trunk/src/format_olympus.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_olympus.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/format_raw.c
===================================================================
--- trunk/src/format_raw.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_raw.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Original version 2005 Lars Ellenberg, base on dcraw by David coffin.

Modified: trunk/src/format_raw.h
===================================================================
--- trunk/src/format_raw.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/format_raw.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  *  Authors:
  *    Original version 2005 Lars Ellenberg, base on dcraw by David coffin.

Modified: trunk/src/fullscreen.c
===================================================================
--- trunk/src/fullscreen.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/fullscreen.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/fullscreen.h
===================================================================
--- trunk/src/fullscreen.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/fullscreen.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/histogram.c
===================================================================
--- trunk/src/histogram.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/histogram.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  * based on a patch by Uwe Ohse

Modified: trunk/src/histogram.h
===================================================================
--- trunk/src/histogram.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/histogram.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  * based on a patch by Uwe Ohse

Modified: trunk/src/history_list.c
===================================================================
--- trunk/src/history_list.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/history_list.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: John Ellis, Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/history_list.h
===================================================================
--- trunk/src/history_list.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/history_list.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis, Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/image-load.c
===================================================================
--- trunk/src/image-load.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image-load.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/image-load.h
===================================================================
--- trunk/src/image-load.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image-load.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/image-overlay.c
===================================================================
--- trunk/src/image-overlay.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image-overlay.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/image-overlay.h
===================================================================
--- trunk/src/image-overlay.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image-overlay.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/image.h
===================================================================
--- trunk/src/image.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/image.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/img-view.c
===================================================================
--- trunk/src/img-view.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/img-view.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/img-view.h
===================================================================
--- trunk/src/img-view.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/img-view.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout.c
===================================================================
--- trunk/src/layout.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout.h
===================================================================
--- trunk/src/layout.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_config.c
===================================================================
--- trunk/src/layout_config.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_config.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_config.h
===================================================================
--- trunk/src/layout_config.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_config.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_image.c
===================================================================
--- trunk/src/layout_image.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_image.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_image.h
===================================================================
--- trunk/src/layout_image.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_image.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_util.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/layout_util.h
===================================================================
--- trunk/src/layout_util.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/layout_util.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/lirc.c
===================================================================
--- trunk/src/lirc.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/lirc.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  */
 

Modified: trunk/src/logwindow.c
===================================================================
--- trunk/src/logwindow.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/logwindow.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik, Laurent Monin
  * based on logwindow.[ch] from Sylpheed 2.4.7 (C) Hiroyuki Yamamoto

Modified: trunk/src/logwindow.h
===================================================================
--- trunk/src/logwindow.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/logwindow.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Vladimir Nadvornik, Laurent Monin
  * based on logwindow.[ch] from Sylpheed 2.4.7 (C) Hiroyuki Yamamoto

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/main.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/main.h
===================================================================
--- trunk/src/main.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/main.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/menu.c
===================================================================
--- trunk/src/menu.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/menu.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/menu.h
===================================================================
--- trunk/src/menu.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/menu.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/metadata.c
===================================================================
--- trunk/src/metadata.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/metadata.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis, Laurent Monin
  *

Modified: trunk/src/metadata.h
===================================================================
--- trunk/src/metadata.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/metadata.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis, Laurent Monin
  *

Modified: trunk/src/misc.c
===================================================================
--- trunk/src/misc.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/misc.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *

Modified: trunk/src/misc.h
===================================================================
--- trunk/src/misc.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/misc.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *

Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/options.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/options.h
===================================================================
--- trunk/src/options.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/options.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/pan-calendar.c
===================================================================
--- trunk/src/pan-calendar.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-calendar.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-folder.c
===================================================================
--- trunk/src/pan-folder.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-folder.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-grid.c
===================================================================
--- trunk/src/pan-grid.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-grid.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-item.c
===================================================================
--- trunk/src/pan-item.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-item.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-timeline.c
===================================================================
--- trunk/src/pan-timeline.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-timeline.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-types.h
===================================================================
--- trunk/src/pan-types.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-types.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-util.c
===================================================================
--- trunk/src/pan-util.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-util.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-view.c
===================================================================
--- trunk/src/pan-view.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-view.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pan-view.h
===================================================================
--- trunk/src/pan-view.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pan-view.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pixbuf-renderer.c
===================================================================
--- trunk/src/pixbuf-renderer.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pixbuf-renderer.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pixbuf-renderer.h
===================================================================
--- trunk/src/pixbuf-renderer.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pixbuf-renderer.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pixbuf_util.c
===================================================================
--- trunk/src/pixbuf_util.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pixbuf_util.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/pixbuf_util.h
===================================================================
--- trunk/src/pixbuf_util.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/pixbuf_util.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/preferences.c
===================================================================
--- trunk/src/preferences.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/preferences.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2125,7 +2125,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 buf = g_strdup_printf(_("%s %s\n\nCopyright (c) 2006 John Ellis\nCopyright (c) %s The Geeqie Team\nwebsite: %s\nemail: %s\n\nReleased under the GNU General Public License"),
       GQ_APPNAME,
       VERSION,
-      "2008 - 2009",
+      "2008 - 2010",
       GQ_WEBSITE,
       GQ_EMAIL_ADDRESS);
 label = gtk_label_new(buf);

Modified: trunk/src/preferences.h
===================================================================
--- trunk/src/preferences.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/preferences.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/print.c
===================================================================
--- trunk/src/print.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/print.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/print.h
===================================================================
--- trunk/src/print.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/print.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/rcfile.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/rcfile.h
===================================================================
--- trunk/src/rcfile.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/rcfile.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/remote.c
===================================================================
--- trunk/src/remote.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/remote.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/remote.h
===================================================================
--- trunk/src/remote.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/remote.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/search.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/search.h
===================================================================
--- trunk/src/search.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/search.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2005 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/secure_save.c
===================================================================
--- trunk/src/secure_save.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/secure_save.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * based on the code developped for ELinks by Laurent Monin
  *

Modified: trunk/src/secure_save.h
===================================================================
--- trunk/src/secure_save.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/secure_save.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * based on the code developped for ELinks by Laurent Monin
  *

Modified: trunk/src/similar.c
===================================================================
--- trunk/src/similar.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/similar.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/similar.h
===================================================================
--- trunk/src/similar.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/similar.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/slideshow.c
===================================================================
--- trunk/src/slideshow.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/slideshow.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/slideshow.h
===================================================================
--- trunk/src/slideshow.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/slideshow.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/thumb.c
===================================================================
--- trunk/src/thumb.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/thumb.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/thumb.h
===================================================================
--- trunk/src/thumb.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/thumb.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/thumb_standard.c
===================================================================
--- trunk/src/thumb_standard.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/thumb_standard.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/thumb_standard.h
===================================================================
--- trunk/src/thumb_standard.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/thumb_standard.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/trash.c
===================================================================
--- trunk/src/trash.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/trash.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/trash.h
===================================================================
--- trunk/src/trash.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/trash.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * This software is released under the GNU General Public License (GNU GPL).
  * Please read the included file COPYING for more information.

Modified: trunk/src/typedefs.h
===================================================================
--- trunk/src/typedefs.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/typedefs.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_bookmark.c
===================================================================
--- trunk/src/ui_bookmark.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_bookmark.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_bookmark.h
===================================================================
--- trunk/src/ui_bookmark.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_bookmark.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_fileops.c
===================================================================
--- trunk/src/ui_fileops.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_fileops.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_fileops.h
===================================================================
--- trunk/src/ui_fileops.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_fileops.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_help.c
===================================================================
--- trunk/src/ui_help.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_help.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_help.h
===================================================================
--- trunk/src/ui_help.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_help.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_menu.c
===================================================================
--- trunk/src/ui_menu.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_menu.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_menu.h
===================================================================
--- trunk/src/ui_menu.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_menu.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_misc.c
===================================================================
--- trunk/src/ui_misc.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_misc.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_misc.h
===================================================================
--- trunk/src/ui_misc.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_misc.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_pathsel.c
===================================================================
--- trunk/src/ui_pathsel.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_pathsel.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_pathsel.h
===================================================================
--- trunk/src/ui_pathsel.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_pathsel.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_spinner.c
===================================================================
--- trunk/src/ui_spinner.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_spinner.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_spinner.h
===================================================================
--- trunk/src/ui_spinner.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_spinner.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_tabcomp.c
===================================================================
--- trunk/src/ui_tabcomp.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_tabcomp.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_tabcomp.h
===================================================================
--- trunk/src/ui_tabcomp.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_tabcomp.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_tree_edit.c
===================================================================
--- trunk/src/ui_tree_edit.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_tree_edit.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_tree_edit.h
===================================================================
--- trunk/src/ui_tree_edit.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_tree_edit.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_utildlg.c
===================================================================
--- trunk/src/ui_utildlg.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_utildlg.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/ui_utildlg.h
===================================================================
--- trunk/src/ui_utildlg.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/ui_utildlg.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/uri_utils.c
===================================================================
--- trunk/src/uri_utils.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/uri_utils.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: John Ellis, Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/uri_utils.h
===================================================================
--- trunk/src/uri_utils.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/uri_utils.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis, Vladimir Nadvornik, Laurent Monin
  *

Modified: trunk/src/utilops.c
===================================================================
--- trunk/src/utilops.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/utilops.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/utilops.h
===================================================================
--- trunk/src/utilops.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/utilops.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_dir.c
===================================================================
--- trunk/src/view_dir.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Laurent Monin
  *

Modified: trunk/src/view_dir.h
===================================================================
--- trunk/src/view_dir.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Laurent Monin
  *

Modified: trunk/src/view_dir_list.c
===================================================================
--- trunk/src/view_dir_list.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir_list.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_dir_list.h
===================================================================
--- trunk/src/view_dir_list.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir_list.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_dir_tree.c
===================================================================
--- trunk/src/view_dir_tree.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir_tree.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_dir_tree.h
===================================================================
--- trunk/src/view_dir_tree.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_dir_tree.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_file.c
===================================================================
--- trunk/src/view_file.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Laurent Monin
  *

Modified: trunk/src/view_file.h
===================================================================
--- trunk/src/view_file.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: Laurent Monin
  *

Modified: trunk/src/view_file_icon.c
===================================================================
--- trunk/src/view_file_icon.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file_icon.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_file_icon.h
===================================================================
--- trunk/src/view_file_icon.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file_icon.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_file_list.c
===================================================================
--- trunk/src/view_file_list.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file_list.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/view_file_list.h
===================================================================
--- trunk/src/view_file_list.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/view_file_list.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Author: John Ellis
  *

Modified: trunk/src/window.c
===================================================================
--- trunk/src/window.c2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/window.c2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *

Modified: trunk/src/window.h
===================================================================
--- trunk/src/window.h2010-02-16 21:10:12 UTC (rev 1906)
+++ trunk/src/window.h2010-02-16 21:18:03 UTC (rev 1907)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,6 +1,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2010 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-16T21:18:04</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/841">
    <title>SF.net SVN: geeqie:[1906] trunk/configure.in</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/841</link>
    <description>&lt;pre&gt;Revision: 1906
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1906&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-16 21:10:12 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
updated version string

Modified Paths:
--------------
    trunk/configure.in

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in2010-02-16 20:07:05 UTC (rev 1905)
+++ trunk/configure.in2010-02-16 21:10:12 UTC (rev 1906)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -15,7 +15,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT(geeqie, 1.0beta2, geeqie-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f&amp;lt; at &amp;gt;public.gmane.org)
+AC_INIT(geeqie, 1.0, geeqie-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f&amp;lt; at &amp;gt;public.gmane.org)
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-16T21:10:12</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/840">
    <title>SF.net SVN: geeqie:[1905] trunk/po/pt_BR.po</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/840</link>
    <description>&lt;pre&gt;Revision: 1905
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1905&amp;amp;view=rev
Author:   zas_
Date:     2010-02-16 20:07:05 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Restore translators list, removed by revision 1899.

Revision Links:
--------------
    http://geeqie.svn.sourceforge.net/geeqie/?rev=1899&amp;amp;view=rev

Modified Paths:
--------------
    trunk/po/pt_BR.po

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po2010-02-16 19:55:35 UTC (rev 1904)
+++ trunk/po/pt_BR.po2010-02-16 20:07:05 UTC (rev 1905)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,3 +1,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
+# geeqie pt_BR.po file.
+#
+# Created by Guilherme M. Schroeder &amp;lt;slump&amp;lt; at &amp;gt;linuxall.org&amp;gt;, 2001.
+# Updated by Herval Ribeiro de Azevêdo &amp;lt;heraze&amp;lt; at &amp;gt;gmail.com&amp;gt;, 2005.
+# Updated by Sérgio Cipolla &amp;lt;secipolla&amp;lt; at &amp;gt;gmail.com&amp;gt;, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Geeqie 2.1.1\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2,3 +7,3 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-02 21:16+0100\n"
+"POT-Creation-Date: 2010-02-16 21:05+0100\n"
 "PO-Revision-Date: 2010-01-31 12:15-0300\n"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn&amp;lt; at &amp;gt;lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
&lt;/pre&gt;</description>
    <dc:creator>zas_-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-16T20:07:05</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/839">
    <title>SF.net SVN: geeqie:[1904] trunk/po/ru.po</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/839</link>
    <description>&lt;pre&gt;Revision: 1904
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1904&amp;amp;view=rev
Author:   zas_
Date:     2010-02-16 19:55:35 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Update russian translation. Thanks to Denis Silakov.

Modified Paths:
--------------
    trunk/po/ru.po

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po2010-02-14 22:00:23 UTC (rev 1903)
+++ trunk/po/ru.po2010-02-16 19:55:35 UTC (rev 1904)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -6,16 +6,18 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 # Edited by Oleg Andryuschenko &amp;lt;oandr&amp;lt; at &amp;gt;itek.com.ua&amp;gt;, 2002.
 # Edited by drF_ckoff &amp;lt;dfo&amp;lt; at &amp;gt;antex.ru&amp;gt;, 2003-2004.
 # Edited by Vitaly Lipatov &amp;lt;lav&amp;lt; at &amp;gt;altlinux.ru&amp;gt;, 2005.
+# Edited by Alexandre Prokoudine &amp;lt;alexandre.prokoudine&amp;lt; at &amp;gt;gmail.com&amp;gt;, 2008.
+# Edited by Denis Silakov &amp;lt;d_uragan&amp;lt; at &amp;gt;rambler.ru&amp;gt;, 2010.
 #
 # $Id$
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: geeqie 1.0alpha1\n"
+"Project-Id-Version: geeqie 1.0beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-14 18:36+0400\n"
-"PO-Revision-Date: 2008-05-14 20:23+0300\n"
-"Last-Translator: Alexandre Prokoudine &amp;lt;alexandre.prokoudine&amp;lt; at &amp;gt;gmail.com&amp;gt;\n"
+"POT-Creation-Date: 2010-02-16 20:54+0100\n"
+"PO-Revision-Date: 2010-02-12 20:23+0300\n"
+"Last-Translator: Denis Silakov &amp;lt;d_uragan&amp;lt; at &amp;gt;rambler.ru&amp;gt;\n"
 "Language-Team: Russian &amp;lt;gnome-cyr&amp;lt; at &amp;gt;lists.gnome.org&amp;gt;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -23,155 +25,346 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: .././src/bar_exif.c:454
-msgid "Tag"
-msgstr "Поле"
+#: ../geeqie.desktop.in.h:1
+msgid "Geeqie"
+msgstr "Geeqie"
 
-#: .././src/bar_exif.c:455
-#: .././src/dupe.c:2634
-#: .././src/dupe.c:3155
-#: .././src/print.c:3231
-#: .././src/search.c:2740
-#: .././src/utilops.c:3096
-#: .././src/view_file_list.c:2026
-msgid "Name"
-msgstr "Название"
+#: ../geeqie.desktop.in.h:2
+msgid "Image Viewer"
+msgstr "Программа просмотра изображений"
 
-#: .././src/bar_exif.c:456
+#: ../geeqie.desktop.in.h:3
+msgid "View and manage images"
+msgstr "Просмотр и управление изображениями"
+
+#: ../plugins/import/geeqie-import-geeqie.desktop.in.h:1
+msgid "Import Geeqie 1.0alphaX metadata"
+msgstr "Импорт метаданных Geeqie 1.0alphaX"
+
+#: ../plugins/import/geeqie-import-gqview.desktop.in.h:1
+msgid "Import GQView metadata"
+msgstr "Импорт метаданных GQView"
+
+#: ../plugins/rotate/rotate.desktop.in.h:1
+msgid "Apply the orientation to image content"
+msgstr "Применить изменение ориентации непосредственно к изображению."
+
+#: ../plugins/symlink/symlink.desktop.in.h:1
+msgid "Symlink"
+msgstr "Символьная ссылка"
+
+#: ../plugins/ufraw/geeqie-ufraw.desktop.in.h:1
+msgid "UFRaw Batch"
+msgstr "Пакетная обработка UFRaw"
+
+#: ../plugins/ufraw/geeqie-ufraw-id.desktop.in.h:1
+msgid "Edit UFRaw ID file"
+msgstr "Редактировать ID-файл UFRaw"
+
+#: ../plugins/ufraw/geeqie-ufraw-recursive.desktop.in.h:1
+msgid "UFRaw Batch recursive"
+msgstr "Рекурсивная пакетная обработка UFRaw"
+
+#: ../src/advanced_exif.c:328 ../src/cache_maint.c:1284
+#: ../src/preferences.c:93 ../src/preferences.c:1595
+msgid "Metadata"
+msgstr "Метаданные"
+
+#: ../src/advanced_exif.c:376 ../src/preferences.c:1512
+msgid "Description"
+msgstr "Описание"
+
+#: ../src/advanced_exif.c:377
 msgid "Value"
 msgstr "Значение"
 
-#: .././src/bar_exif.c:457
+#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2647
+#: ../src/dupe.c:3165 ../src/print.c:3201 ../src/search.c:2844
+#: ../src/utilops.c:462 ../src/view_file_list.c:2046
+msgid "Name"
+msgstr "Название"
+
+#: ../src/advanced_exif.c:379
+msgid "Tag"
+msgstr "Поле"
+
+#: ../src/advanced_exif.c:380
 msgid "Format"
 msgstr "Формат"
 
-#: .././src/bar_exif.c:458
+#: ../src/advanced_exif.c:381
 msgid "Elements"
 msgstr "Элементы"
 
-#: .././src/bar_exif.c:459
-#: .././src/preferences.c:1106
-msgid "Description"
-msgstr "Описание"
+#. default sidebar
+#: ../src/bar.c:167
+msgid "Histogram"
+msgstr "Гистограмма"
 
-#: .././src/bar_exif.c:585
-#: .././src/info.c:124
-#: .././src/preferences.c:1249
+#: ../src/bar.c:168
+msgid "Title"
+msgstr "Название"
+
+#: ../src/bar.c:169 ../src/search.c:2767
+msgid "Keywords"
+msgstr "Ключевые слова"
+
+#: ../src/bar.c:170 ../src/search.c:2779
+msgid "Comment"
+msgstr "Комментарий"
+
+#: ../src/bar.c:171
 msgid "Exif"
 msgstr "Данные Exif"
 
-#: .././src/bar_exif.c:659
-msgid "Advanced view"
-msgstr "Расширенный вид"
+#. other pre-configured panes
+#: ../src/bar.c:173
+msgid "File info"
+msgstr "Информация о файле"
 
-#: .././src/bar_info.c:34
-msgid "Favorite"
-msgstr "Любимое"
+#: ../src/bar.c:174
+msgid "Location and GPS"
+msgstr "Расположение и GPS"
 
-#: .././src/bar_info.c:35
-msgid "Todo"
-msgstr "Доделать"
+#: ../src/bar.c:175 ../src/exif.c:347
+msgid "Copyright"
+msgstr "Авторское право"
 
-#: .././src/bar_info.c:36
-msgid "People"
-msgstr "Люди"
+#: ../src/bar.c:178 ../src/bar_gps.c:768
+msgid "GPS Map"
+msgstr "Карта GPS"
 
-#: .././src/bar_info.c:37
-msgid "Places"
-msgstr "Места"
+#: ../src/bar.c:297
+msgid "Move to _top"
+msgstr "Разместить _сверху"
 
-#: .././src/bar_info.c:38
-msgid "Art"
-msgstr "Искусство"
+#: ../src/bar.c:298 ../src/ui_bookmark.c:405
+msgid "Move _up"
+msgstr "Переместить _вверх"
 
-#: .././src/bar_info.c:39
-msgid "Nature"
-msgstr "Природа"
+#: ../src/bar.c:299 ../src/ui_bookmark.c:407
+msgid "Move _down"
+msgstr "Переместить в_низ"
 
-#: .././src/bar_info.c:40
-msgid "Possessions"
-msgstr "Собственность"
+#: ../src/bar.c:300
+msgid "Move to _bottom"
+msgstr "Разместить сни_зу"
 
-#: .././src/bar_info.c:713
-msgid "Keyword Presets"
-msgstr "Предустановки ключевых слов"
+#: ../src/bar.c:302
+msgid "Remove"
+msgstr "Удалить"
 
-#: .././src/bar_info.c:716
-msgid "Favorite keywords list"
-msgstr "Список любимых ключевых слов"
+#: ../src/bar_comment.c:191
+msgid "Add text to selected files"
+msgstr "Добавить текст в выбранные файлы"
 
-#: .././src/bar_info.c:1186
-#: .././src/info.c:188
-#: .././src/search.c:2679
-msgid "Keywords"
-msgstr "Ключевые слова"
+#: ../src/bar_comment.c:192
+msgid "Replace existing text in selected files"
+msgstr "Заменить существующий текст в выбранных файлах"
 
-#: .././src/bar_info.c:1200
-#: .././src/info.c:826
-#: .././src/pan-view.c:1540
-#: .././src/print.c:2631
-msgid "Filename:"
-msgstr "Название файла:"
+#: ../src/bar_exif.c:213
+msgid "&amp;lt;empty label, fixme&amp;gt;"
+msgstr "&amp;lt;пустая метка, добавьте значение&amp;gt;"
 
-#: .././src/bar_info.c:1201
-#: .././src/info.c:390
-msgid "File date:"
-msgstr "Время файла:"
+#: ../src/bar_exif.c:538 ../src/bar_exif.c:548
+msgid "Configure entry"
+msgstr "Редактировать запись"
 
-#: .././src/bar_info.c:1221
-msgid "Keywords:"
-msgstr "Ключевые слова"
+#. for the pane
+#: ../src/bar_exif.c:538 ../src/bar_exif.c:548 ../src/bar_exif.c:621
+msgid "Add entry"
+msgstr "Добавить запись"
 
-#: .././src/bar_info.c:1289
-msgid "Comment:"
-msgstr "Комментарий:"
+#: ../src/bar_exif.c:554
+msgid "Key:"
+msgstr "Ключевое слово"
 
-#: .././src/bar_info.c:1313
-msgid "Edit favorite keywords list."
-msgstr "Редактирование списка любимых ключевых слов"
+#: ../src/bar_exif.c:563
+msgid "Title:"
+msgstr "Название:"
 
-#: .././src/bar_info.c:1317
-msgid "Add keywords to selected files"
-msgstr "Добавить ключевые слова в выбранные файлы"
+#: ../src/bar_exif.c:572
+msgid "Show only if set"
+msgstr "Показывать, только если значение не пусто"
 
-#: .././src/bar_info.c:1320
-msgid "Add keywords to selected files, replacing the existing ones."
-msgstr "Добавить ключевые слова в выбранные файлы, заменяя существующие"
+#: ../src/bar_exif.c:573
+msgid "Editable (supported only for XMP)"
+msgstr "Редактируемый (поддерживается только для XMP)"
 
-#: .././src/bar_info.c:1324
-msgid "Save comment now"
-msgstr "Сохранить комментарий сейчас"
+#. for the entry
+#: ../src/bar_exif.c:609
+#, c-format
+msgid "Configure \"%s\""
+msgstr "Настроить \"%s\""
 
-#: .././src/bar_sort.c:218
-#, fuzzy, c-format
+#: ../src/bar_exif.c:610 ../src/bar_keywords.c:1143
+#, c-format
+msgid "Remove \"%s\""
+msgstr "Удалить \"%s\""
+
+#: ../src/bar_exif.c:622
+msgid "Show hidden entries"
+msgstr "Показать скрытые файлы"
+
+#: ../src/bar_gps.c:499
+#, c-format
+msgid "Zoom %i"
+msgstr "Масштаб %i"
+
+#: ../src/bar_gps.c:517
+#, c-format
+msgid "Zoom level %i"
+msgstr "Уровень масштабирования %i"
+
+#: ../src/bar_gps.c:522
+msgid "Loading map"
+msgstr "Загружается карта"
+
+#: ../src/bar_gps.c:584
+msgid "Enable markers"
+msgstr "Включить маркеры"
+
+#: ../src/bar_gps.c:586
+msgid "Centre map on marker"
+msgstr "Отцентрировать карту по маркеру"
+
+#: ../src/bar_gps.c:609
 msgid ""
-"Unable to remove symbolic link:\n"
-"%s"
+"Move map centre to marker\n"
+" is disabled"
 msgstr ""
-"Невозможно переместить файл:\n"
-"%s\n"
-"в:\n"
-"%s"
+"Перемещение центра карты на маркер\n"
+" отключено"
 
-#: .././src/bar_sort.c:219
-msgid "Unlink failed"
-msgstr "Удаление ссылки не удалось"
-
-#: .././src/bar_sort.c:298
-#, fuzzy, c-format
+#: ../src/bar_gps.c:614
 msgid ""
-"Unable to create symbolic link:\n"
-"%s"
+"Move map centre to marker\n"
+" is enabled"
 msgstr ""
-"Невозможно создать каталог:\n"
-"%s"
+"Перемещение центра карты на маркер\n"
+" включено"
 
-#: .././src/bar_sort.c:299
-msgid "Link failed"
-msgstr "Создание ссылки не удалось"
+#: ../src/bar_gps.c:623
+msgid "Map Centreing"
+msgstr "Центрирование карты"
 
-#: .././src/bar_sort.c:436
+#. use the same strings as in layout_util.c
+#: ../src/bar_histogram.c:242 ../src/layout_util.c:1392
+msgid "Histogram on _Red"
+msgstr "Гистограмма _красного канала"
+
+#: ../src/bar_histogram.c:243 ../src/layout_util.c:1393
+msgid "Histogram on _Green"
+msgstr "Гистограмма _зеленого канала"
+
+#: ../src/bar_histogram.c:244 ../src/layout_util.c:1394
+msgid "Histogram on _Blue"
+msgstr "Гистограмма _синего канала"
+
+#: ../src/bar_histogram.c:245 ../src/layout_util.c:1395
+msgid "_Histogram on RGB"
+msgstr "_Гистограмма RGB"
+
+#: ../src/bar_histogram.c:246 ../src/layout_util.c:1396
+msgid "Histogram on _Value"
+msgstr "Гистограмма на з_начение"
+
+#: ../src/bar_histogram.c:250 ../src/layout_util.c:1400
+msgid "Li_near Histogram"
+msgstr "_Линейная гистограмма"
+
+#: ../src/bar_histogram.c:251
+msgid "L_og Histogram"
+msgstr "Л_огарифмическая гистограмма"
+
+#: ../src/bar_keywords.c:410
+msgid "Add keywords to selected files"
+msgstr "Добавить ключевые слова в выбранные файлы"
+
+#: ../src/bar_keywords.c:411
+msgid "Replace existing keywords in selected files"
+msgstr "Заменить выбранные ключевые слова в выделенных файлах"
+
+#: ../src/bar_keywords.c:884
+msgid "Edit keyword"
+msgstr "Изменить ключевое слово"
+
+#: ../src/bar_keywords.c:884
+msgid "Add keywords"
+msgstr "Добавить ключевые слова"
+
+#: ../src/bar_keywords.c:891
+msgid "Configure keyword"
+msgstr "Редактировать ключевое слово"
+
+#: ../src/bar_keywords.c:891 ../src/bar_keywords.c:1101
+msgid "Add keyword"
+msgstr "Добавить ключевое слово"
+
+#: ../src/bar_keywords.c:897
+msgid "Keyword:"
+msgstr "Ключевое слово"
+
+#: ../src/bar_keywords.c:906
+msgid "Keyword type:"
+msgstr "Тип ключевого слова"
+
+#: ../src/bar_keywords.c:908
+msgid "Active keyword"
+msgstr "Активное ключевое слово"
+
+#: ../src/bar_keywords.c:911
+msgid "Helper"
+msgstr "Помощник"
+
+#: ../src/bar_keywords.c:1121
 #, c-format
+msgid "Hide \"%s\""
+msgstr "Скрыть \"%s\""
+
+#: ../src/bar_keywords.c:1128
+#, c-format
+msgid "Mark %d"
+msgstr "Закладка %d"
+
+#: ../src/bar_keywords.c:1133
+#, c-format
+msgid "Connect \"%s\" to mark"
+msgstr "Добавить \"%s\" в закладку"
+
+#: ../src/bar_keywords.c:1140
+#, c-format
+msgid "Edit \"%s\""
+msgstr "Выйти из \"%s\""
+
+#: ../src/bar_keywords.c:1150
+#, c-format
+msgid "Disconnect \"%s\" from mark %s"
+msgstr "Отсоединить \"%s\" от закладки %s"
+
+#. for the pane
+#: ../src/bar_keywords.c:1162 ../src/bar_keywords.c:1171
+msgid "Expand checked"
+msgstr "Раскрыть отмеченные"
+
+#: ../src/bar_keywords.c:1163 ../src/bar_keywords.c:1172
+msgid "Collapse unchecked"
+msgstr "Свернуть неотмеченные"
+
+#: ../src/bar_keywords.c:1164 ../src/bar_keywords.c:1173
+msgid "Hide unchecked"
+msgstr "Скрыть неотмеченные"
+
+#: ../src/bar_keywords.c:1165
+msgid "Show all"
+msgstr "Показать все"
+
+#: ../src/bar_keywords.c:1168
+msgid "On any change"
+msgstr "При любом изменении"
+
+#: ../src/bar_sort.c:449
+#, c-format
 msgid ""
 "The collection:\n"
 "%s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -181,13 +374,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "%s\n"
 "уже существует."
 
-#: .././src/bar_sort.c:437
+#: ../src/bar_sort.c:450
 msgid "Collection exists"
 msgstr "Коллекция уже существует"
 
-#: .././src/bar_sort.c:451
-#: .././src/collect.c:1081
-#: .././src/collect-dlg.c:85
+#: ../src/bar_sort.c:464 ../src/collect.c:1098 ../src/collect-dlg.c:85
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -196,323 +387,206 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Не удалось сохранить коллекцию:\n"
 "%s"
 
-#: .././src/bar_sort.c:452
-#: .././src/collect.c:1082
-#: .././src/collect-dlg.c:86
+#: ../src/bar_sort.c:465 ../src/collect.c:1099 ../src/collect-dlg.c:86
 msgid "Save Failed"
 msgstr "Не удалось сохранить"
 
-#: .././src/bar_sort.c:486
-#: .././src/bar_sort.c:612
+#: ../src/bar_sort.c:500 ../src/bar_sort.c:670
 msgid "Add Bookmark"
 msgstr "Добавить закладку"
 
-#: .././src/bar_sort.c:490
+#: ../src/bar_sort.c:504
 msgid "Add Collection"
 msgstr "Добавить коллекцию"
 
-#: .././src/bar_sort.c:507
-#: .././src/ui_bookmark.c:600
+#: ../src/bar_sort.c:521 ../src/ui_bookmark.c:288
 msgid "Name:"
 msgstr "Название:"
 
-#: .././src/bar_sort.c:569
+#: ../src/bar_sort.c:597
 msgid "Sort Manager"
 msgstr "Менеджер сортировки"
 
-#: .././src/bar_sort.c:578
-#: .././src/pan-view.c:2393
-#: .././src/ui_pathsel.c:1102
+#: ../src/bar_sort.c:606 ../src/pan-view.c:2395 ../src/ui_pathsel.c:1099
 msgid "Folders"
 msgstr "Каталоги"
 
-#: .././src/bar_sort.c:579
-#: .././src/main.c:1230
+#: ../src/bar_sort.c:607 ../src/options.c:140
 msgid "Collections"
 msgstr "Коллекции"
 
-#: .././src/bar_sort.c:587
-#: .././src/utilops.c:1174
+#: ../src/bar_sort.c:615 ../src/utilops.c:2124
 msgid "Copy"
 msgstr "Копировать"
 
-#: .././src/bar_sort.c:590
-#: .././src/utilops.c:1188
+#: ../src/bar_sort.c:618 ../src/utilops.c:2075
 msgid "Move"
 msgstr "Переместить"
 
-#: .././src/bar_sort.c:593
-msgid "Link"
-msgstr "Создать ссылку"
-
-#: .././src/bar_sort.c:599
+#: ../src/bar_sort.c:657
 msgid "Add image"
 msgstr "Добавить изображение"
 
-#: .././src/bar_sort.c:602
+#: ../src/bar_sort.c:660
 msgid "Add selection"
 msgstr "Добавить выделение"
 
-#: .././src/bar_sort.c:615
+#: ../src/bar_sort.c:673
 msgid "Undo last image"
 msgstr "Отменить последнее изображение"
 
-#: .././src/cache_maint.c:127
-#: .././src/cache_maint.c:685
-#: .././src/cache_maint.c:898
-#: .././src/editors.c:716
+#: ../src/cache.c:174
+#, c-format
+msgid ""
+"error saving sim cache data: %s\n"
+"error: %s\n"
+msgstr ""
+"ошибка сохранения кэш-данных sim: %s\n"
+"ошибка: %s\n"
+
+#: ../src/cache_maint.c:129 ../src/cache_maint.c:722 ../src/cache_maint.c:938
+#: ../src/editors.c:1176
 msgid "done"
 msgstr "Готово"
 
-#: .././src/cache_maint.c:304
+#: ../src/cache_maint.c:307
 msgid "Removing old metadata..."
 msgstr "Удаляются старые метаданные..."
 
-#: .././src/cache_maint.c:308
+#: ../src/cache_maint.c:311
 msgid "Clearing cached thumbnails..."
-msgstr "Удаляются кэшированные эскизы..."
+msgstr "Удаляются кэшированные миниатюры..."
 
-#: .././src/cache_maint.c:312
-#: .././src/cache_maint.c:1052
+#: ../src/cache_maint.c:315 ../src/cache_maint.c:1096
 msgid "Removing old thumbnails..."
-msgstr "Удаляются старые эскизы..."
+msgstr "Удаляются старые миниатюры..."
 
-#: .././src/cache_maint.c:315
-#: .././src/cache_maint.c:1055
+#: ../src/cache_maint.c:318 ../src/cache_maint.c:1099
 msgid "Maintenance"
 msgstr "Управление"
 
-#: .././src/cache_maint.c:796
-#: .././src/utilops.c:1104
+#: ../src/cache_maint.c:833
 msgid "Invalid folder"
 msgstr "Неправильный каталог"
 
-#: .././src/cache_maint.c:797
+#: ../src/cache_maint.c:834
 msgid "The specified folder can not be found."
 msgstr "Выбранный каталог не может быть найден."
 
-#: .././src/cache_maint.c:825
-#: .././src/cache_maint.c:839
-#: .././src/cache_maint.c:1223
+#: ../src/cache_maint.c:865 ../src/cache_maint.c:879 ../src/cache_maint.c:1275
 msgid "Create thumbnails"
-msgstr "Создание эскизов"
+msgstr "Создать миниатюры"
 
-#: .././src/cache_maint.c:833
-#: .././src/cache_maint.c:1062
+#: ../src/cache_maint.c:873 ../src/cache_maint.c:1106
 msgid "S_tart"
 msgstr "_Начать"
 
-#: .././src/cache_maint.c:846
-#: .././src/preferences.c:1373
+#: ../src/cache_maint.c:886 ../src/preferences.c:1782
 msgid "Folder:"
 msgstr "Каталог:"
 
-#: .././src/cache_maint.c:849
+#: ../src/cache_maint.c:889
 msgid "Select folder"
 msgstr "Выбрать каталог"
 
-#: .././src/cache_maint.c:853
+#: ../src/cache_maint.c:893
 msgid "Include subfolders"
 msgstr "Включать подкаталоги"
 
-#: .././src/cache_maint.c:854
+#: ../src/cache_maint.c:894
 msgid "Store thumbnails local to source images"
-msgstr "Сохранять эскизы в одном каталоге с изображениями"
+msgstr "Сохранять миниатюры в одном каталоге с изображениями"
 
-#: .././src/cache_maint.c:863
-#: .././src/cache_maint.c:1071
+#: ../src/cache_maint.c:903 ../src/cache_maint.c:1115
 msgid "click start to begin"
 msgstr "Нажмите «Начать» для запуска"
 
-#: .././src/cache_maint.c:1001
-#: .././src/editors.c:646
+#: ../src/cache_maint.c:1042 ../src/editors.c:1102
 msgid "running..."
 msgstr "выполняю..."
 
-#: .././src/cache_maint.c:1047
+#: ../src/cache_maint.c:1091
 msgid "Clearing thumbnails..."
-msgstr "Удаляются эскизы..."
+msgstr "Удаляются миниатюры..."
 
-#: .././src/cache_maint.c:1113
-#: .././src/cache_maint.c:1116
-#: .././src/cache_maint.c:1198
-#: .././src/cache_maint.c:1218
+#: ../src/cache_maint.c:1157 ../src/cache_maint.c:1160
+#: ../src/cache_maint.c:1253 ../src/cache_maint.c:1270
 msgid "Clear cache"
 msgstr "Очистить кэш"
 
-#: .././src/cache_maint.c:1117
+#: ../src/cache_maint.c:1161
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
-msgstr "Все сохраненные на диск эскизы будут удалены. Продолжить?"
+msgstr "Все сохраненные на диск миниатюры будут удалены. Продолжить?"
 
-#: .././src/cache_maint.c:1168
+#: ../src/cache_maint.c:1203
+#, c-format
+msgid "Location: %s"
+msgstr "Расположение: %s"
+
+#: ../src/cache_maint.c:1228
 msgid "Cache Maintenance"
 msgstr "Управление кэшем"
 
-#: .././src/cache_maint.c:1180
+#: ../src/cache_maint.c:1238
 msgid "Cache and Data Maintenance"
 msgstr "Управление кэшем и данными"
 
-#: .././src/cache_maint.c:1184
+#: ../src/cache_maint.c:1242
 msgid "Thumbnail cache"
-msgstr "Кэш эскизов Geeqie"
+msgstr "Кэш миниатюр"
 
-#: .././src/cache_maint.c:1186
-#: .././src/cache_maint.c:1206
-#: .././src/cache_maint.c:1234
-#: .././src/pan-view.c:1542
-#: .././src/pan-view.c:2382
-#: .././src/preferences.c:1308
-#: .././src/utilops.c:1872
-msgid "Location:"
-msgstr "Расположение:"
-
-#: .././src/cache_maint.c:1193
-#: .././src/cache_maint.c:1213
-#: .././src/cache_maint.c:1241
+#: ../src/cache_maint.c:1248 ../src/cache_maint.c:1265
+#: ../src/cache_maint.c:1290
 msgid "Clean up"
 msgstr "Очистить"
 
-#: .././src/cache_maint.c:1196
-#: .././src/cache_maint.c:1216
+#: ../src/cache_maint.c:1251 ../src/cache_maint.c:1268
 msgid "Remove orphaned or outdated thumbnails."
-msgstr "Удалить осиротевшие или устаревшие эскизы"
+msgstr "Удалить осиротевшие или устаревшие миниатюры"
 
-#: .././src/cache_maint.c:1201
-#: .././src/cache_maint.c:1221
+#: ../src/cache_maint.c:1256 ../src/cache_maint.c:1273
 msgid "Delete all cached thumbnails."
-msgstr "Удалить все закэшированные эскизы"
+msgstr "Удалить все закэшированные миниатюры"
 
-#: .././src/cache_maint.c:1204
+#: ../src/cache_maint.c:1259
 msgid "Shared thumbnail cache"
-msgstr "Общий кэш эскизов"
+msgstr "Общий кэш миниатюр"
 
-#: .././src/cache_maint.c:1227
+#: ../src/cache_maint.c:1279
 msgid "Render"
 msgstr "Создать"
 
-#: .././src/cache_maint.c:1230
+#: ../src/cache_maint.c:1282
 msgid "Render thumbnails for a specific folder."
-msgstr "Создать эскизы для выбранного каталога"
+msgstr "Создать миниатюры для выбранного каталога"
 
-#: .././src/cache_maint.c:1232
-msgid "Metadata"
-msgstr "Метаданные"
-
-#: .././src/cache_maint.c:1244
+#: ../src/cache_maint.c:1293
 msgid "Remove orphaned keywords and comments."
 msgstr "Удалить осиротевшие ключевые слова и комментарии"
 
-#: .././src/cellrenderericon.c:127
-msgid "Pixbuf Object"
-msgstr ""
-
-#: .././src/cellrenderericon.c:128
-msgid "The pixbuf to render"
-msgstr ""
-
-#: .././src/cellrenderericon.c:135
-#: .././src/print.c:3438
-msgid "Text"
-msgstr "Текст"
-
-#: .././src/cellrenderericon.c:136
-msgid "Text to render"
-msgstr ""
-
-#: .././src/cellrenderericon.c:143
-msgid "Background color"
-msgstr "Цвет фона"
-
-#: .././src/cellrenderericon.c:144
-#, fuzzy
-msgid "Background color as a GdkColor"
-msgstr "Выводить изображения на черном фоне"
-
-#: .././src/cellrenderericon.c:151
-#, fuzzy
-msgid "Foreground color"
-msgstr "Выводить изображения на черном фоне"
-
-#: .././src/cellrenderericon.c:152
-msgid "Foreground color as a GdkColor"
-msgstr ""
-
-#: .././src/cellrenderericon.c:159
-msgid "Focus"
-msgstr "Фокус"
-
-#: .././src/cellrenderericon.c:160
-msgid "Draw focus indicator"
-msgstr ""
-
-#: .././src/cellrenderericon.c:167
-msgid "Fixed width"
-msgstr "Фиксированная ширина"
-
-#: .././src/cellrenderericon.c:168
-msgid "Width of cell"
-msgstr ""
-
-#: .././src/cellrenderericon.c:176
-msgid "Fixed height"
-msgstr "Фиксированная высота"
-
-#: .././src/cellrenderericon.c:177
-msgid "Height of icon excluding text"
-msgstr ""
-
-#: .././src/cellrenderericon.c:185
-#, fuzzy
-msgid "Background set"
-msgstr "Выводить изображения на черном фоне"
-
-#: .././src/cellrenderericon.c:186
-msgid "Whether this tag affects the background color"
-msgstr ""
-
-#: .././src/cellrenderericon.c:193
-msgid "Foreground set"
-msgstr ""
-
-#: .././src/cellrenderericon.c:194
-msgid "Whether this tag affects the foreground color"
-msgstr ""
-
-#: .././src/cellrenderericon.c:201
-#, fuzzy
-msgid "Show text"
-msgstr "Показать _названия файлов"
-
-#: .././src/cellrenderericon.c:202
-msgid "Whether the text is displayed"
-msgstr ""
-
-#: .././src/collect.c:351
-#: .././src/image.c:177
-#: .././src/image-overlay.c:289
-#: .././src/image-overlay.c:362
-#, c-format
+#. When does this occur ??
+#: ../src/collect.c:366 ../src/image.c:160 ../src/image-overlay.c:512
+#: ../src/image-overlay.c:591
 msgid "Untitled"
 msgstr "Безымянный"
 
-#: .././src/collect.c:355
+#: ../src/collect.c:370
 #, c-format
 msgid "Untitled (%d)"
 msgstr "Безымянный (%d)"
 
-#: .././src/collect.c:1000
+#: ../src/collect.c:1016
 #, c-format
 msgid "%s - Collection - %s"
 msgstr "%s — Коллекция — %s"
 
-#: .././src/collect.c:1118
-#: .././src/collect.c:1122
+#: ../src/collect.c:1135 ../src/collect.c:1139
 msgid "Close collection"
 msgstr "Закрыть коллекцию"
 
-#: .././src/collect.c:1123
+#: ../src/collect.c:1140
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -520,11 +594,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Коллекция была изменена.\n"
 "Сохранить сначала?"
 
-#: .././src/collect.c:1126
+#: ../src/collect.c:1143
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: .././src/collect-dlg.c:59
+#: ../src/collect-dlg.c:59
 #, c-format
 msgid ""
 "Specified path:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -535,482 +609,453 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "%s\n"
 "является каталогом, а коллекции - файлы"
 
-#: .././src/collect-dlg.c:60
+#: ../src/collect-dlg.c:60
 msgid "Invalid filename"
 msgstr "Неправильное название файла"
 
-#: .././src/collect-dlg.c:69
+#: ../src/collect-dlg.c:69
 msgid "Overwrite File"
 msgstr "Перезаписать файл"
 
-#: .././src/collect-dlg.c:74
+#: ../src/collect-dlg.c:74
 msgid "Overwrite existing file?"
 msgstr "Заменить существующий файл?"
 
-#: .././src/collect-dlg.c:76
-#: .././src/utilops.c:657
-#: .././src/utilops.c:987
-#: .././src/utilops.c:2027
-#: .././src/utilops.c:2747
+#: ../src/collect-dlg.c:76
 msgid "_Overwrite"
 msgstr "_Перезаписать"
 
-#: .././src/collect-dlg.c:170
+#: ../src/collect-dlg.c:127
+#, c-format
+msgid "No such file '%s'."
+msgstr "Нет такого файла '%s'."
+
+#: ../src/collect-dlg.c:132
+#, c-format
+msgid "'%s' is a directory, not a collection file."
+msgstr "'%s' — каталог, а не файл коллекции."
+
+#: ../src/collect-dlg.c:137
+#, c-format
+msgid "You do not have read permissions on the file '%s'."
+msgstr "У вас нет прав на чтение файла '%s'."
+
+#: ../src/collect-dlg.c:143
+msgid "Can not open collection file"
+msgstr "Не удалось открыть файл коллекции"
+
+#: ../src/collect-dlg.c:195
 msgid "Save collection"
 msgstr "Сохранить коллекцию"
 
-#: .././src/collect-dlg.c:177
+#: ../src/collect-dlg.c:202
 msgid "Open collection"
 msgstr "Открыть коллекцию"
 
-#: .././src/collect-dlg.c:185
+#: ../src/collect-dlg.c:210
 msgid "Append collection"
 msgstr "Добавить коллекцию"
 
-#: .././src/collect-dlg.c:186
+#: ../src/collect-dlg.c:211
 msgid "_Append"
 msgstr "_Добавить"
 
-#: .././src/collect-dlg.c:204
+#: ../src/collect-dlg.c:228
 msgid "Collection Files"
 msgstr "Файлы коллекций"
 
-#: .././src/collect-dlg.c:222
+#: ../src/collect-dlg.c:245
 msgid "Collection empty"
 msgstr "Коллекция пустая"
 
-#: .././src/collect-dlg.c:223
+#: ../src/collect-dlg.c:246
 msgid "The current collection is empty, save aborted."
 msgstr "Текущая коллекция пустая, сохранение отменено."
 
-#: .././src/collect-io.c:341
-#, fuzzy, c-format
+#: ../src/collect-io.c:346
+#, c-format
 msgid "failed to open collection (write) \"%s\"\n"
-msgstr ""
-"Не удалось сохранить коллекцию:\n"
-"%s"
+msgstr "Не удалось открыть коллекцию: \"%s\"\n"
 
-#: .././src/collect-io.c:366
-#, fuzzy, c-format
+#: ../src/collect-io.c:371
+#, c-format
 msgid ""
 "error saving collection file: %s\n"
 "error: %s\n"
-msgstr "ошибка записи файла конфигурации: %s\n"
+msgstr ""
+"ошибка записи файла коллекции: %s\n"
+"error: %s\n"
 
-#: .././src/collect-table.c:166
-#: .././src/layout.c:371
-#: .././src/layout_util.c:957
-msgid "Empty"
-msgstr "Пусто"
-
-#: .././src/collect-table.c:170
+#: ../src/collect-table.c:211
 #, c-format
-msgid "%d images (%d)"
-msgstr "%d изображений (%d)"
+msgid "%s, %d images (%s, %d)"
+msgstr "%s, %d изображений (%s, %d)"
 
-#: .././src/collect-table.c:174
+#: ../src/collect-table.c:218
 #, c-format
-msgid "%d images"
-msgstr "%d изображений"
+msgid "%s, %d images"
+msgstr "%s, %d изображений"
 
-#: .././src/collect-table.c:188
-#: .././src/dupe.c:1326
-#: .././src/search.c:304
-#: .././src/view_file_icon.c:1901
-#: .././src/view_file_icon.c:2017
-#: .././src/view_file_list.c:1137
-#: .././src/view_file_list.c:1253
+#: ../src/collect-table.c:223 ../src/layout_util.c:1194
+#: ../src/layout_util.c:2231
+msgid "Empty"
+msgstr "Пусто"
+
+#: ../src/collect-table.c:237 ../src/dupe.c:1319 ../src/search.c:320
+#: ../src/view_file.c:835 ../src/view_file.c:938
 msgid "Loading thumbs..."
-msgstr "Загружаются эскизы..."
+msgstr "Загружаются миниатюры..."
 
-#: .././src/collect-table.c:768
-#: .././src/dupe.c:2230
-#: .././src/dupe.c:2542
-#: .././src/layout_util.c:1002
-#: .././src/search.c:969
+#: ../src/collect-table.c:866 ../src/dupe.c:2242 ../src/dupe.c:2555
+#: ../src/layout_util.c:1241 ../src/search.c:1000
 msgid "_View"
 msgstr "_Вид"
 
-#: .././src/collect-table.c:770
-#: .././src/dupe.c:2232
-#: .././src/dupe.c:2544
-#: .././src/img-view.c:1274
-#: .././src/layout_image.c:752
-#: .././src/pan-view.c:2803
-#: .././src/search.c:971
-#: .././src/view_file_icon.c:327
-#: .././src/view_file_list.c:573
+#: ../src/collect-table.c:868 ../src/dupe.c:2244 ../src/dupe.c:2557
+#: ../src/img-view.c:1281 ../src/layout_image.c:505 ../src/pan-view.c:2823
+#: ../src/search.c:1002 ../src/view_file.c:588
 msgid "View in _new window"
 msgstr "Просмотр в _новом окне"
 
-#: .././src/collect-table.c:773
-#: .././src/dupe.c:2262
-#: .././src/dupe.c:2552
-#: .././src/search.c:997
+#: ../src/collect-table.c:871 ../src/dupe.c:2278 ../src/dupe.c:2565
+#: ../src/search.c:1032
 msgid "Rem_ove"
 msgstr "Уд_алить"
 
-#: .././src/collect-table.c:776
+#: ../src/collect-table.c:874
 msgid "Append from file list"
 msgstr "Добавить из списка файлов"
 
-#: .././src/collect-table.c:778
+#: ../src/collect-table.c:876
 msgid "Append from collection..."
 msgstr "Добавить из коллекции..."
 
-#: .././src/collect-table.c:781
-#: .././src/dupe.c:2235
-#: .././src/dupe.c:2547
-#: .././src/search.c:974
+#: ../src/collect-table.c:880
+msgid "_Selection"
+msgstr "_Выделение"
+
+#: ../src/collect-table.c:882 ../src/dupe.c:2247 ../src/dupe.c:2560
+#: ../src/layout_util.c:1287 ../src/search.c:1005
 msgid "Select all"
 msgstr "Выделить всё"
 
-#: .././src/collect-table.c:783
-#: .././src/dupe.c:2237
-#: .././src/dupe.c:2549
-#: .././src/search.c:976
+#: ../src/collect-table.c:884 ../src/dupe.c:2249 ../src/dupe.c:2562
+#: ../src/layout_util.c:1288 ../src/search.c:1007
 msgid "Select none"
 msgstr "Снять выделение"
 
-#: .././src/collect-table.c:791
-#: .././src/dupe.c:2246
-#: .././src/img-view.c:1272
-#: .././src/layout_image.c:749
-#: .././src/layout_util.c:1055
-#: .././src/pan-view.c:2800
-#: .././src/search.c:981
-#: .././src/view_file_icon.c:324
-#: .././src/view_file_list.c:571
-msgid "_Properties"
-msgstr "_Свойства"
+#: ../src/collect-table.c:886
+msgid "Invert selection"
+msgstr "Инвертировать выделение"
 
-#: .././src/collect-table.c:794
-#: .././src/dupe.c:2253
-#: .././src/img-view.c:1278
-#: .././src/layout_image.c:760
-#: .././src/layout_util.c:1027
-#: .././src/pan-view.c:2807
-#: .././src/search.c:988
-#: .././src/view_file_icon.c:331
-#: .././src/view_file_list.c:577
+#: ../src/collect-table.c:898 ../src/dupe.c:2267 ../src/img-view.c:1285
+#: ../src/layout_image.c:513 ../src/layout_util.c:1270 ../src/pan-view.c:2827
+#: ../src/search.c:1021 ../src/view_file.c:592
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: .././src/collect-table.c:796
-#: .././src/dupe.c:2255
-#: .././src/img-view.c:1279
-#: .././src/layout_image.c:762
-#: .././src/layout_util.c:1028
-#: .././src/pan-view.c:2809
-#: .././src/search.c:990
-#: .././src/view_file_icon.c:333
-#: .././src/view_file_list.c:579
+#: ../src/collect-table.c:900 ../src/dupe.c:2269 ../src/img-view.c:1286
+#: ../src/layout_image.c:515 ../src/layout_util.c:1271 ../src/pan-view.c:2829
+#: ../src/search.c:1023 ../src/view_file.c:594
 msgid "_Move..."
 msgstr "_Переместить..."
 
-#: .././src/collect-table.c:798
-#: .././src/dupe.c:2257
-#: .././src/img-view.c:1280
-#: .././src/layout_image.c:764
-#: .././src/layout_util.c:1029
-#: .././src/pan-view.c:2811
-#: .././src/search.c:992
-#: .././src/view_dir.c:597
-#: .././src/view_file_icon.c:335
-#: .././src/view_file_list.c:581
+#: ../src/collect-table.c:902 ../src/dupe.c:2271 ../src/img-view.c:1287
+#: ../src/layout_image.c:517 ../src/layout_util.c:1272 ../src/pan-view.c:2831
+#: ../src/search.c:1025 ../src/view_dir.c:666 ../src/view_file.c:596
 msgid "_Rename..."
 msgstr "Пере_именовать..."
 
-#: .././src/collect-table.c:800
-#: .././src/dupe.c:2259
-#: .././src/img-view.c:1281
-#: .././src/layout_image.c:766
-#: .././src/layout_util.c:1030
-#: .././src/layout_util.c:1031
-#: .././src/layout_util.c:1032
-#: .././src/pan-view.c:2813
-#: .././src/search.c:994
-#: .././src/view_dir.c:599
-#: .././src/view_file_icon.c:337
-#: .././src/view_file_list.c:583
+#: ../src/collect-table.c:904 ../src/dupe.c:2273 ../src/img-view.c:1288
+#: ../src/layout_image.c:519 ../src/layout_util.c:1273
+#: ../src/layout_util.c:1274 ../src/layout_util.c:1275 ../src/pan-view.c:2833
+#: ../src/search.c:1027 ../src/view_dir.c:668 ../src/view_file.c:598
 msgid "_Delete..."
 msgstr "_Удалить..."
 
-#: .././src/collect-table.c:805
-#: .././src/view_file_icon.c:353
+#: ../src/collect-table.c:906 ../src/dupe.c:2275 ../src/img-view.c:1289
+#: ../src/layout_image.c:522 ../src/pan-view.c:2835 ../src/search.c:1029
+#: ../src/view_dir.c:671 ../src/view_file.c:600
+msgid "_Copy path"
+msgstr "_Копировать путь"
+
+#: ../src/collect-table.c:912
+msgid "Randomize"
+msgstr "Случайно"
+
+#: ../src/collect-table.c:914 ../src/view_file.c:616
+msgid "_Sort"
+msgstr "Со_ртировать"
+
+#: ../src/collect-table.c:917 ../src/view_file.c:632
 msgid "Show filename _text"
 msgstr "Показать _названия файлов"
 
-#: .././src/collect-table.c:808
+#: ../src/collect-table.c:920
 msgid "_Save collection"
 msgstr "_Сохранить коллекцию"
 
-#: .././src/collect-table.c:810
+#: ../src/collect-table.c:922
 msgid "Save collection _as..."
 msgstr "Сохранить коллекцию _как..."
 
-#: .././src/collect-table.c:813
-#: .././src/layout_util.c:1023
+#: ../src/collect-table.c:925 ../src/layout_util.c:1266
 msgid "_Find duplicates..."
 msgstr "На_йти повторяющиеся..."
 
-#: .././src/collect-table.c:815
-#: .././src/dupe.c:2250
-#: .././src/search.c:985
+#: ../src/collect-table.c:927 ../src/dupe.c:2264 ../src/layout_util.c:1268
+#: ../src/search.c:1018
 msgid "Print..."
 msgstr "Напечатать..."
 
-#: .././src/collect-table.c:1967
-#: .././src/dupe.c:3343
-#: .././src/img-view.c:1435
+#: ../src/collect-table.c:2085 ../src/dupe.c:3355 ../src/img-view.c:1443
 msgid "Dropped list includes folders."
 msgstr "Перенесённый список включает каталоги."
 
-#: .././src/collect-table.c:1969
-#: .././src/dupe.c:3345
-#: .././src/img-view.c:1437
+#: ../src/collect-table.c:2087 ../src/dupe.c:3357 ../src/img-view.c:1445
 msgid "_Add contents"
 msgstr "_Добавить содержимое"
 
-#: .././src/collect-table.c:1971
-#: .././src/dupe.c:3346
-#: .././src/img-view.c:1438
+#: ../src/collect-table.c:2089 ../src/dupe.c:3358 ../src/img-view.c:1446
 msgid "Add contents _recursive"
 msgstr "_Рекурсивно добавить содержимое"
 
-#: .././src/collect-table.c:1973
-#: .././src/dupe.c:3347
-#: .././src/img-view.c:1439
+#: ../src/collect-table.c:2091 ../src/dupe.c:3359 ../src/img-view.c:1447
 msgid "_Skip folders"
 msgstr "_Пропустить каталоги"
 
-#: .././src/collect-table.c:1976
-#: .././src/dupe.c:3349
-#: .././src/img-view.c:1441
-#: .././src/view_dir.c:341
+#: ../src/collect-table.c:2094 ../src/dupe.c:3361 ../src/img-view.c:1449
+#: ../src/view_dir.c:417
 msgid "Cancel"
 msgstr "Отменить"
 
-#: .././src/dupe.c:97
+#: ../src/color-man.c:420 ../src/exif.c:232 ../src/exif-common.c:403
+msgid "sRGB"
+msgstr "sRGB"
+
+#: ../src/color-man.c:422
+msgid "Adobe RGB compatible"
+msgstr "Adobe RGB-совместимый"
+
+#: ../src/color-man.c:430
+msgid "Custom profile"
+msgstr "Выбранный профиль"
+
+#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
+msgid "Can't save"
+msgstr "Невозможно сохранить"
+
+#: ../src/desktop_file.c:74
+msgid "Please specify file name."
+msgstr "Пожалуйста, укажите имя файла"
+
+#: ../src/desktop_file.c:86
+msgid "Could not create directory"
+msgstr "Невозможно создать каталог"
+
+#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
+msgid "Desktop file"
+msgstr "Файл на рабочем столе"
+
+#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:494
+#, c-format
+msgid ""
+"Unable to delete file:\n"
+"%s"
+msgstr ""
+"Невозможно удалить файл:\n"
+"%s"
+
+#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:495 ../src/utilops.c:1962
+#: ../src/utilops.c:1989 ../src/utilops.c:2509
+msgid "File deletion failed"
+msgstr "Удаление файла не прошло"
+
+#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
+msgid "Delete file"
+msgstr "Удалить файл"
+
+#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:543
+#, c-format
+msgid ""
+"About to delete the file:\n"
+" %s"
+msgstr ""
+"Собираемся удалить файл:\n"
+" %s"
+
+#: ../src/desktop_file.c:374
+msgid "new.desktop"
+msgstr "Новый.desktop"
+
+#: ../src/desktop_file.c:453
+msgid "Editors"
+msgstr "Редакторы"
+
+#: ../src/desktop_file.c:524
+msgid "Hidden"
+msgstr "Скрытый"
+
+#: ../src/desktop_file.c:543 ../src/dupe.c:2653 ../src/dupe.c:3169
+#: ../src/print.c:3203 ../src/search.c:2848 ../src/ui_pathsel.c:1111
+#: ../src/utilops.c:458
+msgid "Path"
+msgstr "Путь"
+
+#: ../src/dupe.c:100
 msgid "Drop files to compare them."
 msgstr "Перетащите файлы для их сравнения."
 
-#: .././src/dupe.c:101
+#: ../src/dupe.c:104
 #, c-format
 msgid "%d files"
 msgstr "%d файлов"
 
-#: .././src/dupe.c:105
+#: ../src/dupe.c:108
 #, c-format
 msgid "%d matches found in %d files"
 msgstr "%d совпадений найдено в %d файлах"
 
-#: .././src/dupe.c:110
+#: ../src/dupe.c:113
 msgid "[set 1]"
 msgstr "[набор 1]"
 
-#: .././src/dupe.c:1452
+#: ../src/dupe.c:1445
 msgid "Reading checksums..."
 msgstr "Загружаем контрольные суммы..."
 
-#: .././src/dupe.c:1485
+#: ../src/dupe.c:1478
 msgid "Reading dimensions..."
 msgstr "Загружаем размеры..."
 
-#: .././src/dupe.c:1519
+#: ../src/dupe.c:1512
 msgid "Reading similarity data..."
 msgstr "Загружаем данные о подобии..."
 
-#: .././src/dupe.c:1554
-#: .././src/dupe.c:1585
+#: ../src/dupe.c:1548 ../src/dupe.c:1579
 msgid "Comparing..."
 msgstr "Сравниваем..."
 
-#: .././src/dupe.c:1565
-#: .././src/pan-view.c:1091
+#: ../src/dupe.c:1559 ../src/pan-view.c:1094
 msgid "Sorting..."
 msgstr "Сортируем..."
 
-#: .././src/dupe.c:2239
+#: ../src/dupe.c:2251
 msgid "Select group _1 duplicates"
 msgstr "Выбрать повторяющуюся группу _1"
 
-#: .././src/dupe.c:2241
+#: ../src/dupe.c:2253
 msgid "Select group _2 duplicates"
 msgstr "Выбрать повторяющуюся группу _2"
 
-#: .././src/dupe.c:2248
-#: .././src/search.c:983
+#: ../src/dupe.c:2262 ../src/search.c:1016
 msgid "Add to new collection"
 msgstr "Добавить в новую коллекцию"
 
-#: .././src/dupe.c:2264
-#: .././src/dupe.c:2554
-#: .././src/search.c:999
+#: ../src/dupe.c:2280 ../src/dupe.c:2567 ../src/search.c:1034
 msgid "C_lear"
 msgstr "_Очистить"
 
-#: .././src/dupe.c:2267
-#: .././src/dupe.c:2557
+#: ../src/dupe.c:2283 ../src/dupe.c:2570
 msgid "Close _window"
 msgstr "_Закрыть окно"
 
-#: .././src/dupe.c:2427
+#: ../src/dupe.c:2443
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d файлов (набор 2)"
 
-#: .././src/dupe.c:2635
-#, fuzzy
+#: ../src/dupe.c:2648
 msgid "Name case-insensitive"
-msgstr "Чувствительная к регистру сортировка"
+msgstr "Не учитывать регистр символов"
 
-#: .././src/dupe.c:2636
-#: .././src/dupe.c:3156
-#: .././src/preferences.c:1001
-#: .././src/print.c:3237
-#: .././src/search.c:2741
-#: .././src/view_file_list.c:2029
+#: ../src/dupe.c:2649 ../src/dupe.c:3166 ../src/preferences.c:1336
+#: ../src/print.c:3207 ../src/search.c:2845 ../src/view_file_list.c:2050
 msgid "Size"
 msgstr "Размер файла"
 
-#: .././src/dupe.c:2637
-#: .././src/dupe.c:3157
-#: .././src/exif.c:339
-#: .././src/exif-common.c:47
-#: .././src/print.c:3235
-#: .././src/search.c:2742
-#: .././src/view_file_list.c:2030
+#: ../src/dupe.c:2650 ../src/dupe.c:3167 ../src/exif.c:341
+#: ../src/exif-common.c:514 ../src/print.c:3205 ../src/search.c:2846
+#: ../src/view_file_list.c:2054
 msgid "Date"
 msgstr "Дата"
 
-#: .././src/dupe.c:2638
-#: .././src/dupe.c:3158
-#: .././src/print.c:3239
-#: .././src/search.c:2743
+#: ../src/dupe.c:2651 ../src/dupe.c:3168 ../src/print.c:3209
+#: ../src/search.c:2847
 msgid "Dimensions"
 msgstr "Размеры изображений"
 
-#: .././src/dupe.c:2639
+#: ../src/dupe.c:2652
 msgid "Checksum"
 msgstr "Контрольная сумма"
 
-#: .././src/dupe.c:2640
-#: .././src/dupe.c:3159
-#: .././src/print.c:3233
-#: .././src/search.c:2744
-#: .././src/ui_pathsel.c:1114
-msgid "Path"
-msgstr "Путь"
-
-#: .././src/dupe.c:2641
+#: ../src/dupe.c:2654
 msgid "Similarity (high)"
 msgstr "Похожесть (высокая)"
 
-#: .././src/dupe.c:2642
+#: ../src/dupe.c:2655
 msgid "Similarity"
 msgstr "Похожесть"
 
-#: .././src/dupe.c:2643
+#: ../src/dupe.c:2656
 msgid "Similarity (low)"
 msgstr "Похожесть (низкая)"
 
-#: .././src/dupe.c:2644
+#: ../src/dupe.c:2657
 msgid "Similarity (custom)"
 msgstr "Похожесть (заданная)"
 
-#: .././src/dupe.c:3109
-#, fuzzy
+#: ../src/dupe.c:3119
 msgid "Find duplicates"
-msgstr "На_йти повторяющиеся..."
+msgstr "Найти повторяющиеся..."
 
-#: .././src/dupe.c:3191
+#: ../src/dupe.c:3201
 msgid "Compare to:"
 msgstr "Сравнить с:"
 
-#: .././src/dupe.c:3204
+#: ../src/dupe.c:3214
 msgid "Compare by:"
 msgstr "Сравнить по:"
 
-#: .././src/dupe.c:3212
-#: .././src/preferences.c:859
-#: .././src/search.c:2757
+#: ../src/dupe.c:3222 ../src/preferences.c:1171 ../src/search.c:2861
 msgid "Thumbnails"
-msgstr "Эскизы"
+msgstr "Миниатюры"
 
-#: .././src/dupe.c:3219
+#: ../src/dupe.c:3229
 msgid "Compare two file sets"
 msgstr "Сравнить два набора файлов"
 
-#: .././src/editors.c:60
-msgid "The Gimp"
-msgstr "GIMP"
+#: ../src/editors.c:280
+#, c-format
+msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
+msgstr ""
+"Ссылка '%s' на рабочем столе не должна содержать расширения для значения "
+"пиктограммы (Icon): '%s'\n"
 
-#: .././src/editors.c:61
-msgid "XV"
-msgstr "XV"
+#. flash fired (bit 0)
+#: ../src/editors.c:334 ../src/exif.c:225 ../src/exif-common.c:332
+msgid "yes"
+msgstr "да"
 
-#: .././src/editors.c:62
-msgid "Xpaint"
-msgstr "Xpaint"
+#: ../src/editors.c:334 ../src/exif.c:224 ../src/exif-common.c:332
+msgid "no"
+msgstr "нет"
 
-#: .././src/editors.c:63
-msgid "UFraw"
-msgstr "UFRaw"
-
-#: .././src/editors.c:64
-msgid "Add XMP sidecar"
-msgstr "Добавить внешний файл XMP"
-
-#: .././src/editors.c:68
-msgid "Rotate jpeg clockwise"
-msgstr "Повернуть часовой стрелке"
-
-#: .././src/editors.c:69
-msgid "Rotate jpeg counterclockwise"
-msgstr "Повернуть против часовой стрелки"
-
-#. for testing
-#: .././src/editors.c:73
-#: .././src/editors.c:79
-msgid "External Copy command"
-msgstr "Внешняя команда копирования"
-
-#: .././src/editors.c:74
-#: .././src/editors.c:80
-msgid "External Move command"
-msgstr "Внешняя команда перемещения"
-
-#: .././src/editors.c:75
-#: .././src/editors.c:81
-msgid "External Rename command"
-msgstr "Внешняя команда переименования"
-
-#: .././src/editors.c:76
-#: .././src/editors.c:82
-#, fuzzy
-msgid "External Delete command"
-msgstr "Включить кнопку 'Удалить'"
-
-#: .././src/editors.c:77
-#: .././src/editors.c:83
-msgid "External New Folder command"
-msgstr "Внешняя команда создания нового каталога"
-
-#: .././src/editors.c:139
+#: ../src/editors.c:506
 msgid "stopping..."
 msgstr "останавливаю..."
 
-#: .././src/editors.c:160
+#: ../src/editors.c:527
 msgid "Edit command results"
 msgstr "Редактировать результат команды"
 
-#: .././src/editors.c:163
+#: ../src/editors.c:530
 #, c-format
 msgid "Output of %s"
 msgstr "Вывод %s"
 
-#: .././src/editors.c:602
+#: ../src/editors.c:1053
 #, c-format
 msgid ""
 "Failed to run command:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1019,1675 +1064,2100 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Невозможно выполнить команду:\n"
 "%s\n"
 
-#: .././src/editors.c:720
+#: ../src/editors.c:1180
 msgid "stopped by user"
 msgstr "остановлено пользователем"
 
-#: .././src/editors.c:835
-msgid "Editor template is empty."
+#: ../src/editors.c:1265
+#, c-format
+msgid ""
+"%s\n"
+"\"%s\""
 msgstr ""
+"%s\n"
+"\"%s\""
 
-#: .././src/editors.c:836
+#: ../src/editors.c:1267
+msgid "Invalid editor command"
+msgstr "Неправильная команда редактора"
+
+#: ../src/editors.c:1354
+msgid "Editor template is empty."
+msgstr "Строка вызова редактора пуста."
+
+#: ../src/editors.c:1355
 msgid "Editor template has incorrect syntax."
-msgstr ""
+msgstr "Некорректный синтаксис строки вызова редактора."
 
-#: .././src/editors.c:837
+#: ../src/editors.c:1356
 msgid "Editor template uses incompatible macros."
-msgstr ""
+msgstr "В строке вызова редактора используются несовместимые макроопределения."
 
-#: .././src/editors.c:838
+#: ../src/editors.c:1357
 msgid "Can't find matching file type."
-msgstr ""
+msgstr "Невозможно найти подходящий тип файла"
 
-#: .././src/editors.c:839
+#: ../src/editors.c:1358
 msgid "Can't execute external editor."
-msgstr ""
+msgstr "Невозможно запустить внешний редактор."
 
-#: .././src/editors.c:840
+#: ../src/editors.c:1359
 msgid "External editor returned error status."
-msgstr ""
+msgstr "Внешний редактор завершился с ошибкой."
 
-#: .././src/editors.c:841
+#: ../src/editors.c:1360
 msgid "File was skipped."
-msgstr ""
+msgstr "Файл был пропущен."
 
-#: .././src/editors.c:842
+#: ../src/editors.c:1361
 msgid "Unknown error."
-msgstr ""
+msgstr "Неизвестная ошибка."
 
-#: .././src/exif.c:145
-#: .././src/exif.c:158
-#: .././src/exif.c:172
-#: .././src/exif.c:197
-#: .././src/exif.c:314
-#: .././src/exif.c:625
-#: .././src/exif-common.c:314
-#: .././src/exif-common.c:317
-#: .././src/exif-common.c:382
+#: ../src/exif.c:147 ../src/exif.c:160 ../src/exif.c:174 ../src/exif.c:199
+#: ../src/exif.c:316 ../src/exif.c:663 ../src/exif-common.c:308
+#: ../src/exif-common.c:311 ../src/exif-common.c:378
 msgid "unknown"
 msgstr "неизвестно"
 
-#: .././src/exif.c:146
+#: ../src/exif.c:148
 msgid "top left"
 msgstr "сверху слева"
 
-#: .././src/exif.c:147
+#: ../src/exif.c:149
 msgid "top right"
 msgstr "сверху справа"
 
-#: .././src/exif.c:148
+#: ../src/exif.c:150
 msgid "bottom right"
 msgstr "снизу справа"
 
-#: .././src/exif.c:149
+#: ../src/exif.c:151
 msgid "bottom left"
 msgstr "снизу слева"
 
-#: .././src/exif.c:150
+#: ../src/exif.c:152
 msgid "left top"
 msgstr "слева сверху"
 
-#: .././src/exif.c:151
+#: ../src/exif.c:153
 msgid "right top"
 msgstr "справа сверху"
 
-#: .././src/exif.c:152
+#: ../src/exif.c:154
 msgid "right bottom"
 msgstr "справа снизу"
 
-#: .././src/exif.c:153
+#: ../src/exif.c:155
 msgid "left bottom"
 msgstr "слева снизу"
 
-#: .././src/exif.c:160
+#: ../src/exif.c:162
 msgid "inch"
 msgstr "дюйм"
 
-#: .././src/exif.c:161
+#: ../src/exif.c:163
 msgid "centimeter"
 msgstr "сантиметр"
 
-#: .././src/exif.c:173
+#: ../src/exif.c:175
 msgid "average"
 msgstr "средний"
 
-#: .././src/exif.c:174
+#: ../src/exif.c:176
 msgid "center weighted"
 msgstr "средневзвешенный"
 
-#: .././src/exif.c:175
+#: ../src/exif.c:177
 msgid "spot"
 msgstr "точечный"
 
-#: .././src/exif.c:176
+#: ../src/exif.c:178
 msgid "multi-spot"
 msgstr "многоточечный"
 
-#: .././src/exif.c:177
+#: ../src/exif.c:179
 msgid "multi-segment"
 msgstr "многосегментный"
 
-#: .././src/exif.c:178
+#: ../src/exif.c:180
 msgid "partial"
 msgstr "частичный"
 
-#: .././src/exif.c:179
-#: .././src/exif.c:217
+#: ../src/exif.c:181 ../src/exif.c:219
 msgid "other"
 msgstr "другой"
 
-#: .././src/exif.c:184
-#: .././src/exif.c:236
+#: ../src/exif.c:186 ../src/exif.c:238
 msgid "not defined"
 msgstr "не определена"
 
-#: .././src/exif.c:185
-#: .././src/exif.c:264
-#: .././src/exif.c:271
+#: ../src/exif.c:187 ../src/exif.c:266 ../src/exif.c:273
 msgid "manual"
 msgstr "ручная"
 
-#: .././src/exif.c:186
-#: .././src/exif.c:257
-#: .././src/exif.c:293
-#: .././src/exif.c:300
-#: .././src/exif.c:307
+#: ../src/exif.c:188 ../src/exif.c:259 ../src/exif.c:295 ../src/exif.c:302
+#: ../src/exif.c:309
 msgid "normal"
 msgstr "нормальная"
 
-#: .././src/exif.c:187
+#: ../src/exif.c:189
 msgid "aperture"
 msgstr "апертура"
 
-#: .././src/exif.c:188
+#: ../src/exif.c:190
 msgid "shutter"
 msgstr "затвор"
 
-#: .././src/exif.c:189
+#: ../src/exif.c:191
 msgid "creative"
 msgstr "творчество"
 
-#: .././src/exif.c:190
+#: ../src/exif.c:192
 msgid "action"
 msgstr "действие"
 
-#: .././src/exif.c:191
-#: .././src/exif.c:278
+#: ../src/exif.c:193 ../src/exif.c:280
 msgid "portrait"
 msgstr "портрет"
 
-#: .././src/exif.c:192
-#: .././src/exif.c:277
+#: ../src/exif.c:194 ../src/exif.c:279
 msgid "landscape"
 msgstr "ландшафт"
 
-#: .././src/exif.c:198
+#: ../src/exif.c:200
 msgid "daylight"
 msgstr "дневной свет"
 
-#: .././src/exif.c:199
+#: ../src/exif.c:201
 msgid "fluorescent"
 msgstr "флуоресцентный"
 
-#: .././src/exif.c:200
+#: ../src/exif.c:202
 msgid "tungsten (incandescent)"
 msgstr "вольфрам (раскалённый)"
 
-#: .././src/exif.c:201
+#: ../src/exif.c:203
 msgid "flash"
 msgstr "вспышка"
 
-#: .././src/exif.c:202
+#: ../src/exif.c:204
 msgid "fine weather"
-msgstr ""
+msgstr "хорошая погода"
 
-#: .././src/exif.c:203
+#: ../src/exif.c:205
 msgid "cloudy weather"
-msgstr ""
+msgstr "облачная погода"
 
-#: .././src/exif.c:204
+#: ../src/exif.c:206
 msgid "shade"
-msgstr ""
+msgstr "полумрак"
 
-#: .././src/exif.c:205
-#, fuzzy
+#: ../src/exif.c:207
 msgid "daylight fluorescent"
-msgstr "флуоресцентный"
+msgstr "лампа дневного света"
 
-#: .././src/exif.c:206
-#, fuzzy
+#: ../src/exif.c:208
 msgid "day white fluorescent"
-msgstr "флуоресцентный"
+msgstr "белая лампа дневного света"
 
-#: .././src/exif.c:207
-#, fuzzy
+#: ../src/exif.c:209
 msgid "cool white fluorescent"
-msgstr "флуоресцентный"
+msgstr "холодный белый флуоресцентный"
 
-#: .././src/exif.c:208
-#, fuzzy
+#: ../src/exif.c:210
 msgid "white fluorescent"
-msgstr "флуоресцентный"
+msgstr "белый флуоресцентный"
 
-#: .././src/exif.c:209
+#: ../src/exif.c:211
 msgid "standard light A"
-msgstr ""
+msgstr "стандартный источник света A"
 
-#: .././src/exif.c:210
+#: ../src/exif.c:212
 msgid "standard light B"
-msgstr ""
+msgstr "стандартный источник света B"
 
-#: .././src/exif.c:211
+#: ../src/exif.c:213
 msgid "standard light C"
-msgstr ""
+msgstr "стандартный источник света C"
 
-#: .././src/exif.c:212
+#: ../src/exif.c:214
 msgid "D55"
 msgstr "D55"
 
-#: .././src/exif.c:213
+#: ../src/exif.c:215
 msgid "D65"
 msgstr "D65"
 
-#: .././src/exif.c:214
+#: ../src/exif.c:216
 msgid "D75"
 msgstr "D75"
 
-#: .././src/exif.c:215
+#: ../src/exif.c:217
 msgid "D50"
 msgstr "D50"
 
-#: .././src/exif.c:216
+#: ../src/exif.c:218
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: .././src/exif.c:222
-#: .././src/exif-common.c:337
-#: .././src/info.c:256
-msgid "no"
-msgstr "нет"
-
-#. flash fired (bit 0)
-#: .././src/exif.c:223
-#: .././src/exif-common.c:337
-#: .././src/info.c:256
-msgid "yes"
-msgstr "да"
-
-#: .././src/exif.c:224
+#: ../src/exif.c:226
 msgid "yes, not detected by strobe"
 msgstr "да, не обнаруженный стробом"
 
-#: .././src/exif.c:225
+#: ../src/exif.c:227
 msgid "yes, detected by strobe"
 msgstr "да, обнаруженный стробом"
 
-#: .././src/exif.c:230
-#: .././src/exif-common.c:405
-#: .././src/layout.c:416
-msgid "sRGB"
-msgstr "sRGB"
-
-#: .././src/exif.c:231
+#: ../src/exif.c:233
 msgid "uncalibrated"
-msgstr ""
+msgstr "некалиброванный"
 
-#: .././src/exif.c:237
+#: ../src/exif.c:239
 msgid "1 chip color area"
 msgstr ""
 
-#: .././src/exif.c:238
+#: ../src/exif.c:240
 msgid "2 chip color area"
 msgstr ""
 
-#: .././src/exif.c:239
+#: ../src/exif.c:241
 msgid "3 chip color area"
 msgstr ""
 
-#: .././src/exif.c:240
+#: ../src/exif.c:242
 msgid "color sequential area"
 msgstr ""
 
-#: .././src/exif.c:241
-#, fuzzy
+#: ../src/exif.c:243
 msgid "trilinear"
-msgstr "Билинейный"
+msgstr "трилинейный"
 
-#: .././src/exif.c:242
+#: ../src/exif.c:244
 msgid "color sequential linear"
 msgstr ""
 
-#: .././src/exif.c:247
+#: ../src/exif.c:249
 msgid "digital still camera"
-msgstr ""
+msgstr "бесшумная цифровая камера"
 
-#: .././src/exif.c:252
+#: ../src/exif.c:254
 msgid "direct photo"
-msgstr ""
+msgstr "прямая фотография"
 
-#: .././src/exif.c:258
-#, fuzzy
+#: ../src/exif.c:260
 msgid "custom"
-msgstr "Выбранный"
+msgstr "выбранный"
 
-#: .././src/exif.c:263
-#: .././src/exif.c:270
-#: .././src/exif-common.c:351
+#: ../src/exif.c:265 ../src/exif.c:272 ../src/exif-common.c:346
 msgid "auto"
 msgstr "автоматически"
 
-#: .././src/exif.c:265
+#: ../src/exif.c:267
 msgid "auto bracket"
-msgstr ""
+msgstr "автовилка"
 
-#: .././src/exif.c:276
-#, fuzzy
+#: ../src/exif.c:278
 msgid "standard"
-msgstr "_Очистить"
+msgstr "обычный"
 
-#: .././src/exif.c:279
-#, fuzzy
+#: ../src/exif.c:281
 msgid "night scene"
-msgstr "Источник света"
+msgstr "ночная сцена"
 
-#: .././src/exif.c:284
+#: ../src/exif.c:286
 msgid "none"
 msgstr "нет"
 
-#: .././src/exif.c:285
+#: ../src/exif.c:287
 #, fuzzy
 msgid "low gain up"
 msgstr "Очистить"
 
-#: .././src/exif.c:286
+#: ../src/exif.c:288
 msgid "high gain up"
 msgstr ""
 
-#: .././src/exif.c:287
+#: ../src/exif.c:289
 #, fuzzy
 msgid "low gain down"
 msgstr "_Закрыть окно"
 
-#: .././src/exif.c:288
+#: ../src/exif.c:290
 msgid "high gain down"
 msgstr ""
 
-#: .././src/exif.c:294
-#: .././src/exif.c:308
-#, fuzzy
+#: ../src/exif.c:296 ../src/exif.c:310
 msgid "soft"
-msgstr "точечный"
+msgstr "мягкий"
 
-#: .././src/exif.c:295
-#: .././src/exif.c:309
+#: ../src/exif.c:297 ../src/exif.c:311
 msgid "hard"
-msgstr ""
+msgstr "жесткий"
 
-#: .././src/exif.c:301
+#: ../src/exif.c:303
 msgid "low"
-msgstr ""
+msgstr "низкий"
 
-#: .././src/exif.c:302
-#, fuzzy
+#: ../src/exif.c:304
 msgid "high"
-msgstr "Высота"
+msgstr "высокий"
 
-#: .././src/exif.c:315
+#: ../src/exif.c:317
 msgid "macro"
-msgstr ""
+msgstr "макро"
 
-#: .././src/exif.c:316
+#: ../src/exif.c:318
 msgid "close"
-msgstr ""
+msgstr "близкий"
 
-#: .././src/exif.c:317
+#: ../src/exif.c:319
 msgid "distant"
-msgstr ""
+msgstr "удаленный"
 
-#: .././src/exif.c:327
-#, fuzzy
+#: ../src/exif.c:329
 msgid "Image Width"
-msgstr "Графический файл"
+msgstr "Ширина изображения"
 
-#: .././src/exif.c:328
-#, fuzzy
+#: ../src/exif.c:330
 msgid "Image Height"
-msgstr "Высота"
+msgstr "Высота изображения"
 
-#: .././src/exif.c:329
+#: ../src/exif.c:331
 msgid "Bits per Sample/Pixel"
-msgstr ""
+msgstr "Бит на сэмпл/пиксел"
 
-#: .././src/exif.c:330
-#, fuzzy
+#: ../src/exif.c:332
 msgid "Compression"
-msgstr "Коэффициент сжатия:"
+msgstr "Коэффициент сжатия"
 
-#: .././src/exif.c:331
+#: ../src/exif.c:333
 msgid "Image description"
 msgstr "Описание изображения"
 
-#: .././src/exif.c:332
+#: ../src/exif.c:334
 #, fuzzy
 msgid "Camera make"
 msgstr "Камера"
 
-#: .././src/exif.c:333
-#, fuzzy
+#: ../src/exif.c:335
 msgid "Camera model"
-msgstr "Камера"
+msgstr "Модель камеры"
 
-#: .././src/exif.c:334
+#: ../src/exif.c:336
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: .././src/exif.c:335
-#, fuzzy
+#: ../src/exif.c:337
 msgid "X resolution"
-msgstr "Разрешение"
+msgstr "Разрешение по X"
 
-#: .././src/exif.c:336
-#, fuzzy
+#: ../src/exif.c:338
 msgid "Y Resolution"
-msgstr "Разрешение"
+msgstr "Разрешение по Y"
 
-#: .././src/exif.c:337
-#, fuzzy
+#: ../src/exif.c:339
 msgid "Resolution units"
-msgstr "Разрешение"
+msgstr "Единицы измерения разрешения"
 
-#: .././src/exif.c:338
+#: ../src/exif.c:340
 msgid "Firmware"
 msgstr "Прошивка"
 
-#: .././src/exif.c:340
+#: ../src/exif.c:342
 msgid "White point"
 msgstr "Точка белого"
 
-#: .././src/exif.c:341
+#: ../src/exif.c:343
 msgid "Primary chromaticities"
-msgstr ""
+msgstr "Хроматичность"
 
-#: .././src/exif.c:342
+#: ../src/exif.c:344
 msgid "YCbCy coefficients"
-msgstr ""
+msgstr "Коэффициенты YCbCy"
 
-#: .././src/exif.c:343
+#: ../src/exif.c:345
 msgid "YCbCr positioning"
-msgstr ""
+msgstr "Регулировка YCbCr"
 
-#: .././src/exif.c:344
+#: ../src/exif.c:346
 msgid "Black white reference"
 msgstr ""
 
-#: .././src/exif.c:345
-msgid "Copyright"
-msgstr "Авторское право"
-
-#: .././src/exif.c:346
+#: ../src/exif.c:348
 msgid "SubIFD Exif offset"
-msgstr ""
+msgstr "Смещение SubIFD Exif"
 
 #. subIFD follows
-#: .././src/exif.c:348
+#: ../src/exif.c:350
 msgid "Exposure time (seconds)"
 msgstr "Экспозиция (секунды)"
 
-#: .././src/exif.c:349
+#: ../src/exif.c:351
 msgid "FNumber"
-msgstr ""
+msgstr "Диафрагменное число"
 
-#: .././src/exif.c:350
+#: ../src/exif.c:352
 msgid "Exposure program"
 msgstr "Программа экспозиции"
 
-#: .././src/exif.c:351
-#, fuzzy
+#: ../src/exif.c:353
 msgid "Spectral Sensitivity"
-msgstr "Чувствительность ISO"
+msgstr "Спектральная чувствительность"
 
-#: .././src/exif.c:352
-#: .././src/exif.c:388
-#: .././src/exif-common.c:51
+#: ../src/exif.c:354 ../src/exif.c:390 ../src/exif-common.c:518
 msgid "ISO sensitivity"
 msgstr "Чувствительность ISO"
 
-#: .././src/exif.c:353
+#: ../src/exif.c:355
 msgid "Optoelectric conversion factor"
 msgstr ""
 
-#: .././src/exif.c:354
+#: ../src/exif.c:356
 msgid "Exif version"
 msgstr "Версия Exif"
 
-#: .././src/exif.c:355
+#: ../src/exif.c:357
 msgid "Date original"
 msgstr "Дата съемки"
 
-#: .././src/exif.c:356
+#: ../src/exif.c:358
 msgid "Date digitized"
 msgstr "Дата оцифровки"
 
-#: .././src/exif.c:357
-#, fuzzy
+#: ../src/exif.c:359
 msgid "Pixel format"
-msgstr "Формат файла:"
+msgstr "Формат пиксела"
 
-#: .././src/exif.c:358
-#, fuzzy
+#: ../src/exif.c:360
 msgid "Compression ratio"
-msgstr "Коэффициент сжатия:"
+msgstr "Коэффициент сжатия"
 
-#: .././src/exif.c:359
-#: .././src/exif-common.c:48
+#: ../src/exif.c:361 ../src/exif-common.c:515
 msgid "Shutter speed"
 msgstr "Скорость затвора"
 
-#: .././src/exif.c:360
-#: .././src/exif-common.c:49
+#: ../src/exif.c:362 ../src/exif-common.c:516
 msgid "Aperture"
 msgstr "Апертура"
 
-#: .././src/exif.c:361
+#: ../src/exif.c:363
 msgid "Brightness"
 msgstr "Яркость"
 
-#: .././src/exif.c:362
-#: .././src/exif-common.c:50
+#: ../src/exif.c:364 ../src/exif-common.c:517
 msgid "Exposure bias"
 msgstr "Смещение экспозиции"
 
-#: .././src/exif.c:363
-#, fuzzy
+#: ../src/exif.c:365
 msgid "Maximum aperture"
-msgstr "апертура"
+msgstr "Максимальная апертура"
 
-#: .././src/exif.c:364
-#: .././src/exif-common.c:54
+#: ../src/exif.c:366 ../src/exif-common.c:521
 msgid "Subject distance"
 msgstr "Расстояние до объекта"
 
-#: .././src/exif.c:365
+#: ../src/exif.c:367
 msgid "Metering mode"
 msgstr "Метод измерения"
 
-#: .././src/exif.c:366
+#: ../src/exif.c:368
 msgid "Light source"
 msgstr "Источник света"
 
-#: .././src/exif.c:367
-#: .././src/exif-common.c:55
+#: ../src/exif.c:369 ../src/exif-common.c:522
 msgid "Flash"
 msgstr "Вспышка"
 
-#: .././src/exif.c:368
-#: .././src/exif-common.c:52
+#: ../src/exif.c:370 ../src/exif-common.c:519
 msgid "Focal length"
 msgstr "Фокусное расстояние"
 
-#: .././src/exif.c:369
+#: ../src/exif.c:371
 #, fuzzy
 msgid "Subject area"
 msgstr "Расстояние до объекта"
 
-#: .././src/exif.c:370
+#: ../src/exif.c:372
 msgid "MakerNote"
 msgstr ""
 
-#: .././src/exif.c:371
-#, fuzzy
+#: ../src/exif.c:373
 msgid "UserComment"
-msgstr "Комментарий:"
+msgstr "Комментарий"
 
-#: .././src/exif.c:372
+#: ../src/exif.c:374
 msgid "Subsecond time"
 msgstr ""
 
-#: .././src/exif.c:373
+#: ../src/exif.c:375
 #, fuzzy
 msgid "Subsecond time original"
 msgstr "Дата съемки"
 
-#: .././src/exif.c:374
+#: ../src/exif.c:376
 #, fuzzy
 msgid "Subsecond time digitized"
 msgstr "Дата оцифровки"
 
-#: .././src/exif.c:375
+#: ../src/exif.c:377
 msgid "FlashPix version"
-msgstr ""
+msgstr "Версия FlashPix"
 
-#: .././src/exif.c:376
+#: ../src/exif.c:378
 msgid "Colorspace"
 msgstr "Цветовое пространство"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: .././src/exif.c:378
+#: ../src/exif.c:380
 msgid "Width"
 msgstr "Ширина"
 
-#: .././src/exif.c:379
+#: ../src/exif.c:381
 msgid "Height"
 msgstr "Высота"
 
-#: .././src/exif.c:380
+#: ../src/exif.c:382
 msgid "Audio data"
 msgstr "Звуковые данные"
 
-#: .././src/exif.c:381
+#: ../src/exif.c:383
 msgid "ExifR98 extension"
-msgstr ""
+msgstr "Расширение ExifR98"
 
-#: .././src/exif.c:382
-#, fuzzy
+#: ../src/exif.c:384
 msgid "Flash strength"
-msgstr "Фокусное расстояние"
+msgstr "Сила вспышки"
 
-#: .././src/exif.c:383
+#: ../src/exif.c:385
 msgid "Spatial frequency response"
 msgstr ""
 
-#: .././src/exif.c:384
+#: ../src/exif.c:386
 msgid "X Pixel density"
-msgstr ""
+msgstr "Плотность точек по X"
 
-#: .././src/exif.c:385
+#: ../src/exif.c:387
 msgid "Y Pixel density"
-msgstr ""
+msgstr "Плотность точек по Y"
 
-#: .././src/exif.c:386
+#: ../src/exif.c:388
 msgid "Pixel density units"
 msgstr ""
 
-#: .././src/exif.c:387
-#, fuzzy
+#: ../src/exif.c:389
 msgid "Subject location"
-msgstr "Выделение"
+msgstr "Положение объекта"
 
-#: .././src/exif.c:389
+#: ../src/exif.c:391
 msgid "Sensor type"
 msgstr "Тип сенсора"
 
-#: .././src/exif.c:390
-#, fuzzy
+#: ../src/exif.c:392
 msgid "Source type"
-msgstr "Источник"
+msgstr "Тип источника"
 
-#: .././src/exif.c:391
+#: ../src/exif.c:393
 #, fuzzy
 msgid "Scene type"
-msgstr "сантиметр"
+msgstr "Тип сцены"
 
-#: .././src/exif.c:392
+#: ../src/exif.c:394
 msgid "Color filter array pattern"
 msgstr ""
 
 #. tags a4xx were added for Exif 2.2 (not just these - some above, as well)
-#: .././src/exif.c:394
+#: ../src/exif.c:396
 #, fuzzy
 msgid "Render process"
 msgstr "Создать"
 
-#: .././src/exif.c:395
+#: ../src/exif.c:397
 msgid "Exposure mode"
 msgstr "Режим замера экспозиции"
 
-#: .././src/exif.c:396
+#: ../src/exif.c:398
 msgid "White balance"
 msgstr "Баланс белого"
 
-#: .././src/exif.c:397
+#: ../src/exif.c:399
 msgid "Digital zoom ratio"
-msgstr ""
+msgstr "Кратность цифрового масштабирования"
 
-#: .././src/exif.c:398
+#: ../src/exif.c:400
 msgid "Focal length (35mm)"
 msgstr "Фокусное расстояние (35mm)"
 
-#: .././src/exif.c:399
+#: ../src/exif.c:401
 msgid "Scene capture type"
 msgstr ""
 
-#: .././src/exif.c:400
+#: ../src/exif.c:402
 msgid "Gain control"
 msgstr ""
 
-#: .././src/exif.c:401
+#: ../src/exif.c:403
 msgid "Contrast"
 msgstr "Контраст"
 
-#: .././src/exif.c:402
+#: ../src/exif.c:404
 msgid "Saturation"
 msgstr "Насыщенность"
 
-#: .././src/exif.c:403
+#: ../src/exif.c:405
 msgid "Sharpness"
 msgstr "Резкость"
 
-#: .././src/exif.c:404
+#: ../src/exif.c:406
 msgid "Device setting"
-msgstr ""
+msgstr "Настройка устройства"
 
-#: .././src/exif.c:405
-#, fuzzy
+#: ../src/exif.c:407
 msgid "Subject range"
 msgstr "Расстояние до объекта"
 
-#: .././src/exif.c:406
+#: ../src/exif.c:408
 msgid "Image serial number"
 msgstr "Серийный номер снимка"
 
-#: .././src/exif-common.c:46
-msgid "Camera"
-msgstr "Камера"
-
-#: .././src/exif-common.c:53
-msgid "Focal length 35mm"
-msgstr "Фокусное расстояние (35mm)"
-
-#: .././src/exif-common.c:56
-msgid "Resolution"
-msgstr "Разрешение"
-
-#: .././src/exif-common.c:57
-msgid "Color profile"
-msgstr "Цветовой профиль"
-
-#: .././src/exif-common.c:313
+#: ../src/exif-common.c:307
 msgid "infinity"
 msgstr "бесконечность"
 
-#: .././src/exif-common.c:341
+#: ../src/exif-common.c:336
 msgid "mode:"
 msgstr "режим:"
 
-#: .././src/exif-common.c:345
-#: .././src/utilops.c:1468
+#: ../src/exif-common.c:340 ../src/trash.c:205
 msgid "on"
 msgstr "включен"
 
-#: .././src/exif-common.c:348
-#: .././src/utilops.c:1473
+#: ../src/exif-common.c:343 ../src/trash.c:210
 msgid "off"
 msgstr "выключен"
 
-#: .././src/exif-common.c:357
+#: ../src/exif-common.c:352
 msgid "not detected by strobe"
 msgstr "не обнаружено стробом"
 
-#: .././src/exif-common.c:358
+#: ../src/exif-common.c:353
 msgid "detected by strobe"
 msgstr "обнаружено стробом"
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: .././src/exif-common.c:363
+#: ../src/exif-common.c:358
 msgid "red-eye reduction"
 msgstr "снижение эффекта красных глаз"
 
-#: .././src/exif-common.c:382
+#: ../src/exif-common.c:378
 msgid "dot"
 msgstr "точка"
 
-#: .././src/exif-common.c:410
+#: ../src/exif-common.c:408
 msgid "AdobeRGB"
-msgstr ""
+msgstr "AdobeRGB"
 
-#: .././src/exif-common.c:418
+#: ../src/exif-common.c:416
 msgid "embedded"
-msgstr ""
+msgstr "встроенный"
 
-#: .././src/filelist.c:644
+#: ../src/exif-common.c:505
+msgid "Above Sea Level"
+msgstr "Над уровнем моря"
+
+#: ../src/exif-common.c:505
+msgid "Below Sea Level"
+msgstr "Ниже уровня моря"
+
+#: ../src/exif-common.c:513
+msgid "Camera"
+msgstr "Камера"
+
+#: ../src/exif-common.c:520
+msgid "Focal length 35mm"
+msgstr "Фокусное расстояние (35mm)"
+
+#: ../src/exif-common.c:523
+msgid "Resolution"
+msgstr "Разрешение"
+
+#: ../src/exif-common.c:524
+msgid "Color profile"
+msgstr "Цветовой профиль"
+
+#: ../src/exif-common.c:525
+msgid "GPS position"
+msgstr "Координаты GPS"
+
+#: ../src/exif-common.c:526
+msgid "GPS altitude"
+msgstr "Высота GPS"
+
+#: ../src/exif-common.c:527
+msgid "File size"
+msgstr "Размер файла"
+
+#: ../src/exif-common.c:528
+msgid "File date"
+msgstr "Дата файла"
+
+#: ../src/exif-common.c:529
+msgid "File mode"
+msgstr "Атрибуты файла"
+
+#: ../src/filedata.c:91
 #, c-format
 msgid "%d bytes"
 msgstr "%d байт"
 
-#: .././src/filelist.c:648
+#: ../src/filedata.c:95
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f Кбайт"
 
-#: .././src/filelist.c:652
+#: ../src/filedata.c:99
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f Мбайт"
 
-#: .././src/filelist.c:657
+#: ../src/filedata.c:104
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f Гбайт"
 
-#: .././src/fullscreen.c:242
-#: .././src/preferences.c:1304
+#: ../src/filedata.c:2185
+msgid "file or directory does not exist"
+msgstr "файл или каталог не существует"
+
+#: ../src/filedata.c:2191
+msgid "destination already exists"
+msgstr "конечный файл уже существует"
+
+#: ../src/filedata.c:2197
+msgid "destination can't be overwritten"
+msgstr "невозможно перезаписать каталог назначения"
+
+#: ../src/filedata.c:2203
+msgid "destination directory is not writable"
+msgstr "нет прав на запись в каталог назначения"
+
+#: ../src/filedata.c:2209
+msgid "destination directory does not exist"
+msgstr "каталог назначения не существует"
+
+#: ../src/filedata.c:2215
+msgid "source directory is not writable"
+msgstr "нет прав на запись в исходную директорию"
+
+#: ../src/filedata.c:2221
+msgid "no read permission"
+msgstr "нет прав на чтение"
+
+#: ../src/filedata.c:2227
+msgid "file is readonly"
+msgstr "файл доступен только для чтения"
+
+#: ../src/filedata.c:2233
+msgid "destination already exists and will be overwritten"
+msgstr "конечный файл уже существует и будет перезаписан"
+
+#: ../src/filedata.c:2239
+msgid "source and destination are the same"
+msgstr "исходный и конечный файлы совпадают"
+
+#: ../src/filedata.c:2245
+msgid "source and destination have different extension"
+msgstr "исходный и конечный файлы имеют различные расширения"
+
+#: ../src/filedata.c:2251
+msgid "there are unsaved metadata changes for the file"
+msgstr "для файла есть несохраненные изменения в метаданных"
+
+#: ../src/fullscreen.c:243 ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331 ../src/preferences.c:1349
 msgid "Full screen"
 msgstr "Полноэкранный режим"
 
-#: .././src/fullscreen.c:394
+#: ../src/fullscreen.c:391
 msgid "Full size"
 msgstr "Полный размер"
 
-#: .././src/fullscreen.c:399
+#: ../src/fullscreen.c:396
 msgid "Monitor"
 msgstr "Монитор"
 
-#: .././src/fullscreen.c:404
-#: .././src/layout.c:449
+#: ../src/fullscreen.c:401
 msgid "Screen"
 msgstr "Экран"
 
-#: .././src/fullscreen.c:641
+#: ../src/fullscreen.c:638
 msgid "Stay above other windows"
 msgstr "Располагаться поверх всех окон"
 
-#: .././src/fullscreen.c:648
+#: ../src/fullscreen.c:645
 msgid "Determined by Window Manager"
 msgstr "Определяется менеджером окон"
 
-#: .././src/fullscreen.c:649
+#: ../src/fullscreen.c:646
 msgid "Active screen"
 msgstr "Активный экран"
 
-#: .././src/fullscreen.c:651
+#: ../src/fullscreen.c:648
 msgid "Active monitor"
 msgstr "Активный монитор"
 
-#: .././src/histogram.c:86
-msgid "logarithmical histogram on red"
-msgstr ""
+#: ../src/histogram.c:113
+msgid "Log Histogram on Red"
+msgstr "Логарифмическая гистограмма красного канала"
 
-#: .././src/histogram.c:87
-msgid "logarithmical histogram on green"
-msgstr ""
+#: ../src/histogram.c:114
+msgid "Log Histogram on Green"
+msgstr "Логарифмическая гистограмма зеленого канала"
 
-#: .././src/histogram.c:88
-msgid "logarithmical histogram on blue"
-msgstr ""
+#: ../src/histogram.c:115
+msgid "Log Histogram on Blue"
+msgstr "Логарифмическая гистограмма синего канала"
 
-#: .././src/histogram.c:89
-msgid "logarithmical histogram on value"
-msgstr ""
+#: ../src/histogram.c:116
+msgid "Log Histogram on RGB"
+msgstr "Логарифмическая гистограмма RGB"
 
-#: .././src/histogram.c:90
-msgid "logarithmical histogram on RGB"
-msgstr ""
+#: ../src/histogram.c:117
+msgid "Log Histogram on value"
+msgstr "Логарифмическая гистограмма на значение"
 
-#: .././src/histogram.c:91
-msgid "logarithmical histogram on max value"
-msgstr ""
+#: ../src/histogram.c:122
+msgid "Linear Histogram on Red"
+msgstr "Линейная гистограмма красного канала"
 
-#: .././src/histogram.c:96
-msgid "linear histogram on red"
-msgstr ""
+#: ../src/histogram.c:123
+msgid "Linear Histogram on Green"
+msgstr "Линейная гистограмма зеленого канала"
 
-#: .././src/histogram.c:97
-msgid "linear histogram on green"
-msgstr ""
+#: ../src/histogram.c:124
+msgid "Linear Histogram on Blue"
+msgstr "Линейная гистограмма синего канала"
 
-#: .././src/histogram.c:98
-msgid "linear histogram on blue"
-msgstr ""
+#: ../src/histogram.c:125
+msgid "Linear Histogram on RGB"
+msgstr "Линейная гистограмма RGB"
 
-#: .././src/histogram.c:99
-msgid "linear histogram on value"
-msgstr ""
+#: ../src/histogram.c:126
+msgid "Linear Histogram on value"
+msgstr "Линейная гистограмма на значение"
 
-#: .././src/histogram.c:100
-msgid "linear histogram on RGB"
-msgstr ""
+#: ../src/history_list.c:131
+#, c-format
+msgid "Unable to write history lists to: %s\n"
+msgstr "Невозможно записать список истории в:%s\n"
 
-#: .././src/histogram.c:101
-msgid "linear histogram on max value"
-msgstr ""
+#: ../src/image.c:161
+#, c-format
+msgid " (Collection %s)"
+msgstr " (Коллекция %s)"
 
-#: .././src/img-view.c:1260
-#: .././src/layout_image.c:736
-#: .././src/layout_util.c:1062
-#: .././src/layout_util.c:1063
-#: .././src/layout_util.c:1064
-#: .././src/pan-view.c:2789
+#: ../src/img-view.c:1266 ../src/layout_image.c:489 ../src/layout_util.c:1296
+#: ../src/layout_util.c:1297 ../src/layout_util.c:1312
+#: ../src/layout_util.c:1313 ../src/pan-view.c:2808
 msgid "Zoom _in"
 msgstr "Масштаб _+"
 
-#: .././src/img-view.c:1261
-#: .././src/layout_image.c:737
-#: .././src/layout_util.c:1065
-#: .././src/layout_util.c:1066
-#: .././src/pan-view.c:2791
+#: ../src/img-view.c:1267 ../src/layout_image.c:490 ../src/layout_util.c:1298
+#: ../src/layout_util.c:1299 ../src/layout_util.c:1314
+#: ../src/layout_util.c:1315 ../src/pan-view.c:2810
 msgid "Zoom _out"
 msgstr "Масштаб _-"
 
-#: .././src/img-view.c:1262
-#: .././src/layout_image.c:738
-#: .././src/layout_util.c:1067
-#: .././src/layout_util.c:1068
-#: .././src/pan-view.c:2793
+#: ../src/img-view.c:1268 ../src/layout_image.c:491 ../src/layout_util.c:1300
+#: ../src/layout_util.c:1301 ../src/layout_util.c:1316
+#: ../src/layout_util.c:1317 ../src/pan-view.c:2812
 msgid "Zoom _1:1"
 msgstr "Масштаб _1:1"
 
-#: .././src/img-view.c:1263
-#: .././src/layout_image.c:739
+#: ../src/img-view.c:1269 ../src/layout_image.c:492
 msgid "Fit image to _window"
 msgstr "Масштабировать к _размеру окна"
 
-#: .././src/img-view.c:1268
-#: .././src/layout_image.c:745
-#: .././src/layout_util.c:1060
+#: ../src/img-view.c:1277 ../src/layout_image.c:501 ../src/layout_util.c:1294
 msgid "Set as _wallpaper"
 msgstr "_Установить в качестве обоев"
 
-#: .././src/img-view.c:1275
-#: .././src/layout_image.c:755
+#: ../src/img-view.c:1282 ../src/layout_image.c:508
 msgid "_Go to directory view"
-msgstr ""
+msgstr "П_ерейти к обзору каталогов"
 
-#: .././src/img-view.c:1287
-#: .././src/layout_image.c:773
+#: ../src/img-view.c:1295 ../src/layout_image.c:529
 msgid "_Stop slideshow"
 msgstr "_Остановить просмотр слайдов"
 
-#: .././src/img-view.c:1290
-#: .././src/layout_image.c:776
+#: ../src/img-view.c:1298 ../src/layout_image.c:532
 msgid "Continue slides_how"
 msgstr "_Продолжить просмотр слайдов"
 
-#: .././src/img-view.c:1295
-#: .././src/img-view.c:1303
-#: .././src/layout_image.c:781
-#: .././src/layout_image.c:788
+#: ../src/img-view.c:1303 ../src/img-view.c:1311 ../src/layout_image.c:537
+#: ../src/layout_image.c:544
 msgid "Pause slides_how"
 msgstr "Пр_иостановить просмотр слайдов"
 
-#: .././src/img-view.c:1301
-#: .././src/layout_image.c:787
+#: ../src/img-view.c:1309 ../src/layout_image.c:543
 msgid "_Start slideshow"
 msgstr "_Начать просмотр слайдов"
 
-#: .././src/img-view.c:1309
-#: .././src/layout_image.c:798
-#: .././src/pan-view.c:2859
+#: ../src/img-view.c:1317 ../src/layout_image.c:554 ../src/pan-view.c:2881
 msgid "Exit _full screen"
 msgstr "_Выйти из полного экрана"
 
-#: .././src/img-view.c:1313
-#: .././src/layout_image.c:794
-#: .././src/pan-view.c:2863
+#: ../src/img-view.c:1321 ../src/layout_image.c:550 ../src/pan-view.c:2885
 msgid "_Full screen"
 msgstr "На весь _экран"
 
-#: .././src/img-view.c:1317
-#: .././src/layout_util.c:1033
-#: .././src/pan-view.c:2867
+#: ../src/img-view.c:1325 ../src/layout_util.c:1279 ../src/pan-view.c:2889
 msgid "C_lose window"
 msgstr "_Закрыть окно"
 
-#: .././src/info.c:391
-msgid "File size:"
-msgstr "Размер файла:"
-
-#: .././src/info.c:393
-msgid "Dimensions:"
-msgstr "Размерность:"
-
-#: .././src/info.c:394
-msgid "Transparent:"
-msgstr "Прозрачность:"
-
-#: .././src/info.c:395
-#: .././src/print.c:3418
-msgid "Image size:"
-msgstr "Размер изображения:"
-
-#: .././src/info.c:397
-msgid "Compress ratio:"
-msgstr "Коэффициент сжатия:"
-
-#: .././src/info.c:398
-msgid "File type:"
-msgstr "Тип файла:"
-
-#: .././src/info.c:400
-msgid "Owner:"
-msgstr "Владелец:"
-
-#: .././src/info.c:401
-msgid "Group:"
-msgstr "Группа:"
-
-#: .././src/info.c:404
-#: .././src/preferences.c:840
-msgid "General"
-msgstr "Общие"
-
-#: .././src/info.c:530
-#, c-format
-msgid "Image %d of %d"
-msgstr "Изображение %d из %d"
-
-#: .././src/info.c:779
-msgid "Image properties"
-msgstr "Свойства изображения"
-
-#: .././src/layout.c:276
-#: .././src/view_file_icon.c:345
-#: .././src/view_file_list.c:591
+#: ../src/layout.c:363 ../src/view_file.c:613
 msgid "Ascending"
 msgstr "По увеличению"
 
-#: .././src/layout.c:378
-#, c-format
-msgid "This installation of %s was not built with support for color profiles."
-msgstr ""
-
-#: .././src/layout.c:379
-msgid "Color profiles not supported"
-msgstr "Цветовые профили не поддерживаются"
-
-#: .././src/layout.c:404
-msgid "Use _color profiles"
-msgstr "_Использовать цветовые профили"
-
-#: .././src/layout.c:409
-msgid "Use profile from _image"
-msgstr ""
-
-#: .././src/layout.c:415
-#: .././src/layout.c:433
-#, c-format
-msgid "Input _%d:"
-msgstr ""
-
-#: .././src/layout.c:416
-msgid "AdobeRGB compatible"
-msgstr ""
-
-#: .././src/layout.c:458
-msgid "_Screen profile"
-msgstr "Профиль _монитора"
-
-#: .././src/layout.c:525
+#: ../src/layout.c:433
 msgid " Slideshow"
 msgstr " Просмотр слайдов"
 
-#: .././src/layout.c:529
+#: ../src/layout.c:437
 msgid " Paused"
 msgstr " Приостановлено"
 
-#: .././src/layout.c:546
+#: ../src/layout.c:453
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
 msgstr "%s, %d файлов (%s, %d)%s"
 
-#: .././src/layout.c:553
+#: ../src/layout.c:460
 #, c-format
 msgid "%s, %d files%s"
 msgstr "%s, %d файлов%s"
 
-#: .././src/layout.c:558
+#: ../src/layout.c:465
 #, c-format
 msgid "%d files%s"
 msgstr "%d файлов%s"
 
-#: .././src/layout.c:587
+#: ../src/layout.c:510
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(нет прав на чтение) %s байт"
 
-#: .././src/layout.c:591
+#: ../src/layout.c:514
 #, c-format
 msgid "( ? x ? ) %s bytes"
 msgstr "( ? x ? ) %s байт"
 
-#: .././src/layout.c:599
+#: ../src/layout.c:522
 #, c-format
 msgid "( %d x %d ) %s bytes"
 msgstr "( %d x %d ) %s байт"
 
-#: .././src/layout.c:1331
-#: .././src/layout_config.c:58
+#: ../src/layout.c:1231 ../src/layout_config.c:58
 msgid "Tools"
 msgstr "Инструменты"
 
-#: .././src/layout.c:2002
-#, fuzzy
+#: ../src/layout.c:1853
+msgid "Window options and layout"
+msgstr "Параметры и размещение окон"
+
+#: ../src/layout.c:1912
+msgid "General options"
+msgstr "Общие настройки"
+
+#: ../src/layout.c:1914
+msgid "Home path (empty to use your home directory)"
+msgstr ""
+"Домашний каталог (оставьте пустым, чтобы использовать ваш домашний каталог в "
+"системе)"
+
+#: ../src/layout.c:1922
+msgid "Use current"
+msgstr "Использовать текущий"
+
+#: ../src/layout.c:1925
+msgid "Show date in directories list view"
+msgstr "Показывать дату в списке каталогов"
+
+#: ../src/layout.c:1928
+msgid "Exit program when this window is closed"
+msgstr "Выйти из программы после закрытия этого окна"
+
+#: ../src/layout.c:1931
+msgid "Start-up directory:"
+msgstr "Начальный каталог"
+
+#: ../src/layout.c:1933
+msgid "No change"
+msgstr "Без изменений"
+
+#: ../src/layout.c:1936
+msgid "Restore last path"
+msgstr "Восстановить последний путь"
+
+#: ../src/layout.c:1939
+msgid "Home path"
+msgstr "Домашний каталог"
+
+#: ../src/layout.c:1943 ../src/print.c:3373 ../src/print.c:3380
+msgid "Layout"
+msgstr "Размещение"
+
+#: ../src/layout.c:2187
 msgid "Invalid geometry\n"
-msgstr "Неправильный каталог"
+msgstr "Неправильные размеры\n"
 
-#: .././src/layout_config.c:58
-#: .././src/ui_pathsel.c:1182
+#: ../src/layout_config.c:58 ../src/preferences.c:1446
+#: ../src/ui_pathsel.c:1179
 msgid "Files"
 msgstr "Файлы"
 
-#: .././src/layout_config.c:58
-#: .././src/preferences.c:916
-#: .././src/print.c:115
+#: ../src/layout_config.c:58 ../src/preferences.c:91 ../src/preferences.c:1240
+#: ../src/print.c:123
 msgid "Image"
 msgstr "Изображение"
 
-#: .././src/layout_config.c:364
+#: ../src/layout_config.c:364
 msgid "(drag to change order)"
 msgstr "(номер панели меняется перетаскиванием)"
 
-#: .././src/layout_image.c:803
+#: ../src/layout_image.c:559
 msgid "Hide file _list"
-msgstr "Спрят_ать список файлов"
+msgstr "Скр_ыть список файлов"
 
-#: .././src/layout_util.c:871
-#: .././src/menu.c:75
+#: ../src/layout_image.c:1559
 #, c-format
-msgid "_%d in %s..."
-msgstr "_%d в %s..."
+msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
+msgstr "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 
-#: .././src/layout_util.c:875
-#: .././src/menu.c:77
+#: ../src/layout_image.c:1567
 #, c-format
-msgid "_%d in (unknown)..."
-msgstr "_%d в (неизвестно)..."
+msgid "[%*s,%*s]: RGB(---,---,---)"
+msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: .././src/layout_util.c:885
-#, fuzzy, c-format
-msgid "_%d empty"
-msgstr "пусто"
-
-#: .././src/layout_util.c:997
+#: ../src/layout_util.c:1234
 msgid "_File"
 msgstr "_Файл"
 
-#: .././src/layout_util.c:998
+#: ../src/layout_util.c:1235
 msgid "_Go"
 msgstr "Пере_ход"
 
-#: .././src/layout_util.c:999
-#: .././src/menu.c:92
+#: ../src/layout_util.c:1236 ../src/menu.c:109
 msgid "_Edit"
 msgstr "Пр_авка"
 
-#: .././src/layout_util.c:1000
+#: ../src/layout_util.c:1237
 msgid "_Select"
 msgstr "В_ыделение"
 
-#: .././src/layout_util.c:1001
-#: .././src/menu.c:264
-msgid "_Adjust"
-msgstr "_Изменить"
+#: ../src/layout_util.c:1238 ../src/menu.c:276
+msgid "_Orientation"
+msgstr "_Ориентация"
 
-#: .././src/layout_util.c:1003
-msgid "_View Directory as"
-msgstr "Просмотреть _каталог как"
+#: ../src/layout_util.c:1239
+msgid "E_xternal Editors"
+msgstr "Внешние _редакторы"
 
-#: .././src/layout_util.c:1004
+#: ../src/layout_util.c:1240
+msgid "P_references"
+msgstr "_Параметры"
+
+#: ../src/layout_util.c:1242
+msgid "_Files and Folders"
+msgstr "_Файлы и каталоги"
+
+#: ../src/layout_util.c:1243
 msgid "_Zoom"
 msgstr "_Масштаб"
 
-#: .././src/layout_util.c:1005
-msgid "_Split"
+#: ../src/layout_util.c:1244
+msgid "_Color Management"
+msgstr "_Управление цветом"
+
+#: ../src/layout_util.c:1245
+msgid "_Connected Zoom"
+msgstr "С_вязанный масштаб"
+
+#: ../src/layout_util.c:1246
+msgid "Spli_t"
 msgstr "_Разделить"
 
-#: .././src/layout_util.c:1006
+#: ../src/layout_util.c:1247 ../src/layout_util.c:1361
+msgid "Image _Overlay"
+msgstr "_Перекрытие изображений"
+
+#: ../src/layout_util.c:1248
 msgid "_Help"
 msgstr "_Справка"
 
-#: .././src/layout_util.c:1008
+#: ../src/layout_util.c:1250
 msgid "_First Image"
 msgstr "_Первое изображение"
 
-#: .././src/layout_util.c:1009
-#: .././src/layout_util.c:1010
-#: .././src/layout_util.c:1011
+#: ../src/layout_util.c:1250
+msgid "First Image"
+msgstr "Первое изображение"
+
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
 msgid "_Previous Image"
 msgstr "Пр_едыдущее изображение"
 
-#: .././src/layout_util.c:1012
-#: .././src/layout_util.c:1013
-#: .././src/layout_util.c:1014
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
+msgid "Previous Image"
+msgstr "Предыдущее изображение"
+
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
 msgid "_Next Image"
 msgstr "_Следующее изображение"
 
-#: .././src/layout_util.c:1015
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
+msgid "Next Image"
+msgstr "Следующее изображение"
+
+#: ../src/layout_util.c:1257
 msgid "_Last Image"
 msgstr "П_оследнее изображение"
 
-#: .././src/layout_util.c:1018
+#: ../src/layout_util.c:1257
+msgid "Last Image"
+msgstr "Последнее изображение"
+
+#: ../src/layout_util.c:1258
+msgid "_Back"
+msgstr "_Назад"
+
+#: ../src/layout_util.c:1258
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/layout_util.c:1259
+msgid "_Home"
+msgstr "_Домашняя папка"
+
+#: ../src/layout_util.c:1259 ../src/options.c:136 ../src/ui_bookmark.c:543
+#: ../src/ui_pathsel.c:1047
+msgid "Home"
+msgstr "Домашняя папка"
+
+#: ../src/layout_util.c:1261
 msgid "New _window"
 msgstr "Создать новое _окно"
 
-#: .././src/layout_util.c:1019
+#: ../src/layout_util.c:1261
+msgid "New window"
+msgstr "Создать новое окно"
+
+#: ../src/layout_util.c:1262
 msgid "_New collection"
 msgstr "_Создать коллекцию"
 
-#: .././src/layout_util.c:1020
+#: ../src/layout_util.c:1262
+msgid "New collection"
+msgstr "Создать коллекцию"
+
+#: ../src/layout_util.c:1263
 msgid "_Open collection..."
 msgstr "Откр_ыть коллекцию..."
 
-#: .././src/layout_util.c:1021
-msgid "Open _recent"
+#: ../src/layout_util.c:1263
+msgid "Open collection..."
+msgstr "Открыть коллекцию..."
+
+#: ../src/layout_util.c:1264
+msgid "Open recen_t"
 msgstr "Открыть н_едавнее"
 
-#: .././src/layout_util.c:1022
+#: ../src/layout_util.c:1264
+msgid "Open recent"
+msgstr "Открыть недавнее"
+
+#: ../src/layout_util.c:1265
 msgid "_Search..."
 msgstr "_Найти..."
 
-#: .././src/layout_util.c:1024
-msgid "Pan _view"
+#: ../src/layout_util.c:1265
+msgid "Search..."
+msgstr "Найти..."
+
+#: ../src/layout_util.c:1266
+msgid "Find duplicates..."
+msgstr "Найти повторяющиеся..."
+
+#: ../src/layout_util.c:1267
+msgid "Pa_n view"
 msgstr "_Расширенный вид"
 
-#: .././src/layout_util.c:1025
+#: ../src/layout_util.c:1267
+msgid "Pan view"
+msgstr "Расширенный вид"
+
+#: ../src/layout_util.c:1268
 msgid "_Print..."
 msgstr "Напе_чатать..."
 
-#: .././src/layout_util.c:1026
+#: ../src/layout_util.c:1269
 msgid "N_ew folder..."
 msgstr "Создать _каталог..."
 
-#: .././src/layout_util.c:1034
+#: ../src/layout_util.c:1269
+msgid "New folder..."
+msgstr "Создать каталог..."
+
+#: ../src/layout_util.c:1270
+msgid "Copy..."
+msgstr "Копировать..."
+
+#: ../src/layout_util.c:1271
+msgid "Move..."
+msgstr "Переместить..."
+
+#: ../src/layout_util.c:1272
+msgid "Rename..."
+msgstr "Переименовать..."
+
+#: ../src/layout_util.c:1273 ../src/layout_util.c:1274
+#: ../src/layout_util.c:1275
+msgid "Delete..."
+msgstr "Удалить..."
+
+#: ../src/layout_util.c:1276 ../src/view_file.c:603
+msgid "Enable file _grouping"
+msgstr "_Выключить отбор файлов"
+
+#: ../src/layout_util.c:1276
+msgid "Enable file grouping"
+msgstr "Включить отбор файлов"
+
+#: ../src/layout_util.c:1277 ../src/view_file.c:605
+msgid "Disable file groupi_ng"
+msgstr "В_ыключить отбор файлов"
+
+#: ../src/layout_util.c:1277
+msgid "Disable file grouping"
+msgstr "Выключить отбор файлов"
+
+#: ../src/layout_util.c:1278
+msgid "_Copy path to clipboard"
+msgstr "_Скопировать путь в буфер обмена"
+
+#: ../src/layout_util.c:1278
+msgid "Copy path to clipboard"
+msgstr "Скопировать путь в буфер обмена"
+
+#: ../src/layout_util.c:1279
+msgid "Close window"
+msgstr "Закрыть окно"
+
+#: ../src/layout_util.c:1280
 msgid "_Quit"
 msgstr "В_ыйти"
 
-#: .././src/layout_util.c:1047
-#: .././src/menu.c:202
+#: ../src/layout_util.c:1280
+msgid "Quit"
+msgstr "Выйти"
+
+#: ../src/layout_util.c:1281 ../src/menu.c:218
 msgid "_Rotate clockwise"
 msgstr "Повернуть по _часовой стрелке"
 
-#: .././src/layout_util.c:1048
-#: .././src/menu.c:205
+#: ../src/layout_util.c:1281
+msgid "Rotate clockwise"
+msgstr "Повернуть по часовой стрелке"
+
+#: ../src/layout_util.c:1282 ../src/menu.c:221
 msgid "Rotate _counterclockwise"
 msgstr "Повернуть п_ротив часовой стрелки"
 
-#: .././src/layout_util.c:1049
+#: ../src/layout_util.c:1282
+msgid "Rotate counterclockwise"
+msgstr "Повернуть против часовой стрелки"
+
+#: ../src/layout_util.c:1283
 msgid "Rotate 1_80"
 msgstr "Повернуть на 1_80"
 
-#: .././src/layout_util.c:1050
-#: .././src/menu.c:211
+#: ../src/layout_util.c:1283
+msgid "Rotate 180"
+msgstr "Повернуть на 180"
+
+#: ../src/layout_util.c:1284 ../src/menu.c:227
 msgid "_Mirror"
 msgstr "Отразить _зеркально"
 
-#: .././src/layout_util.c:1051
-#: .././src/menu.c:214
+#: ../src/layout_util.c:1284
+msgid "Mirror"
+msgstr "Отразить зеркально"
+
+#: ../src/layout_util.c:1285 ../src/menu.c:230
 msgid "_Flip"
 msgstr "_Перевернуть"
 
-#: .././src/layout_util.c:1052
-#: .././src/menu.c:217
-msgid "Toggle _grayscale"
-msgstr "Переключить просмотр в _ч/б"
+#: ../src/layout_util.c:1285
+msgid "Flip"
+msgstr "Перевернуть"
 
-#: .././src/layout_util.c:1053
-#: .././src/menu.c:220
+#: ../src/layout_util.c:1286 ../src/menu.c:233
 msgid "_Original state"
 msgstr "_Исходное состояние"
 
-#: .././src/layout_util.c:1056
+#: ../src/layout_util.c:1286
+msgid "Original state"
+msgstr "Исходное состояние"
+
+#: ../src/layout_util.c:1287
 msgid "Select _all"
 msgstr "Выделить вс_ё"
 
-#: .././src/layout_util.c:1057
+#: ../src/layout_util.c:1288
 msgid "Select _none"
 msgstr "Снять в_ыделение"
 
-#: .././src/layout_util.c:1058
+#: ../src/layout_util.c:1289
+msgid "_Invert Selection"
+msgstr "_Инвертировать выделение"
+
+#: ../src/layout_util.c:1289
+msgid "Invert Selection"
+msgstr "Инвертировать выделение"
+
+#: ../src/layout_util.c:1290
 msgid "P_references..."
 msgstr "_Параметры"
 
-#: .././src/layout_util.c:1059
+#: ../src/layout_util.c:1290
+msgid "Preferences..."
+msgstr "Параметры"
+
+#: ../src/layout_util.c:1291
+msgid "Configure _Editors..."
+msgstr "Настроить _редакторы..."
+
+#: ../src/layout_util.c:1291
+msgid "Configure Editors..."
+msgstr "Настроить редакторы..."
+
+#: ../src/layout_util.c:1292
+msgid "_Configure this window..."
+msgstr "_Настроить это окно..."
+
+#: ../src/layout_util.c:1292
+msgid "Configure this window..."
+msgstr "Настроить это окно..."
+
+#: ../src/layout_util.c:1293
 msgid "_Thumbnail maintenance..."
 msgstr "У_правление миниатюрами"
 
-#: .././src/layout_util.c:1069
-#: .././src/layout_util.c:1070
+#: ../src/layout_util.c:1293
+msgid "Thumbnail maintenance..."
+msgstr "Управление миниатюрами"
+
+#: ../src/layout_util.c:1294
+msgid "Set as wallpaper"
+msgstr "Установить в качестве обоев"
+
+#: ../src/layout_util.c:1295
+msgid "_Save metadata"
+msgstr "Сохранить _метаданные"
+
+#: ../src/layout_util.c:1295
+msgid "Save metadata"
+msgstr "Сохранить метаданные"
+
+#: ../src/layout_util.c:1296 ../src/layout_util.c:1297
+msgid "Zoom in"
+msgstr "Увеличить"
+
+#: ../src/layout_util.c:1298 ../src/layout_util.c:1299
+msgid "Zoom out"
+msgstr "Уменьшить"
+
+#: ../src/layout_util.c:1300 ../src/layout_util.c:1301
+msgid "Zoom 1:1"
+msgstr "Масштаб 1:1"
+
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
 msgid "_Zoom to fit"
 msgstr "Масштаб к размеру _окна"
 
-#: .././src/layout_util.c:1071
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
+msgid "Zoom to fit"
+msgstr "Масштаб к размеру окна"
+
+#: ../src/layout_util.c:1304 ../src/layout_util.c:1320
 msgid "Fit _Horizontally"
 msgstr "Уместить по _горизонтали"
 
-#: .././src/layout_util.c:1072
-msgid "Fit _Vorizontally"
+#: ../src/layout_util.c:1304
+msgid "Fit Horizontally"
+msgstr "Уместить по горизонтали"
+
+#: ../src/layout_util.c:1305 ../src/layout_util.c:1321
+msgid "Fit _Vertically"
 msgstr "Уместить по _вертикали"
 
-#: .././src/layout_util.c:1073
+#: ../src/layout_util.c:1305
+msgid "Fit Vertically"
+msgstr "Уместить по вертикали"
+
+#: ../src/layout_util.c:1306 ../src/layout_util.c:1322
 msgid "Zoom _2:1"
 msgstr "Масштаб _2:1"
 
-#: .././src/layout_util.c:1074
+#: ../src/layout_util.c:1306
+msgid "Zoom 2:1"
+msgstr "Масштаб 2:1"
+
+#: ../src/layout_util.c:1307 ../src/layout_util.c:1323
 msgid "Zoom _3:1"
 msgstr "Масштаб _3:1"
 
-#: .././src/layout_util.c:1075
+#: ../src/layout_util.c:1307
+msgid "Zoom 3:1"
+msgstr "Масштаб 3:1"
+
+#: ../src/layout_util.c:1308 ../src/layout_util.c:1324
 msgid "Zoom _4:1"
 msgstr "Масштаб _4:1"
 
-#: .././src/layout_util.c:1076
+#: ../src/layout_util.c:1308
+msgid "Zoom 4:1"
+msgstr "Масштаб 4:1"
+
+#: ../src/layout_util.c:1309 ../src/layout_util.c:1325
 msgid "Zoom 1:2"
 msgstr "Масштаб 1:2"
 
-#: .././src/layout_util.c:1077
+#: ../src/layout_util.c:1310 ../src/layout_util.c:1326
 msgid "Zoom 1:3"
 msgstr "Масштаб 1:3"
 
-#: .././src/layout_util.c:1078
+#: ../src/layout_util.c:1311 ../src/layout_util.c:1327
 msgid "Zoom 1:4"
 msgstr "Масштаб 1:4"
 
-#: .././src/layout_util.c:1081
+#: ../src/layout_util.c:1312 ../src/layout_util.c:1313
+msgid "Connected Zoom in"
+msgstr "Связанный масштаб +"
+
+#: ../src/layout_util.c:1314 ../src/layout_util.c:1315
+msgid "Connected Zoom out"
+msgstr "Связанный масштаб -"
+
+#: ../src/layout_util.c:1316 ../src/layout_util.c:1317
+msgid "Connected Zoom 1:1"
+msgstr "Связанный масштаб 1:1"
+
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
+msgid "Connected Zoom to fit"
+msgstr "Связанный масштаб к размеру окна"
+
+#: ../src/layout_util.c:1320
+msgid "Connected Fit Horizontally"
+msgstr "Уместить связанные изображения по горизонтали"
+
+#: ../src/layout_util.c:1321
+msgid "Connected Fit Vertically"
+msgstr "Уместить связанные изображения по вертикали"
+
+#: ../src/layout_util.c:1322
+msgid "Connected Zoom 2:1"
+msgstr "Связанный масштаб 2:1"
+
+#: ../src/layout_util.c:1323
+msgid "Connected Zoom 3:1"
+msgstr "Связанный масштаб 3:1"
+
+#: ../src/layout_util.c:1324
+msgid "Connected Zoom 4:1"
+msgstr "Связанный масштаб 4:1"
+
+#: ../src/layout_util.c:1325
+msgid "Connected Zoom 1:2"
+msgstr "Связанный масштаб 1:2"
+
+#: ../src/layout_util.c:1326
+msgid "Connected Zoom 1:3"
+msgstr "Связанный масштаб 1:3"
+
+#: ../src/layout_util.c:1327
+msgid "Connected Zoom 1:4"
+msgstr "Связанный масштаб 1:4"
+
+#: ../src/layout_util.c:1328
 msgid "_View in new window"
 msgstr "_Показать в новом окне"
 
-#: .././src/layout_util.c:1083
-#: .././src/layout_util.c:1084
-#: .././src/layout_util.c:1085
+#: ../src/layout_util.c:1328
+msgid "View in new window"
+msgstr "Просмотр в новом окне"
+
+#: ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331
 msgid "F_ull screen"
 msgstr "Полно_экранный режим"
 
-#: .././src/layout_util.c:1086
-#: .././src/layout_util.c:1087
-#, fuzzy
-msgid "Escape"
-msgstr "ландшафт"
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
+msgid "_Leave full screen"
+msgstr "_Выйти из полноэкранного режима"
 
-#: .././src/layout_util.c:1088
-msgid "_Image Overlay"
-msgstr "С_водка по изображению"
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
+msgid "Leave full screen"
+msgstr "Выйти из полноэкранного режима"
 
-#: .././src/layout_util.c:1089
-msgid "Histogram _channels"
-msgstr "Поканальный просмотр _гистограммы"
+#: ../src/layout_util.c:1334
+msgid "_Cycle through overlay modes"
+msgstr "_Переключение между режимами перекрытия"
 
-#: .././src/layout_util.c:1090
-msgid "Histogram _log mode"
-msgstr "Л_огарифмический/линейный масштаб гистограммы"
+#: ../src/layout_util.c:1334
+msgid "Cycle through Overlay modes"
+msgstr "Переключение между режимами перекрытия"
 
-#: .././src/layout_util.c:1091
+#: ../src/layout_util.c:1335
+msgid "Cycle through histogram ch_annels"
+msgstr "Переключение между _каналами гистограммы"
+
+#: ../src/layout_util.c:1335
+msgid "Cycle through histogram channels"
+msgstr "Переключение между каналами гистограммы"
+
+#: ../src/layout_util.c:1336
+msgid "Cycle through histogram mo_des"
+msgstr "Переключение между _режимами гистограммы"
+
+#: ../src/layout_util.c:1336
+msgid "Cycle through histogram modes"
+msgstr "Переключение между режимами гистограммы"
+
+#: ../src/layout_util.c:1337
 msgid "_Hide file list"
 msgstr "Скр_ыть список файлов"
 
-#: .././src/layout_util.c:1092
+#: ../src/layout_util.c:1337
+msgid "Hide file list"
+msgstr "Скрыть список файлов"
+
+#: ../src/layout_util.c:1338
 msgid "_Pause slideshow"
 msgstr "Пр_иостановить просмотр слайдов"
 
-#: .././src/layout_util.c:1093
+#: ../src/layout_util.c:1338
+msgid "Pause slideshow"
+msgstr "Приостановить просмотр слайдов"
+
+#: ../src/layout_util.c:1339
 msgid "_Refresh"
 msgstr "О_бновить"
 
-#: .././src/layout_util.c:1095
+#: ../src/layout_util.c:1339
+msgid "Refresh"
+msgstr "Обновить"
+
+#: ../src/layout_util.c:1340
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: .././src/layout_util.c:1096
+#: ../src/layout_util.c:1340
+msgid "Contents"
+msgstr "Содержание"
+
+#: ../src/layout_util.c:1341
 msgid "_Keyboard shortcuts"
 msgstr "_Горячие клавиши"
 
-#: .././src/layout_util.c:1097
+#: ../src/layout_util.c:1341
+msgid "Keyboard shortcuts"
+msgstr "Горячие клавиши"
+
+#: ../src/layout_util.c:1342
 msgid "_Release notes"
 msgstr "_Информация о версии"
 
-#: .././src/layout_util.c:1098
+#: ../src/layout_util.c:1342
+msgid "Release notes"
+msgstr "Информация о версии"
+
+#: ../src/layout_util.c:1343
 msgid "_About"
 msgstr "_О программе"
 
-#: .././src/layout_util.c:1102
-#: .././src/layout_util.c:1500
-msgid "_Thumbnails"
-msgstr "_Эскизы"
+#: ../src/layout_util.c:1343 ../src/preferences.c:2108
+msgid "About"
+msgstr "О программе"
 
-#: .././src/layout_util.c:1103
+#: ../src/layout_util.c:1344
+msgid "_Log Window"
+msgstr "Окно ж_урнала"
+
+#: ../src/layout_util.c:1344
+msgid "Log Window"
+msgstr "Окно журнала"
+
+#: ../src/layout_util.c:1345
+msgid "_Exif window"
+msgstr "_Окно Exif"
+
+#: ../src/layout_util.c:1345
+msgid "Exif window"
+msgstr "Окно Exif"
+
+#: ../src/layout_util.c:1350
+msgid "Show _Thumbnails"
+msgstr "Показать м_иниатюры"
+
+#: ../src/layout_util.c:1350
+msgid "Show Thumbnails"
+msgstr "Показать миниатюры"
+
+#: ../src/layout_util.c:1351
 msgid "Show _Marks"
-msgstr "Показать _метки"
+msgstr "Показать з_акладки"
 
-#: .././src/layout_util.c:1104
+#: ../src/layout_util.c:1351
+msgid "Show Marks"
+msgstr "Показать метки"
+
+#: ../src/layout_util.c:1352
+msgid "Pi_xel Info"
+msgstr "Информация о _пикселе"
+
+#: ../src/layout_util.c:1352
+msgid "Show Pixel Info"
+msgstr "Показать информацию о пикселе"
+
+#: ../src/layout_util.c:1353
 msgid "_Float file list"
 msgstr "Открепленный список _файлов"
 
-#: .././src/layout_util.c:1105
+#: ../src/layout_util.c:1353
+msgid "Float file list"
+msgstr "Открепленный список файлов"
+
+#: ../src/layout_util.c:1354
 msgid "Hide tool_bar"
-msgstr "Скрытая панель инс_трументов"
+msgstr "Скрыть панель инс_трументов"
 
-#: .././src/layout_util.c:1106
-msgid "_Keywords"
-msgstr "Кл_ючевые слова"
+#: ../src/layout_util.c:1354
+msgid "Hide toolbar"
+msgstr "Скрыть панель инструментов"
 
-#: .././src/layout_util.c:1107
-msgid "E_xif data"
-msgstr "Данные _Exif"
+#: ../src/layout_util.c:1355
+msgid "_Info sidebar"
+msgstr "_Информационная панель"
 
-#: .././src/layout_util.c:1108
+#: ../src/layout_util.c:1355
+msgid "Info sidebar"
+msgstr "Информационная панель"
+
+#: ../src/layout_util.c:1356
 msgid "Sort _manager"
 msgstr "_Менеджер сортировки"
 
-#: .././src/layout_util.c:1109
-msgid "Co_nnected scroll"
-msgstr "_Связанная прокрутка"
+#: ../src/layout_util.c:1356
+msgid "Sort manager"
+msgstr "Менеджер сортировки"
 
-#: .././src/layout_util.c:1110
-msgid "C_onnected zoom"
-msgstr "С_вязанный масштаб"
-
-#: .././src/layout_util.c:1111
+#: ../src/layout_util.c:1357
 msgid "Toggle _slideshow"
 msgstr "Переключить просмотр сла_йдов"
 
-#: .././src/layout_util.c:1115
-#: .././src/view_dir.c:29
-msgid "_List"
-msgstr "_Список"
+#: ../src/layout_util.c:1357
+msgid "Toggle slideshow"
+msgstr "Переключить просмотр слайдов"
 
-#: .././src/layout_util.c:1116
+#: ../src/layout_util.c:1358
+msgid "Use _color profiles"
+msgstr "_Использовать цветовые профили"
+
+#: ../src/layout_util.c:1358
+msgid "Use color profiles"
+msgstr "Использовать цветовые профили"
+
+#: ../src/layout_util.c:1359
+msgid "Use profile from _image"
+msgstr "Использовать профили из _изображения"
+
+#: ../src/layout_util.c:1359
+msgid "Use profile from image"
+msgstr "Использовать профили из изображения"
+
+#: ../src/layout_util.c:1360
+msgid "Toggle _grayscale"
+msgstr "Переключить просмотр в _ч/б"
+
+#: ../src/layout_util.c:1360
+msgid "Toggle grayscale"
+msgstr "Переключить просмотр в ч/б"
+
+#: ../src/layout_util.c:1361
+msgid "Image Overlay"
+msgstr "Перекрытие изображений"
+
+#: ../src/layout_util.c:1362
+msgid "_Show Histogram"
+msgstr "_Показать гистограмму"
+
+#: ../src/layout_util.c:1362
+msgid "Show Histogram"
+msgstr "Показать гистограмму"
+
+#: ../src/layout_util.c:1366
+msgid "Image _List"
+msgstr "_Список изображений"
+
+#: ../src/layout_util.c:1366
+msgid "View Images as List"
+msgstr "Показать как список"
+
+#: ../src/layout_util.c:1367
 msgid "I_cons"
-msgstr "_Эскизы"
+msgstr "_Пиктограммы"
 
-#: .././src/layout_util.c:1120
-msgid "Horizontal"
-msgstr "По горизонтали"
+#: ../src/layout_util.c:1367
+msgid "View Images as Icons"
+msgstr "Показать как пиктограммы"
 
-#: .././src/layout_util.c:1121
-msgid "Vertical"
-msgstr "По вертикали"
+#: ../src/layout_util.c:1371
+msgid "Folder Li_st"
+msgstr "_Список каталогов"
 
-#: .././src/layout_util.c:1122
-msgid "Quad"
-msgstr "На четыре"
+#: ../src/layout_util.c:1371
+msgid "View Folders as List"
+msgstr "Показать каталоги как список"
 
-#: .././src/layout_util.c:1123
-msgid "Single"
+#: ../src/layout_util.c:1372
+msgid "Folder T_ree"
+msgstr "_Дерево каталогов"
+
+#: ../src/layout_util.c:1372
+msgid "View Folders as Tree"
+msgstr "Показать каталоги как дерево"
+
+#: ../src/layout_util.c:1376
+msgid "_Horizontal"
+msgstr "По _горизонтали"
+
+#: ../src/layout_util.c:1376
+msgid "Split Horizontal"
+msgstr "Разделить по горизонтали"
+
+#: ../src/layout_util.c:1377
+msgid "_Vertical"
+msgstr "По _вертикали"
+
+#: ../src/layout_util.c:1377
+msgid "Split Vertical"
+msgstr "Разделить по вертикали"
+
+#: ../src/layout_util.c:1378
+msgid "_Quad"
+msgstr "На _четыре"
+
+#: ../src/layout_util.c:1378
+msgid "Split Quad"
+msgstr "Разделить на четыре"
+
+#: ../src/layout_util.c:1379
+msgid "_Single"
+msgstr "_Одиночная область просмотра"
+
+#: ../src/layout_util.c:1379
+msgid "Split Single"
 msgstr "Одиночная область просмотра"
 
-#: .././src/layout_util.c:1309
-#, c-format
-msgid "Mark _%d"
-msgstr ""
+#: ../src/layout_util.c:1383
+msgid "Input _0: sRGB"
+msgstr "Вход _0: sRGB"
 
-#: .././src/layout_util.c:1310
-#: .././src/view_file_list.c:527
-#, c-format
-msgid "_Set mark %d"
-msgstr ""
+#: ../src/layout_util.c:1383
+msgid "Input 0: sRGB"
+msgstr "Вход 0: sRGB"
 
-#: .././src/layout_util.c:1311
-#: .././src/view_file_list.c:528
-#, c-format
-msgid "_Reset mark %d"
-msgstr ""
+#: ../src/layout_util.c:1384
+msgid "Input _1: AdobeRGB compatible"
+msgstr "Вход _1: AdobeRGB-совместимый"
 
-#: .././src/layout_util.c:1312
-#: .././src/layout_util.c:1313
-#: .././src/view_file_list.c:529
-#, c-format
-msgid "_Toggle mark %d"
-msgstr ""
+#: ../src/layout_util.c:1384
+msgid "Input 1: AdobeRGB compatible"
+msgstr "Вход 1: AdobeRGB-совместимый"
 
-#: .././src/layout_util.c:1314
-#: .././src/layout_util.c:1315
-#: .././src/view_file_list.c:530
-#, fuzzy, c-format
-msgid "_Select mark %d"
-msgstr "Выделить всё"
+#: ../src/layout_util.c:1385
+msgid "Input _2"
+msgstr "Вход _2"
 
-#: .././src/layout_util.c:1316
-#: .././src/view_file_list.c:531
-#, fuzzy, c-format
-msgid "_Add mark %d"
-msgstr "Добавить закладку"
+#: ../src/layout_util.c:1385
+msgid "Input 2"
+msgstr "Вход 2"
 
-#: .././src/layout_util.c:1317
-#: .././src/view_file_list.c:532
-#, c-format
-msgid "_Intersection with mark %d"
-msgstr ""
+#: ../src/layout_util.c:1386
+msgid "Input _3"
+msgstr "Вход _3"
 
-#: .././src/layout_util.c:1318
-#: .././src/view_file_list.c:533
-#, c-format
-msgid "_Unselect mark %d"
-msgstr ""
+#: ../src/layout_util.c:1386
+msgid "Input 3"
+msgstr "Вход 3"
 
-#: .././src/layout_util.c:1501
-msgid "Show thumbnails"
-msgstr "Показать эскизы"
+#: ../src/layout_util.c:1387
+msgid "Input _4"
+msgstr "Вход _4"
 
-#: .././src/layout_util.c:1506
-msgid "Change to home folder"
-msgstr "Перейти в домашний каталог"
+#: ../src/layout_util.c:1387
+msgid "Input 4"
+msgstr "Вход 4"
 
-#: .././src/layout_util.c:1508
-msgid "Refresh file list"
-msgstr "Обновить список файлов"
+#: ../src/layout_util.c:1388
+msgid "Input _5"
+msgstr "Вход _5"
 
-#: .././src/layout_util.c:1510
-msgid "Zoom in"
-msgstr "Увеличить"
+#: ../src/layout_util.c:1388
+msgid "Input 5"
+msgstr "Вход 5"
 
-#: .././src/layout_util.c:1512
-msgid "Zoom out"
-msgstr "Уменьшить"
+#: ../src/layout_util.c:1392
+msgid "Histogram on Red"
+msgstr "Гистограмма красного канала"
 
-#: .././src/layout_util.c:1514
-#: .././src/preferences.c:953
-msgid "Fit image to window"
-msgstr "Уместить в окне"
+#: ../src/layout_util.c:1393
+msgid "Histogram on Green"
+msgstr "Гистограмма зеленого канала"
 
-#: .././src/layout_util.c:1516
-msgid "Set zoom 1:1"
-msgstr "Масштаб 1:1"
+#: ../src/layout_util.c:1394
+msgid "Histogram on Blue"
+msgstr "Гистограмма синего канала"
 
-#: .././src/layout_util.c:1518
-msgid "Configure options"
-msgstr "Настроить программу"
+#: ../src/layout_util.c:1395
+msgid "Histogram on RGB"
+msgstr "Гистограмма RGB"
 
-#: .././src/layout_util.c:1519
-#, fuzzy
-msgid "_Float"
-msgstr "Формат"
+#: ../src/layout_util.c:1396
+msgid "Histogram on Value"
+msgstr "Гистограмма значения"
 
-#: .././src/layout_util.c:1520
-msgid "Float Controls"
-msgstr "Прикрепить/открепить панель инструментов"
+#: ../src/layout_util.c:1400
+msgid "Linear Histogram"
+msgstr "Линейная гистограмма"
 
-#: .././src/main.c:324
-msgid "Help"
-msgstr "Справка"
+#: ../src/layout_util.c:1401
+msgid "_Log Histogram"
+msgstr "Л_огарифмическая гистограмма"
 
-#: .././src/main.c:545
-#: .././src/main.c:1493
-msgid "Command line"
-msgstr "Командная строка"
+#: ../src/layout_util.c:1401
+msgid "Log Histogram"
+msgstr "Логарифмическая гистограмма"
 
-#. short, long                  callback,               extra, prefer,description
-#: .././src/main.c:583
-msgid "next image"
-msgstr "следующее изображение"
+#: ../src/layout_util.c:1667
+#, c-format
+msgid "Mark _%d"
+msgstr "Закладка _%d"
 
-#: .././src/main.c:584
-msgid "previous image"
-msgstr "предыдущее изображение"
+#: ../src/layout_util.c:1668 ../src/view_file.c:540
+#, c-format
+msgid "_Set mark %d"
+msgstr "_Установить закладку %d"
 
-#: .././src/main.c:585
-msgid "first image"
-msgstr "первое изображение"
+#: ../src/layout_util.c:1668
+#, c-format
+msgid "Set mark %d"
+msgstr "Установить закладку %d"
 
-#: .././src/main.c:586
-msgid "last image"
-msgstr "последнее изображение"
+#: ../src/layout_util.c:1669 ../src/view_file.c:541
+#, c-format
+msgid "_Reset mark %d"
+msgstr "Сбр_осить закладку %d"
 
-#: .././src/main.c:587
-msgid "toggle full screen"
-msgstr "переключить полноэкранный режим"
+#: ../src/layout_util.c:1669
+#, c-format
+msgid "Reset mark %d"
+msgstr "Сбросить закладку %d"
 
-#: .././src/main.c:588
-msgid "start full screen"
-msgstr "войти в полноэкранный режим"
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671 ../src/view_file.c:542
+#, c-format
+msgid "_Toggle mark %d"
+msgstr "Пе_реключиться на закладку %d"
 
-#: .././src/main.c:589
-msgid "stop full screen"
-msgstr "выйти из полноэкранного режима"
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671
+#, c-format
+msgid "Toggle mark %d"
+msgstr "Переключиться на закладку %d"
 
-#: .././src/main.c:590
-msgid "toggle slide show"
-msgstr "переключить просмотр слайдов"
+#: ../src/layout_util.c:1672
+#, c-format
+msgid "Se_lect mark %d"
+msgstr "_Выделить закладку %d"
 
-#: .././src/main.c:591
-msgid "start slide show"
-msgstr "начать просмотр слайдов"
+#: ../src/layout_util.c:1672 ../src/layout_util.c:1673
+#, c-format
+msgid "Select mark %d"
+msgstr "Выделить закладку %d"
 
-#: .././src/main.c:592
-msgid "stop slide show"
-msgstr "остановить просмотр слайдов"
+#: ../src/layout_util.c:1673 ../src/view_file.c:543
+#, c-format
+msgid "_Select mark %d"
+msgstr "_Выделить закладку %d"
 
-#: .././src/main.c:593
-msgid "start recursive slide show"
-msgstr "начать рекурсивный просмотр слайдов"
+#: ../src/layout_util.c:1674 ../src/view_file.c:544
+#, c-format
+msgid "_Add mark %d"
+msgstr "_Добавить закладку %d"
 
-#: .././src/main.c:594
-msgid "set slide show delay in seconds"
-msgstr "установить задержку просмотра слайдов (в секундах)"
+#: ../src/layout_util.c:1674
+#, c-format
+msgid "Add mark %d"
+msgstr "Добавить закладку %d"
 
-#: .././src/main.c:595
-msgid "show tools"
-msgstr "показать инструменты"
+#: ../src/layout_util.c:1675 ../src/view_file.c:545
+#, c-format
+msgid "_Intersection with mark %d"
+msgstr "_Пересечение с закладкой %d"
 
-#: .././src/main.c:596
-msgid "hide tools"
-msgstr "спрятать инструменты"
+#: ../src/layout_util.c:1675
+#, c-format
+msgid "Intersection with mark %d"
+msgstr "Пересечение с закладкой %d"
 
-#: .././src/main.c:597
-msgid "quit"
-msgstr "выйти"
+#: ../src/layout_util.c:1676 ../src/view_file.c:546
+#, c-format

&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; Diff output truncated at 100000 characters. &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn&amp;lt; at &amp;gt;lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
&lt;/pre&gt;</description>
    <dc:creator>zas_-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-16T19:55:35</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/838">
    <title>SF.net SVN: geeqie:[1903] trunk/src/exif.c</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/838</link>
    <description>&lt;pre&gt;Revision: 1903
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1903&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-14 22:00:23 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
fixed segfault in exif parser

http://sourceforge.net/tracker/index.php?func=detail&amp;amp;aid=2950617&amp;amp;group_id=222125&amp;amp;atid=1054682

Modified Paths:
--------------
    trunk/src/exif.c

Modified: trunk/src/exif.c
===================================================================
--- trunk/src/exif.c2010-02-14 21:35:11 UTC (rev 1902)
+++ trunk/src/exif.c2010-02-14 22:00:23 UTC (rev 1903)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1458,6 +1458,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 gint exif_item_get_integer(ExifItem *item, gint *value)
 {
 if (!item) return FALSE;
+if (!item-&amp;gt;elements) return FALSE;
 
 switch (item-&amp;gt;format)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-14T22:00:23</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/837">
    <title>SF.net SVN: geeqie:[1902] trunk/src/utilops.c</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/837</link>
    <description>&lt;pre&gt;Revision: 1902
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1902&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-14 21:35:11 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
fixed reference count

there was a bug in reference count on writting unsaved metadata
before starting an external editor

Modified Paths:
--------------
    trunk/src/utilops.c

Modified: trunk/src/utilops.c
===================================================================
--- trunk/src/utilops.c2010-02-07 13:16:35 UTC (rev 1901)
+++ trunk/src/utilops.c2010-02-14 21:35:11 UTC (rev 1902)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2744,11 +2744,15 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 FileData *fd = work-&amp;gt;data;
 work = work-&amp;gt;next;
 
-if (fd-&amp;gt;change) return FALSE; /* another op. in progress, let the caller handle it */
+if (fd-&amp;gt;change) 
+{
+filelist_free(unsaved);
+return FALSE; /* another op. in progress, let the caller handle it */
+}
 
 if (fd-&amp;gt;modified_xmp) /* has unsaved metadata */
 {
-unsaved = g_list_prepend(unsaved, fd);
+unsaved = g_list_prepend(unsaved, file_data_ref(fd));
 }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-14T21:35:11</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/836">
    <title>SF.net SVN: geeqie:[1900] trunk/README</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/836</link>
    <description>&lt;pre&gt;Revision: 1900
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1900&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-07 12:44:55 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
dropped obsolete sections, gqview changelog moved to wiki

Modified Paths:
--------------
    trunk/README

Modified: trunk/README
===================================================================
--- trunk/README2010-02-02 20:21:11 UTC (rev 1899)
+++ trunk/README2010-02-07 12:44:55 UTC (rev 1900)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,7 +1,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 ###################################################################
-##                          Geeqie 1.0alpha3                     ##
+##                            Geeqie 1.0                         ##
 ##                                                               ##
-##              Copyright (C) 2008 - 2009 The Geeqie Team        ##
+##              Copyright (C) 2008 - 2010 The Geeqie Team        ##
 ##              Copyright (C) 1999 - 2006 John Ellis.            ##
 ##                                                               ##
 ##                      Use at your own risk!                    ##
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -62,142 +62,20 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
         FIXME: minimal version ?
     lirc, for remote control support: http://www.lirc.org/
     (disable with configure option: '--disable-lirc')
-
+    libchamplain - experimental map support, dissabled by default
+        http://projects.gnome.org/libchamplain/
+        WARNING: this library has a lot of dependencise
+        
 ======== Notes and changes for this release            [section:release_notes]
 
-!!! FIXME Geeqie changes !!!
 See http://geeqie.wiki.sourceforge.net/new_features
 
-The list for Geeqie is quite long - maybe use separate file?
 
-
-  Changes:
-
-    + Add support for color profiles (requires lcms, see Notes).
-    + Add ability to delete a folder and it's contents (with restrictions).
-    - Add support for jpegs embedded in pentax and olympus raw files.
-    - Add icons for image state, enabled with I keyboard shortcut.
-    - For pan view calendar only show months that contain an image.
-    - Make scrolling with overlays (full screen info display) a bit smoother.
-    - Make sort menus display choices as radio group instead of checkbox.
-    - Use white background for transparent images when printing.
-    * Escape filename characters "`$\ before passing them to the system shell
-      when running an editor command.
-    * Fix occasional crash in icon view when removing files.
-    * Always use aligned memory access in EXIF parser, fixes crash
-      with BUS error on sparc.
-    * Fix progress bar warning when removing files while loading thumbnails.
-    * Fix image count in full screen information overlay when in slideshow.
-    * Fix memory leak when unable to start a slideshow.
-
-  Notes:
-
-    For translation status list, see further below.
-
-    Version in parentheses indicates first appearance of feature or change.
-
-
-   
-    Below are GQView releases:
-    (2.1.5) Add support for color profiles when lcms is installed. To
-    disable color profiles and use of lcms, run configure
-    with '--without-lcms'.
-
-    (2.1.1) Add support for viewing jpeg images and EXIF embedded within
-    raw files for Canon (.crw, .cr2) Fujifilm (.raf), and Nikon (.nef).
-    Note that not all cameras that support a raw format will necessarily
-    save a usable jpeg in the raw file (for example some Nikon cameras only
-    store a tiny thumbnail within the raw .nef file).
-
-    (1.5.6) The "shared thumbnail cache" is a proposal to unify the method
-    of storing thumbnails, so that they are compatible between different
-    applications. Using this option will allow GQview to share it's
-    thumbnails with, and use thumbnails from, other applications. Current
-    releases of GNOME (through nautilus and gthumb) and the gimp use this
-    new thumbnailing system. The latest draft of the thumbnail standard
-    is located on freedesktop.org in the standards section, and links to:
-
-      http://triq.net/~jens/thumbnail-spec/index.html
-
-    The shared thumbnail standard and GQview's classic mechanism can
-    not be used at the same time, enabling the "use shared thumbnail cache"
-    option will disable the use of classic thumbnails and use the new
-    shared thumbnails.
-
-    (1.5.6) Collections contained in $HOME/.gqview/collections are now
-    updated when moving or renaming files, even if the collection is not
-    open at the time.
-
-    (1.5.6) The new option to the keep the full screen window above other
-    windows is only available when using at least GTK+ 2.4.0
-
-    (1.5.5) Dialog buttons are now ordered as recommended by the GNOME HIG.
-    The GNOME Human Interface Guidelines live at:
-       http://developer.gnome.org/projects/gup/hig/
-    To restore the old button order you must be using GTK 2.6 and set
-    the "gtk-alternative-button-order" key to TRUE in the gtkrc file:
-       $HOME/.gtkrc-2.0
-    by changing or adding this line:
-       gtk-alternative-button-order = 1
-
-    (1.5.5) The dithering option is now a hidden option, to change it
-    please refer to section 10.7 of the manual (help -&amp;gt; contents).
-
-    (1.5.0) Keywords and comments can now be entered for a file. Two places
-    allow keyword and comment entry. The first is via the new image details
-    sidebar accessed with (Ctrl-K), and the second is a details tab in the
-    properties dialog. If multiple files are selected, two buttons are
-    available: One allows adding the keywords to the selected files, the
-    other replaces existing keywords with the new keywords.
-
-    Keyword and comment metadata is stored in $(HOME)/.gqview/metadata, and
-    mirrors the existing filesystem tree. Metadata filenames have a suffix
-    of .meta appended. If 'cache into .thumbnails' is enabled, metadata is
-    stored locally to the original file in a hidden subfolder ".metadata".
-    If write permissions do not allow local saving of metadata, GQview falls
-    back to the default $(HOME)/.gqview/metadata location.
-
-    (1.5.0) Search dialog (F3 key) types:
-       Path       searches files in the entered folder.
-       Comments   searches all file metadata stored in ~/.gqview/metadata.
-       Results    searches the current list of results, allowing refinement.
-
-    (1.3.6) Drag and drop has been significantly improved, with a few
-    changes. Button 1 will now initiate a drag, button 2 will still work
-    for this, the difference is button 2 will not change the selection.
-
-    (1.3.6) A middle button click will now toggle selection of clicked item.
-
-    (1.3.5) UTF-8 and filenames: GQview works fine if your filenames
-    correctly match the preferred locale encoding (LANG environment
-    variable), and prints errors on the console when they do not.
-
-    (1.3.3) Safe delete does not include undo, you will need to go to the
-    trash folder and retrieve the file(s) manually. The files can be viewed
-    by clicking the view button near the safe delete option in the preferences
-    window. Files moved to the trash folder are prefixed with a 6 digit
-    number. Lower numbers are older, and deleted (permanently) first when the
-    trash size limit is reached.
-
-    (1.3.2) New in 1.3.2 are sidebars for EXIF data display and a sort
-    manager. EXIF (ctrl + E) should be self explanatory. The Sort manager is a
-    directory list that allows copying or moving the displayed image to that
-    destination with one click of the button - very helpful when visually
-    sorting many images into subdirectories. To edit, reorder, or remove items
-    in the sort list, use the right click menu. The keyboard can also be used
-    by moving the focus to the desired button, then pressing menu/ctrl+f10 key
-    to display the popup menu, or shift+up/shift+down keys to change the
-    button location in the list. Items can also be added to the list by
-    dragging a directory onto the list.
-
   Code hackers:
 
     If you plan on making any major changes to the code that will be offered
     for inclusion to the main source, please contact us first - so that we
-    can avoid duplication of effort. A good example is porting any part of
-    GQview that uses deprecated widgets to GTK2 widgets, there are already
-    several such patches floating around. This is especially true if the
-    change is listed in the TODO!
+    can avoid duplication of effort. 
                                                          The Geeqie Team
 
   Known bugs:
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -210,17 +88,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
   General install: make install
   Removal: make uninstall
 
-!!! FIXME !!!
-    - To build an RPM binary:
-
-         on RedHat 6.x, 7.x use 'rpm -tb gqview-x.x.x.tar.gz'.
-         on RedHat 8 and 9 use 'rpmbuild -tb gqview-x.x.x.tar.gz'.
-         on other rpm distros, it depends on which version of rpm is used, if
-         the option fails with the rpm command, try rpmbuild.
-
-      Where the resulting package is placed is distribution specific, for
-      example in RedHat it is placed in /usr/src/redhat/RPMS/{architecture}/
-
 ======== Description / Features
 
   Geeqie is a graphics file viewer. Basic features:
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -240,8 +107,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 ======== Documentation (brief)                         [section:documentation]
 
-FIXME: do we need this section? The keyboard configuration dialog should provide
-correct up-to-date list.
+This sections lists default hotkeys. Most of the hotkeys can be redefined 
+in the Preferences dialog.
 
   Keyboard commands:
     [PageDown], [Keypad PageDown]      next image
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -269,10 +136,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
     [Ctrl] - R                         rename file
     [Ctrl] - D, [Delete]               delete file
     [Ctrl] - W                         close window
-    [Ctrl] - Q                         exit GQview
+    [Ctrl] - Q                         exit Geeqie
 
   Edit menu related:
-    [Ctrl] - 1 .. 0                    run external editor
+    1 .. 6                             toggle mark
+    [Ctrl] - 1..6                      select mark
     [Ctrl] - A                         select all files
     [Ctrl] - [Shift] - A               unselect all files
     [Ctrl] - P                         display image properties window
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -291,8 +159,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
     X, [Keypad *]                      zoom to fit within window
     W                                  zoom to fit width of window
     H                                  zoom to fit height of window
-    1, 2, 3, 4                         zoom to Nx (3 = 3x)
-    9, 8, 7                            zoom to -2, -3, -4, respectively
     T                                  toggle thumbnails in list view
     [Ctrl] - L                         display files as list view
     [Ctrl] - I                         display files as icon view
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -300,8 +166,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
     R                                  refresh list
     L                                  (Un)float file selection area
     [ctrl] - H                         (Un)hide file selection area
-    [Ctrl] - K                         toggle Keywords sidebar
-    [Ctrl] - E                         toggle EXIF sidebar
+    [Ctrl] - K                         toggle sidebar with EXIF or keywords
+    [Ctrl] - E                         show EXIF window
     [Ctrl] - S                         toggle sort manager sidebar
     F, V                               toggle full screen
     S                                  toggle slide show
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -336,7 +202,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
     [Enter], [Keypad Enter]            view image with focus in main window
     V                                  view image with focus in new window
-    [Ctrl] - 1 .. 0                    open selected image(s) in editor
 
     S                                  save collection
     [Ctrl] - S                         save collection as...
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -403,11 +268,9 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 ======== Editor command macros                               [section:editors]
 
 Editors are configured via standard desktop files, see
-http://standards.freedesktop.org/desktop-entry-spec/latest/
+https://sourceforge.net/apps/trac/geeqie/wiki/GuideEditorsConfig
 
-FIXME: Geeqie extensions
 
-
 ======== Overlay Info                                        [section:overlay]
 
 Overlay info format string syntax is: %tag[:max_length][:extra]%
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -472,27 +335,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
                              "Collection " and a newline is appended
 
 
-======== Additional comments:
-
-FIXME: here are some changes
-
-  Hidden options:
-    These options are not adjustable in the preferences window, to change
-    them edit $(HOME)/.geeqie/geeqierc while Geeqie is not running. An option
-    becomes 'hidden' when it is removed from the user's visibility, and
-    only remains so that those few users that really want it will not complain
-    about it's removal :)
-
-  lazy_image_sync: false
-    Set true to enable the old behavior of lazy image updates when changing
-    directories. (viewed image will remain until a new file is selected)
-
-  display_dialogs_under_mouse: false
-    Set true to force dialogs to display under the current mouse position,
-    note that this goes against the preference set for the window manager.
-
-
-
 ======== Credits                                             [section:credits]
 
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -679,50 +521,3 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
          Thanks to the users for finding Geeqie useful.
 
 
-======== Translation status:
-
-   Please send po files/patches in gzipped form to ensure data integrity.
-
-Translations statistics
-Date: Fri, 05 Sep 2008 00:30:54 +0200
-
-Note: completion % in the chart below may not be quite correct
-      when fuzzy translations exist but do not appear in the source.
-      For exact results, run make update-po with up to date POTFILES.in.
-      comp % = trans / (trans + fuzzy + untrans)
-
-Language      Comp(%)  Trans  Fuzzy  Untrans  Total
-fr             100.00    996      0        0    996
-be              82.43    821     77       98    996
-ru              71.99    717    128      151    996
-eu              62.05    618    185      193    996
-eo              61.95    617    186      193    996
-vi              61.85    616    192      188    996
-it              61.65    614    187      195    996
-pt_BR           61.65    614    187      195    996
-zh_TW           60.84    606    183      207    996
-sk              60.34    601    192      203    996
-fi              58.23    580    211      205    996
-nl              58.23    580    214      202    996
-sv              58.03    578    207      211    996
-bg              57.93    577    208      211    996
-ca              57.93    577    208      211    996
-cs              57.93    577    208      211    996
-de              57.93    577    208      211    996
-es              57.93    577    208      211    996
-ja              57.93    577    208      211    996
-pl              55.32    551    180      265    996
-ar              38.86    387    332      277    996
-ro              34.34    342    352      302    996
-hu              32.93    328    342      326    996
-id              17.17    171    412      413    996
-et              16.77    167    411      418    996
-uk              14.86    148    413      435    996
-nb              13.76    137    418      441    996
-zh_CN.GB2312    13.76    137    419      440    996
-th              12.95    129    413      454    996
-sl              12.55    125    422      449    996
-da              11.85    118    406      472    996
-ko              11.04    110     65      821    996
-tr               4.92     49    395      552    996
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-07T12:44:55</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/835">
    <title>SF.net SVN: geeqie:[1901] trunk</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/835</link>
    <description>&lt;pre&gt;Revision: 1901
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1901&amp;amp;view=rev
Author:   nadvornik
Date:     2010-02-07 13:16:35 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
test gnome-doc-tool in configure

Modified Paths:
--------------
    trunk/configure.in
    trunk/doc/Makefile.am

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in2010-02-07 12:44:55 UTC (rev 1900)
+++ trunk/configure.in2010-02-07 13:16:35 UTC (rev 1901)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -218,6 +218,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files])
 AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation])
 
+AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool)
+
 AC_SUBST(readmedir)
 AC_SUBST(htmldir)
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -469,6 +471,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 Documentation:
   Doxygen:       $DOXYGEN
   Formats:       $doxy_formats_report
+  doc-tool:      $GNOME_DOC_TOOL
+
 END
 
 cat config.report

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am2010-02-07 12:44:55 UTC (rev 1900)
+++ trunk/doc/Makefile.am2010-02-07 13:16:35 UTC (rev 1901)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -8,13 +8,20 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 EXTRA_DIST = docbook2html.sh docbook
 
 html/GuideIndex.html: docbook/GuideIndex.xml
-rm -rf html; mkdir html &amp;amp;&amp;amp; gnome-doc-tool html -o html $(srcdir)/docbook/GuideIndex.xml
+rm -rf html; mkdir html
+if [ -x "$(GNOME_DOC_TOOL)" ]; then \
+"$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
+else \
+echo "gnome-doc-tool not found, html is not built" ; \
+fi
 
 html: html/GuideIndex.html
 
 install-data-hook: html
-cd html; for f in * ; do $(INSTALL_DATA) "$$f" "$(DESTDIR)$(helpdir)/$$f" ; done
-ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html"
+if [ -x "$(GNOME_DOC_TOOL)" ]; then \
+cd html; for f in * ; do $(INSTALL_DATA) "$$f" "$(DESTDIR)$(helpdir)/$$f" ; done; \
+ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html" ; \
+fi
 
 uninstall-hook:
 rm "$(DESTDIR)$(helpdir)/"*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-07T13:16:38</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/834">
    <title>SF.net SVN: geeqie:[1899] trunk/po/pt_BR.po</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/834</link>
    <description>&lt;pre&gt;Revision: 1899
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1899&amp;amp;view=rev
Author:   zas_
Date:     2010-02-02 20:21:11 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
Brazilian Portuguese translation was updated. 

Thanks to Sergio Cipolla.

References:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567824

Modified Paths:
--------------
    trunk/po/pt_BR.po

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po2010-01-27 22:27:10 UTC (rev 1898)
+++ trunk/po/pt_BR.po2010-02-02 20:21:11 UTC (rev 1899)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,172 +1,357 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
-# gqview pt_BR.po file.
-# Copyright (C) Guilherme M. Schroeder.
-# Guilherme M. Schroeder &amp;lt;slump&amp;lt; at &amp;gt;linuxall.org&amp;gt;, 2001.
-# Herval Ribeiro de Azevêdo &amp;lt;heraze&amp;lt; at &amp;gt;gmail.com&amp;gt;, 2005.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Geeqie 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-13 22:14+0200\n"
-"PO-Revision-Date: 2005-11-01 19:50-0200\n"
-"Last-Translator: Herval Ribeiro de Azevêdo &amp;lt;heraze&amp;lt; at &amp;gt;gmail.com&amp;gt;\n"
+"POT-Creation-Date: 2010-02-02 21:16+0100\n"
+"PO-Revision-Date: 2010-01-31 12:15-0300\n"
+"Last-Translator: Sérgio Cipolla &amp;lt;secipolla&amp;lt; at &amp;gt;gmail.com&amp;gt;\n"
 "Language-Team: Brazilian Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=2; plural=(n &amp;gt; 1);\n"
+"Plural-Forms: nplurals=2; plural=(n &amp;gt; 1);\n"
 
-#: src/bar_exif.c:444
-msgid "Tag"
-msgstr "Marca"
+#: ../geeqie.desktop.in.h:1
+msgid "Geeqie"
+msgstr "Geeqie"
 
-#: src/bar_exif.c:445 src/dupe.c:2646 src/dupe.c:3167 src/print.c:3232
-#: src/search.c:2760 src/utilops.c:2971 src/view_file_list.c:1820
-msgid "Name"
-msgstr "Nome"
+#: ../geeqie.desktop.in.h:2
+msgid "Image Viewer"
+msgstr "Visualizador de imagens"
 
-#: src/bar_exif.c:446
+#: ../geeqie.desktop.in.h:3
+msgid "View and manage images"
+msgstr "Visualizar e gerir imagens"
+
+#: ../plugins/import/geeqie-import-geeqie.desktop.in.h:1
+msgid "Import Geeqie 1.0alphaX metadata"
+msgstr "Importar os metadados do Geeqie 1.0alphaX"
+
+#: ../plugins/import/geeqie-import-gqview.desktop.in.h:1
+msgid "Import GQView metadata"
+msgstr "Importar os metadados do GQView"
+
+#: ../plugins/rotate/rotate.desktop.in.h:1
+msgid "Apply the orientation to image content"
+msgstr "Aplicar a orientação ao conteúdo da imagem"
+
+#: ../plugins/symlink/symlink.desktop.in.h:1
+msgid "Symlink"
+msgstr "Ligar simbolicamente"
+
+#: ../plugins/ufraw/geeqie-ufraw.desktop.in.h:1
+msgid "UFRaw Batch"
+msgstr "Lote UFRaw"
+
+#: ../plugins/ufraw/geeqie-ufraw-id.desktop.in.h:1
+msgid "Edit UFRaw ID file"
+msgstr "Editar arquivo UFRaw ID"
+
+#: ../plugins/ufraw/geeqie-ufraw-recursive.desktop.in.h:1
+msgid "UFRaw Batch recursive"
+msgstr "Lote UFRaw recursivo"
+
+#: ../src/advanced_exif.c:328 ../src/cache_maint.c:1284
+#: ../src/preferences.c:93 ../src/preferences.c:1595
+msgid "Metadata"
+msgstr "Metadados"
+
+#: ../src/advanced_exif.c:376 ../src/preferences.c:1512
+msgid "Description"
+msgstr "Descrição"
+
+#: ../src/advanced_exif.c:377
 msgid "Value"
 msgstr "Valor"
 
-#: src/bar_exif.c:447
+#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2647
+#: ../src/dupe.c:3165 ../src/print.c:3201 ../src/search.c:2844
+#: ../src/utilops.c:462 ../src/view_file_list.c:2046
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/advanced_exif.c:379
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: ../src/advanced_exif.c:380
 msgid "Format"
 msgstr "Formato"
 
-#: src/bar_exif.c:448
+#: ../src/advanced_exif.c:381
 msgid "Elements"
 msgstr "Elementos"
 
-#: src/bar_exif.c:449 src/preferences.c:1131
-msgid "Description"
-msgstr "Descrição"
+#. default sidebar
+#: ../src/bar.c:167
+msgid "Histogram"
+msgstr "Histograma"
 
-#: src/bar_exif.c:576 src/info.c:125 src/preferences.c:1274
+#: ../src/bar.c:168
+msgid "Title"
+msgstr "Título"
+
+#: ../src/bar.c:169 ../src/search.c:2767
+msgid "Keywords"
+msgstr "Palavras-chave"
+
+#: ../src/bar.c:170 ../src/search.c:2779
+msgid "Comment"
+msgstr "Comentário"
+
+#: ../src/bar.c:171
 msgid "Exif"
 msgstr "Exif"
 
-#: src/bar_exif.c:650
-msgid "Advanced view"
-msgstr "Exibição avançada"
+#. other pre-configured panes
+#: ../src/bar.c:173
+msgid "File info"
+msgstr "Informações do arquivo"
 
-#: src/bar_info.c:35
-msgid "Favorite"
-msgstr "Favorito"
+#: ../src/bar.c:174
+msgid "Location and GPS"
+msgstr "Localização e GPS"
 
-#: src/bar_info.c:36
-msgid "Todo"
-msgstr "Fazer"
+#: ../src/bar.c:175 ../src/exif.c:347
+msgid "Copyright"
+msgstr "Copyright"
 
-#: src/bar_info.c:37
-msgid "People"
-msgstr "Pessoas"
+#: ../src/bar.c:178 ../src/bar_gps.c:768
+msgid "GPS Map"
+msgstr "Mapa GPS"
 
-#: src/bar_info.c:38
-msgid "Places"
-msgstr "Lugares"
+#: ../src/bar.c:297
+msgid "Move to _top"
+msgstr "Mover para o _topo"
 
-#: src/bar_info.c:39
-msgid "Art"
-msgstr "Arte"
+#: ../src/bar.c:298 ../src/ui_bookmark.c:405
+msgid "Move _up"
+msgstr "Mover para _cima"
 
-#: src/bar_info.c:40
-msgid "Nature"
-msgstr "Natureza"
+#: ../src/bar.c:299 ../src/ui_bookmark.c:407
+msgid "Move _down"
+msgstr "Mover para _baixo"
 
-#: src/bar_info.c:41
-msgid "Possessions"
-msgstr "Bens"
+#: ../src/bar.c:300
+msgid "Move to _bottom"
+msgstr "Mover para _embaixo"
 
-#: src/bar_info.c:801
-msgid "Keyword Presets"
-msgstr "Pré-ajustes de Palavras-Chave"
+#: ../src/bar.c:302
+msgid "Remove"
+msgstr "Remover"
 
-#: src/bar_info.c:804
-msgid "Favorite keywords list"
-msgstr "Lista de palavras-chave favoritas"
+#: ../src/bar_comment.c:191
+msgid "Add text to selected files"
+msgstr "Adicionar texto aos arquivos selecionados"
 
-#: src/bar_info.c:1301 src/info.c:189 src/search.c:2699
-msgid "Keywords"
-msgstr "Palavras-chave"
+#: ../src/bar_comment.c:192
+msgid "Replace existing text in selected files"
+msgstr "Substituir o texto existente nos arquivos selecionados"
 
-#: src/bar_info.c:1315 src/info.c:825 src/pan-view.c:1542 src/print.c:2632
-msgid "Filename:"
-msgstr "Nome de arquivo:"
+#: ../src/bar_exif.c:213
+msgid "&amp;lt;empty label, fixme&amp;gt;"
+msgstr "&amp;lt;rótulo vazio, corrigir&amp;gt;"
 
-#: src/bar_info.c:1316 src/info.c:391
-msgid "File date:"
-msgstr "Data do arquivo:"
+#: ../src/bar_exif.c:538 ../src/bar_exif.c:548
+msgid "Configure entry"
+msgstr "Configurar a entrada"
 
-#: src/bar_info.c:1336
-msgid "Keywords:"
-msgstr "Palavras-chave:"
+#. for the pane
+#: ../src/bar_exif.c:538 ../src/bar_exif.c:548 ../src/bar_exif.c:621
+msgid "Add entry"
+msgstr "Adicionar uma entrada"
 
-#: src/bar_info.c:1404
-msgid "Comment:"
-msgstr "Comentário:"
+#: ../src/bar_exif.c:554
+msgid "Key:"
+msgstr "Tecla:"
 
-#: src/bar_info.c:1428
-msgid "Edit favorite keywords list."
-msgstr "Editar lista de palavras-chave favoritas."
+#: ../src/bar_exif.c:563
+msgid "Title:"
+msgstr "Título:"
 
-#: src/bar_info.c:1432
-msgid "Add keywords to selected files"
-msgstr "Adicionar palavras-chave aos arquivos selecionados"
+#: ../src/bar_exif.c:572
+msgid "Show only if set"
+msgstr "Exibir apenas se definido"
 
-#: src/bar_info.c:1435
-#, fuzzy
-msgid "Add keywords to selected files, replacing existing ones"
-msgstr ""
-"Adicionar palavras-chave aos arquivos selecionados, substituindo as "
-"existentes."
+#: ../src/bar_exif.c:573
+msgid "Editable (supported only for XMP)"
+msgstr "Editável (suportado apenas para XMP)"
 
-#: src/bar_info.c:1438
-#, fuzzy
-msgid "Add comment to selected files"
-msgstr "Adicionar palavras-chave aos arquivos selecionados"
+#. for the entry
+#: ../src/bar_exif.c:609
+#, c-format
+msgid "Configure \"%s\""
+msgstr "Configurar \"%s\""
 
-#: src/bar_info.c:1441
-#, fuzzy
-msgid "Add comment to selected files, replacing existing one"
-msgstr ""
-"Adicionar palavras-chave aos arquivos selecionados, substituindo as "
-"existentes."
+#: ../src/bar_exif.c:610 ../src/bar_keywords.c:1143
+#, c-format
+msgid "Remove \"%s\""
+msgstr "Remover \"%s\""
 
-#: src/bar_info.c:1446
-msgid "Save comment now"
-msgstr "Salvar comentário agora"
+#: ../src/bar_exif.c:622
+msgid "Show hidden entries"
+msgstr "Exibir entradas ocultas"
 
-#: src/bar_sort.c:218
-#, fuzzy, c-format
+#: ../src/bar_gps.c:499
+#, c-format
+msgid "Zoom %i"
+msgstr "Zoom %i"
+
+#: ../src/bar_gps.c:517
+#, c-format
+msgid "Zoom level %i"
+msgstr "Nível de zoom %i"
+
+#: ../src/bar_gps.c:522
+msgid "Loading map"
+msgstr "Carregando o mapa"
+
+#: ../src/bar_gps.c:584
+msgid "Enable markers"
+msgstr "Habilitar marcadores"
+
+#: ../src/bar_gps.c:586
+msgid "Centre map on marker"
+msgstr "Centralizar o mapa sobre o marcador"
+
+#: ../src/bar_gps.c:609
 msgid ""
-"Unable to remove symbolic link:\n"
-"%s"
+"Move map centre to marker\n"
+" is disabled"
 msgstr ""
-"Incapaz de mover arquivo:\n"
-"%s\n"
-"para:\n"
-"%s"
+"Mover o centro do mapa para\n"
+" o marcador está desabilitado"
 
-#: src/bar_sort.c:219
-msgid "Unlink failed"
-msgstr "Falha ao desvincular"
-
-#: src/bar_sort.c:300
-#, fuzzy, c-format
+#: ../src/bar_gps.c:614
 msgid ""
-"Unable to create symbolic link:\n"
-"%s"
+"Move map centre to marker\n"
+" is enabled"
 msgstr ""
-"Impossível criar pasta:\n"
-"%s"
+"Mover o centro do mapa para\n"
+" o marcador está habilitado"
 
-#: src/bar_sort.c:301
-msgid "Link failed"
-msgstr "Falha ao vincular"
+#: ../src/bar_gps.c:623
+msgid "Map Centreing"
+msgstr "Centralização do mapa"
 
-#: src/bar_sort.c:452
+#. use the same strings as in layout_util.c
+#: ../src/bar_histogram.c:242 ../src/layout_util.c:1392
+msgid "Histogram on _Red"
+msgstr "Histograma no _vermelho"
+
+#: ../src/bar_histogram.c:243 ../src/layout_util.c:1393
+msgid "Histogram on _Green"
+msgstr "Histograma no v_erde"
+
+#: ../src/bar_histogram.c:244 ../src/layout_util.c:1394
+msgid "Histogram on _Blue"
+msgstr "Histograma no _azul"
+
+#: ../src/bar_histogram.c:245 ../src/layout_util.c:1395
+msgid "_Histogram on RGB"
+msgstr "_Histograma no RGB"
+
+#: ../src/bar_histogram.c:246 ../src/layout_util.c:1396
+msgid "Histogram on _Value"
+msgstr "Histograma no valo_r"
+
+#: ../src/bar_histogram.c:250 ../src/layout_util.c:1400
+msgid "Li_near Histogram"
+msgstr "Histograma li_near"
+
+#: ../src/bar_histogram.c:251
+msgid "L_og Histogram"
+msgstr "L_ogar o histograma"
+
+#: ../src/bar_keywords.c:410
+msgid "Add keywords to selected files"
+msgstr "Adicionar palavras-chave aos arquivos selecionados"
+
+#: ../src/bar_keywords.c:411
+msgid "Replace existing keywords in selected files"
+msgstr "Substituir as palavras-chave existentes nos arquivos selecionados"
+
+#: ../src/bar_keywords.c:884
+msgid "Edit keyword"
+msgstr "Editar a palavra-chave"
+
+#: ../src/bar_keywords.c:884
+msgid "Add keywords"
+msgstr "Adicionar palavras-chave"
+
+#: ../src/bar_keywords.c:891
+msgid "Configure keyword"
+msgstr "Configurar a palavra-chave"
+
+#: ../src/bar_keywords.c:891 ../src/bar_keywords.c:1101
+msgid "Add keyword"
+msgstr "Adicionar palavra-chave"
+
+#: ../src/bar_keywords.c:897
+msgid "Keyword:"
+msgstr "Palavra-chave:"
+
+#: ../src/bar_keywords.c:906
+msgid "Keyword type:"
+msgstr "Tipo de palavra-chave:"
+
+#: ../src/bar_keywords.c:908
+msgid "Active keyword"
+msgstr "Palavra-chave ativa"
+
+#: ../src/bar_keywords.c:911
+msgid "Helper"
+msgstr "Ajudante"
+
+#: ../src/bar_keywords.c:1121
 #, c-format
+msgid "Hide \"%s\""
+msgstr "Ocultar \"%s\""
+
+#: ../src/bar_keywords.c:1128
+#, c-format
+msgid "Mark %d"
+msgstr "Marcação %d"
+
+#: ../src/bar_keywords.c:1133
+#, c-format
+msgid "Connect \"%s\" to mark"
+msgstr "Conectar \"%s\" à marcação"
+
+#: ../src/bar_keywords.c:1140
+#, c-format
+msgid "Edit \"%s\""
+msgstr "Editar \"%s\""
+
+#: ../src/bar_keywords.c:1150
+#, c-format
+msgid "Disconnect \"%s\" from mark %s"
+msgstr "Desconectar \"%s\" da marcação %s"
+
+#. for the pane
+#: ../src/bar_keywords.c:1162 ../src/bar_keywords.c:1171
+msgid "Expand checked"
+msgstr "Expandir os selecionados"
+
+#: ../src/bar_keywords.c:1163 ../src/bar_keywords.c:1172
+msgid "Collapse unchecked"
+msgstr "Recolher os não selecionados"
+
+#: ../src/bar_keywords.c:1164 ../src/bar_keywords.c:1173
+msgid "Hide unchecked"
+msgstr "Ocultar os não selecionados"
+
+#: ../src/bar_keywords.c:1165
+msgid "Show all"
+msgstr "Exibir tudo"
+
+#: ../src/bar_keywords.c:1168
+msgid "On any change"
+msgstr "Em toda modificação"
+
+#: ../src/bar_sort.c:449
+#, c-format
 msgid ""
 "The collection:\n"
 "%s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -176,314 +361,221 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "%s\n"
 "já existe."
 
-#: src/bar_sort.c:453
+#: ../src/bar_sort.c:450
 msgid "Collection exists"
-msgstr "Coleção existe"
+msgstr "A coleção existe"
 
-#: src/bar_sort.c:467 src/collect.c:1083 src/collect-dlg.c:85
+#: ../src/bar_sort.c:464 ../src/collect.c:1098 ../src/collect-dlg.c:85
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
 "%s"
 msgstr ""
-"Falha ao salvar coleção:\n"
+"Falha ao salvar a coleção:\n"
 "%s"
 
-#: src/bar_sort.c:468 src/collect.c:1084 src/collect-dlg.c:86
+#: ../src/bar_sort.c:465 ../src/collect.c:1099 ../src/collect-dlg.c:86
 msgid "Save Failed"
 msgstr "Falha ao salvar"
 
-#: src/bar_sort.c:502 src/bar_sort.c:628
+#: ../src/bar_sort.c:500 ../src/bar_sort.c:670
 msgid "Add Bookmark"
-msgstr "Adicionar Favorito"
+msgstr "Adicionar um favorito"
 
-#: src/bar_sort.c:506
+#: ../src/bar_sort.c:504
 msgid "Add Collection"
-msgstr "Adicionar Coleção"
+msgstr "Adicionar coleção"
 
-#: src/bar_sort.c:523 src/ui_bookmark.c:601
+#: ../src/bar_sort.c:521 ../src/ui_bookmark.c:288
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/bar_sort.c:585
+#: ../src/bar_sort.c:597
 msgid "Sort Manager"
-msgstr "Classificar por nome"
+msgstr "Classificador"
 
-#: src/bar_sort.c:594 src/pan-view.c:2395 src/ui_pathsel.c:1103
+#: ../src/bar_sort.c:606 ../src/pan-view.c:2395 ../src/ui_pathsel.c:1099
 msgid "Folders"
-msgstr "Pastas"
+msgstr "Diretórios"
 
-#: src/bar_sort.c:595 src/main.c:567
+#: ../src/bar_sort.c:607 ../src/options.c:140
 msgid "Collections"
 msgstr "Coleções"
 
-#: src/bar_sort.c:603 src/utilops.c:1177
+#: ../src/bar_sort.c:615 ../src/utilops.c:2124
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bar_sort.c:606 src/utilops.c:1191
+#: ../src/bar_sort.c:618 ../src/utilops.c:2075
 msgid "Move"
 msgstr "Mover"
 
-#: src/bar_sort.c:609
-msgid "Link"
-msgstr "Vincular"
-
-#: src/bar_sort.c:615
+#: ../src/bar_sort.c:657
 msgid "Add image"
 msgstr "Adicionar imagem"
 
-#: src/bar_sort.c:618
+#: ../src/bar_sort.c:660
 msgid "Add selection"
 msgstr "Adicionar seleção"
 
-#: src/bar_sort.c:631
+#: ../src/bar_sort.c:673
 msgid "Undo last image"
-msgstr "Desfazer última imagem"
+msgstr "Desfazer a última imagem"
 
-#: src/cache.c:175
-#, fuzzy, c-format
+#: ../src/cache.c:174
+#, c-format
 msgid ""
 "error saving sim cache data: %s\n"
 "error: %s\n"
-msgstr "erro salvando arquivo de configuração: %s\n"
+msgstr ""
+"erro ao salvar os dados do cache de similaridades: %s\n"
+"erro: %s\n"
 
-#: src/cache_maint.c:127 src/cache_maint.c:689 src/cache_maint.c:902
-#: src/editors.c:717
+#: ../src/cache_maint.c:129 ../src/cache_maint.c:722 ../src/cache_maint.c:938
+#: ../src/editors.c:1176
 msgid "done"
-msgstr "Concluído"
+msgstr "concluído"
 
-#: src/cache_maint.c:306
+#: ../src/cache_maint.c:307
 msgid "Removing old metadata..."
 msgstr "Removendo metadados antigos..."
 
-#: src/cache_maint.c:310
+#: ../src/cache_maint.c:311
 msgid "Clearing cached thumbnails..."
 msgstr "Limpando miniaturas em cache..."
 
-#: src/cache_maint.c:314 src/cache_maint.c:1056
+#: ../src/cache_maint.c:315 ../src/cache_maint.c:1096
 msgid "Removing old thumbnails..."
 msgstr "Removendo miniaturas antigas..."
 
-#: src/cache_maint.c:317 src/cache_maint.c:1059
+#: ../src/cache_maint.c:318 ../src/cache_maint.c:1099
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: src/cache_maint.c:800 src/utilops.c:1107
+#: ../src/cache_maint.c:833
 msgid "Invalid folder"
-msgstr "Pasta inválida"
+msgstr "Diretório inválido"
 
-#: src/cache_maint.c:801
+#: ../src/cache_maint.c:834
 msgid "The specified folder can not be found."
-msgstr "A pasta especificada não pôde ser encontrada."
+msgstr "O diretório especificado não pode ser encontrado."
 
-#: src/cache_maint.c:829 src/cache_maint.c:843 src/cache_maint.c:1227
+#: ../src/cache_maint.c:865 ../src/cache_maint.c:879 ../src/cache_maint.c:1275
 msgid "Create thumbnails"
 msgstr "Criar miniaturas"
 
-#: src/cache_maint.c:837 src/cache_maint.c:1066
+#: ../src/cache_maint.c:873 ../src/cache_maint.c:1106
 msgid "S_tart"
 msgstr "_Iniciar"
 
-#: src/cache_maint.c:850 src/preferences.c:1407
+#: ../src/cache_maint.c:886 ../src/preferences.c:1782
 msgid "Folder:"
-msgstr "Pasta:"
+msgstr "Diretório:"
 
-#: src/cache_maint.c:853
+#: ../src/cache_maint.c:889
 msgid "Select folder"
-msgstr "Selecionar pasta"
+msgstr "Selecionar diretório"
 
-#: src/cache_maint.c:857
+#: ../src/cache_maint.c:893
 msgid "Include subfolders"
-msgstr "Incluir subpastas"
+msgstr "Incluir subdiretórios"
 
-#: src/cache_maint.c:858
+#: ../src/cache_maint.c:894
 msgid "Store thumbnails local to source images"
-msgstr "Armazenar miniaturas onde se encontra as imagens de origem"
+msgstr "Armazenar as miniaturas no local das imagens de origem"
 
-#: src/cache_maint.c:867 src/cache_maint.c:1075
+#: ../src/cache_maint.c:903 ../src/cache_maint.c:1115
 msgid "click start to begin"
-msgstr "Clique em Iniciar para começar"
+msgstr "clique em iniciar para começar"
 
-#: src/cache_maint.c:1005 src/editors.c:647
+#: ../src/cache_maint.c:1042 ../src/editors.c:1102
 msgid "running..."
-msgstr "Executando..."
+msgstr "executando..."
 
-#: src/cache_maint.c:1051
+#: ../src/cache_maint.c:1091
 msgid "Clearing thumbnails..."
-msgstr "Limpando miniaturas..."
+msgstr "Limpando as miniaturas..."
 
-#: src/cache_maint.c:1117 src/cache_maint.c:1120 src/cache_maint.c:1202
-#: src/cache_maint.c:1222
+#: ../src/cache_maint.c:1157 ../src/cache_maint.c:1160
+#: ../src/cache_maint.c:1253 ../src/cache_maint.c:1270
 msgid "Clear cache"
-msgstr "Limpar cache"
+msgstr "Limpar o cache"
 
-#: src/cache_maint.c:1121
+#: ../src/cache_maint.c:1161
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
 msgstr ""
-"Isso irá remover todos as miniaturas\n"
+"Isto irá remover todas as miniaturas\n"
 "salvas no disco, continuar?"
 
-#: src/cache_maint.c:1172
-#, fuzzy
+#: ../src/cache_maint.c:1203
+#, c-format
+msgid "Location: %s"
+msgstr "Localização: %s"
+
+#: ../src/cache_maint.c:1228
 msgid "Cache Maintenance"
-msgstr "Manutenção do Cache - Geeqie"
+msgstr "Manutenção do cache"
 
-#: src/cache_maint.c:1184
+#: ../src/cache_maint.c:1238
 msgid "Cache and Data Maintenance"
-msgstr "Manutenção de Cache e Dados"
+msgstr "Manutenção do cache e de dados"
 
-#: src/cache_maint.c:1188
-#, fuzzy
+#: ../src/cache_maint.c:1242
 msgid "Thumbnail cache"
-msgstr "Cache de miniaturas do Geeqie"
+msgstr "Cache de miniaturas"
 
-#: src/cache_maint.c:1190 src/cache_maint.c:1210 src/cache_maint.c:1238
-#: src/pan-view.c:1544 src/pan-view.c:2384 src/preferences.c:1333
-#: src/utilops.c:1747
-msgid "Location:"
-msgstr "Localização:"
-
-#: src/cache_maint.c:1197 src/cache_maint.c:1217 src/cache_maint.c:1245
+#: ../src/cache_maint.c:1248 ../src/cache_maint.c:1265
+#: ../src/cache_maint.c:1290
 msgid "Clean up"
 msgstr "Limpar"
 
-#: src/cache_maint.c:1200 src/cache_maint.c:1220
+#: ../src/cache_maint.c:1251 ../src/cache_maint.c:1268
 msgid "Remove orphaned or outdated thumbnails."
 msgstr "Remover miniaturas órfãs ou desatualizadas."
 
-#: src/cache_maint.c:1205 src/cache_maint.c:1225
+#: ../src/cache_maint.c:1256 ../src/cache_maint.c:1273
 msgid "Delete all cached thumbnails."
 msgstr "Apagar todas as miniaturas em cache."
 
-#: src/cache_maint.c:1208
+#: ../src/cache_maint.c:1259
 msgid "Shared thumbnail cache"
 msgstr "Cache de miniaturas compartilhado"
 
-#: src/cache_maint.c:1231
+#: ../src/cache_maint.c:1279
 msgid "Render"
 msgstr "Gerar"
 
-#: src/cache_maint.c:1234
+#: ../src/cache_maint.c:1282
 msgid "Render thumbnails for a specific folder."
-msgstr "Gerar miniaturas em uma pasta específica."
+msgstr "Gerar miniaturas para um diretório específico."
 
-#: src/cache_maint.c:1236
-msgid "Metadata"
-msgstr "Metadados"
-
-#: src/cache_maint.c:1248
+#: ../src/cache_maint.c:1293
 msgid "Remove orphaned keywords and comments."
 msgstr "Remover palavras-chave e comentários órfãos."
 
-#: src/cellrenderericon.c:127
-msgid "Pixbuf Object"
-msgstr ""
-
-#: src/cellrenderericon.c:128
-msgid "The pixbuf to render"
-msgstr ""
-
-#: src/cellrenderericon.c:135 src/print.c:3439
-msgid "Text"
-msgstr "Texto"
-
-#: src/cellrenderericon.c:136
-msgid "Text to render"
-msgstr ""
-
-#: src/cellrenderericon.c:143
-#, fuzzy
-msgid "Background color"
-msgstr "Plano de fundo preto"
-
-#: src/cellrenderericon.c:144
-#, fuzzy
-msgid "Background color as a GdkColor"
-msgstr "Plano de fundo preto"
-
-#: src/cellrenderericon.c:151
-#, fuzzy
-msgid "Foreground color"
-msgstr "Plano de fundo preto"
-
-#: src/cellrenderericon.c:152
-msgid "Foreground color as a GdkColor"
-msgstr ""
-
-#: src/cellrenderericon.c:159
-msgid "Focus"
-msgstr ""
-
-#: src/cellrenderericon.c:160
-msgid "Draw focus indicator"
-msgstr ""
-
-#: src/cellrenderericon.c:167
-msgid "Fixed width"
-msgstr ""
-
-#: src/cellrenderericon.c:168
-msgid "Width of cell"
-msgstr ""
-
-#: src/cellrenderericon.c:176
-msgid "Fixed height"
-msgstr ""
-
-#: src/cellrenderericon.c:177
-msgid "Height of icon excluding text"
-msgstr ""
-
-#: src/cellrenderericon.c:185
-#, fuzzy
-msgid "Background set"
-msgstr "Plano de fundo preto"
-
-#: src/cellrenderericon.c:186
-msgid "Whether this tag affects the background color"
-msgstr ""
-
-#: src/cellrenderericon.c:193
-msgid "Foreground set"
-msgstr ""
-
-#: src/cellrenderericon.c:194
-msgid "Whether this tag affects the foreground color"
-msgstr ""
-
-#: src/cellrenderericon.c:201
-#, fuzzy
-msgid "Show text"
-msgstr "Mostrar _nome do arquivo"
-
-#: src/cellrenderericon.c:202
-msgid "Whether the text is displayed"
-msgstr ""
-
-#: src/collect.c:353 src/image.c:178 src/image-overlay.c:437
-#: src/image-overlay.c:512
-#, c-format
+#. When does this occur ??
+#: ../src/collect.c:366 ../src/image.c:160 ../src/image-overlay.c:512
+#: ../src/image-overlay.c:591
 msgid "Untitled"
 msgstr "Sem nome"
 
-#: src/collect.c:357
+#: ../src/collect.c:370
 #, c-format
 msgid "Untitled (%d)"
 msgstr "Sem nome (%d)"
 
-#: src/collect.c:1002
-#, fuzzy, c-format
+#: ../src/collect.c:1016
+#, c-format
 msgid "%s - Collection - %s"
-msgstr "%s - Coleção do Geeqie"
+msgstr "%s - Coleção - %s"
 
-#: src/collect.c:1120 src/collect.c:1124
+#: ../src/collect.c:1135 ../src/collect.c:1139
 msgid "Close collection"
-msgstr "Fechar coleção"
+msgstr "Fechar a coleção"
 
-#: src/collect.c:1125
+#: ../src/collect.c:1140
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -491,2733 +583,3698 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "A coleção foi modificada.\n"
 "Salvar primeiro?"
 
-#: src/collect.c:1128
+#: ../src/collect.c:1143
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/collect-dlg.c:59
+#: ../src/collect-dlg.c:59
 #, c-format
 msgid ""
 "Specified path:\n"
 "%s\n"
 "is a folder, collections are files"
 msgstr ""
-"Caminho especificado:\n"
+"O caminho especificado:\n"
 "%s\n"
-"é uma pasta, coleções são arquivos"
+"é um diretório, coleções são arquivos"
 
-#: src/collect-dlg.c:60
+#: ../src/collect-dlg.c:60
 msgid "Invalid filename"
 msgstr "Nome de arquivo inválido"
 
-#: src/collect-dlg.c:69
+#: ../src/collect-dlg.c:69
 msgid "Overwrite File"
-msgstr "Sobrescrever arquivo"
+msgstr "Sobre-escrever Arquivo"
 
-#: src/collect-dlg.c:74
+#: ../src/collect-dlg.c:74
 msgid "Overwrite existing file?"
-msgstr "Sobrescrever arquivo existente?"
+msgstr "Sobre-escrever arquivo existente?"
 
-#: src/collect-dlg.c:76 src/utilops.c:660 src/utilops.c:990 src/utilops.c:1902
-#: src/utilops.c:2622
+#: ../src/collect-dlg.c:76
 msgid "_Overwrite"
-msgstr "_Sobrescrever"
+msgstr "_Sobre-escrever"
 
-#: src/collect-dlg.c:171
+#: ../src/collect-dlg.c:127
+#, c-format
+msgid "No such file '%s'."
+msgstr "Nenhum arquivo '%s'."
+
+#: ../src/collect-dlg.c:132
+#, c-format
+msgid "'%s' is a directory, not a collection file."
+msgstr "'%s' é um diretório, não um arquivo de coleção."
+
+#: ../src/collect-dlg.c:137
+#, c-format
+msgid "You do not have read permissions on the file '%s'."
+msgstr "Você não tem permissão para leitura do arquivo '%s'."
+
+#: ../src/collect-dlg.c:143
+msgid "Can not open collection file"
+msgstr "Não posso abrir o arquivo de coleção"
+
+#: ../src/collect-dlg.c:195
 msgid "Save collection"
-msgstr "Salvar coleção"
+msgstr "Salvar a coleção"
 
-#: src/collect-dlg.c:178
+#: ../src/collect-dlg.c:202
 msgid "Open collection"
 msgstr "Abrir coleção"
 
-#: src/collect-dlg.c:186
+#: ../src/collect-dlg.c:210
 msgid "Append collection"
 msgstr "Adicionar coleção"
 
-#: src/collect-dlg.c:187
+#: ../src/collect-dlg.c:211
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: src/collect-dlg.c:205
+#: ../src/collect-dlg.c:228
 msgid "Collection Files"
-msgstr "Coleção de arquivos"
+msgstr "Arquivos de coleção"
 
-#: src/collect-dlg.c:223
+#: ../src/collect-dlg.c:245
 msgid "Collection empty"
 msgstr "Coleção vazia"
 
-#: src/collect-dlg.c:224
+#: ../src/collect-dlg.c:246
 msgid "The current collection is empty, save aborted."
-msgstr "Erro ao salvar, a coleção está vazia."
+msgstr "A coleção atual está vazia, salvamento abortado."
 
-#: src/collect-io.c:343
-#, fuzzy, c-format
+#: ../src/collect-io.c:346
+#, c-format
 msgid "failed to open collection (write) \"%s\"\n"
-msgstr ""
-"Falha ao salvar coleção:\n"
-"%s"
+msgstr "falha ao abrir a coleção (escrita) \"%s\"\n"
 
-#: src/collect-io.c:368
-#, fuzzy, c-format
+#: ../src/collect-io.c:371
+#, c-format
 msgid ""
 "error saving collection file: %s\n"
 "error: %s\n"
-msgstr "erro salvando arquivo de configuração: %s\n"
+msgstr ""
+"erro ao salvar o arquivo de coleção: %s\n"
+"erro: %s\n"
 
-#: src/collect-table.c:167 src/layout.c:377 src/layout_util.c:965
-msgid "Empty"
-msgstr "Vazio"
-
-#: src/collect-table.c:171
+#: ../src/collect-table.c:211
 #, c-format
-msgid "%d images (%d)"
-msgstr "%d imagens (%d)"
+msgid "%s, %d images (%s, %d)"
+msgstr "imagens %s, %d (%s, %d)"
 
-#: src/collect-table.c:175
+#: ../src/collect-table.c:218
 #, c-format
-msgid "%d images"
-msgstr "%d imagens"
+msgid "%s, %d images"
+msgstr "imagens %s, %d"
 
-#: src/collect-table.c:189 src/dupe.c:1328 src/search.c:304
-#: src/view_file_icon.c:1779 src/view_file_icon.c:1895
-#: src/view_file_list.c:915 src/view_file_list.c:1031
+#: ../src/collect-table.c:223 ../src/layout_util.c:1194
+#: ../src/layout_util.c:2231
+msgid "Empty"
+msgstr "Vazio"
+
+#: ../src/collect-table.c:237 ../src/dupe.c:1319 ../src/search.c:320
+#: ../src/view_file.c:835 ../src/view_file.c:938
 msgid "Loading thumbs..."
 msgstr "Carregando miniaturas..."
 
-#: src/collect-table.c:776 src/dupe.c:2239 src/dupe.c:2554
-#: src/layout_util.c:1042 src/search.c:983
+#: ../src/collect-table.c:866 ../src/dupe.c:2242 ../src/dupe.c:2555
+#: ../src/layout_util.c:1241 ../src/search.c:1000
 msgid "_View"
-msgstr "_Ver"
+msgstr "_Visualizar"
 
-#: src/collect-table.c:778 src/dupe.c:2241 src/dupe.c:2556 src/img-view.c:1282
-#: src/layout_image.c:759 src/pan-view.c:2814 src/search.c:985
-#: src/view_file.c:564
+#: ../src/collect-table.c:868 ../src/dupe.c:2244 ../src/dupe.c:2557
+#: ../src/img-view.c:1281 ../src/layout_image.c:505 ../src/pan-view.c:2823
+#: ../src/search.c:1002 ../src/view_file.c:588
 msgid "View in _new window"
-msgstr "Ver em _nova janela"
+msgstr "Visualizar em uma _nova janela"
 
-#: src/collect-table.c:781 src/dupe.c:2274 src/dupe.c:2564 src/search.c:1014
+#: ../src/collect-table.c:871 ../src/dupe.c:2278 ../src/dupe.c:2565
+#: ../src/search.c:1032
 msgid "Rem_ove"
-msgstr "_Remover"
+msgstr "Rem_over"
 
-#: src/collect-table.c:784
+#: ../src/collect-table.c:874
 msgid "Append from file list"
 msgstr "Adicionar da lista de arquivos"
 
-#: src/collect-table.c:786
+#: ../src/collect-table.c:876
 msgid "Append from collection..."
 msgstr "Adicionar da coleção..."
 
-#: src/collect-table.c:789 src/dupe.c:2244 src/dupe.c:2559 src/search.c:988
+#: ../src/collect-table.c:880
+msgid "_Selection"
+msgstr "_Seleção"
+
+#: ../src/collect-table.c:882 ../src/dupe.c:2247 ../src/dupe.c:2560
+#: ../src/layout_util.c:1287 ../src/search.c:1005
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: src/collect-table.c:791 src/dupe.c:2246 src/dupe.c:2561 src/search.c:990
+#: ../src/collect-table.c:884 ../src/dupe.c:2249 ../src/dupe.c:2562
+#: ../src/layout_util.c:1288 ../src/search.c:1007
 msgid "Select none"
-msgstr "Selecionar nenhum"
+msgstr "Não selecionar nenhum"
 
-#: src/collect-table.c:799 src/dupe.c:2255 src/img-view.c:1280
-#: src/layout_image.c:756 src/layout_util.c:1096 src/pan-view.c:2811
-#: src/search.c:995 src/view_file.c:562
-msgid "_Properties"
-msgstr "_Propriedades"
+#: ../src/collect-table.c:886
+msgid "Invert selection"
+msgstr "Inverter a seleção"
 
-#: src/collect-table.c:802 src/dupe.c:2262 src/img-view.c:1286
-#: src/layout_image.c:767 src/layout_util.c:1067 src/pan-view.c:2818
-#: src/search.c:1002 src/view_file.c:568
+#: ../src/collect-table.c:898 ../src/dupe.c:2267 ../src/img-view.c:1285
+#: ../src/layout_image.c:513 ../src/layout_util.c:1270 ../src/pan-view.c:2827
+#: ../src/search.c:1021 ../src/view_file.c:592
 msgid "_Copy..."
-msgstr "_Copiar..."
+msgstr "Co_piar..."
 
-#: src/collect-table.c:804 src/dupe.c:2264 src/img-view.c:1287
-#: src/layout_image.c:769 src/layout_util.c:1068 src/pan-view.c:2820
-#: src/search.c:1004 src/view_file.c:570
+#: ../src/collect-table.c:900 ../src/dupe.c:2269 ../src/img-view.c:1286
+#: ../src/layout_image.c:515 ../src/layout_util.c:1271 ../src/pan-view.c:2829
+#: ../src/search.c:1023 ../src/view_file.c:594
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: src/collect-table.c:806 src/dupe.c:2266 src/img-view.c:1288
-#: src/layout_image.c:771 src/layout_util.c:1069 src/pan-view.c:2822
-#: src/search.c:1006 src/view_dir.c:608 src/view_file.c:572
+#: ../src/collect-table.c:902 ../src/dupe.c:2271 ../src/img-view.c:1287
+#: ../src/layout_image.c:517 ../src/layout_util.c:1272 ../src/pan-view.c:2831
+#: ../src/search.c:1025 ../src/view_dir.c:666 ../src/view_file.c:596
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/collect-table.c:808 src/dupe.c:2268 src/img-view.c:1289
-#: src/layout_image.c:773 src/layout_util.c:1070 src/layout_util.c:1071
-#: src/layout_util.c:1072 src/pan-view.c:2824 src/search.c:1008
-#: src/view_dir.c:610 src/view_file.c:574
+#: ../src/collect-table.c:904 ../src/dupe.c:2273 ../src/img-view.c:1288
+#: ../src/layout_image.c:519 ../src/layout_util.c:1273
+#: ../src/layout_util.c:1274 ../src/layout_util.c:1275 ../src/pan-view.c:2833
+#: ../src/search.c:1027 ../src/view_dir.c:668 ../src/view_file.c:598
 msgid "_Delete..."
-msgstr "_Remover..."
+msgstr "_Apagar..."
 
-#: src/collect-table.c:811 src/dupe.c:2271 src/img-view.c:1291
-#: src/layout_image.c:778 src/layout_util.c:1073 src/pan-view.c:2827
-#: src/search.c:1011 src/view_dir.c:614 src/view_file.c:577
-#, fuzzy
+#: ../src/collect-table.c:906 ../src/dupe.c:2275 ../src/img-view.c:1289
+#: ../src/layout_image.c:522 ../src/pan-view.c:2835 ../src/search.c:1029
+#: ../src/view_dir.c:671 ../src/view_file.c:600
 msgid "_Copy path"
-msgstr "_Copiar"
+msgstr "_Copiar o caminho"
 
-#: src/collect-table.c:816 src/view_file.c:601
+#: ../src/collect-table.c:912
+msgid "Randomize"
+msgstr "Aleatorizar"
+
+#: ../src/collect-table.c:914 ../src/view_file.c:616
+msgid "_Sort"
+msgstr "_Ordenar"
+
+#: ../src/collect-table.c:917 ../src/view_file.c:632
 msgid "Show filename _text"
-msgstr "Mostrar _nome do arquivo"
+msgstr "Exibir o _nome do arquivo"
 
-#: src/collect-table.c:819
+#: ../src/collect-table.c:920
 msgid "_Save collection"
-msgstr "_Salvar coleção"
+msgstr "_Salvar a coleção"
 
-#: src/collect-table.c:821
+#: ../src/collect-table.c:922
 msgid "Save collection _as..."
-msgstr "Salvar coleção _como..."
+msgstr "Salvar a coleção _como..."
 
-#: src/collect-table.c:824 src/layout_util.c:1063
+#: ../src/collect-table.c:925 ../src/layout_util.c:1266
 msgid "_Find duplicates..."
-msgstr "Procurar _duplicados..."
+msgstr "Procurar por _duplicatas..."
 
-#: src/collect-table.c:826 src/dupe.c:2259 src/search.c:999
+#: ../src/collect-table.c:927 ../src/dupe.c:2264 ../src/layout_util.c:1268
+#: ../src/search.c:1018
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: src/collect-table.c:1978 src/dupe.c:3355 src/img-view.c:1445
+#: ../src/collect-table.c:2085 ../src/dupe.c:3355 ../src/img-view.c:1443
 msgid "Dropped list includes folders."
-msgstr "Lista inclui pastas."
+msgstr "A lista inclui diretórios."
 
-#: src/collect-table.c:1980 src/dupe.c:3357 src/img-view.c:1447
+#: ../src/collect-table.c:2087 ../src/dupe.c:3357 ../src/img-view.c:1445
 msgid "_Add contents"
-msgstr "_Adicionar conteúdo"
+msgstr "_Adicionar o conteúdo"
 
-#: src/collect-table.c:1982 src/dupe.c:3358 src/img-view.c:1448
+#: ../src/collect-table.c:2089 ../src/dupe.c:3358 ../src/img-view.c:1446
 msgid "Add contents _recursive"
-msgstr "Adicionar conteúdo _recursivamente"
+msgstr "Adicionar o conteúdo _recursivamente"
 
-#: src/collect-table.c:1984 src/dupe.c:3359 src/img-view.c:1449
+#: ../src/collect-table.c:2091 ../src/dupe.c:3359 ../src/img-view.c:1447
 msgid "_Skip folders"
-msgstr "_Ignorar pastas"
+msgstr "_Ignorar os diretórios"
 
-#: src/collect-table.c:1987 src/dupe.c:3361 src/img-view.c:1451
-#: src/view_dir.c:343
+#: ../src/collect-table.c:2094 ../src/dupe.c:3361 ../src/img-view.c:1449
+#: ../src/view_dir.c:417
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/dupe.c:99
+#: ../src/color-man.c:420 ../src/exif.c:232 ../src/exif-common.c:403
+msgid "sRGB"
+msgstr "sRGB"
+
+#: ../src/color-man.c:422
+msgid "Adobe RGB compatible"
+msgstr "Compatível com AdobeRGB"
+
+#: ../src/color-man.c:430
+msgid "Custom profile"
+msgstr "Perfil personalizado"
+
+#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
+msgid "Can't save"
+msgstr "Não posso salvar"
+
+#: ../src/desktop_file.c:74
+msgid "Please specify file name."
+msgstr "Por favor, especifique o nome do arquivo."
+
+#: ../src/desktop_file.c:86
+msgid "Could not create directory"
+msgstr "Não pude criar o diretório"
+
+#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
+msgid "Desktop file"
+msgstr "Arquivo .desktop"
+
+#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:494
+#, c-format
+msgid ""
+"Unable to delete file:\n"
+"%s"
+msgstr ""
+"Incapaz de apagar o arquivo:\n"
+"%s"
+
+#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:495 ../src/utilops.c:1962
+#: ../src/utilops.c:1989 ../src/utilops.c:2509
+msgid "File deletion failed"
+msgstr "O apagamento do arquivo falhou"
+
+#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
+msgid "Delete file"
+msgstr "Apagar o arquivo"
+
+#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:543
+#, c-format
+msgid ""
+"About to delete the file:\n"
+" %s"
+msgstr ""
+"Prestes a apagar o arquivo:\n"
+" %s"
+
+#: ../src/desktop_file.c:374
+msgid "new.desktop"
+msgstr "novo.desktop"
+
+#: ../src/desktop_file.c:453
+msgid "Editors"
+msgstr "Editores"
+
+#: ../src/desktop_file.c:524
+msgid "Hidden"
+msgstr "Oculto"
+
+#: ../src/desktop_file.c:543 ../src/dupe.c:2653 ../src/dupe.c:3169
+#: ../src/print.c:3203 ../src/search.c:2848 ../src/ui_pathsel.c:1111
+#: ../src/utilops.c:458
+msgid "Path"
+msgstr "Caminho"
+
+#: ../src/dupe.c:100
 msgid "Drop files to compare them."
 msgstr "Arraste e solte os arquivos para compará-los."
 
-#: src/dupe.c:103
+#: ../src/dupe.c:104
 #, c-format
 msgid "%d files"
 msgstr "%d arquivos"
 
-#: src/dupe.c:107
+#: ../src/dupe.c:108
 #, c-format
 msgid "%d matches found in %d files"
 msgstr "%d ocorrências encontradas em %d arquivos"
 
-#: src/dupe.c:112
+#: ../src/dupe.c:113
 msgid "[set 1]"
 msgstr "[conjunto 1]"
 
-#: src/dupe.c:1454
+#: ../src/dupe.c:1445
 msgid "Reading checksums..."
-msgstr "Lendo soma de verificações..."
+msgstr "Lendo as somas de verificação..."
 
-#: src/dupe.c:1487
+#: ../src/dupe.c:1478
 msgid "Reading dimensions..."
-msgstr "Lendo dimensões..."
+msgstr "Lendo as dimensões..."
 
-#: src/dupe.c:1521
+#: ../src/dupe.c:1512
 msgid "Reading similarity data..."
-msgstr "Lendo datas similares..."
+msgstr "Lendo os dados de similaridade..."
 
-#: src/dupe.c:1556 src/dupe.c:1587
+#: ../src/dupe.c:1548 ../src/dupe.c:1579
 msgid "Comparing..."
 msgstr "Comparando..."
 
-#: src/dupe.c:1567 src/pan-view.c:1093
+#: ../src/dupe.c:1559 ../src/pan-view.c:1094
 msgid "Sorting..."
 msgstr "Ordenando..."
 
-#: src/dupe.c:2248
+#: ../src/dupe.c:2251
 msgid "Select group _1 duplicates"
 msgstr "Selecionar duplicatas do grupo _1"
 
-#: src/dupe.c:2250
+#: ../src/dupe.c:2253
 msgid "Select group _2 duplicates"
 msgstr "Selecionar duplicatas do grupo _2"
 
-#: src/dupe.c:2257 src/search.c:997
+#: ../src/dupe.c:2262 ../src/search.c:1016
 msgid "Add to new collection"
-msgstr "Adicionar a nova coleção"
+msgstr "Adicionar a uma nova coleção"
 
-#: src/dupe.c:2276 src/dupe.c:2566 src/search.c:1016
+#: ../src/dupe.c:2280 ../src/dupe.c:2567 ../src/search.c:1034
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: src/dupe.c:2279 src/dupe.c:2569
+#: ../src/dupe.c:2283 ../src/dupe.c:2570
 msgid "Close _window"
-msgstr "_Fechar janela"
+msgstr "_Fechar a janela"
 
-#: src/dupe.c:2439
+#: ../src/dupe.c:2443
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d arquivos (conjunto 2)"
 
-#: src/dupe.c:2647
-#, fuzzy
+#: ../src/dupe.c:2648
 msgid "Name case-insensitive"
-msgstr "Diferenciar maiúsculas de minúsculas"
+msgstr "Nome insensível ao caso"
 
-#: src/dupe.c:2648 src/dupe.c:3168 src/preferences.c:1026 src/print.c:3238
-#: src/search.c:2761 src/view_file_list.c:1823
+#: ../src/dupe.c:2649 ../src/dupe.c:3166 ../src/preferences.c:1336
+#: ../src/print.c:3207 ../src/search.c:2845 ../src/view_file_list.c:2050
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/dupe.c:2649 src/dupe.c:3169 src/exif.c:339 src/exif-common.c:442
-#: src/print.c:3236 src/search.c:2762 src/view_file_list.c:1824
+#: ../src/dupe.c:2650 ../src/dupe.c:3167 ../src/exif.c:341
+#: ../src/exif-common.c:514 ../src/print.c:3205 ../src/search.c:2846
+#: ../src/view_file_list.c:2054
 msgid "Date"
 msgstr "Data"
 
-#: src/dupe.c:2650 src/dupe.c:3170 src/print.c:3240 src/search.c:2763
+#: ../src/dupe.c:2651 ../src/dupe.c:3168 ../src/print.c:3209
+#: ../src/search.c:2847
 msgid "Dimensions"
 msgstr "Dimensões"
 
-#: src/dupe.c:2651
+#: ../src/dupe.c:2652
 msgid "Checksum"
 msgstr "Soma de verificação"
 
-#: src/dupe.c:2652 src/dupe.c:3171 src/print.c:3234 src/search.c:2764
-#: src/ui_pathsel.c:1115
-msgid "Path"
-msgstr "Caminho"
-
-#: src/dupe.c:2653
+#: ../src/dupe.c:2654
 msgid "Similarity (high)"
 msgstr "Similaridade (alta)"
 
-#: src/dupe.c:2654
+#: ../src/dupe.c:2655
 msgid "Similarity"
 msgstr "Similaridade"
 
-#: src/dupe.c:2655
+#: ../src/dupe.c:2656
 msgid "Similarity (low)"
 msgstr "Similaridade (baixa)"
 
-#: src/dupe.c:2656
+#: ../src/dupe.c:2657
 msgid "Similarity (custom)"
 msgstr "Similaridade (personalizada)"
 
-#: src/dupe.c:3121
-#, fuzzy
+#: ../src/dupe.c:3119
 msgid "Find duplicates"
-msgstr "Procurar _duplicados..."
+msgstr "Procurar por duplicatas"
 
-#: src/dupe.c:3203
+#: ../src/dupe.c:3201
 msgid "Compare to:"
 msgstr "Comparar com:"
 
-#: src/dupe.c:3216
+#: ../src/dupe.c:3214
 msgid "Compare by:"
 msgstr "Comparar por:"
 
-#: src/dupe.c:3224 src/preferences.c:884 src/search.c:2777
+#: ../src/dupe.c:3222 ../src/preferences.c:1171 ../src/search.c:2861
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: src/dupe.c:3231
+#: ../src/dupe.c:3229
 msgid "Compare two file sets"
-msgstr "Comparar por conjuntos de arquivos"
+msgstr "Comparar dois conjuntos de arquivos"
 
-#: src/editors.c:61
-msgid "The Gimp"
-msgstr "GIMP"
-
-#: src/editors.c:62
-msgid "XV"
-msgstr "XV"
-
-#: src/editors.c:63
-msgid "Xpaint"
-msgstr "Xpaint"
-
-#: src/editors.c:64
-msgid "UFraw"
+#: ../src/editors.c:280
+#, c-format
+msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
 msgstr ""
+"O arquivo .desktop '%s' não deveria incluir a extensão na chave Icon: '%s'\n"
 
-#: src/editors.c:65
-msgid "Add XMP sidecar"
-msgstr ""
+#. flash fired (bit 0)
+#: ../src/editors.c:334 ../src/exif.c:225 ../src/exif-common.c:332
+msgid "yes"
+msgstr "sim"
 
-#: src/editors.c:69
-msgid "Rotate jpeg clockwise"
-msgstr "Rotacionar JPEG no sentido horário"
+#: ../src/editors.c:334 ../src/exif.c:224 ../src/exif-common.c:332
+msgid "no"
+msgstr "não"
 
-#: src/editors.c:70
-msgid "Rotate jpeg counterclockwise"
-msgstr "Rotacionar JPEG no sentido anti-horário"
-
-#. for testing
-#: src/editors.c:74 src/editors.c:80
-msgid "External Copy command"
-msgstr ""
-
-#: src/editors.c:75 src/editors.c:81
-msgid "External Move command"
-msgstr ""
-
-#: src/editors.c:76 src/editors.c:82
-msgid "External Rename command"
-msgstr ""
-
-#: src/editors.c:77 src/editors.c:83
-#, fuzzy
-msgid "External Delete command"
-msgstr "Habilitar a tecla delete"
-
-#: src/editors.c:78 src/editors.c:84
-msgid "External New Folder command"
-msgstr ""
-
-#: src/editors.c:140
+#: ../src/editors.c:506
 msgid "stopping..."
-msgstr "Finalizando..."
+msgstr "interrompendo..."
 
-#: src/editors.c:161
+#: ../src/editors.c:527
 msgid "Edit command results"
 msgstr "Resultados do comando de edição"
 
-#: src/editors.c:164
+#: ../src/editors.c:530
 #, c-format
 msgid "Output of %s"
 msgstr "Saída de %s"
 
-#: src/editors.c:603
+#: ../src/editors.c:1053
 #, c-format
 msgid ""
 "Failed to run command:\n"
 "%s\n"
 msgstr ""
-"Falha ao executar comando:\n"
+"Falha ao executar o comando:\n"
 "%s\n"
 
-#: src/editors.c:721
+#: ../src/editors.c:1180
 msgid "stopped by user"
-msgstr "Cancelado pelo usuário"
+msgstr "interrompido pelo usuário"
 
-#: src/editors.c:836
-msgid "Editor template is empty."
+#: ../src/editors.c:1265
+#, c-format
+msgid ""
+"%s\n"
+"\"%s\""
 msgstr ""
+"%s\n"
+"\"%s\""
 
-#: src/editors.c:837
+#: ../src/editors.c:1267
+msgid "Invalid editor command"
+msgstr "Comando do editor inválido"
+
+#: ../src/editors.c:1354
+msgid "Editor template is empty."
+msgstr "O gabarito do editor está vazio."
+
+#: ../src/editors.c:1355
 msgid "Editor template has incorrect syntax."
-msgstr ""
+msgstr "O gabarito do editor tem uma sintaxe incorreta."
 
-#: src/editors.c:838
+#: ../src/editors.c:1356
 msgid "Editor template uses incompatible macros."
-msgstr ""
+msgstr "O gabarito do editor usa macros incompatíveis."
 
-#: src/editors.c:839
+#: ../src/editors.c:1357
 msgid "Can't find matching file type."
-msgstr ""
+msgstr "Não posso encontrar um tipo de arquivo correspondente."
 
-#: src/editors.c:840
+#: ../src/editors.c:1358
 msgid "Can't execute external editor."
-msgstr ""
+msgstr "Não posso executar o editor externo."
 
-#: src/editors.c:841
+#: ../src/editors.c:1359
 msgid "External editor returned error status."
-msgstr ""
+msgstr "O editor externo retornou um status de erro."
 
-#: src/editors.c:842
+#: ../src/editors.c:1360
 msgid "File was skipped."
-msgstr ""
+msgstr "O arquivo foi omitido."
 
-#: src/editors.c:843
+#: ../src/editors.c:1361
 msgid "Unknown error."
-msgstr ""
+msgstr "Erro desconhecido."
 
-#: src/exif.c:145 src/exif.c:158 src/exif.c:172 src/exif.c:197 src/exif.c:314
-#: src/exif.c:625 src/exif-common.c:308 src/exif-common.c:311
-#: src/exif-common.c:378
+#: ../src/exif.c:147 ../src/exif.c:160 ../src/exif.c:174 ../src/exif.c:199
+#: ../src/exif.c:316 ../src/exif.c:663 ../src/exif-common.c:308
+#: ../src/exif-common.c:311 ../src/exif-common.c:378
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/exif.c:146
+#: ../src/exif.c:148
 msgid "top left"
-msgstr "esquerda superior"
+msgstr "no alto à esquerda"
 
-#: src/exif.c:147
+#: ../src/exif.c:149
 msgid "top right"
-msgstr "direita superior"
+msgstr "no alto à direita"
 
-#: src/exif.c:148
+#: ../src/exif.c:150
 msgid "bottom right"
-msgstr "inferior direito"
+msgstr "embaixo à direita"
 
-#: src/exif.c:149
+#: ../src/exif.c:151
 msgid "bottom left"
-msgstr "inferior esquerdo"
+msgstr "embaixo à esquerda"
 
-#: src/exif.c:150
+#: ../src/exif.c:152
 msgid "left top"
-msgstr "superior esquerdo"
+msgstr "à esquerda no alto"
 
-#: src/exif.c:151
+#: ../src/exif.c:153
 msgid "right top"
-msgstr "superior direito"
+msgstr "à direita no alto"
 
-#: src/exif.c:152
+#: ../src/exif.c:154
 msgid "right bottom"
-msgstr "inferior direito"
+msgstr "à direita embaixo"
 
-#: src/exif.c:153
+#: ../src/exif.c:155
 msgid "left bottom"
-msgstr "inferior esquerdo"
+msgstr "à esquerda embaixo"
 
-#: src/exif.c:160
+#: ../src/exif.c:162
 msgid "inch"
 msgstr "polegada"
 
-#: src/exif.c:161
+#: ../src/exif.c:163
 msgid "centimeter"
 msgstr "centímetro"
 
-#: src/exif.c:173
+#: ../src/exif.c:175
 msgid "average"
-msgstr "médio"
+msgstr "média"
 
-#: src/exif.c:174
+#: ../src/exif.c:176
 msgid "center weighted"
 msgstr "alinhado ao centro"
 
-#: src/exif.c:175
+#: ../src/exif.c:177
 msgid "spot"
 msgstr "luz direcional"
 
-#: src/exif.c:176
+#: ../src/exif.c:178
 msgid "multi-spot"
 msgstr "luz multidirecional"
 
-#: src/exif.c:177
+#: ../src/exif.c:179
 msgid "multi-segment"
-msgstr "multiseguimento"
+msgstr "multisegmento"
 
-#: src/exif.c:178
+#: ../src/exif.c:180
 msgid "partial"
 msgstr "parcial"
 
-#: src/exif.c:179 src/exif.c:217
+#: ../src/exif.c:181 ../src/exif.c:219
 msgid "other"
 msgstr "outro"
 
-#: src/exif.c:184 src/exif.c:236
+#: ../src/exif.c:186 ../src/exif.c:238
 msgid "not defined"
 msgstr "não definido"
 
-#: src/exif.c:185 src/exif.c:264 src/exif.c:271
+#: ../src/exif.c:187 ../src/exif.c:266 ../src/exif.c:273
 msgid "manual"
 msgstr "manual"
 
-#: src/exif.c:186 src/exif.c:257 src/exif.c:293 src/exif.c:300 src/exif.c:307
+#: ../src/exif.c:188 ../src/exif.c:259 ../src/exif.c:295 ../src/exif.c:302
+#: ../src/exif.c:309
 msgid "normal"
 msgstr "normal"
 
-#: src/exif.c:187
+#: ../src/exif.c:189
 msgid "aperture"
 msgstr "abertura"
 
-#: src/exif.c:188
+#: ../src/exif.c:190
 msgid "shutter"
 msgstr "exposição"
 
-#: src/exif.c:189
+#: ../src/exif.c:191
 msgid "creative"
 msgstr "criativo"
 
-#: src/exif.c:190
+#: ../src/exif.c:192
 msgid "action"
 msgstr "ação"
 
-#: src/exif.c:191 src/exif.c:278
+#: ../src/exif.c:193 ../src/exif.c:280
 msgid "portrait"
 msgstr "retrato"
 
-#: src/exif.c:192 src/exif.c:277
+#: ../src/exif.c:194 ../src/exif.c:279
 msgid "landscape"
 msgstr "paisagem"
 
-#: src/exif.c:198
+#: ../src/exif.c:200
 msgid "daylight"
 msgstr "luz do dia"
 
-#: src/exif.c:199
+#: ../src/exif.c:201
 msgid "fluorescent"
-msgstr "fluorecente"
+msgstr "fluorescente"
 
-#: src/exif.c:200
+#: ../src/exif.c:202
 msgid "tungsten (incandescent)"
 msgstr "tungstênio (incandescente)"
 
-#: src/exif.c:201
+#: ../src/exif.c:203
 msgid "flash"
 msgstr "flash"
 
-#: src/exif.c:202
+#: ../src/exif.c:204
 msgid "fine weather"
-msgstr ""
+msgstr "tempo bom"
 
-#: src/exif.c:203
+#: ../src/exif.c:205
 msgid "cloudy weather"
-msgstr ""
+msgstr "tempo nublado"
 
-#: src/exif.c:204
+#: ../src/exif.c:206
 msgid "shade"
-msgstr ""
+msgstr "sombra"
 
-#: src/exif.c:205
-#, fuzzy
+#: ../src/exif.c:207
 msgid "daylight fluorescent"
-msgstr "fluorecente"
+msgstr "fluorescente luz do dia"
 
-#: src/exif.c:206
-#, fuzzy
+#: ../src/exif.c:208
 msgid "day white fluorescent"
-msgstr "fluorecente"
+msgstr "fluorescente branco dia"
 
-#: src/exif.c:207
-#, fuzzy
+#: ../src/exif.c:209
 msgid "cool white fluorescent"
-msgstr "fluorecente"
+msgstr "fluorescente branco frio"
 
-#: src/exif.c:208
-#, fuzzy
+#: ../src/exif.c:210
 msgid "white fluorescent"
-msgstr "fluorecente"
+msgstr "fluorescente branco"
 
-#: src/exif.c:209
+#: ../src/exif.c:211
 msgid "standard light A"
-msgstr ""
+msgstr "luz standard A"
 
-#: src/exif.c:210
+#: ../src/exif.c:212
 msgid "standard light B"
-msgstr ""
+msgstr "luz standard B"
 
-#: src/exif.c:211
+#: ../src/exif.c:213
 msgid "standard light C"
-msgstr ""
+msgstr "luz standard C"
 
-#: src/exif.c:212
+#: ../src/exif.c:214
 msgid "D55"
-msgstr ""
+msgstr "D55"
 
-#: src/exif.c:213
+#: ../src/exif.c:215
 msgid "D65"
-msgstr ""
+msgstr "D65"
 
-#: src/exif.c:214
+#: ../src/exif.c:216
 msgid "D75"
-msgstr ""
+msgstr "D75"
 
-#: src/exif.c:215
+#: ../src/exif.c:217
 msgid "D50"
-msgstr ""
+msgstr "D50"
 
-#: src/exif.c:216
+#: ../src/exif.c:218
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "tungstênio studio ISO"
 
-#: src/exif.c:222 src/exif-common.c:332 src/info.c:257
-msgid "no"
-msgstr "não"
-
-#. flash fired (bit 0)
-#: src/exif.c:223 src/exif-common.c:332 src/info.c:257
-msgid "yes"
-msgstr "sim"
-
-#: src/exif.c:224
+#: ../src/exif.c:226
 msgid "yes, not detected by strobe"
-msgstr "sim, não detectado"
+msgstr "sim, não detectado pelo strobe"
 
-#: src/exif.c:225
+#: ../src/exif.c:227
 msgid "yes, detected by strobe"
-msgstr "sim, detectado"
+msgstr "sim, detectado pelo strobe"
 
-#: src/exif.c:230 src/exif-common.c:403 src/layout.c:422
-msgid "sRGB"
-msgstr ""
-
-#: src/exif.c:231
+#: ../src/exif.c:233
 msgid "uncalibrated"
-msgstr ""
+msgstr "não calibrado"
 
-#: src/exif.c:237
+#: ../src/exif.c:239
 msgid "1 chip color area"
-msgstr ""
+msgstr "mono-CCD"
 
-#: src/exif.c:238
+#: ../src/exif.c:240
 msgid "2 chip color area"
-msgstr ""
+msgstr "bi-CCD"
 
-#: src/exif.c:239
+#: ../src/exif.c:241
 msgid "3 chip color area"
-msgstr ""
+msgstr "tri-CCD"
 
-#: src/exif.c:240
+#: ../src/exif.c:242
 msgid "color sequential area"
-msgstr ""
+msgstr "CCD de área"
 
-#: src/exif.c:241
-#, fuzzy
+#: ../src/exif.c:243
 msgid "trilinear"
-msgstr "Bilinear"
+msgstr "trilinear"
 
-#: src/exif.c:242
+#: ../src/exif.c:244
 msgid "color sequential linear"
-msgstr ""
+msgstr "CCD linear"
 
-#: src/exif.c:247
+#: ../src/exif.c:249
 msgid "digital still camera"
-msgstr ""
+msgstr "câmera digital"
 
-#: src/exif.c:252
+#: ../src/exif.c:254
 msgid "direct photo"
-msgstr ""
+msgstr "foto direta"
 
-#: src/exif.c:258
-#, fuzzy
+#: ../src/exif.c:260
 msgid "custom"
-msgstr "Personalizado"
+msgstr "personalizado"
 
-#: src/exif.c:263 src/exif.c:270 src/exif-common.c:346
+#: ../src/exif.c:265 ../src/exif.c:272 ../src/exif-common.c:346
 msgid "auto"
 msgstr "auto"
 
-#: src/exif.c:265
-#, fuzzy
+#: ../src/exif.c:267
 msgid "auto bracket"
-msgstr "Auto renomear"
+msgstr "autobracketing"
 
-#: src/exif.c:276
-#, fuzzy
+#: ../src/exif.c:278
 msgid "standard"
-msgstr "Calendário"
+msgstr "standard"
 
-#: src/exif.c:279
-#, fuzzy
+#: ../src/exif.c:281
 msgid "night scene"
-msgstr "Fonte da luz"
+msgstr "cena noturna"
 
-#: src/exif.c:284
-#, fuzzy
+#: ../src/exif.c:286
 msgid "none"
-msgstr "Concluído"
+msgstr "nenhum"
 
-#: src/exif.c:285
-#, fuzzy
+#: ../src/exif.c:287
 msgid "low gain up"
-msgstr "Limpar"
+msgstr "suave aumento de ganho"
 
-#: src/exif.c:286
+#: ../src/exif.c:288
 msgid "high gain up"
-msgstr ""
+msgstr "forte aumento de ganho"
 
-#: src/exif.c:287
-#, fuzzy
+#: ../src/exif.c:289
 msgid "low gain down"
-msgstr "_Fechar janela"
+msgstr "suave redução de ganho"
 
-#: src/exif.c:288
+#: ../src/exif.c:290
 msgid "high gain down"
-msgstr ""
+msgstr "forte redução de ganho"
 
-#: src/exif.c:294 src/exif.c:308
-#, fuzzy
+#: ../src/exif.c:296 ../src/exif.c:310
 msgid "soft"
-msgstr "luz direcional"
+msgstr "doce"
 
-#: src/exif.c:295 src/exif.c:309
+#: ../src/exif.c:297 ../src/exif.c:311
 msgid "hard"
-msgstr ""
+msgstr "duro"
 
-#: src/exif.c:301
+#: ../src/exif.c:303
 msgid "low"
-msgstr ""
+msgstr "suave"
 
-#: src/exif.c:302
-#, fuzzy
+#: ../src/exif.c:304
 msgid "high"
-msgstr "Altura"
+msgstr "elevado"
 
-#: src/exif.c:315
+#: ../src/exif.c:317
 msgid "macro"
-msgstr ""
+msgstr "macro"
 
-#: src/exif.c:316
+#: ../src/exif.c:318
 msgid "close"
-msgstr ""
+msgstr "próximo"
 
-#: src/exif.c:317
+#: ../src/exif.c:319
 msgid "distant"
-msgstr ""
+msgstr "distante"
 
-#: src/exif.c:327
-#, fuzzy
+#: ../src/exif.c:329
 msgid "Image Width"
-msgstr "Arquivo de imagem"
+msgstr "Largura da imagem"
 
-#: src/exif.c:328
-#, fuzzy
+#: ../src/exif.c:330
 msgid "Image Height"
-msgstr "Altura"
+msgstr "Altura da imagem"
 
-#: src/exif.c:329
+#: ../src/exif.c:331
 msgid "Bits per Sample/Pixel"
-msgstr ""
+msgstr "Bits por amostra/pixel"
 
-#: src/exif.c:330
-#, fuzzy
+#: ../src/exif.c:332
 msgid "Compression"
-msgstr "Taxa de compressão:"
+msgstr "Compressão"
 
-#: src/exif.c:331
+#: ../src/exif.c:333
 msgid "Image description"
 msgstr "Descrição da imagem"
 
-#: src/exif.c:332
-#, fuzzy
+#: ../src/exif.c:334
 msgid "Camera make"
-msgstr "Câmera"
+msgstr "Fabricante da câmera"
 
-#: src/exif.c:333
-#, fuzzy
+#: ../src/exif.c:335
 msgid "Camera model"
-msgstr "Câmera"
+msgstr "Modelo da câmera"
 
-#: src/exif.c:334
+#: ../src/exif.c:336
 msgid "Orientation"
 msgstr "Orientação"
 
-#: src/exif.c:335
-#, fuzzy
+#: ../src/exif.c:337
 msgid "X resolution"
-msgstr "Resolução"
+msgstr "Resolução X"
 
-#: src/exif.c:336
-#, fuzzy
+#: ../src/exif.c:338
 msgid "Y Resolution"
-msgstr "Resolução"
+msgstr "Resolução Y"
 
-#: src/exif.c:337
-#, fuzzy
+#: ../src/exif.c:339
 msgid "Resolution units"
-msgstr "Resolução"
+msgstr "Unidades de resolução"
 
-#: src/exif.c:338
+#: ../src/exif.c:340
 msgid "Firmware"
-msgstr ""
+msgstr "Firmware"
 
-#: src/exif.c:340
+#: ../src/exif.c:342
 msgid "White point"
-msgstr ""
+msgstr "Ponto branco"
 
-#: src/exif.c:341
+#: ../src/exif.c:343
 msgid "Primary chromaticities"
-msgstr ""
+msgstr "Cromaticidades primárias"
 
-#: src/exif.c:342
+#: ../src/exif.c:344
 msgid "YCbCy coefficients"
-msgstr ""
+msgstr "Coeficientes YCbCr"
 
-#: src/exif.c:343
+#: ../src/exif.c:345
 msgid "YCbCr positioning"
-msgstr ""
+msgstr "Posicionamento YCbCr"
 
-#: src/exif.c:344
-#, fuzzy
+#: ../src/exif.c:346
 msgid "Black white reference"
-msgstr "Preferências do Geeqie"
+msgstr "Referência branco preto"
 
-#: src/exif.c:345
-msgid "Copyright"
-msgstr "Copyrigth"
-
-#: src/exif.c:346
+#: ../src/exif.c:348
 msgid "SubIFD Exif offset"
-msgstr ""
+msgstr "Offset Exif SubIFD"
 
 #. subIFD follows
-#: src/exif.c:348
-#, fuzzy
+#: ../src/exif.c:350
 msgid "Exposure time (seconds)"
-msgstr "Margem de exposição"
+msgstr "Tempo de exposição (segundos)"
 
-#: src/exif.c:349
+#: ../src/exif.c:351
 msgid "FNumber"
-msgstr ""
+msgstr "Número F"
 
-#: src/exif.c:350
+#: ../src/exif.c:352
 msgid "Exposure program"
 msgstr "Programa de exposição"
 
-#: src/exif.c:351
-#, fuzzy
+#: ../src/exif.c:353
 msgid "Spectral Sensitivity"
-msgstr "Sensibilidade ISO"
+msgstr "Sensibilidade espectral"
 
-#: src/exif.c:352 src/exif.c:388 src/exif-common.c:446
+#: ../src/exif.c:354 ../src/exif.c:390 ../src/exif-common.c:518
 msgid "ISO sensitivity"
 msgstr "Sensibilidade ISO"
 
-#: src/exif.c:353
+#: ../src/exif.c:355
 msgid "Optoelectric conversion factor"
-msgstr ""
+msgstr "Fator de conversão optoeletrônica"
 
-#: src/exif.c:354
+#: ../src/exif.c:356
 msgid "Exif version"
-msgstr ""
+msgstr "Versão do Exif"
 
-#: src/exif.c:355
+#: ../src/exif.c:357
 msgid "Date original"
 msgstr "Data do original"
 
-#: src/exif.c:356
+#: ../src/exif.c:358
 msgid "Date digitized"
 msgstr "Data da digitalização"
 
-#: src/exif.c:357
-#, fuzzy
+#: ../src/exif.c:359
 msgid "Pixel format"
-msgstr "Formato de arquivo:"
+msgstr "Formato do pixel"
 
-#: src/exif.c:358
-#, fuzzy
+#: ../src/exif.c:360
 msgid "Compression ratio"
-msgstr "Taxa de compressão:"
+msgstr "Taxa de compressão"
 
-#: src/exif.c:359 src/exif-common.c:443
+#: ../src/exif.c:361 ../src/exif-common.c:515
 msgid "Shutter speed"
 msgstr "Velocidade de exposição"
 
-#: src/exif.c:360 src/exif-common.c:444
+#: ../src/exif.c:362 ../src/exif-common.c:516
 msgid "Aperture"
 msgstr "Abertura"
 
-#: src/exif.c:361
+#: ../src/exif.c:363
 msgid "Brightness"
-msgstr ""
+msgstr "Brilho"
 
-#: src/exif.c:362 src/exif-common.c:445
+#: ../src/exif.c:364 ../src/exif-common.c:517
 msgid "Exposure bias"
 msgstr "Margem de exposição"
 
-#: src/exif.c:363
-#, fuzzy
+#: ../src/exif.c:365
 msgid "Maximum aperture"
-msgstr "abertura"
+msgstr "Abertura máxima"
 
-#: src/exif.c:364 src/exif-common.c:449
+#: ../src/exif.c:366 ../src/exif-common.c:521
 msgid "Subject distance"
-msgstr "Distância do objeto"
+msgstr "Distância do sujeito"
 
-#: src/exif.c:365
+#: ../src/exif.c:367
 msgid "Metering mode"
 msgstr "Método de medição"
 
-#: src/exif.c:366
+#: ../src/exif.c:368
 msgid "Light source"
 msgstr "Fonte da luz"
 
-#: src/exif.c:367 src/exif-common.c:450
+#: ../src/exif.c:369 ../src/exif-common.c:522
 msgid "Flash"
 msgstr "Flash"
 
-#: src/exif.c:368 src/exif-common.c:447
+#: ../src/exif.c:370 ../src/exif-common.c:519
 msgid "Focal length"
 msgstr "Comprimento do foco"
 
-#: src/exif.c:369
-#, fuzzy
+#: ../src/exif.c:371
 msgid "Subject area"
-msgstr "Distância do objeto"
+msgstr "Área do sujeito"
 
-#: src/exif.c:370
+#: ../src/exif.c:372
 msgid "MakerNote"
-msgstr ""
+msgstr "Nota do fabricante"
 
-#: src/exif.c:371
-#, fuzzy
+#: ../src/exif.c:373
 msgid "UserComment"
-msgstr "Comentário:"
+msgstr "Comentário do usuário"
 
-#: src/exif.c:372
+#: ../src/exif.c:374
 msgid "Subsecond time"
-msgstr ""
+msgstr "Hora em sub-segundo"
 
-#: src/exif.c:373
-#, fuzzy
+#: ../src/exif.c:375
 msgid "Subsecond time original"
-msgstr "Data do original"
+msgstr "Hora em sub-segundo original"
 
-#: src/exif.c:374
-#, fuzzy
+#: ../src/exif.c:376
 msgid "Subsecond time digitized"
-msgstr "Data da digitalização"
+msgstr "Hora da digitalização em sub-segundo"
 
-#: src/exif.c:375
+#: ../src/exif.c:377
 msgid "FlashPix version"
-msgstr ""
+msgstr "Versão do FlashPix"
 
-#: src/exif.c:376
+#: ../src/exif.c:378
 msgid "Colorspace"
-msgstr ""
+msgstr "Espaço de cores"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: src/exif.c:378
+#: ../src/exif.c:380
 msgid "Width"
 msgstr "Largura"
 
-#: src/exif.c:379
+#: ../src/exif.c:381
 msgid "Height"
 msgstr "Altura"
 
-#: src/exif.c:380
-#, fuzzy
+#: ../src/exif.c:382
 msgid "Audio data"
-msgstr "Dados E_xif"
+msgstr "Dados de áudio"
 
-#: src/exif.c:381
+#: ../src/exif.c:383
 msgid "ExifR98 extension"
-msgstr ""
+msgstr "Extensão ExifR98"
 
-#: src/exif.c:382
-#, fuzzy
+#: ../src/exif.c:384
 msgid "Flash strength"
-msgstr "Comprimento do foco"
+msgstr "Força do flash"
 
-#: src/exif.c:383
+#: ../src/exif.c:385
 msgid "Spatial frequency response"
-msgstr ""
+msgstr "Resposta da frequência espacial"
 
-#: src/exif.c:384
+#: ../src/exif.c:386
 msgid "X Pixel density"
-msgstr ""
+msgstr "Densidade de pixel em X"
 
-#: src/exif.c:385
+#: ../src/exif.c:387
 msgid "Y Pixel density"
-msgstr ""
+msgstr "Densidade de pixel em Y"
 
-#: src/exif.c:386
+#: ../src/exif.c:388
 msgid "Pixel density units"
-msgstr ""
+msgstr "Unidades de densidade de pixel"
 
-#: src/exif.c:387
-#, fuzzy
+#: ../src/exif.c:389
 msgid "Subject location"
-msgstr "Seleção"
+msgstr "Localização do sujeito"
 
-#: src/exif.c:389
-#, fuzzy
+#: ../src/exif.c:391
 msgid "Sensor type"
-msgstr "Desordenado"
+msgstr "Tipo de sensor"
 
-#: src/exif.c:390
-#, fuzzy
+#: ../src/exif.c:392
 msgid "Source type"
-msgstr "Origem"
+msgstr "Tipo de fonte"
 
-#: src/exif.c:391
-#, fuzzy
+#: ../src/exif.c:393
 msgid "Scene type"
-msgstr "centímetro"
+msgstr "Tipo de cena"
 
-#: src/exif.c:392
+#: ../src/exif.c:394
 msgid "Color filter array pattern"
-msgstr ""
+msgstr "Padrão de arranjo do filtro de cor"
 
 #. tags a4xx were added for Exif 2.2 (not just these - some above, as well)
-#: src/exif.c:394
-#, fuzzy
+#: ../src/exif.c:396
 msgid "Render process"
-msgstr "Gerar"
+msgstr "Processo de renderização"
 
-#: src/exif.c:395
-#, fuzzy
+#: ../src/exif.c:397
 msgid "Exposure mode"
-msgstr "Margem de exposição"
+msgstr "Modo de exposição"
 
-#: src/exif.c:396
+#: ../src/exif.c:398
 msgid "White balance"
-msgstr ""
+msgstr "Balanço do branco"
 
-#: src/exif.c:397
+#: ../src/exif.c:399
 msgid "Digital zoom ratio"
-msgstr ""
+msgstr "Taxa do zoom digital"
 
-#: src/exif.c:398
-#, fuzzy
+#: ../src/exif.c:400
 msgid "Focal length (35mm)"
-msgstr "Comprimento do foco"
+msgstr "Comprimento do foco (35mm)"
 
-#: src/exif.c:399
+#: ../src/exif.c:401
 msgid "Scene capture type"
-msgstr ""
+msgstr "Tipo de captura da cena"
 
-#: src/exif.c:400
-#, fuzzy
+#: ../src/exif.c:402
 msgid "Gain control"
-msgstr "Controles Flutuantes"
+msgstr "Controle de ganho"
 
-#: src/exif.c:401
-#, fuzzy
+#: ../src/exif.c:403
 msgid "Contrast"
-msgstr "retrato"
+msgstr "Contraste"
 
-#: src/exif.c:402
-#, fuzzy
+#: ../src/exif.c:404
 msgid "Saturation"
-msgstr "ação"
+msgstr "Saturação"
 
-#: src/exif.c:403
+#: ../src/exif.c:405
 msgid "Sharpness"
-msgstr ""
+msgstr "Nitidez"
 
-#: src/exif.c:404
+#: ../src/exif.c:406
 msgid "Device setting"
-msgstr ""
+msgstr "Configuração do dispositivo"
 
-#: src/exif.c:405
-#, fuzzy
+#: ../src/exif.c:407
 msgid "Subject range"
-msgstr "Distância do objeto"
+msgstr "Distância do sujeito"
 
-#: src/exif.c:406
-#, fuzzy
+#: ../src/exif.c:408
 msgid "Image serial number"
-msgstr "Arquivo de imagem"
+msgstr "Número de série da imagem"
 
-#: src/exif-common.c:307
+#: ../src/exif-common.c:307
 msgid "infinity"
-msgstr "Infinito"
+msgstr "infinito"
 
-#: src/exif-common.c:336
+#: ../src/exif-common.c:336
 msgid "mode:"
 msgstr "modo:"
 
-#: src/exif-common.c:340 src/trash.c:193
+#: ../src/exif-common.c:340 ../src/trash.c:205
 msgid "on"
 msgstr "ativado"
 
-#: src/exif-common.c:343 src/trash.c:198
+#: ../src/exif-common.c:343 ../src/trash.c:210
 msgid "off"
 msgstr "desativado"
 
-#: src/exif-common.c:352
+#: ../src/exif-common.c:352
 msgid "not detected by strobe"
-msgstr "não detectado"
+msgstr "não detectado pelo strobe"
 
-#: src/exif-common.c:353
+#: ../src/exif-common.c:353
 msgid "detected by strobe"
-msgstr "detectado"
+msgstr "detectado pelo strobe"
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: src/exif-common.c:358
+#: ../src/exif-common.c:358
 msgid "red-eye reduction"
 msgstr "redução de olhos vermelhos"
 
-#: src/exif-common.c:378
+#: ../src/exif-common.c:378
 msgid "dot"
-msgstr "pontos"
+msgstr "ponto"
 
-#: src/exif-common.c:408
+#: ../src/exif-common.c:408
 msgid "AdobeRGB"
-msgstr ""
+msgstr "AdobeRGB"
 
-#: src/exif-common.c:416
+#: ../src/exif-common.c:416
 msgid "embedded"
-msgstr ""
+msgstr "embarcado"
 
-#: src/exif-common.c:441
-#, fuzzy
+#: ../src/exif-common.c:505
+msgid "Above Sea Level"
+msgstr "Acima do nível do mar"
+
+#: ../src/exif-common.c:505
+msgid "Below Sea Level"
+msgstr "Abaixo do nível do mar"
+
+#: ../src/exif-common.c:513
 msgid "Camera"
 msgstr "Câmera"
 
-#: src/exif-common.c:448
-#, fuzzy
+#: ../src/exif-common.c:520
 msgid "Focal length 35mm"
-msgstr "Comprimento do foco"
+msgstr "Comprimento do foco 35mm"
 
-#: src/exif-common.c:451
-#, fuzzy
+#: ../src/exif-common.c:523
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/exif-common.c:452
-#, fuzzy
+#: ../src/exif-common.c:524
 msgid "Color profile"
-msgstr "Todos os arquivos"
+msgstr "Perfil de cor"
 
-#: src/filedata.c:86
+#: ../src/exif-common.c:525
+msgid "GPS position"
+msgstr "Posição do GPS"
+
+#: ../src/exif-common.c:526
+msgid "GPS altitude"
+msgstr "Altitude do GPS"
+
+#: ../src/exif-common.c:527
+msgid "File size"
+msgstr "Tamanho do arquivo"
+
+#: ../src/exif-common.c:528
+msgid "File date"
+msgstr "Data do arquivo"
+
+#: ../src/exif-common.c:529
+msgid "File mode"
+msgstr "Modo do arquivo"
+
+#: ../src/filedata.c:91
 #, c-format
 msgid "%d bytes"
 msgstr "%d bytes"
 
-#: src/filedata.c:90
+#: ../src/filedata.c:95
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f KB"
 
-#: src/filedata.c:94
+#: ../src/filedata.c:99
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: src/filedata.c:99
+#: ../src/filedata.c:104
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: src/fullscreen.c:243 src/preferences.c:1329
+#: ../src/filedata.c:2185
+msgid "file or directory does not exist"
+msgstr "o arquivo ou o diretório não existe"
+
+#: ../src/filedata.c:2191
+msgid "destination already exists"
+msgstr "o destino já existe"
+
+#: ../src/filedata.c:2197
+msgid "destination can't be overwritten"
+msgstr "o destino não pode ser sobre-escrito"
+
+#: ../src/filedata.c:2203
+msgid "destination directory is not writable"
+msgstr "o diretório de destino não é escrevível"
+
+#: ../src/filedata.c:2209
+msgid "destination directory does not exist"
+msgstr "o diretório de destino não existe"
+
+#: ../src/filedata.c:2215
+msgid "source directory is not writable"
+msgstr "o diretório de origem não é escrevível"
+
+#: ../src/filedata.c:2221
+msgid "no read permission"
+msgstr "sem permissão de leitura"
+
+#: ../src/filedata.c:2227
+msgid "file is readonly"
+msgstr "o arquivo é somente leitura"
+
+#: ../src/filedata.c:2233
+msgid "destination already exists and will be overwritten"
+msgstr "o destino já existe e será sobre-escrito"
+
+#: ../src/filedata.c:2239
+msgid "source and destination are the same"
+msgstr "a origem e o destino são o mesmo"
+
+#: ../src/filedata.c:2245
+msgid "source and destination have different extension"
+msgstr "a origem e o destino têm diferentes extensões"
+
+#: ../src/filedata.c:2251
+msgid "there are unsaved metadata changes for the file"
+msgstr "há modificações nos metadados não salvas para o arquivo"
+
+#: ../src/fullscreen.c:243 ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331 ../src/preferences.c:1349
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/fullscreen.c:395
+#: ../src/fullscreen.c:391
 msgid "Full size"
 msgstr "Tamanho natural"
 
-#: src/fullscreen.c:400
+#: ../src/fullscreen.c:396
 msgid "Monitor"
 msgstr "Monitor"
 
-#: src/fullscreen.c:405 src/layout.c:455
+#: ../src/fullscreen.c:401
 msgid "Screen"
 msgstr "Tela"
 
-#: src/fullscreen.c:642
+#: ../src/fullscreen.c:638
 msgid "Stay above other windows"
 msgstr "Manter acima de outras janelas"
 
-#: src/fullscreen.c:649
+#: ../src/fullscreen.c:645
 msgid "Determined by Window Manager"
-msgstr "Determinado pelo Gerenciador de Janelas"
+msgstr "Determinado pelo gerenciador de janelas"
 
-#: src/fullscreen.c:650
+#: ../src/fullscreen.c:646
 msgid "Active screen"
 msgstr "Tela ativa"
 
-#: src/fullscreen.c:652
+#: ../src/fullscreen.c:648
 msgid "Active monitor"
 msgstr "Monitor ativo"
 
-#: src/histogram.c:86
-msgid "logarithmical histogram on red"
-msgstr ""
+#: ../src/histogram.c:113
+msgid "Log Histogram on Red"
+msgstr "Logar o histograma no vermelho"
 
-#: src/histogram.c:87
-msgid "logarithmical histogram on green"
-msgstr ""
+#: ../src/histogram.c:114
+msgid "Log Histogram on Green"
+msgstr "Logar o histograma no verde"
 
-#: src/histogram.c:88
-msgid "logarithmical histogram on blue"
-msgstr ""
+#: ../src/histogram.c:115
+msgid "Log Histogram on Blue"
+msgstr "Logar o histograma no azul"
 
-#: src/histogram.c:89
-msgid "logarithmical histogram on value"
-msgstr ""
+#: ../src/histogram.c:116
+msgid "Log Histogram on RGB"
+msgstr "Logar o histograma no RGB"
 
-#: src/histogram.c:90
-msgid "logarithmical histogram on RGB"
-msgstr ""
+#: ../src/histogram.c:117
+msgid "Log Histogram on value"
+msgstr "Logar o histograma no valor"
 
-#: src/histogram.c:91
-msgid "logarithmical histogram on max value"
-msgstr ""
+#: ../src/histogram.c:122
+msgid "Linear Histogram on Red"
+msgstr "Histograma linear no vermelho"
 
-#: src/histogram.c:96
-msgid "linear histogram on red"
-msgstr ""
+#: ../src/histogram.c:123
+msgid "Linear Histogram on Green"
+msgstr "Histograma linear no verde"
 
-#: src/histogram.c:97
-msgid "linear histogram on green"
-msgstr ""
+#: ../src/histogram.c:124
+msgid "Linear Histogram on Blue"
+msgstr "Histograma linear no azul"
 
-#: src/histogram.c:98
-msgid "linear histogram on blue"
-msgstr ""
+#: ../src/histogram.c:125
+msgid "Linear Histogram on RGB"
+msgstr "Histograma linear no RGB"
 
-#: src/histogram.c:99
-msgid "linear histogram on value"
-msgstr ""
+#: ../src/histogram.c:126
+msgid "Linear Histogram on value"
+msgstr "Histograma linear no valor"
 
-#: src/histogram.c:100
-msgid "linear histogram on RGB"
-msgstr ""
+#: ../src/history_list.c:131
+#, c-format
+msgid "Unable to write history lists to: %s\n"
+msgstr "Incapaz de escrever as listas do histórico em: %s\n"
 
-#: src/histogram.c:101
-msgid "linear histogram on max value"
-msgstr ""
+#: ../src/image.c:161
+#, c-format
+msgid " (Collection %s)"
+msgstr " (Coleção %s)"
 
-#: src/img-view.c:1268 src/layout_image.c:743 src/layout_util.c:1105
-#: src/layout_util.c:1106 src/layout_util.c:1107 src/pan-view.c:2800
+#: ../src/img-view.c:1266 ../src/layout_image.c:489 ../src/layout_util.c:1296
+#: ../src/layout_util.c:1297 ../src/layout_util.c:1312
+#: ../src/layout_util.c:1313 ../src/pan-view.c:2808
 msgid "Zoom _in"
-msgstr "_Mais Zoom"
+msgstr "_Mais zoom"
 
-#: src/img-view.c:1269 src/layout_image.c:744 src/layout_util.c:1108
-#: src/layout_util.c:1109 src/pan-view.c:2802
+#: ../src/img-view.c:1267 ../src/layout_image.c:490 ../src/layout_util.c:1298
+#: ../src/layout_util.c:1299 ../src/layout_util.c:1314
+#: ../src/layout_util.c:1315 ../src/pan-view.c:2810
 msgid "Zoom _out"
-msgstr "Me_nos Zoom"
+msgstr "Me_nos zoom"
 
-#: src/img-view.c:1270 src/layout_image.c:745 src/layout_util.c:1110
-#: src/layout_util.c:1111 src/pan-view.c:2804
+#: ../src/img-view.c:1268 ../src/layout_image.c:491 ../src/layout_util.c:1300
+#: ../src/layout_util.c:1301 ../src/layout_util.c:1316
+#: ../src/layout_util.c:1317 ../src/pan-view.c:2812
 msgid "Zoom _1:1"
-msgstr "Zoom _Automático"
+msgstr "Zoom _1:1"
 
-#: src/img-view.c:1271 src/layout_image.c:746
+#: ../src/img-view.c:1269 ../src/layout_image.c:492
 msgid "Fit image to _window"
-msgstr "Ajustar imagem a _janela"
+msgstr "Ajustar a imagem à _janela"
 
-#: src/img-view.c:1276 src/layout_image.c:752 src/layout_util.c:1103
+#: ../src/img-view.c:1277 ../src/layout_image.c:501 ../src/layout_util.c:1294
 msgid "Set as _wallpaper"
 msgstr "Definir como _papel de parede"
 
-#: src/img-view.c:1283 src/layout_image.c:762
+#: ../src/img-view.c:1282 ../src/layout_image.c:508
 msgid "_Go to directory view"
-msgstr ""
+msgstr "_Ir para a visualização por diretórios"
 
-#: src/img-view.c:1297 src/layout_image.c:786
+#: ../src/img-view.c:1295 ../src/layout_image.c:529
 msgid "_Stop slideshow"
-msgstr "_Para show de slides"
+msgstr "_Parar a apresentação de slides"
 
-#: src/img-view.c:1300 src/layout_image.c:789
+#: ../src/img-view.c:1298 ../src/layout_image.c:532
 msgid "Continue slides_how"
-msgstr "Continuar com _show de slides"
+msgstr "_Continuar com a apresentação de slides"
 
-#: src/img-view.c:1305 src/img-view.c:1313 src/layout_image.c:794
-#: src/layout_image.c:801
+#: ../src/img-view.c:1303 ../src/img-view.c:1311 ../src/layout_image.c:537
+#: ../src/layout_image.c:544
 msgid "Pause slides_how"
-msgstr "_Pausar show de slides"
+msgstr "Pau_sar a apresentação de slides"
 
-#: src/img-view.c:1311 src/layout_image.c:800
+#: ../src/img-view.c:1309 ../src/layout_image.c:543
 msgid "_Start slideshow"
-msgstr "_Iniciar show de slides"
+msgstr "_Iniciar a apresentação de slides"
 
-#: src/img-view.c:1319 src/layout_image.c:811 src/pan-view.c:2873
+#: ../src/img-view.c:1317 ../src/layout_image.c:554 ../src/pan-view.c:2881
 msgid "Exit _full screen"
 msgstr "_Sair da tela cheia"
 
-#: src/img-view.c:1323 src/layout_image.c:807 src/pan-view.c:2877
+#: ../src/img-view.c:1321 ../src/layout_image.c:550 ../src/pan-view.c:2885
 msgid "_Full screen"
 msgstr "_Tela cheia"
 
-#: src/img-view.c:1327 src/layout_util.c:1074 src/pan-view.c:2881
+#: ../src/img-view.c:1325 ../src/layout_util.c:1279 ../src/pan-view.c:2889
 msgid "C_lose window"
-msgstr "_Fechar janela"
+msgstr "_Fechar a janela"
 
-#: src/info.c:392
-msgid "File size:"
-msgstr "Tamanho do arquivo:"
-
-#: src/info.c:394
-msgid "Dimensions:"
-msgstr "Dimensões:"
-
-#: src/info.c:395
-msgid "Transparent:"
-msgstr "Transparência:"
-
-#: src/info.c:396 src/print.c:3419
-msgid "Image size:"
-msgstr "Tamanho da imagem:"
-
-#: src/info.c:398
-msgid "Compress ratio:"
-msgstr "Taxa de compressão:"
-
-#: src/info.c:399
-msgid "File type:"
-msgstr "Tipo do arquivo:"
-
-#: src/info.c:401
-msgid "Owner:"
-msgstr "Dono:"
-
-#: src/info.c:402
-msgid "Group:"
-msgstr "Grupo:"
-
-#: src/info.c:405 src/preferences.c:858
-msgid "General"
-msgstr "Geral"
-
-#: src/info.c:531
-#, c-format
-msgid "Image %d of %d"
-msgstr "Imagem %d de %d"
-
-#: src/info.c:778
-#, fuzzy
-msgid "Image properties"
-msgstr "Propriedades da imagem - Geeqie"
-
-#: src/layout.c:282 src/view_file.c:585
+#: ../src/layout.c:363 ../src/view_file.c:613
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/layout.c:384
-#, c-format
-msgid "This installation of %s was not built with support for color profiles."
-msgstr ""
-
-#: src/layout.c:385
-#, fuzzy
-msgid "Color profiles not supported"
-msgstr "Pasta não suportada"
-
-#: src/layout.c:410
-msgid "Use _color profiles"
-msgstr ""
-
-#: src/layout.c:415
-msgid "Use profile from _image"
-msgstr ""
-
-#: src/layout.c:421 src/layout.c:439
-#, c-format
-msgid "Input _%d:"
-msgstr ""
-
-#: src/layout.c:422
-msgid "AdobeRGB compatible"
-msgstr ""
-
-#: src/layout.c:464
-msgid "_Screen profile"
-msgstr ""
-
-#: src/layout.c:531
+#: ../src/layout.c:433
 msgid " Slideshow"
-msgstr " Show de slides"
+msgstr " Apresentação de slides"
 
-#: src/layout.c:535
+#: ../src/layout.c:437
 msgid " Paused"
-msgstr "Pausado"
+msgstr " Pausada"
 
-#: src/layout.c:552
+#: ../src/layout.c:453
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
-msgstr "%s, %d arquivos (%s, %d)%s"
+msgstr "arquivos %s, %d (%s, %d)%s"
 
-#: src/layout.c:559
+#: ../src/layout.c:460
 #, c-format
 msgid "%s, %d files%s"
-msgstr "%s, %d arquivos%s"
+msgstr "arquivos %s, %d%s"
 
-#: src/layout.c:564
+#: ../src/layout.c:465
 #, c-format
 msgid "%d files%s"
-msgstr "%d arquivos%s"
+msgstr "arquivos %d%s"
 
-#: src/layout.c:593
+#: ../src/layout.c:510
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(sem permissão de leitura) %s bytes"
 
-#: src/layout.c:597
+#: ../src/layout.c:514
 #, c-format
 msgid "( ? x ? ) %s bytes"
 msgstr "( ? x ?) %s bytes"
 
-#: src/layout.c:605
+#: ../src/layout.c:522
 #, c-format
 msgid "( %d x %d ) %s bytes"
 msgstr "( %d x %d) %s bytes"
 
-#: src/layout.c:1301 src/layout_config.c:58
+#: ../src/layout.c:1231 ../src/layout_config.c:58
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: src/layout.c:1983
-#, fuzzy
+#: ../src/layout.c:1853
+msgid "Window options and layout"
+msgstr "Opções da janela e da disposição"
+
+#: ../src/layout.c:1912
+msgid "General options"
+msgstr "Opções gerais"
+
+#: ../src/layout.c:1914
+msgid "Home path (empty to use your home directory)"
+msgstr "Caminho do diretório inicial (vazio usa o seu diretório home)"
+
+#: ../src/layout.c:1922
+msgid "Use current"
+msgstr "Usar o atual"
+
+#: ../src/layout.c:1925
+msgid "Show date in directories list view"
+msgstr "Exibir a data na visualização por diretórios em lista"
+
+#: ../src/layout.c:1928
+msgid "Exit program when this window is closed"
+msgstr "Finalizar o programa quando esta janela for fechada"
+
+#: ../src/layout.c:1931
+msgid "Start-up directory:"
+msgstr "Diretório inicial:"
+
+#: ../src/layout.c:1933
+msgid "No change"
+msgstr "Sem modificação"
+
+#: ../src/layout.c:1936
+msgid "Restore last path"
+msgstr "Restaurar o último caminho"
+
+#: ../src/layout.c:1939
+msgid "Home path"
+msgstr "Caminho do diretório inicial"
+
+#: ../src/layout.c:1943 ../src/print.c:3373 ../src/print.c:3380
+msgid "Layout"
+msgstr "Disposição"
+
+#: ../src/layout.c:2187
 msgid "Invalid geometry\n"
-msgstr "Pasta inválida"
+msgstr "Geometria inválida\n"
 
-#: src/layout_config.c:58 src/ui_pathsel.c:1183
+#: ../src/layout_config.c:58 ../src/preferences.c:1446
+#: ../src/ui_pathsel.c:1179
 msgid "Files"
 msgstr "Arquivos"
 
-#: src/layout_config.c:58 src/preferences.c:941 src/print.c:116
+#: ../src/layout_config.c:58 ../src/preferences.c:91 ../src/preferences.c:1240
+#: ../src/print.c:123
 msgid "Image"
 msgstr "Imagem"
 
-#: src/layout_config.c:364
+#: ../src/layout_config.c:364
 msgid "(drag to change order)"
-msgstr "(arraste para mudar ordem)"
+msgstr "(arraste para mudar a ordem)"
 
-#: src/layout_image.c:816
+#: ../src/layout_image.c:559
 msgid "Hide file _list"
-msgstr "Esconder _lista de arquivos"
+msgstr "Ocultar a lista de _arquivos"
 
-#: src/layout_util.c:879 src/menu.c:76
-#, fuzzy, c-format
-msgid "_%d %s..."
-msgstr "em %s..."
+#: ../src/layout_image.c:1559
+#, c-format
+msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
+msgstr "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 
-#: src/layout_util.c:883 src/menu.c:78
-#, fuzzy, c-format
-msgid "_%d (unknown)..."
-msgstr "em (desconhecido)..."
+#: ../src/layout_image.c:1567
+#, c-format
+msgid "[%*s,%*s]: RGB(---,---,---)"
+msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: src/layout_util.c:893
-#, fuzzy, c-format
-msgid "_%d empty"
-msgstr "vazio"
-
-#: src/layout_util.c:1037
+#: ../src/layout_util.c:1234
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/layout_util.c:1038
+#: ../src/layout_util.c:1235
 msgid "_Go"
-msgstr ""
+msgstr "_Ir"
 
-#: src/layout_util.c:1039 src/menu.c:93
+#: ../src/layout_util.c:1236 ../src/menu.c:109
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/layout_util.c:1040
-#, fuzzy
+#: ../src/layout_util.c:1237
 msgid "_Select"
-msgstr "Seleção"
+msgstr "_Selecionar"
 
-#: src/layout_util.c:1041 src/menu.c:265
-msgid "_Adjust"
-msgstr "Aj_ustar"
+#: ../src/layout_util.c:1238 ../src/menu.c:276
+msgid "_Orientation"
+msgstr "_Orientação"
 
-#: src/layout_util.c:1043
-msgid "_View Directory as"
-msgstr ""
+#: ../src/layout_util.c:1239
+msgid "E_xternal Editors"
+msgstr "Editores e_xternos"
 
-#: src/layout_util.c:1044
-#, fuzzy
+#: ../src/layout_util.c:1240
+msgid "P_references"
+msgstr "P_referências"
+
+#: ../src/layout_util.c:1242
+msgid "_Files and Folders"
+msgstr "_Arquivos e diretórios"
+
+#: ../src/layout_util.c:1243
 msgid "_Zoom"
-msgstr "Zoom"
+msgstr "_Zoom"
 
-#: src/layout_util.c:1045
-msgid "_Split"
-msgstr ""
+#: ../src/layout_util.c:1244
+msgid "_Color Management"
+msgstr "Gestão de _cores"
 
-#: src/layout_util.c:1046
+#: ../src/layout_util.c:1245
+msgid "_Connected Zoom"
+msgstr "Zoom _conectado"
+
+#: ../src/layout_util.c:1246
+msgid "Spli_t"
+msgstr "_Dividir"
+
+#: ../src/layout_util.c:1247 ../src/layout_util.c:1361
+msgid "Image _Overlay"
+msgstr "_Overlay da imagem"
+
+#: ../src/layout_util.c:1248
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/layout_util.c:1048
-#, fuzzy
+#: ../src/layout_util.c:1250
 msgid "_First Image"
-msgstr "primeira imagem"
+msgstr "_Primeira imagem"
 
-#: src/layout_util.c:1049 src/layout_util.c:1050 src/layout_util.c:1051
-#, fuzzy
+#: ../src/layout_util.c:1250
+msgid "First Image"
+msgstr "Primeira imagem"
+
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
 msgid "_Previous Image"
-msgstr "anterior"
+msgstr "Imagem _anterior"
 
-#: src/layout_util.c:1052 src/layout_util.c:1053 src/layout_util.c:1054
-#, fuzzy
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
+msgid "Previous Image"
+msgstr "Imagem anterior"
+
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
 msgid "_Next Image"
-msgstr "próxima"
+msgstr "Próxima _imagem"
 
-#: src/layout_util.c:1055
-#, fuzzy
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
+msgid "Next Image"
+msgstr "Próxima imagem"
+
+#: ../src/layout_util.c:1257
 msgid "_Last Image"
-msgstr "última imagem"
+msgstr "_Última imagem"
 
-#: src/layout_util.c:1058
+#: ../src/layout_util.c:1257
+msgid "Last Image"
+msgstr "Última imagem"
+
+#: ../src/layout_util.c:1258
+msgid "_Back"
+msgstr "_Voltar"
+
+#: ../src/layout_util.c:1258
+msgid "Back"
+msgstr "Voltar"
+
+#: ../src/layout_util.c:1259
+msgid "_Home"
+msgstr "_Diretório inicial"
+
+#: ../src/layout_util.c:1259 ../src/options.c:136 ../src/ui_bookmark.c:543
+#: ../src/ui_pathsel.c:1047
+msgid "Home"
+msgstr "Diretório inicial"
+
+#: ../src/layout_util.c:1261
 msgid "New _window"
 msgstr "Nova _janela"
 
-#: src/layout_util.c:1059
+#: ../src/layout_util.c:1261
+msgid "New window"
+msgstr "Nova janela"
+
+#: ../src/layout_util.c:1262
 msgid "_New collection"
 msgstr "Nova _coleção"
 
-#: src/layout_util.c:1060
+#: ../src/layout_util.c:1262
+msgid "New collection"
+msgstr "Nova coleção"
+
+#: ../src/layout_util.c:1263
 msgid "_Open collection..."
 msgstr "Abrir c_oleção..."
 
-#: src/layout_util.c:1061
-msgid "Open _recent"
-msgstr "Abrir r_ecente"
+#: ../src/layout_util.c:1263
+msgid "Open collection..."
+msgstr "Abrir coleção..."
 
-#: src/layout_util.c:1062
+#: ../src/layout_util.c:1264
+msgid "Open recen_t"
+msgstr "Abrir recen_tes"
+
+#: ../src/layout_util.c:1264
+msgid "Open recent"
+msgstr "Abrir recentes"
+
+#: ../src/layout_util.c:1265
 msgid "_Search..."
-msgstr "_Procurar..."
+msgstr "Proc_urar..."
 
-# pan = panorâmica?, achei melhor chamar de mural
-#: src/layout_util.c:1064
-msgid "Pan _view"
-msgstr "Visão em _Mural"
+#: ../src/layout_util.c:1265
+msgid "Search..."
+msgstr "Procurar..."
 
-#: src/layout_util.c:1065
+#: ../src/layout_util.c:1266
+msgid "Find duplicates..."
+msgstr "Procurar por duplicatas..."
+
+#: ../src/layout_util.c:1267
+msgid "Pa_n view"
+msgstr "Visualização pa_norâmica"
+
+#: ../src/layout_util.c:1267
+msgid "Pan view"
+msgstr "Visualização panorâmica"
+
+#: ../src/layout_util.c:1268
 msgid "_Print..."
-msgstr "Im_primir..."
+msgstr "_Imprimir..."
 
-#: src/layout_util.c:1066
+#: ../src/layout_util.c:1269
 msgid "N_ew folder..."
-msgstr "N_ova pasta..."
+msgstr "No_vo diretório..."
 
-#: src/layout_util.c:1075
+#: ../src/layout_util.c:1269
+msgid "New folder..."
+msgstr "Novo diretório..."
+
+#: ../src/layout_util.c:1270
+msgid "Copy..."
+msgstr "Copiar..."
+
+#: ../src/layout_util.c:1271
+msgid "Move..."
+msgstr "Mover..."
+
+#: ../src/layout_util.c:1272
+msgid "Rename..."
+msgstr "Renomear..."
+
+#: ../src/layout_util.c:1273 ../src/layout_util.c:1274
+#: ../src/layout_util.c:1275
+msgid "Delete..."
+msgstr "Apagar..."
+
+#: ../src/layout_util.c:1276 ../src/view_file.c:603
+msgid "Enable file _grouping"
+msgstr "Habilitar o a_grupamento de arquivos"
+
+#: ../src/layout_util.c:1276
+msgid "Enable file grouping"
+msgstr "Habilitar o agrupamento de arquivos"
+
+#: ../src/layout_util.c:1277 ../src/view_file.c:605
+msgid "Disable file groupi_ng"
+msgstr "Desabilitar o agrupame_nto de arquivos"
+
+#: ../src/layout_util.c:1277
+msgid "Disable file grouping"
+msgstr "Desabilitar o agrupamento de arquivos"
+
+#: ../src/layout_util.c:1278
+msgid "_Copy path to clipboard"
+msgstr "_Copiar o caminho para a área de transferência"
+
+#: ../src/layout_util.c:1278
+msgid "Copy path to clipboard"
+msgstr "Copiar o caminho para a área de transferência"
+
+#: ../src/layout_util.c:1279
+msgid "Close window"
+msgstr "Fechar a janela"
+
+#: ../src/layout_util.c:1280
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/layout_util.c:1088 src/menu.c:203
+#: ../src/layout_util.c:1280
+msgid "Quit"
+msgstr "Sair"
+
+#: ../src/layout_util.c:1281 ../src/menu.c:218
 msgid "_Rotate clockwise"
 msgstr "Girar no sentido _horário"
 
-#: src/layout_util.c:1089 src/menu.c:206
+#: ../src/layout_util.c:1281
+msgid "Rotate clockwise"
+msgstr "Girar no sentido horário"
+
+#: ../src/layout_util.c:1282 ../src/menu.c:221
 msgid "Rotate _counterclockwise"
 msgstr "Girar no sentido _anti-horário"
 
-#: src/layout_util.c:1090
+#: ../src/layout_util.c:1282
+msgid "Rotate counterclockwise"
+msgstr "Girar no sentido anti-horário"
+
+#: ../src/layout_util.c:1283
 msgid "Rotate 1_80"
-msgstr "Girar _180"
+msgstr "Girar 1_80"
 
-#: src/layout_util.c:1091 src/menu.c:212
+#: ../src/layout_util.c:1283
+msgid "Rotate 180"
+msgstr "Girar 180"
+
+#: ../src/layout_util.c:1284 ../src/menu.c:227
 msgid "_Mirror"
-msgstr "Refletir _horizontalmente"
+msgstr "_Espelhar horizontalmente"
 
-#: src/layout_util.c:1092 src/menu.c:215
+#: ../src/layout_util.c:1284
+msgid "Mirror"
+msgstr "Espelhar horizontalmente"
+
+#: ../src/layout_util.c:1285 ../src/menu.c:230
 msgid "_Flip"
-msgstr "Refletir _verticalmente"
+msgstr "Espelhar _verticalmente"
 
-#: src/layout_util.c:1093 src/menu.c:218
-#, fuzzy
-msgid "Toggle _grayscale"
-msgstr "_Alternar show de slides"
+#: ../src/layout_util.c:1285
+msgid "Flip"
+msgstr "Espelhar verticalmente"
 
-#: src/layout_util.c:1094 src/menu.c:221
-#, fuzzy
+#: ../src/layout_util.c:1286 ../src/menu.c:233
 msgid "_Original state"
-msgstr "Nome Original"
+msgstr "Estado _original"
 
-#: src/layout_util.c:1097
+#: ../src/layout_util.c:1286
+msgid "Original state"
+msgstr "Estado original"
+
+#: ../src/layout_util.c:1287
 msgid "Select _all"
 msgstr "Selecionar _tudo"
 
-#: src/layout_util.c:1098
+#: ../src/layout_util.c:1288
 msgid "Select _none"
-msgstr "Selecionar _nada"
+msgstr "Não selecionar _nada"
 
-#: src/layout_util.c:1099
-#, fuzzy
+#: ../src/layout_util.c:1289
 msgid "_Invert Selection"
-msgstr "Seleção"
+msgstr "_Inverter a seleção"
 
-#: src/layout_util.c:1101
+#: ../src/layout_util.c:1289
+msgid "Invert Selection"
+msgstr "Inverter a seleção"
+
+#: ../src/layout_util.c:1290
 msgid "P_references..."
 msgstr "P_referências..."
 
-#: src/layout_util.c:1102
+#: ../src/layout_util.c:1290
+msgid "Preferences..."
+msgstr "Preferências..."
+
+#: ../src/layout_util.c:1291
+msgid "Configure _Editors..."
+msgstr "Configurar os _editores..."
+
+#: ../src/layout_util.c:1291
+msgid "Configure Editors..."
+msgstr "Configurar os editores..."
+
+#: ../src/layout_util.c:1292
+msgid "_Configure this window..."
+msgstr "_Configurar esta janela..."
+
+#: ../src/layout_util.c:1292
+msgid "Configure this window..."
+msgstr "Configurar esta janela..."
+
+#: ../src/layout_util.c:1293
 msgid "_Thumbnail maintenance..."
-msgstr "_Manutenção de miniaturas..."
+msgstr "_Manutenção das miniaturas..."
 
-#: src/layout_util.c:1112 src/layout_util.c:1113
+#: ../src/layout_util.c:1293
+msgid "Thumbnail maintenance..."
+msgstr "Manutenção das miniaturas..."
+
+#: ../src/layout_util.c:1294
+msgid "Set as wallpaper"
+msgstr "Definir como papel de parede"
+
+#: ../src/layout_util.c:1295
+msgid "_Save metadata"
+msgstr "_Salvar os metadados"
+
+#: ../src/layout_util.c:1295
+msgid "Save metadata"
+msgstr "Salvar os metadados"
+
+#: ../src/layout_util.c:1296 ../src/layout_util.c:1297
+msgid "Zoom in"
+msgstr "Mais zoom"
+
+#: ../src/layout_util.c:1298 ../src/layout_util.c:1299
+msgid "Zoom out"
+msgstr "Menos zoom"
+
+#: ../src/layout_util.c:1300 ../src/layout_util.c:1301
+msgid "Zoom 1:1"
+msgstr "Zoom 1:1"
+
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
 msgid "_Zoom to fit"
 msgstr "_Zoom ajustado"
 
-#: src/layout_util.c:1114
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
+msgid "Zoom to fit"
+msgstr "Zoom ajustado"
+
+#: ../src/layout_util.c:1304 ../src/layout_util.c:1320
 msgid "Fit _Horizontally"
-msgstr ""
+msgstr "Ajustar _horizontalmente"
 
-#: src/layout_util.c:1115
-msgid "Fit _Vorizontally"
-msgstr ""
+#: ../src/layout_util.c:1304
+msgid "Fit Horizontally"
+msgstr "Ajustar horizontalmente"
 
-#: src/layout_util.c:1116
-#, fuzzy
+#: ../src/layout_util.c:1305 ../src/layout_util.c:1321
+msgid "Fit _Vertically"
+msgstr "Ajustar _verticalmente"
+
+#: ../src/layout_util.c:1305
+msgid "Fit Vertically"
+msgstr "Ajustar verticalmente"
+
+#: ../src/layout_util.c:1306 ../src/layout_util.c:1322
 msgid "Zoom _2:1"
-msgstr "Zoom _Automático"
+msgstr "Zoom _2:1"
 
-#: src/layout_util.c:1117
-#, fuzzy
+#: ../src/layout_util.c:1306
+msgid "Zoom 2:1"
+msgstr "Zoom 2:1"
+
+#: ../src/layout_util.c:1307 ../src/layout_util.c:1323
 msgid "Zoom _3:1"
-msgstr "Zoom _Automático"
+msgstr "Zoom _3:1"
 
-#: src/layout_util.c:1118
-#, fuzzy
+#: ../src/layout_util.c:1307
+msgid "Zoom 3:1"
+msgstr "Zoom 3:1"
+
+#: ../src/layout_util.c:1308 ../src/layout_util.c:1324
 msgid "Zoom _4:1"
-msgstr "Zoom _Automático"
+msgstr "Zoom _4:1"
 
-#: src/layout_util.c:1119
-#, fuzzy
+#: ../src/layout_util.c:1308
+msgid "Zoom 4:1"
+msgstr "Zoom 4:1"
+
+#: ../src/layout_util.c:1309 ../src/layout_util.c:1325
 msgid "Zoom 1:2"
-msgstr "Zoom _Automático"
+msgstr "Zoom 1:2"
 
-#: src/layout_util.c:1120
-#, fuzzy
+#: ../src/layout_util.c:1310 ../src/layout_util.c:1326
 msgid "Zoom 1:3"
-msgstr "Zoom _Automático"
+msgstr "Zoom 1:3"
 
-#: src/layout_util.c:1121
-#, fuzzy
+#: ../src/layout_util.c:1311 ../src/layout_util.c:1327
 msgid "Zoom 1:4"
-msgstr "Zoom _Automático"
+msgstr "Zoom 1:4"
 
-#: src/layout_util.c:1124
-#, fuzzy
+#: ../src/layout_util.c:1312 ../src/layout_util.c:1313
+msgid "Connected Zoom in"
+msgstr "Mais zoom conectado"
+
+#: ../src/layout_util.c:1314 ../src/layout_util.c:1315
+msgid "Connected Zoom out"
+msgstr "Menos zoom conectado"
+
+#: ../src/layout_util.c:1316 ../src/layout_util.c:1317
+msgid "Connected Zoom 1:1"
+msgstr "Zoom conectado 1:1"
+
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
+msgid "Connected Zoom to fit"
+msgstr "Zoom conectado ajustado"
+
+#: ../src/layout_util.c:1320
+msgid "Connected Fit Horizontally"
+msgstr "Ajustar conectado horizontalmente"
+
+#: ../src/layout_util.c:1321
+msgid "Connected Fit Vertically"
+msgstr "Ajustar conectado verticalmente"
+
+#: ../src/layout_util.c:1322
+msgid "Connected Zoom 2:1"
+msgstr "Zoom conectado 2:1"
+
+#: ../src/layout_util.c:1323
+msgid "Connected Zoom 3:1"
+msgstr "Zoom conectado 3:1"
+
+#: ../src/layout_util.c:1324
+msgid "Connected Zoom 4:1"
+msgstr "Zoom conectado 4:1"
+
+#: ../src/layout_util.c:1325
+msgid "Connected Zoom 1:2"
+msgstr "Zoom conectado 1:2"
+
+#: ../src/layout_util.c:1326
+msgid "Connected Zoom 1:3"
+msgstr "Zoom conectado 1:3"
+
+#: ../src/layout_util.c:1327
+msgid "Connected Zoom 1:4"
+msgstr "Zoom conectado 1:4"
+
+#: ../src/layout_util.c:1328
 msgid "_View in new window"
-msgstr "Ver em _nova janela"
+msgstr "_Visualizar em uma nova janela"
 
-#: src/layout_util.c:1126 src/layout_util.c:1127 src/layout_util.c:1128
+#: ../src/layout_util.c:1328
+msgid "View in new window"
+msgstr "Visualizar em uma nova janela"
+
+#: ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331
 msgid "F_ull screen"
 msgstr "_Tela cheia"
 
-#: src/layout_util.c:1129 src/layout_util.c:1130
-#, fuzzy
-msgid "Escape"
-msgstr "paisagem"
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
+msgid "_Leave full screen"
+msgstr "_Sair da tela cheia"
 
-#: src/layout_util.c:1131
-msgid "_Image Overlay"
-msgstr ""
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
+msgid "Leave full screen"
+msgstr "Sair da tela cheia"
 
-#: src/layout_util.c:1132
-msgid "Histogram _channels"
-msgstr ""
+#: ../src/layout_util.c:1334
+msgid "_Cycle through overlay modes"
+msgstr "_Circular pelos modos de overlay"
 
-#: src/layout_util.c:1133
-msgid "Histogram _log mode"
-msgstr ""
+#: ../src/layout_util.c:1334
+msgid "Cycle through Overlay modes"
+msgstr "Circular pelos modos de overlay"
 
-#: src/layout_util.c:1134
+#: ../src/layout_util.c:1335
+msgid "Cycle through histogram ch_annels"
+msgstr "Circ_ular pelos canais de histograma"
+
+#: ../src/layout_util.c:1335
+msgid "Cycle through histogram channels"
+msgstr "Circular pelos canais de histograma"
+
+#: ../src/layout_util.c:1336
+msgid "Cycle through histogram mo_des"
+msgstr "Circular pelos mo_dos de histograma"
+
+#: ../src/layout_util.c:1336
+msgid "Cycle through histogram modes"
+msgstr "Circular pelos modos de histograma"
+
+#: ../src/layout_util.c:1337
 msgid "_Hide file list"
-msgstr "Esconder _lista de arquivos"
+msgstr "Ocultar a _lista de arquivos"
 
-#: src/layout_util.c:1135
-#, fuzzy
+#: ../src/layout_util.c:1337
+msgid "Hide file list"
+msgstr "Ocultar a lista de arquivos"
+
+#: ../src/layout_util.c:1338
 msgid "_Pause slideshow"
-msgstr "_Pausar show de slides"
+msgstr "_Pausar a apresentação de slides"
 
-#: src/layout_util.c:1136
+#: ../src/layout_util.c:1338
+msgid "Pause slideshow"
+msgstr "Pausar a apresentação de slides"
+
+#: ../src/layout_util.c:1339
 msgid "_Refresh"
 msgstr "Atualiza_r"
 
-#: src/layout_util.c:1138
+#: ../src/layout_util.c:1339
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: ../src/layout_util.c:1340
 msgid "_Contents"
-msgstr "_Índice"
+msgstr "_Conteúdo"
 
-#: src/layout_util.c:1139
+#: ../src/layout_util.c:1340
+msgid "Contents"
+msgstr "Conteúdo"
+
+#: ../src/layout_util.c:1341
 msgid "_Keyboard shortcuts"
-msgstr "Atalhos do _teclado"
+msgstr "Atalhos de _teclado"
 
-#: src/layout_util.c:1140
+#: ../src/layout_util.c:1341
+msgid "Keyboard shortcuts"
+msgstr "Atalhos de teclado"
+
+#: ../src/layout_util.c:1342
 msgid "_Release notes"
-msgstr "_Novidades desta versão"
+msgstr "_Notas de lançamento"
 
-#: src/layout_util.c:1141
+#: ../src/layout_util.c:1342
+msgid "Release notes"
+msgstr "Notas de lançamento"
+
+#: ../src/layout_util.c:1343
 msgid "_About"
 msgstr "_Sobre"
 
-#: src/layout_util.c:1145 src/layout_util.c:1546
-msgid "_Thumbnails"
-msgstr "_Miniaturas"
+#: ../src/layout_util.c:1343 ../src/preferences.c:2108
+msgid "About"
+msgstr "Sobre"
 
-#: src/layout_util.c:1146
-#, fuzzy
+#: ../src/layout_util.c:1344
+msgid "_Log Window"
+msgstr "_Logar a janela"
+
+#: ../src/layout_util.c:1344
+msgid "Log Window"
+msgstr "Logar a janela"
+
+#: ../src/layout_util.c:1345
+msgid "_Exif window"
+msgstr "Janela _Exif"
+
+#: ../src/layout_util.c:1345
+msgid "Exif window"
+msgstr "Janela Exif"
+
+#: ../src/layout_util.c:1350
+msgid "Show _Thumbnails"
+msgstr "Exibir _miniaturas"
+
+#: ../src/layout_util.c:1350
+msgid "Show Thumbnails"
+msgstr "Exibir miniaturas"
+
+#: ../src/layout_util.c:1351
 msgid "Show _Marks"
-msgstr "Mostrar arquivos escondidos"
+msgstr "Exibir as _marcações"
 
-#: src/layout_util.c:1147
+#: ../src/layout_util.c:1351
+msgid "Show Marks"
+msgstr "Exibir as marcações"
+
+#: ../src/layout_util.c:1352
+msgid "Pi_xel Info"
+msgstr "Informação do pi_xel"
+
+#: ../src/layout_util.c:1352
+msgid "Show Pixel Info"
+msgstr "Exibir a informação do pixel"
+
+#: ../src/layout_util.c:1353
 msgid "_Float file list"
-msgstr "_Lista de arquivos flutuante"
+msgstr "_Flutuar a lista de arquivos"
 
-#: src/layout_util.c:1148
+#: ../src/layout_util.c:1353
+msgid "Float file list"
+msgstr "Flutuar a lista de arquivos"
+
+#: ../src/layout_util.c:1354
 msgid "Hide tool_bar"
-msgstr "Ocultar _barra de ferramentas"
+msgstr "Ocultar a _barra de ferramentas"
 
-#: src/layout_util.c:1149
-msgid "_Keywords"
-msgstr "Palavras-cha_ve"
+#: ../src/layout_util.c:1354
+msgid "Hide toolbar"
+msgstr "Ocultar a barra de ferramentas"
 
-#: src/layout_util.c:1150
-msgid "E_xif data"
-msgstr "Dados E_xif"
+#: ../src/layout_util.c:1355
+msgid "_Info sidebar"
+msgstr "Barra lateral de _informações"
 
-#: src/layout_util.c:1151
+#: ../src/layout_util.c:1355
+msgid "Info sidebar"
+msgstr "Barra lateral de informações"
+
+#: ../src/layout_util.c:1356
 msgid "Sort _manager"
-msgstr "Class_ificador"
+msgstr "C_lassificador"
 
-#: src/layout_util.c:1152
-msgid "Co_nnected scroll"
-msgstr ""
+#: ../src/layout_util.c:1356
+msgid "Sort manager"
+msgstr "Classificador"
 
-#: src/layout_util.c:1153
-msgid "C_onnected zoom"
-msgstr ""
-
-#: src/layout_util.c:1154
+#: ../src/layout_util.c:1357
 msgid "Toggle _slideshow"
-msgstr "_Alternar show de slides"
+msgstr "Alternar apresentação de _slides"
 
-#: src/layout_util.c:1158 src/view_dir.c:29
-msgid "_List"
-msgstr "Lis_ta"
+#: ../src/layout_util.c:1357
+msgid "Toggle slideshow"
+msgstr "Alternar apresentação de slides"
 
-#: src/layout_util.c:1159
+#: ../src/layout_util.c:1358
+msgid "Use _color profiles"
+msgstr "Usar perfis de _cor"
+
+#: ../src/layout_util.c:1358
+msgid "Use color profiles"
+msgstr "Usar perfis de cor"
+
+#: ../src/layout_util.c:1359
+msgid "Use profile from _image"
+msgstr "Usar o perfil da _imagem"
+
+#: ../src/layout_util.c:1359
+msgid "Use profile from image"
+msgstr "Usar o perfil da imagem"
+
+#: ../src/layout_util.c:1360
+msgid "Toggle _grayscale"
+msgstr "Alternar _escala de cinza"
+
+#: ../src/layout_util.c:1360
+msgid "Toggle grayscale"
+msgstr "Alternar escala de cinza"
+
+#: ../src/layout_util.c:1361
+msgid "Image Overlay"
+msgstr "Overlay da imagem"
+
+#: ../src/layout_util.c:1362
+msgid "_Show Histogram"
+msgstr "Exibir o hi_stograma"
+
+#: ../src/layout_util.c:1362
+msgid "Show Histogram"
+msgstr "Exibir o histograma"
+
+#: ../src/layout_util.c:1366
+msgid "Image _List"
+msgstr "_Lista de imagens"
+
+#: ../src/layout_util.c:1366
+msgid "View Images as List"
+msgstr "Visualizar imagens em lista"
+
+#: ../src/layout_util.c:1367
 msgid "I_cons"
 msgstr "Íco_nes"
 
-#: src/layout_util.c:1163
-msgid "Horizontal"
-msgstr ""
+#: ../src/layout_util.c:1367
+msgid "View Images as Icons"
+msgstr "Visualizar imagens em ícones"
 
-#: src/layout_util.c:1164
-#, fuzzy
-msgid "Vertical"
-msgstr "parcial"
+#: ../src/layout_util.c:1371
+msgid "Folder Li_st"
+msgstr "Li_sta de diretórios"
 
-#: src/layout_util.c:1165
-msgid "Quad"
-msgstr ""
+#: ../src/layout_util.c:1371
+msgid "View Folders as List"
+msgstr "Visualizar diretórios em lista"
 
-#: src/layout_util.c:1166
-#, fuzzy
-msgid "Single"
-msgstr "Tamanho"
+#: ../src/layout_util.c:1372
+msgid "Folder T_ree"
+msgstr "Á_rvore de diretórios"
 
-#: src/layout_util.c:1354
+#: ../src/layout_util.c:1372
+msgid "View Folders as Tree"
+msgstr "Visualizar diretórios em árvore"
+
+#: ../src/layout_util.c:1376
+msgid "_Horizontal"
+msgstr "_Horizontal"
+
+#: ../src/layout_util.c:1376
+msgid "Split Horizontal"
+msgstr "Dividir horizontalmente"
+
+#: ../src/layout_util.c:1377
+msgid "_Vertical"
+msgstr "_Vertical"
+
+#: ../src/layout_util.c:1377
+msgid "Split Vertical"
+msgstr "Dividir verticalmente"
+
+#: ../src/layout_util.c:1378
+msgid "_Quad"
+msgstr "Em _quatro"
+
+#: ../src/layout_util.c:1378
+msgid "Split Quad"
+msgstr "Dividir em quatro"
+
+#: ../src/layout_util.c:1379
+msgid "_Single"
+msgstr "_Única"
+
+#: ../src/layout_util.c:1379
+msgid "Split Single"
+msgstr "Divisão única"
+
+#: ../src/layout_util.c:1383
+msgid "Input _0: sRGB"
+msgstr "Entrada _0: sRGB"
+
+#: ../src/layout_util.c:1383
+msgid "Input 0: sRGB"
+msgstr "Entrada 0: sRGB"
+
+#: ../src/layout_util.c:1384
+msgid "Input _1: AdobeRGB compatible"
+msgstr "Entrada _1: compatível com AdobeRGB"
+
+#: ../src/layout_util.c:1384
+msgid "Input 1: AdobeRGB compatible"
+msgstr "Entrada 1: compatível com AdobeRGB"
+
+#: ../src/layout_util.c:1385
+msgid "Input _2"
+msgstr "Entrada _2"
+
+#: ../src/layout_util.c:1385
+msgid "Input 2"
+msgstr "Entrada 2"
+
+#: ../src/layout_util.c:1386
+msgid "Input _3"
+msgstr "Entrada _3"
+
+#: ../src/layout_util.c:1386
+msgid "Input 3"
+msgstr "Entrada 3"
+
+#: ../src/layout_util.c:1387
+msgid "Input _4"
+msgstr "Entrada _4"
+
+#: ../src/layout_util.c:1387
+msgid "Input 4"
+msgstr "Entrada 4"
+
+#: ../src/layout_util.c:1388
+msgid "Input _5"
+msgstr "Entrada _5"
+
+#: ../src/layout_util.c:1388
+msgid "Input 5"
+msgstr "Entrada 5"
+
+#: ../src/layout_util.c:1392
+msgid "Histogram on Red"
+msgstr "Histograma no vermelho"
+
+#: ../src/layout_util.c:1393
+msgid "Histogram on Green"
+msgstr "Histograma no verde"
+
+#: ../src/layout_util.c:1394
+msgid "Histogram on Blue"
+msgstr "Histograma no azul"
+
+#: ../src/layout_util.c:1395
+msgid "Histogram on RGB"
+msgstr "Histograma no RGB"
+
+#: ../src/layout_util.c:1396
+msgid "Histogram on Value"
+msgstr "Histograma no valor"
+
+#: ../src/layout_util.c:1400
+msgid "Linear Histogram"
+msgstr "Histograma linear"
+
+#: ../src/layout_util.c:1401
+msgid "_Log Histogram"
+msgstr "_Logar o histograma"
+
+#: ../src/layout_util.c:1401
+msgid "Log Histogram"
+msgstr "Logar o histograma"
+
+#: ../src/layout_util.c:1667
 #, c-format
 msgid "Mark _%d"
-msgstr ""
+msgstr "Marcação _%d"
 
-#: src/layout_util.c:1355 src/view_file.c:515
+#: ../src/layout_util.c:1668 ../src/view_file.c:540
 #, c-format
 msgid "_Set mark %d"
-msgstr ""
+msgstr "_Definir a marcação %d"
 
-#: src/layout_util.c:1356 src/view_file.c:516
+#: ../src/layout_util.c:1668
 #, c-format
+msgid "Set mark %d"
+msgstr "Definir a marcação %d"
+
+#: ../src/layout_util.c:1669 ../src/view_file.c:541
+#, c-format
 msgid "_Reset mark %d"
-msgstr ""
+msgstr "_Redefinir a marcação %d"
 
-#: src/layout_util.c:1357 src/layout_util.c:1358 src/view_file.c:517
+#: ../src/layout_util.c:1669
 #, c-format
+msgid "Reset mark %d"
+msgstr "Redefinir a marcação %d"
+
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671 ../src/view_file.c:542
+#, c-format
 msgid "_Toggle mark %d"
-msgstr ""
+msgstr "Al_ternar a marcação %d"
 
-#: src/layout_util.c:1359 src/layout_util.c:1360 src/view_file.c:518
-#, fuzzy, c-format
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671
+#, c-format
+msgid "Toggle mark %d"
+msgstr "Alternar a marcação %d"
+
+#: ../src/layout_util.c:1672
+#, c-format
+msgid "Se_lect mark %d"
+msgstr "Se_lecionar a marcação %d"
+
+#: ../src/layout_util.c:1672 ../src/layout_util.c:1673
+#, c-format
+msgid "Select mark %d"
+msgstr "Selecionar a marcação %d"
+
+#: ../src/layout_util.c:1673 ../src/view_file.c:543
+#, c-format
 msgid "_Select mark %d"
-msgstr "Selecionar tudo"
+msgstr "_Selecionar a marcação %d"
 
-#: src/layout_util.c:1361 src/view_file.c:519
-#, fuzzy, c-format
+#: ../src/layout_util.c:1674 ../src/view_file.c:544
+#, c-format
 msgid "_Add mark %d"
-msgstr "Adicionar Favorito"
+msgstr "_Adicionar a marcação %d"
 
-#: src/layout_util.c:1362 src/view_file.c:520
+#: ../src/layout_util.c:1674
 #, c-format
+msgid "Add mark %d"
+msgstr "Adicionar a marcação %d"
+
+#: ../src/layout_util.c:1675 ../src/view_file.c:545
+#, c-format
 msgid "_Intersection with mark %d"
-msgstr ""
+msgstr "_Interseção com a marcação %d"
 
-#: src/layout_util.c:1363 src/view_file.c:521
+#: ../src/layout_util.c:1675
 #, c-format
+msgid "Intersection with mark %d"
+msgstr "Interseção com a marcação %d"
+
+#: ../src/layout_util.c:1676 ../src/view_file.c:546
+#, c-format
 msgid "_Unselect mark %d"
-msgstr ""
+msgstr "De_sselecionar a marcação %d"
 
-#: src/layout_util.c:1547
-msgid "Show thumbnails"
-msgstr "Mostrar miniaturas"
+#: ../src/layout_util.c:1676
+#, c-format
+msgid "Unselect mark %d"
+msgstr "Desselecionar a marcação %d"
 
-#: src/layout_util.c:1552
-msgid "Change to home folder"
-msgstr "Mudar para pasta inicial"
+#: ../src/layout_util.c:1677
+#, c-format
+msgid "_Filter mark %d"
+msgstr "_Filtrar a marcação %d"
 
-#: src/layout_util.c:1554
-msgid "Refresh file list"
-msgstr "Atualizar lista de arquivos"
+#: ../src/layout_util.c:1677
+#, c-format
+msgid "Filter mark %d"
+msgstr "Filtrar a marcação %d"
 
-#: src/layout_util.c:1556
-msgid "Zoom in"
-msgstr "Mais Zoom"
+#: ../src/layout_util.c:2205
+#, c-format
+msgid "Number of files with unsaved metadata: %d"
+msgstr "Número de arquivos com metadados não salvos: %d"
 
-#: src/layout_util.c:1558
-msgid "Zoom out"
-msgstr "Menos Zoom"
+#: ../src/layout_util.c:2211
+msgid "No unsaved metadata"
+msgstr "Nenhum metadado não salvo"
 
-#: src/layout_util.c:1560 src/preferences.c:978
-msgid "Fit image to window"
-msgstr "Ajustar imagem a janela"
+#: ../src/layout_util.c:2258
+#, c-format
+msgid ""
+"Image profile: %s\n"
+"Screen profile: %s"
+msgstr ""
+"Perfil da imagem: %s\n"
+"Perfil da tela: %s"
 
-#: src/layout_util.c:1562
-msgid "Set zoom 1:1"
-msgstr "Zoom 1:1"
+#: ../src/layout_util.c:2266
+msgid "Click to enable color management"
+msgstr "Clicar para habilitar a gestão de cores"
 
-#: src/layout_util.c:1564
-msgid "Configure options"
-msgstr "Configurar opções"
+#: ../src/layout_util.c:2271
+msgid "Color profiles not supported"
+msgstr "Perfis de cor não suportados"
 
-#: src/layout_util.c:1565
-msgid "_Float"
-msgstr "_Flutuar"
+#: ../src/layout_util.c:2293
+#, c-format
+msgid "Input _%d: %s"
+msgstr "Entrada _%d: %s"
 
-#: src/layout_util.c:1566
-msgid "Float Controls"
-msgstr "Controles Flutuantes"
-
 #. something went badly wrong
-#: src/lirc.c:184
+#: ../src/lirc.c:197
 #, c-format
 msgid "disconnected from LIRC\n"
-msgstr ""
+msgstr "desconectado do LIRC\n"
 
-#: src/lirc.c:199
-#, fuzzy, c-format
+#: ../src/lirc.c:212
+#, c-format
 msgid "Could not init LIRC support\n"
-msgstr "Pasta não suportada"
+msgstr "Não pude iniciar o suporte ao LIRC\n"
 
-#: src/lirc.c:206
+#: ../src/lirc.c:219
 #, c-format
 msgid ""
 "could not read LIRC config file\n"
 "please read the documentation of LIRC to \n"
 "know how to create a proper config file\n"
 msgstr ""
+"não pude ler o arquivo de configuração do LIRC\n"
+"por favor, leia a documentação do LIRC para saber\n"
+"como criar um arquivo de configuração apropriado\n"
 
-#: src/main.c:391
-#, fuzzy, c-format
+#: ../src/logwindow.c:76
+msgid "Log"
+msgstr "Log"
+
+#: ../src/main.c:321
+#, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
 "\n"
 msgstr ""
-"Uso: gqview [opções] [caminho]\n"
+"Uso: %s [opções] [caminho]\n"
 "\n"
 
-#: src/main.c:392
+#: ../src/main.c:322
 msgid "valid options are:\n"
 msgstr "opções válidas são:\n"
 
-#: src/main.c:393
+#: ../src/main.c:323
 msgid "  +t, --with-tools           force show of tools\n"
-msgstr "  +t, --with-tools          exibir as ferramentas\n"
+msgstr "  +t, --with-tools          forçar a exibição das ferramentas\n"
 
-#: src/main.c:394
+#: ../src/main.c:324

&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; Diff output truncated at 100000 characters. &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn&amp;lt; at &amp;gt;lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
&lt;/pre&gt;</description>
    <dc:creator>zas_-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-02-02T20:21:11</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/833">
    <title>SF.net SVN: geeqie:[1898] trunk/po/cs.po</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/833</link>
    <description>&lt;pre&gt;Revision: 1898
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1898&amp;amp;view=rev
Author:   nadvornik
Date:     2010-01-27 22:27:10 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
czech translation fixes

Modified Paths:
--------------
    trunk/po/cs.po

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po2010-01-27 19:58:11 UTC (rev 1897)
+++ trunk/po/cs.po2010-01-27 22:27:10 UTC (rev 1898)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -577,7 +577,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 #: ../src/collect.c:1135 ../src/collect.c:1139
 msgid "Close collection"
-msgstr "Uzavřít sbírku"
+msgstr "Uzavřít kolekci"
 
 #: ../src/collect.c:1140
 msgid ""
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -721,7 +721,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 #: ../src/collect-table.c:876
 msgid "Append from collection..."
-msgstr "Připojit ze sbírky..."
+msgstr "Připojit z kolekce..."
 
 #: ../src/collect-table.c:880
 msgid "_Selection"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -764,7 +764,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 #: ../src/layout_util.c:1270 ../src/layout_util.c:1271 ../src/pan-view.c:2835
 #: ../src/search.c:1023 ../src/view_dir.c:667 ../src/view_file.c:585
 msgid "_Delete..."
-msgstr "O_dstranit..."
+msgstr "S_mazat..."
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2275 ../src/img-view.c:1289
 #: ../src/layout_image.c:515 ../src/pan-view.c:2837 ../src/search.c:1025
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -786,11 +786,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 #: ../src/collect-table.c:920
 msgid "_Save collection"
-msgstr "_Uložit sbírku"
+msgstr "_Uložit kolekci"
 
 #: ../src/collect-table.c:922
 msgid "Save collection _as..."
-msgstr "Uložit sbírku j_ako..."
+msgstr "Uložit kolekci j_ako..."
 
 #: ../src/collect-table.c:925 ../src/layout_util.c:1262
 msgid "_Find duplicates..."
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -944,7 +944,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 #: ../src/dupe.c:2262 ../src/search.c:1012
 msgid "Add to new collection"
-msgstr "Přidat do nové sbírky"
+msgstr "Přidat do nové kolekce"
 
 #: ../src/dupe.c:2280 ../src/dupe.c:2567 ../src/search.c:1030
 msgid "C_lear"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3116,7 +3116,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 
 #: ../src/main.c:319
 msgid "  -l, --list                 open collection window for command line\n"
-msgstr "  -l, --list                 otevřít okno sbírky do příkazové řádky\n"
+msgstr "  -l, --list                 otevřít okno kolekce z příkazové řádky\n"
 
 #: ../src/main.c:320
 msgid "      --geometry=GEOMETRY    set main window location\n"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn&amp;lt; at &amp;gt;lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
&lt;/pre&gt;</description>
    <dc:creator>nadvornik-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-01-27T22:27:13</dc:date>
  </item>
  <item rdf:about="http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/832">
    <title>SF.net SVN: geeqie:[1897] trunk/po/ca.po</title>
    <link>http://comments.gmane.org/gmane.comp.gnome.apps.geeqie.scm/832</link>
    <description>&lt;pre&gt;Revision: 1897
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1897&amp;amp;view=rev
Author:   zas_
Date:     2010-01-27 19:58:11 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
Update catalan translation, by angel mompo.

Modified Paths:
--------------
    trunk/po/ca.po

Modified: trunk/po/ca.po
===================================================================
--- trunk/po/ca.po2010-01-17 13:34:48 UTC (rev 1896)
+++ trunk/po/ca.po2010-01-27 19:58:11 UTC (rev 1897)
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1,18 +1,17 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk, www.gyfieithu.co.uk, 2003.
-#
-#
+# angel mompo &amp;lt;mecatxis&amp;lt; at &amp;gt;ya.com&amp;gt;, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Geeqie 1.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 22:37+0200\n"
-"PO-Revision-Date: 2009-07-01 23:31+0200\n"
-"Last-Translator: Jordi Vilalta Prat &amp;lt;jvprat&amp;lt; at &amp;gt;gmail.com&amp;gt;\n"
-"Language-Team: catux.org &amp;lt;mecatxis&amp;lt; at &amp;gt;ya.com&amp;gt;\n"
+"POT-Creation-Date: 2010-01-27 20:56+0100\n"
+"PO-Revision-Date: 2010-01-10 18:36+0100\n"
+"Last-Translator: angel mompo &amp;lt;mecatxis&amp;lt; at &amp;gt;ya.com&amp;gt;\n"
+"Language-Team: catalan &amp;lt;traducció&amp;lt; at &amp;gt;catux.com&amp;gt;\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../geeqie.desktop.in.h:1
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -68,9 +67,9 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced_exif.c:378 ../src/desktop_file.c:497 ../src/dupe.c:2647
-#: ../src/dupe.c:3161 ../src/print.c:3250 ../src/search.c:2844
-#: ../src/utilops.c:449 ../src/view_file_list.c:2005
+#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2647
+#: ../src/dupe.c:3165 ../src/print.c:3201 ../src/search.c:2844
+#: ../src/utilops.c:462 ../src/view_file_list.c:2046
 msgid "Name"
 msgstr "Nom"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -120,7 +119,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/bar.c:178 ../src/bar_gps.c:771
+#: ../src/bar.c:178 ../src/bar_gps.c:768
 msgid "GPS Map"
 msgstr "Mapa GPS"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -144,11 +143,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: ../src/bar_comment.c:188
+#: ../src/bar_comment.c:191
 msgid "Add text to selected files"
 msgstr "Afegeix un text als fitxers seleccionats"
 
-#: ../src/bar_comment.c:189
+#: ../src/bar_comment.c:192
 msgid "Replace existing text in selected files"
 msgstr "Reemplaça el text existent als fitxers seleccionats"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -187,7 +186,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Configure \"%s\""
 msgstr "Configura «%s»"
 
-#: ../src/bar_exif.c:610 ../src/bar_keywords.c:1135
+#: ../src/bar_exif.c:610 ../src/bar_keywords.c:1143
 #, c-format
 msgid "Remove \"%s\""
 msgstr "Suprimeix «%s»"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -196,156 +195,160 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Show hidden entries"
 msgstr "Mostra els registres ocults"
 
-#: ../src/bar_gps.c:496
+#: ../src/bar_gps.c:499
 #, c-format
 msgid "Zoom %i"
 msgstr "Zoom %i"
 
-#: ../src/bar_gps.c:514
+#: ../src/bar_gps.c:517
 #, c-format
 msgid "Zoom level %i"
 msgstr "Nivell de zoom %i"
 
-#: ../src/bar_gps.c:519
+#: ../src/bar_gps.c:522
 msgid "Loading map"
 msgstr "Estic carregant el mapa"
 
-#: ../src/bar_gps.c:581
+#: ../src/bar_gps.c:584
 msgid "Enable markers"
 msgstr "Habilita els marcadors"
 
-#: ../src/bar_gps.c:583
+#: ../src/bar_gps.c:586
 msgid "Centre map on marker"
 msgstr "Centra el mapa al marcador"
 
-#: ../src/bar_gps.c:606
+#: ../src/bar_gps.c:609
 msgid ""
 "Move map centre to marker\n"
 " is disabled"
 msgstr ""
+"Moure el centre del mapa al marcador\n"
+"està deshabilitat"
 
-#: ../src/bar_gps.c:611
+#: ../src/bar_gps.c:614
 msgid ""
 "Move map centre to marker\n"
 " is enabled"
 msgstr ""
+"Moure el centre del mapa al marcador\n"
+"està habilitat"
 
-#: ../src/bar_gps.c:620
+#: ../src/bar_gps.c:623
 msgid "Map Centreing"
-msgstr ""
+msgstr "Centrat del mapa"
 
 #. use the same strings as in layout_util.c
-#: ../src/bar_histogram.c:240 ../src/layout_util.c:1388
+#: ../src/bar_histogram.c:242 ../src/layout_util.c:1392
 msgid "Histogram on _Red"
 msgstr "Histograma del ve_rmell"
 
-#: ../src/bar_histogram.c:241 ../src/layout_util.c:1389
+#: ../src/bar_histogram.c:243 ../src/layout_util.c:1393
 msgid "Histogram on _Green"
 msgstr "Histograma del _verd"
 
-#: ../src/bar_histogram.c:242 ../src/layout_util.c:1390
+#: ../src/bar_histogram.c:244 ../src/layout_util.c:1394
 msgid "Histogram on _Blue"
 msgstr "Histograma del _blau"
 
-#: ../src/bar_histogram.c:243 ../src/layout_util.c:1391
+#: ../src/bar_histogram.c:245 ../src/layout_util.c:1395
 msgid "_Histogram on RGB"
 msgstr "_Histograma del RGB"
 
-#: ../src/bar_histogram.c:244 ../src/layout_util.c:1392
+#: ../src/bar_histogram.c:246 ../src/layout_util.c:1396
 msgid "Histogram on _Value"
 msgstr "Histograma _segons el valor"
 
-#: ../src/bar_histogram.c:248 ../src/layout_util.c:1396
+#: ../src/bar_histogram.c:250 ../src/layout_util.c:1400
 msgid "Li_near Histogram"
 msgstr "Histograma li_neal"
 
-#: ../src/bar_histogram.c:249 ../src/layout_util.c:1397
+#: ../src/bar_histogram.c:251
 msgid "L_og Histogram"
 msgstr "Histograma l_ogarítmic"
 
-#: ../src/bar_keywords.c:406
+#: ../src/bar_keywords.c:410
 msgid "Add keywords to selected files"
 msgstr "Afegeix paraules clau als fitxers seleccionats"
 
-#: ../src/bar_keywords.c:407
+#: ../src/bar_keywords.c:411
 msgid "Replace existing keywords in selected files"
 msgstr "Reemplaça les paraules clau dels fitxers seleccionats"
 
-#: ../src/bar_keywords.c:880
+#: ../src/bar_keywords.c:884
 msgid "Edit keyword"
 msgstr "Edita la paraula clau"
 
-#: ../src/bar_keywords.c:880
+#: ../src/bar_keywords.c:884
 msgid "Add keywords"
 msgstr "Afegeix paraules clau"
 
-#: ../src/bar_keywords.c:887
+#: ../src/bar_keywords.c:891
 msgid "Configure keyword"
 msgstr "Configura la paraula clau"
 
-#: ../src/bar_keywords.c:887 ../src/bar_keywords.c:1169
+#: ../src/bar_keywords.c:891 ../src/bar_keywords.c:1101
 msgid "Add keyword"
 msgstr "Afegeix una paraula clau"
 
-#: ../src/bar_keywords.c:893
+#: ../src/bar_keywords.c:897
 msgid "Keyword:"
 msgstr "Paraula clau:"
 
-#: ../src/bar_keywords.c:902
+#: ../src/bar_keywords.c:906
 msgid "Keyword type:"
 msgstr "Tipus de paraula clau:"
 
-#: ../src/bar_keywords.c:904
+#: ../src/bar_keywords.c:908
 msgid "Active keyword"
 msgstr "Paraula clau activa"
 
-#: ../src/bar_keywords.c:907
+#: ../src/bar_keywords.c:911
 msgid "Helper"
 msgstr "Ajuda"
 
-#: ../src/bar_keywords.c:1113
+#: ../src/bar_keywords.c:1121
 #, c-format
 msgid "Hide \"%s\""
 msgstr "Oculta «%s»"
 
-#: ../src/bar_keywords.c:1120
+#: ../src/bar_keywords.c:1128
 #, c-format
 msgid "Mark %d"
 msgstr "Marca _%d"
 
-#: ../src/bar_keywords.c:1125
+#: ../src/bar_keywords.c:1133
 #, c-format
 msgid "Connect \"%s\" to mark"
 msgstr "Connecta «%s» a la marca"
 
-#: ../src/bar_keywords.c:1132
+#: ../src/bar_keywords.c:1140
 #, c-format
 msgid "Edit \"%s\""
 msgstr "Edita «%s»"
 
-#: ../src/bar_keywords.c:1142
+#: ../src/bar_keywords.c:1150
 #, c-format
 msgid "Disconnect \"%s\" from mark %s"
 msgstr "Desconnecta «%s» de la marca %s"
 
 #. for the pane
-#: ../src/bar_keywords.c:1154 ../src/bar_keywords.c:1163
+#: ../src/bar_keywords.c:1162 ../src/bar_keywords.c:1171
 msgid "Expand checked"
 msgstr "Amplia els seleccionats"
 
-#: ../src/bar_keywords.c:1155 ../src/bar_keywords.c:1164
+#: ../src/bar_keywords.c:1163 ../src/bar_keywords.c:1172
 msgid "Collapse unchecked"
 msgstr "Redueix els seleccionats"
 
-#: ../src/bar_keywords.c:1156 ../src/bar_keywords.c:1165
+#: ../src/bar_keywords.c:1164 ../src/bar_keywords.c:1173
 msgid "Hide unchecked"
 msgstr "Oculta els seleccionats"
 
-#: ../src/bar_keywords.c:1157
+#: ../src/bar_keywords.c:1165
 msgid "Show all"
 msgstr "Mostra'ls tots"
 
-#: ../src/bar_keywords.c:1160
+#: ../src/bar_keywords.c:1168
 msgid "On any change"
 msgstr "Si hi ha algun canvi"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -401,11 +404,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Collections"
 msgstr "Col·leccions"
 
-#: ../src/bar_sort.c:615 ../src/utilops.c:2107
+#: ../src/bar_sort.c:615 ../src/utilops.c:2124
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/bar_sort.c:618 ../src/utilops.c:2061
+#: ../src/bar_sort.c:618 ../src/utilops.c:2075
 msgid "Move"
 msgstr "Mou"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -431,7 +434,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "error: %s\n"
 
 #: ../src/cache_maint.c:129 ../src/cache_maint.c:722 ../src/cache_maint.c:938
-#: ../src/editors.c:1133
+#: ../src/editors.c:1176
 msgid "done"
 msgstr "fet"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -487,7 +490,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "click start to begin"
 msgstr "feu clic a inici per començar"
 
-#: ../src/cache_maint.c:1042 ../src/editors.c:1059
+#: ../src/cache_maint.c:1042 ../src/editors.c:1102
 msgid "running..."
 msgstr "executant..."
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -555,8 +558,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgstr "Suprimeix les paraules clau i els comentaris orfes."
 
 #. When does this occur ??
-#: ../src/collect.c:366 ../src/image.c:160 ../src/image-overlay.c:513
-#: ../src/image-overlay.c:592
+#: ../src/collect.c:366 ../src/image.c:160 ../src/image-overlay.c:512
+#: ../src/image-overlay.c:591
 msgid "Untitled"
 msgstr "Sense títol"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -684,24 +687,24 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "%s, %d images"
 msgstr "%s, %d imatges"
 
-#: ../src/collect-table.c:223 ../src/layout_util.c:1190
-#: ../src/layout_util.c:2135
+#: ../src/collect-table.c:223 ../src/layout_util.c:1194
+#: ../src/layout_util.c:2231
 msgid "Empty"
 msgstr "Buida"
 
-#: ../src/collect-table.c:237 ../src/dupe.c:1319 ../src/search.c:324
-#: ../src/view_file.c:822 ../src/view_file.c:925
+#: ../src/collect-table.c:237 ../src/dupe.c:1319 ../src/search.c:320
+#: ../src/view_file.c:835 ../src/view_file.c:938
 msgid "Loading thumbs..."
 msgstr "S'estan carregant les miniatures..."
 
-#: ../src/collect-table.c:866 ../src/dupe.c:2244 ../src/dupe.c:2555
-#: ../src/layout_util.c:1237 ../src/search.c:1002
+#: ../src/collect-table.c:866 ../src/dupe.c:2242 ../src/dupe.c:2555
+#: ../src/layout_util.c:1241 ../src/search.c:1000
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../src/collect-table.c:868 ../src/dupe.c:2246 ../src/dupe.c:2557
-#: ../src/img-view.c:1284 ../src/layout_image.c:498 ../src/pan-view.c:2822
-#: ../src/search.c:1004 ../src/view_file.c:575
+#: ../src/collect-table.c:868 ../src/dupe.c:2244 ../src/dupe.c:2557
+#: ../src/img-view.c:1281 ../src/layout_image.c:505 ../src/pan-view.c:2823
+#: ../src/search.c:1002 ../src/view_file.c:588
 msgid "View in _new window"
 msgstr "Visualitzar en una finestra _nova"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -722,13 +725,13 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "_Selection"
 msgstr "_Selecciona"
 
-#: ../src/collect-table.c:882 ../src/dupe.c:2249 ../src/dupe.c:2560
-#: ../src/layout_util.c:1283 ../src/search.c:1007
+#: ../src/collect-table.c:882 ../src/dupe.c:2247 ../src/dupe.c:2560
+#: ../src/layout_util.c:1287 ../src/search.c:1005
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../src/collect-table.c:884 ../src/dupe.c:2251 ../src/dupe.c:2562
-#: ../src/layout_util.c:1284 ../src/search.c:1009
+#: ../src/collect-table.c:884 ../src/dupe.c:2249 ../src/dupe.c:2562
+#: ../src/layout_util.c:1288 ../src/search.c:1007
 msgid "Select none"
 msgstr "Desfés la selecció"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -736,34 +739,34 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Invert selection"
 msgstr "Inverteix la selecció"
 
-#: ../src/collect-table.c:898 ../src/dupe.c:2267 ../src/img-view.c:1288
-#: ../src/layout_image.c:506 ../src/layout_util.c:1266 ../src/pan-view.c:2826
-#: ../src/search.c:1021 ../src/view_file.c:579
+#: ../src/collect-table.c:898 ../src/dupe.c:2267 ../src/img-view.c:1285
+#: ../src/layout_image.c:513 ../src/layout_util.c:1270 ../src/pan-view.c:2827
+#: ../src/search.c:1021 ../src/view_file.c:592
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../src/collect-table.c:900 ../src/dupe.c:2269 ../src/img-view.c:1289
-#: ../src/layout_image.c:508 ../src/layout_util.c:1267 ../src/pan-view.c:2828
-#: ../src/search.c:1023 ../src/view_file.c:581
+#: ../src/collect-table.c:900 ../src/dupe.c:2269 ../src/img-view.c:1286
+#: ../src/layout_image.c:515 ../src/layout_util.c:1271 ../src/pan-view.c:2829
+#: ../src/search.c:1023 ../src/view_file.c:594
 msgid "_Move..."
 msgstr "_Mou..."
 
-#: ../src/collect-table.c:902 ../src/dupe.c:2271 ../src/img-view.c:1290
-#: ../src/layout_image.c:510 ../src/layout_util.c:1268 ../src/pan-view.c:2830
-#: ../src/search.c:1025 ../src/view_dir.c:665 ../src/view_file.c:583
+#: ../src/collect-table.c:902 ../src/dupe.c:2271 ../src/img-view.c:1287
+#: ../src/layout_image.c:517 ../src/layout_util.c:1272 ../src/pan-view.c:2831
+#: ../src/search.c:1025 ../src/view_dir.c:666 ../src/view_file.c:596
 msgid "_Rename..."
 msgstr "Can_via el nom..."
 
-#: ../src/collect-table.c:904 ../src/dupe.c:2273 ../src/img-view.c:1291
-#: ../src/layout_image.c:512 ../src/layout_util.c:1269
-#: ../src/layout_util.c:1270 ../src/layout_util.c:1271 ../src/pan-view.c:2832
-#: ../src/search.c:1027 ../src/view_dir.c:667 ../src/view_file.c:585
+#: ../src/collect-table.c:904 ../src/dupe.c:2273 ../src/img-view.c:1288
+#: ../src/layout_image.c:519 ../src/layout_util.c:1273
+#: ../src/layout_util.c:1274 ../src/layout_util.c:1275 ../src/pan-view.c:2833
+#: ../src/search.c:1027 ../src/view_dir.c:668 ../src/view_file.c:598
 msgid "_Delete..."
 msgstr "_Suprimeix..."
 
-#: ../src/collect-table.c:906 ../src/dupe.c:2275 ../src/img-view.c:1292
-#: ../src/layout_image.c:515 ../src/pan-view.c:2834 ../src/search.c:1029
-#: ../src/view_dir.c:670 ../src/view_file.c:587
+#: ../src/collect-table.c:906 ../src/dupe.c:2275 ../src/img-view.c:1289
+#: ../src/layout_image.c:522 ../src/pan-view.c:2835 ../src/search.c:1029
+#: ../src/view_dir.c:671 ../src/view_file.c:600
 msgid "_Copy path"
 msgstr "_Copia el camí"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -771,11 +774,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Randomize"
 msgstr "Barreja-les"
 
-#: ../src/collect-table.c:914 ../src/view_file.c:603
+#: ../src/collect-table.c:914 ../src/view_file.c:616
 msgid "_Sort"
 msgstr "_Ordena"
 
-#: ../src/collect-table.c:917 ../src/view_file.c:619
+#: ../src/collect-table.c:917 ../src/view_file.c:632
 msgid "Show filename _text"
 msgstr "Mostra el _nom del fitxer"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -787,33 +790,33 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Save collection _as..."
 msgstr "_Anomena i desa la col·lecció..."
 
-#: ../src/collect-table.c:925 ../src/layout_util.c:1262
+#: ../src/collect-table.c:925 ../src/layout_util.c:1266
 msgid "_Find duplicates..."
 msgstr "_Cerca imatges duplicades"
 
-#: ../src/collect-table.c:927 ../src/dupe.c:2264 ../src/layout_util.c:1264
+#: ../src/collect-table.c:927 ../src/dupe.c:2264 ../src/layout_util.c:1268
 #: ../src/search.c:1018
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: ../src/collect-table.c:2081 ../src/dupe.c:3351 ../src/img-view.c:1446
+#: ../src/collect-table.c:2085 ../src/dupe.c:3355 ../src/img-view.c:1443
 msgid "Dropped list includes folders."
 msgstr "La llista deixada inclou carpetes."
 
-#: ../src/collect-table.c:2083 ../src/dupe.c:3353 ../src/img-view.c:1448
+#: ../src/collect-table.c:2087 ../src/dupe.c:3357 ../src/img-view.c:1445
 msgid "_Add contents"
 msgstr "_Afegeix continguts"
 
-#: ../src/collect-table.c:2085 ../src/dupe.c:3354 ../src/img-view.c:1449
+#: ../src/collect-table.c:2089 ../src/dupe.c:3358 ../src/img-view.c:1446
 msgid "Add contents _recursive"
 msgstr "Afegeix continguts _recursivament"
 
-#: ../src/collect-table.c:2087 ../src/dupe.c:3355 ../src/img-view.c:1450
+#: ../src/collect-table.c:2091 ../src/dupe.c:3359 ../src/img-view.c:1447
 msgid "_Skip folders"
 msgstr "_Salta carpetes"
 
-#: ../src/collect-table.c:2090 ../src/dupe.c:3357 ../src/img-view.c:1452
-#: ../src/view_dir.c:416
+#: ../src/collect-table.c:2094 ../src/dupe.c:3361 ../src/img-view.c:1449
+#: ../src/view_dir.c:417
 msgid "Cancel"
 msgstr "Cancel·la"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -829,23 +832,23 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Custom profile"
 msgstr "Perfil personalitzat"
 
-#: ../src/desktop_file.c:72 ../src/desktop_file.c:84 ../src/desktop_file.c:90
+#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
 msgid "Can't save"
 msgstr "No es pot desar"
 
-#: ../src/desktop_file.c:72
+#: ../src/desktop_file.c:74
 msgid "Please specify file name."
 msgstr "Especifiqueu un nom de fitxer"
 
-#: ../src/desktop_file.c:84
+#: ../src/desktop_file.c:86
 msgid "Could not create directory"
 msgstr "No es pot crear el directori"
 
-#: ../src/desktop_file.c:177 ../src/desktop_file.c:520
+#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
 msgid "Desktop file"
 msgstr "Fitxer desktop"
 
-#: ../src/desktop_file.c:286 ../src/ui_pathsel.c:494
+#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:494
 #, c-format
 msgid ""
 "Unable to delete file:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -854,17 +857,17 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "No es pot suprimir el fitxer:\n"
 "%s"
 
-#: ../src/desktop_file.c:287 ../src/ui_pathsel.c:495 ../src/utilops.c:1948
-#: ../src/utilops.c:1975 ../src/utilops.c:2489
+#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:495 ../src/utilops.c:1962
+#: ../src/utilops.c:1989 ../src/utilops.c:2509
 msgid "File deletion failed"
 msgstr "No es pot suprimir el fitxer"
 
-#: ../src/desktop_file.c:329 ../src/desktop_file.c:337 ../src/ui_pathsel.c:537
+#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:537
 #: ../src/ui_pathsel.c:545
 msgid "Delete file"
 msgstr "Suprimeix l'arxiu"
 
-#: ../src/desktop_file.c:335 ../src/ui_pathsel.c:543
+#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:543
 #, c-format
 msgid ""
 "About to delete the file:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -873,21 +876,21 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Quant a suprimir el fitxer:\n"
 " %s"
 
-#: ../src/desktop_file.c:367
+#: ../src/desktop_file.c:374
 msgid "new.desktop"
 msgstr "nou.desktop"
 
-#: ../src/desktop_file.c:440
+#: ../src/desktop_file.c:453
 msgid "Editors"
 msgstr "Editors"
 
-#: ../src/desktop_file.c:506
+#: ../src/desktop_file.c:524
 msgid "Hidden"
 msgstr "Ocult"
 
-#: ../src/desktop_file.c:529 ../src/dupe.c:2653 ../src/dupe.c:3165
-#: ../src/print.c:3252 ../src/search.c:2848 ../src/ui_pathsel.c:1111
-#: ../src/utilops.c:445
+#: ../src/desktop_file.c:543 ../src/dupe.c:2653 ../src/dupe.c:3169
+#: ../src/print.c:3203 ../src/search.c:2848 ../src/ui_pathsel.c:1111
+#: ../src/utilops.c:458
 msgid "Path"
 msgstr "Camí"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -929,11 +932,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Sorting..."
 msgstr "S'està ordenant..."
 
-#: ../src/dupe.c:2253
+#: ../src/dupe.c:2251
 msgid "Select group _1 duplicates"
 msgstr "Seleccioneu duplicats del grup _1"
 
-#: ../src/dupe.c:2255
+#: ../src/dupe.c:2253
 msgid "Select group _2 duplicates"
 msgstr "Seleccioneu duplicats del grup_ 2 duplicats"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -958,18 +961,18 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Name case-insensitive"
 msgstr "El nom no distingeix entre majúscules i minúscules"
 
-#: ../src/dupe.c:2649 ../src/dupe.c:3162 ../src/preferences.c:1336
-#: ../src/print.c:3256 ../src/search.c:2845 ../src/view_file_list.c:2009
+#: ../src/dupe.c:2649 ../src/dupe.c:3166 ../src/preferences.c:1336
+#: ../src/print.c:3207 ../src/search.c:2845 ../src/view_file_list.c:2050
 msgid "Size"
 msgstr "Mida"
 
-#: ../src/dupe.c:2650 ../src/dupe.c:3163 ../src/exif.c:341
-#: ../src/exif-common.c:514 ../src/print.c:3254 ../src/search.c:2846
-#: ../src/view_file_list.c:2013
+#: ../src/dupe.c:2650 ../src/dupe.c:3167 ../src/exif.c:341
+#: ../src/exif-common.c:514 ../src/print.c:3205 ../src/search.c:2846
+#: ../src/view_file_list.c:2054
 msgid "Date"
 msgstr "Data"
 
-#: ../src/dupe.c:2651 ../src/dupe.c:3164 ../src/print.c:3258
+#: ../src/dupe.c:2651 ../src/dupe.c:3168 ../src/print.c:3209
 #: ../src/search.c:2847
 msgid "Dimensions"
 msgstr "Dimensions"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -994,45 +997,55 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Similarity (custom)"
 msgstr "Semblança (personalitzada)"
 
-#: ../src/dupe.c:3115
+#: ../src/dupe.c:3119
 msgid "Find duplicates"
 msgstr "Cerca els duplicats"
 
-#: ../src/dupe.c:3197
+#: ../src/dupe.c:3201
 msgid "Compare to:"
 msgstr "Compara amb:"
 
-#: ../src/dupe.c:3210
+#: ../src/dupe.c:3214
 msgid "Compare by:"
 msgstr "Compara per:"
 
-#: ../src/dupe.c:3218 ../src/preferences.c:1171 ../src/search.c:2861
+#: ../src/dupe.c:3222 ../src/preferences.c:1171 ../src/search.c:2861
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../src/dupe.c:3225
+#: ../src/dupe.c:3229
 msgid "Compare two file sets"
 msgstr "Compara dos conjunts de fitxers"
 
-#: ../src/editors.c:279
-#, fuzzy, c-format
+#: ../src/editors.c:280
+#, c-format
 msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
-msgstr "El fixer desktop '%s'"
+msgstr ""
+"El fixer desktop '%s' no hauria d'incloure extensió a la clau Icon: «%s»\n"
 
-#: ../src/editors.c:486
+#. flash fired (bit 0)
+#: ../src/editors.c:334 ../src/exif.c:225 ../src/exif-common.c:332
+msgid "yes"
+msgstr "sí"
+
+#: ../src/editors.c:334 ../src/exif.c:224 ../src/exif-common.c:332
+msgid "no"
+msgstr "no"
+
+#: ../src/editors.c:506
 msgid "stopping..."
 msgstr "aturant..."
 
-#: ../src/editors.c:507
+#: ../src/editors.c:527
 msgid "Edit command results"
 msgstr "Edita els resultats de la comanda"
 
-#: ../src/editors.c:510
+#: ../src/editors.c:530
 #, c-format
 msgid "Output of %s"
 msgstr "Sortida de %s"
 
-#: ../src/editors.c:1010
+#: ../src/editors.c:1053
 #, c-format
 msgid ""
 "Failed to run command:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1041,11 +1054,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "No es pot executar la comanda:\n"
 "%s\n"
 
-#: ../src/editors.c:1137
+#: ../src/editors.c:1180
 msgid "stopped by user"
 msgstr "aturat per l'usuari"
 
-#: ../src/editors.c:1218
+#: ../src/editors.c:1265
 #, c-format
 msgid ""
 "%s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1054,39 +1067,39 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "%s\n"
 "«%s»"
 
-#: ../src/editors.c:1220
+#: ../src/editors.c:1267
 msgid "Invalid editor command"
 msgstr "comanda invalida del editor"
 
-#: ../src/editors.c:1307
+#: ../src/editors.c:1354
 msgid "Editor template is empty."
 msgstr "La plantilla de l'editor és buida."
 
-#: ../src/editors.c:1308
+#: ../src/editors.c:1355
 msgid "Editor template has incorrect syntax."
 msgstr "La plantilla de l'editor te una sintaxi incorrecta."
 
-#: ../src/editors.c:1309
+#: ../src/editors.c:1356
 msgid "Editor template uses incompatible macros."
 msgstr "La plantilla de l'editor fa servir macros incompatibles."
 
-#: ../src/editors.c:1310
+#: ../src/editors.c:1357
 msgid "Can't find matching file type."
 msgstr "No es troba cap tipus de fitxer coincident."
 
-#: ../src/editors.c:1311
+#: ../src/editors.c:1358
 msgid "Can't execute external editor."
 msgstr "No es pot executar l'editor extern."
 
-#: ../src/editors.c:1312
+#: ../src/editors.c:1359
 msgid "External editor returned error status."
 msgstr "L'editor extern a retornat un error."
 
-#: ../src/editors.c:1313
+#: ../src/editors.c:1360
 msgid "File was skipped."
 msgstr "S'ha omès el fitxer."
 
-#: ../src/editors.c:1314
+#: ../src/editors.c:1361
 msgid "Unknown error."
 msgstr "Error desconegut."
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1277,15 +1290,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "ISO studio tungsten"
 msgstr "ISO tungstè d'estudi"
 
-#: ../src/exif.c:224 ../src/exif-common.c:332
-msgid "no"
-msgstr "no"
-
-#. flash fired (bit 0)
-#: ../src/exif.c:225 ../src/exif-common.c:332
-msgid "yes"
-msgstr "sí"
-
 #: ../src/exif.c:226
 msgid "yes, not detected by strobe"
 msgstr "sí, no detectat per l'efecte estroboscòpic "
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1783,76 +1787,76 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "File mode"
 msgstr "Mode del fitxer"
 
-#: ../src/filedata.c:90
+#: ../src/filedata.c:91
 #, c-format
 msgid "%d bytes"
 msgstr "%d bytes"
 
-#: ../src/filedata.c:94
+#: ../src/filedata.c:95
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../src/filedata.c:98
+#: ../src/filedata.c:99
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../src/filedata.c:103
+#: ../src/filedata.c:104
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../src/filedata.c:2091
+#: ../src/filedata.c:2185
 msgid "file or directory does not exist"
 msgstr "el fitxer o el directori no existeix"
 
-#: ../src/filedata.c:2097
+#: ../src/filedata.c:2191
 msgid "destination already exists"
 msgstr "el destí ja existeix"
 
-#: ../src/filedata.c:2103
+#: ../src/filedata.c:2197
 msgid "destination can't be overwritten"
 msgstr "el destí no es pot sobreescriure"
 
-#: ../src/filedata.c:2109
+#: ../src/filedata.c:2203
 msgid "destination directory is not writable"
 msgstr "no es pot escriure al directori destí"
 
-#: ../src/filedata.c:2115
+#: ../src/filedata.c:2209
 msgid "destination directory does not exist"
 msgstr "el directori de destí no existeix"
 
-#: ../src/filedata.c:2121
+#: ../src/filedata.c:2215
 msgid "source directory is not writable"
 msgstr "no es pot escriure al directori font"
 
-#: ../src/filedata.c:2127
+#: ../src/filedata.c:2221
 msgid "no read permission"
 msgstr "no teniu permís de lectura"
 
-#: ../src/filedata.c:2133
+#: ../src/filedata.c:2227
 msgid "file is readonly"
 msgstr "el fitxer és de només lectura"
 
-#: ../src/filedata.c:2139
+#: ../src/filedata.c:2233
 msgid "destination already exists and will be overwritten"
 msgstr "el destí ja existeix i es sobreescriurà"
 
-#: ../src/filedata.c:2145
+#: ../src/filedata.c:2239
 msgid "source and destination are the same"
 msgstr "L'origen i el destí són els mateixos"
 
-#: ../src/filedata.c:2151
+#: ../src/filedata.c:2245
 msgid "source and destination have different extension"
 msgstr "L'origen i el destí tenen extensió diferent"
 
-#: ../src/filedata.c:2157
+#: ../src/filedata.c:2251
 msgid "there are unsaved metadata changes for the file"
 msgstr "hi ha canvis a les metadades del fitxer que no s'han desat"
 
-#: ../src/fullscreen.c:243 ../src/layout_util.c:1325 ../src/layout_util.c:1326
-#: ../src/layout_util.c:1327 ../src/preferences.c:1349
+#: ../src/fullscreen.c:243 ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331 ../src/preferences.c:1349
 msgid "Full screen"
 msgstr "Pantalla completa"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -1934,66 +1938,66 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid " (Collection %s)"
 msgstr "(Col·leccions %s)"
 
-#: ../src/img-view.c:1271 ../src/layout_image.c:484 ../src/layout_util.c:1292
-#: ../src/layout_util.c:1293 ../src/layout_util.c:1308
-#: ../src/layout_util.c:1309 ../src/pan-view.c:2810
+#: ../src/img-view.c:1266 ../src/layout_image.c:489 ../src/layout_util.c:1296
+#: ../src/layout_util.c:1297 ../src/layout_util.c:1312
+#: ../src/layout_util.c:1313 ../src/pan-view.c:2808
 msgid "Zoom _in"
 msgstr "Apropa"
 
-#: ../src/img-view.c:1272 ../src/layout_image.c:485 ../src/layout_util.c:1294
-#: ../src/layout_util.c:1295 ../src/layout_util.c:1310
-#: ../src/layout_util.c:1311 ../src/pan-view.c:2812
+#: ../src/img-view.c:1267 ../src/layout_image.c:490 ../src/layout_util.c:1298
+#: ../src/layout_util.c:1299 ../src/layout_util.c:1314
+#: ../src/layout_util.c:1315 ../src/pan-view.c:2810
 msgid "Zoom _out"
 msgstr "Allunya"
 
-#: ../src/img-view.c:1273 ../src/layout_image.c:486 ../src/layout_util.c:1296
-#: ../src/layout_util.c:1297 ../src/layout_util.c:1312
-#: ../src/layout_util.c:1313 ../src/pan-view.c:2814
+#: ../src/img-view.c:1268 ../src/layout_image.c:491 ../src/layout_util.c:1300
+#: ../src/layout_util.c:1301 ../src/layout_util.c:1316
+#: ../src/layout_util.c:1317 ../src/pan-view.c:2812
 msgid "Zoom _1:1"
 msgstr "Escala real"
 
-#: ../src/img-view.c:1274 ../src/layout_image.c:487
+#: ../src/img-view.c:1269 ../src/layout_image.c:492
 msgid "Fit image to _window"
 msgstr "Ajusta la imatge a la _finestra"
 
-#: ../src/img-view.c:1280 ../src/layout_image.c:494 ../src/layout_util.c:1290
+#: ../src/img-view.c:1277 ../src/layout_image.c:501 ../src/layout_util.c:1294
 msgid "Set as _wallpaper"
 msgstr "Posa com a _fons d'escriptori"
 
-#: ../src/img-view.c:1285 ../src/layout_image.c:501
+#: ../src/img-view.c:1282 ../src/layout_image.c:508
 msgid "_Go to directory view"
 msgstr "_Ves a la vista de directoris"
 
-#: ../src/img-view.c:1298 ../src/layout_image.c:522
+#: ../src/img-view.c:1295 ../src/layout_image.c:529
 msgid "_Stop slideshow"
 msgstr "_Atura les diapositives"
 
-#: ../src/img-view.c:1301 ../src/layout_image.c:525
+#: ../src/img-view.c:1298 ../src/layout_image.c:532
 msgid "Continue slides_how"
 msgstr "_Continua mostrant diapositives"
 
-#: ../src/img-view.c:1306 ../src/img-view.c:1314 ../src/layout_image.c:530
-#: ../src/layout_image.c:537
+#: ../src/img-view.c:1303 ../src/img-view.c:1311 ../src/layout_image.c:537
+#: ../src/layout_image.c:544
 msgid "Pause slides_how"
 msgstr "_Pausa la seqüència de diapositives"
 
-#: ../src/img-view.c:1312 ../src/layout_image.c:536
+#: ../src/img-view.c:1309 ../src/layout_image.c:543
 msgid "_Start slideshow"
 msgstr "_Inicia la seqüència de diapositives"
 
-#: ../src/img-view.c:1320 ../src/layout_image.c:547 ../src/pan-view.c:2880
+#: ../src/img-view.c:1317 ../src/layout_image.c:554 ../src/pan-view.c:2881
 msgid "Exit _full screen"
 msgstr "Sortir del mode _pantalla completa"
 
-#: ../src/img-view.c:1324 ../src/layout_image.c:543 ../src/pan-view.c:2884
+#: ../src/img-view.c:1321 ../src/layout_image.c:550 ../src/pan-view.c:2885
 msgid "_Full screen"
 msgstr "_Pantalla completa"
 
-#: ../src/img-view.c:1328 ../src/layout_util.c:1275 ../src/pan-view.c:2888
+#: ../src/img-view.c:1325 ../src/layout_util.c:1279 ../src/pan-view.c:2889
 msgid "C_lose window"
 msgstr "_Tanca la finestra"
 
-#: ../src/layout.c:363 ../src/view_file.c:600
+#: ../src/layout.c:363 ../src/view_file.c:613
 msgid "Ascending"
 msgstr "Ascendent"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2079,11 +2083,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Home path"
 msgstr "Directori de l'usuari"
 
-#: ../src/layout.c:1943 ../src/print.c:3422 ../src/print.c:3429
+#: ../src/layout.c:1943 ../src/print.c:3373 ../src/print.c:3380
 msgid "Layout"
 msgstr "Format"
 
-#: ../src/layout.c:2186
+#: ../src/layout.c:2187
 msgid "Invalid geometry\n"
 msgstr "Geometria invàlida\n"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -2101,927 +2105,936 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "(drag to change order)"
 msgstr "(arrossegueu per canviar l'ordre)"
 
-#: ../src/layout_image.c:552
+#: ../src/layout_image.c:559
 msgid "Hide file _list"
 msgstr "Oculta la _llista de fitxers"
 
-#: ../src/layout_image.c:1552
+#: ../src/layout_image.c:1559
 #, c-format
 msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 msgstr "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 
-#: ../src/layout_image.c:1560
+#: ../src/layout_image.c:1567
 #, c-format
 msgid "[%*s,%*s]: RGB(---,---,---)"
 msgstr "[%*s,%*s]: RGB(---,---,---)"
 
-#: ../src/layout_util.c:1230
+#: ../src/layout_util.c:1234
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../src/layout_util.c:1231
+#: ../src/layout_util.c:1235
 msgid "_Go"
 msgstr "_Ves"
 
-#: ../src/layout_util.c:1232 ../src/menu.c:109
+#: ../src/layout_util.c:1236 ../src/menu.c:109
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/layout_util.c:1233
+#: ../src/layout_util.c:1237
 msgid "_Select"
 msgstr "_Selecció"
 
-#: ../src/layout_util.c:1234 ../src/menu.c:276
+#: ../src/layout_util.c:1238 ../src/menu.c:276
 msgid "_Orientation"
 msgstr "_Orientació"
 
-#: ../src/layout_util.c:1235
+#: ../src/layout_util.c:1239
 msgid "E_xternal Editors"
 msgstr "Editors e_xterns"
 
-#: ../src/layout_util.c:1236
+#: ../src/layout_util.c:1240
 msgid "P_references"
 msgstr "P_referències"
 
-#: ../src/layout_util.c:1238
+#: ../src/layout_util.c:1242
 msgid "_Files and Folders"
 msgstr "_Fitxers i carpetes"
 
-#: ../src/layout_util.c:1239
+#: ../src/layout_util.c:1243
 msgid "_Zoom"
 msgstr "_Lupa"
 
-#: ../src/layout_util.c:1240
-msgid "Color _Management"
-msgstr "_Gestió del color"
+#: ../src/layout_util.c:1244
+msgid "_Color Management"
+msgstr "Gestió del _color"
 
-#: ../src/layout_util.c:1241
+#: ../src/layout_util.c:1245
 msgid "_Connected Zoom"
 msgstr "Ampliació _connectada"
 
-#: ../src/layout_util.c:1242
-msgid "_Split"
+#: ../src/layout_util.c:1246
+msgid "Spli_t"
 msgstr "_Dividir"
 
-#: ../src/layout_util.c:1243 ../src/layout_util.c:1357
-msgid "_Image Overlay"
-msgstr "_Imatge sobreposada"
+#: ../src/layout_util.c:1247 ../src/layout_util.c:1361
+msgid "Image _Overlay"
+msgstr "Imatge _sobreposada"
 
-#: ../src/layout_util.c:1244
+#: ../src/layout_util.c:1248
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/layout_util.c:1246
+#: ../src/layout_util.c:1250
 msgid "_First Image"
 msgstr "_Primera imatge"
 
-#: ../src/layout_util.c:1246
+#: ../src/layout_util.c:1250
 msgid "First Image"
 msgstr "Primera imatge"
 
-#: ../src/layout_util.c:1247 ../src/layout_util.c:1248
-#: ../src/layout_util.c:1249
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
 msgid "_Previous Image"
 msgstr "Imatge _anterior"
 
-#: ../src/layout_util.c:1247 ../src/layout_util.c:1248
-#: ../src/layout_util.c:1249
+#: ../src/layout_util.c:1251 ../src/layout_util.c:1252
+#: ../src/layout_util.c:1253
 msgid "Previous Image"
 msgstr "Imatge anterior"
 
-#: ../src/layout_util.c:1250 ../src/layout_util.c:1251
-#: ../src/layout_util.c:1252
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
 msgid "_Next Image"
 msgstr "Imatge _següent"
 
-#: ../src/layout_util.c:1250 ../src/layout_util.c:1251
-#: ../src/layout_util.c:1252
+#: ../src/layout_util.c:1254 ../src/layout_util.c:1255
+#: ../src/layout_util.c:1256
 msgid "Next Image"
 msgstr "Imatge següent"
 
-#: ../src/layout_util.c:1253
+#: ../src/layout_util.c:1257
 msgid "_Last Image"
 msgstr "_Última imatge"
 
-#: ../src/layout_util.c:1253
+#: ../src/layout_util.c:1257
 msgid "Last Image"
 msgstr "Última imatge"
 
-#: ../src/layout_util.c:1254
+#: ../src/layout_util.c:1258
 msgid "_Back"
 msgstr "_Enrrere"
 
-#: ../src/layout_util.c:1254
+#: ../src/layout_util.c:1258
 msgid "Back"
 msgstr "Enrrere"
 
-#: ../src/layout_util.c:1255
+#: ../src/layout_util.c:1259
 msgid "_Home"
 msgstr "_Directori de l'usuari"
 
-#: ../src/layout_util.c:1255 ../src/options.c:136 ../src/ui_bookmark.c:543
+#: ../src/layout_util.c:1259 ../src/options.c:136 ../src/ui_bookmark.c:543
 #: ../src/ui_pathsel.c:1047
 msgid "Home"
 msgstr "Directori de l'usuari"
 
-#: ../src/layout_util.c:1257
+#: ../src/layout_util.c:1261
 msgid "New _window"
 msgstr "Nova _finestra"
 
-#: ../src/layout_util.c:1257
+#: ../src/layout_util.c:1261
 msgid "New window"
 msgstr "Nova finestra"
 
-#: ../src/layout_util.c:1258
+#: ../src/layout_util.c:1262
 msgid "_New collection"
 msgstr "_Nova col·lecció"
 
-#: ../src/layout_util.c:1258
+#: ../src/layout_util.c:1262
 msgid "New collection"
 msgstr "Nova col·lecció"
 
-#: ../src/layout_util.c:1259
+#: ../src/layout_util.c:1263
 msgid "_Open collection..."
 msgstr "_Obre una col·lecció..."
 
-#: ../src/layout_util.c:1259
+#: ../src/layout_util.c:1263
 msgid "Open collection..."
 msgstr "Obre una col·lecció..."
 
-#: ../src/layout_util.c:1260
-msgid "Open _recent"
-msgstr "Obre _recents"
+#: ../src/layout_util.c:1264
+msgid "Open recen_t"
+msgstr "Obre recen_ts"
 
-#: ../src/layout_util.c:1260
+#: ../src/layout_util.c:1264
 msgid "Open recent"
 msgstr "Obre recents"
 
-#: ../src/layout_util.c:1261
+#: ../src/layout_util.c:1265
 msgid "_Search..."
 msgstr "_Cerca..."
 
-#: ../src/layout_util.c:1261
+#: ../src/layout_util.c:1265
 msgid "Search..."
 msgstr "Cerca..."
 
-#: ../src/layout_util.c:1262
+#: ../src/layout_util.c:1266
 msgid "Find duplicates..."
 msgstr "Cerca imatges duplicades"
 
-#: ../src/layout_util.c:1263
-msgid "Pan _view"
-msgstr "Vista _panoràmica"
+#: ../src/layout_util.c:1267
+msgid "Pa_n view"
+msgstr "Vista pa_noràmica"
 
-#: ../src/layout_util.c:1263
+#: ../src/layout_util.c:1267
 msgid "Pan view"
 msgstr "Vista panoràmica"
 
-#: ../src/layout_util.c:1264
+#: ../src/layout_util.c:1268
 msgid "_Print..."
 msgstr "_Imprimeix..."
 
-#: ../src/layout_util.c:1265
+#: ../src/layout_util.c:1269
 msgid "N_ew folder..."
 msgstr "_Nova carpeta..."
 
-#: ../src/layout_util.c:1265
+#: ../src/layout_util.c:1269
 msgid "New folder..."
 msgstr "Nova carpeta..."
 
-#: ../src/layout_util.c:1266
+#: ../src/layout_util.c:1270
 msgid "Copy..."
 msgstr "Copia..."
 
-#: ../src/layout_util.c:1267
+#: ../src/layout_util.c:1271
 msgid "Move..."
 msgstr "Mou..."
 
-#: ../src/layout_util.c:1268
+#: ../src/layout_util.c:1272
 msgid "Rename..."
 msgstr "Canvia el nom..."
 
-#: ../src/layout_util.c:1269 ../src/layout_util.c:1270
-#: ../src/layout_util.c:1271
+#: ../src/layout_util.c:1273 ../src/layout_util.c:1274
+#: ../src/layout_util.c:1275
 msgid "Delete..."
 msgstr "Suprimeix..."
 
-#: ../src/layout_util.c:1272 ../src/view_file.c:590
+#: ../src/layout_util.c:1276 ../src/view_file.c:603
 msgid "Enable file _grouping"
 msgstr "Habilita els _grups de fitxers"
 
-#: ../src/layout_util.c:1272
+#: ../src/layout_util.c:1276
 msgid "Enable file grouping"
 msgstr "Habilita els grups de fitxers"
 
-#: ../src/layout_util.c:1273 ../src/view_file.c:592
+#: ../src/layout_util.c:1277 ../src/view_file.c:605
 msgid "Disable file groupi_ng"
 msgstr "I_nhabilita els grups de fitxers"
 
-#: ../src/layout_util.c:1273
+#: ../src/layout_util.c:1277
 msgid "Disable file grouping"
 msgstr "Inhabilita els grups de fitxers"
 
-#: ../src/layout_util.c:1274
+#: ../src/layout_util.c:1278
 msgid "_Copy path to clipboard"
 msgstr "_Copia el camí al portapapers"
 
-#: ../src/layout_util.c:1274
+#: ../src/layout_util.c:1278
 msgid "Copy path to clipboard"
 msgstr "Copia el camí al portapapers"
 
-#: ../src/layout_util.c:1275
+#: ../src/layout_util.c:1279
 msgid "Close window"
 msgstr "Tanca la finestra"
 
-#: ../src/layout_util.c:1276
+#: ../src/layout_util.c:1280
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/layout_util.c:1276
+#: ../src/layout_util.c:1280
 msgid "Quit"
 msgstr "Surt"
 
-#: ../src/layout_util.c:1277 ../src/menu.c:218
+#: ../src/layout_util.c:1281 ../src/menu.c:218
 msgid "_Rotate clockwise"
 msgstr "_Gira en sentit horari"
 
-#: ../src/layout_util.c:1277
+#: ../src/layout_util.c:1281
 msgid "Rotate clockwise"
 msgstr "Gira en sentit horari"
 
-#: ../src/layout_util.c:1278 ../src/menu.c:221
+#: ../src/layout_util.c:1282 ../src/menu.c:221
 msgid "Rotate _counterclockwise"
 msgstr "Gira en sentit _antihorari"
 
-#: ../src/layout_util.c:1278
+#: ../src/layout_util.c:1282
 msgid "Rotate counterclockwise"
 msgstr "Gira en sentit antihorari"
 
-#: ../src/layout_util.c:1279
+#: ../src/layout_util.c:1283
 msgid "Rotate 1_80"
 msgstr "Gira 1_80"
 
-#: ../src/layout_util.c:1279
+#: ../src/layout_util.c:1283
 msgid "Rotate 180"
 msgstr "Gira 180"
 
-#: ../src/layout_util.c:1280 ../src/menu.c:227
+#: ../src/layout_util.c:1284 ../src/menu.c:227
 msgid "_Mirror"
 msgstr "_Reflexa"
 
-#: ../src/layout_util.c:1280
+#: ../src/layout_util.c:1284
 msgid "Mirror"
 msgstr "Reflexa"
 
-#: ../src/layout_util.c:1281 ../src/menu.c:230
+#: ../src/layout_util.c:1285 ../src/menu.c:230
 msgid "_Flip"
 msgstr "_Inverteix"
 
-#: ../src/layout_util.c:1281
+#: ../src/layout_util.c:1285
 msgid "Flip"
 msgstr "Inverteix"
 
-#: ../src/layout_util.c:1282 ../src/menu.c:233
+#: ../src/layout_util.c:1286 ../src/menu.c:233
 msgid "_Original state"
 msgstr "Estat _original"
 
-#: ../src/layout_util.c:1282
+#: ../src/layout_util.c:1286
 msgid "Original state"
 msgstr "Estat original"
 
-#: ../src/layout_util.c:1283
+#: ../src/layout_util.c:1287
 msgid "Select _all"
 msgstr "Selecciona-ho _tot"
 
-#: ../src/layout_util.c:1284
+#: ../src/layout_util.c:1288
 msgid "Select _none"
 msgstr "_Desfés la selecció"
 
-#: ../src/layout_util.c:1285
+#: ../src/layout_util.c:1289
 msgid "_Invert Selection"
 msgstr "_Inverteix la Selecció"
 
-#: ../src/layout_util.c:1285
+#: ../src/layout_util.c:1289
 msgid "Invert Selection"
 msgstr "Inverteix la Selecció"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1290
 msgid "P_references..."
 msgstr "P_referències..."
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1290
 msgid "Preferences..."
 msgstr "Preferències..."
 
-#: ../src/layout_util.c:1287
+#: ../src/layout_util.c:1291
 msgid "Configure _Editors..."
 msgstr "Configura els _editors..."
 
-#: ../src/layout_util.c:1287
+#: ../src/layout_util.c:1291
 msgid "Configure Editors..."
 msgstr "Configura els editors..."
 
-#: ../src/layout_util.c:1288
+#: ../src/layout_util.c:1292
 msgid "_Configure this window..."
 msgstr "_Configura aquesta finestra..."
 
-#: ../src/layout_util.c:1288
+#: ../src/layout_util.c:1292
 msgid "Configure this window..."
 msgstr "Configura aquesta finestra..."
 
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1293
 msgid "_Thumbnail maintenance..."
 msgstr "Manteniment de les _Miniatures..."
 
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1293
 msgid "Thumbnail maintenance..."
 msgstr "Manteniment de les Miniatures..."
 
-#: ../src/layout_util.c:1290
+#: ../src/layout_util.c:1294
 msgid "Set as wallpaper"
 msgstr "Posa com a fons d'escriptori"
 
-#: ../src/layout_util.c:1291
+#: ../src/layout_util.c:1295
 msgid "_Save metadata"
 msgstr "De_sa les metadades"
 
-#: ../src/layout_util.c:1291
+#: ../src/layout_util.c:1295
 msgid "Save metadata"
 msgstr "Desa les metadades"
 
-#: ../src/layout_util.c:1292 ../src/layout_util.c:1293
+#: ../src/layout_util.c:1296 ../src/layout_util.c:1297
 msgid "Zoom in"
 msgstr "Apropa"
 
-#: ../src/layout_util.c:1294 ../src/layout_util.c:1295
+#: ../src/layout_util.c:1298 ../src/layout_util.c:1299
 msgid "Zoom out"
 msgstr "Allunya"
 
-#: ../src/layout_util.c:1296 ../src/layout_util.c:1297
+#: ../src/layout_util.c:1300 ../src/layout_util.c:1301
 msgid "Zoom 1:1"
 msgstr "Escala real"
 
-#: ../src/layout_util.c:1298 ../src/layout_util.c:1299
-#: ../src/layout_util.c:1314 ../src/layout_util.c:1315
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
 msgid "_Zoom to fit"
 msgstr "_Amplia fins que encaixi"
 
-#: ../src/layout_util.c:1298 ../src/layout_util.c:1299
+#: ../src/layout_util.c:1302 ../src/layout_util.c:1303
 msgid "Zoom to fit"
 msgstr "Amplia fins que encaixi"
 
-#: ../src/layout_util.c:1300 ../src/layout_util.c:1316
+#: ../src/layout_util.c:1304 ../src/layout_util.c:1320
 msgid "Fit _Horizontally"
 msgstr "Ajusta _Horitzontalment"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1304
 msgid "Fit Horizontally"
 msgstr "Ajusta Horitzontalment"
 
-#: ../src/layout_util.c:1301 ../src/layout_util.c:1317
+#: ../src/layout_util.c:1305 ../src/layout_util.c:1321
 msgid "Fit _Vertically"
 msgstr "Ajusta _Verticalment"
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1305
 msgid "Fit Vertically"
 msgstr "Ajusta Verticalment"
 
-#: ../src/layout_util.c:1302 ../src/layout_util.c:1318
+#: ../src/layout_util.c:1306 ../src/layout_util.c:1322
 msgid "Zoom _2:1"
 msgstr "Escala _2:1"
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1306
 msgid "Zoom 2:1"
 msgstr "Escala 2:1"
 
-#: ../src/layout_util.c:1303 ../src/layout_util.c:1319
+#: ../src/layout_util.c:1307 ../src/layout_util.c:1323
 msgid "Zoom _3:1"
 msgstr "Escala _3:1"
 
-#: ../src/layout_util.c:1303
+#: ../src/layout_util.c:1307
 msgid "Zoom 3:1"
 msgstr "Escala 3:1"
 
-#: ../src/layout_util.c:1304 ../src/layout_util.c:1320
+#: ../src/layout_util.c:1308 ../src/layout_util.c:1324
 msgid "Zoom _4:1"
 msgstr "Escala _4:1"
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1308
 msgid "Zoom 4:1"
 msgstr "Escala 4:1"
 
-#: ../src/layout_util.c:1305 ../src/layout_util.c:1321
+#: ../src/layout_util.c:1309 ../src/layout_util.c:1325
 msgid "Zoom 1:2"
 msgstr "Escala 1:2"
 
-#: ../src/layout_util.c:1306 ../src/layout_util.c:1322
+#: ../src/layout_util.c:1310 ../src/layout_util.c:1326
 msgid "Zoom 1:3"
 msgstr "Escala 1:3"
 
-#: ../src/layout_util.c:1307 ../src/layout_util.c:1323
+#: ../src/layout_util.c:1311 ../src/layout_util.c:1327
 msgid "Zoom 1:4"
 msgstr "Escala 1:4"
 
-#: ../src/layout_util.c:1308 ../src/layout_util.c:1309
+#: ../src/layout_util.c:1312 ../src/layout_util.c:1313
 msgid "Connected Zoom in"
 msgstr "Ampliació connectada"
 
-#: ../src/layout_util.c:1310 ../src/layout_util.c:1311
+#: ../src/layout_util.c:1314 ../src/layout_util.c:1315
 msgid "Connected Zoom out"
 msgstr "Reducció connectada"
 
-#: ../src/layout_util.c:1312 ../src/layout_util.c:1313
+#: ../src/layout_util.c:1316 ../src/layout_util.c:1317
 msgid "Connected Zoom 1:1"
 msgstr "Escala real connectada"
 
-#: ../src/layout_util.c:1314 ../src/layout_util.c:1315
+#: ../src/layout_util.c:1318 ../src/layout_util.c:1319
 msgid "Connected Zoom to fit"
 msgstr "Ampliació fins que encaixi connectada"
 
-#: ../src/layout_util.c:1316
+#: ../src/layout_util.c:1320
 msgid "Connected Fit Horizontally"
 msgstr "Ajusta Horitzontalment connectat"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1321
 msgid "Connected Fit Vertically"
 msgstr "Ajusta Verticalment connectat"
 
-#: ../src/layout_util.c:1318
+#: ../src/layout_util.c:1322
 msgid "Connected Zoom 2:1"
 msgstr "Escala 2:1 connectada"
 
-#: ../src/layout_util.c:1319
+#: ../src/layout_util.c:1323
 msgid "Connected Zoom 3:1"
 msgstr "Escala 3:1 connectada"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1324
 msgid "Connected Zoom 4:1"
 msgstr "Escala 4:1 connectada"
 
-#: ../src/layout_util.c:1321
+#: ../src/layout_util.c:1325
 msgid "Connected Zoom 1:2"
 msgstr "Escala 1:2 connectada"
 
-#: ../src/layout_util.c:1322
+#: ../src/layout_util.c:1326
 msgid "Connected Zoom 1:3"
 msgstr "Escala 1:3 connectada"
 
-#: ../src/layout_util.c:1323
+#: ../src/layout_util.c:1327
 msgid "Connected Zoom 1:4"
 msgstr "Escala 1:4 connectada"
 
-#: ../src/layout_util.c:1324
+#: ../src/layout_util.c:1328
 msgid "_View in new window"
 msgstr "_Visualitzar en una finestra nova"
 
-#: ../src/layout_util.c:1324
+#: ../src/layout_util.c:1328
 msgid "View in new window"
 msgstr "Visualitzar en una finestra nova"
 
-#: ../src/layout_util.c:1325 ../src/layout_util.c:1326
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1329 ../src/layout_util.c:1330
+#: ../src/layout_util.c:1331
 msgid "F_ull screen"
 msgstr "_Pantalla completa"
 
-#: ../src/layout_util.c:1328 ../src/layout_util.c:1329
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
 msgid "_Leave full screen"
 msgstr "_Surt de la pantalla completa"
 
-#: ../src/layout_util.c:1328 ../src/layout_util.c:1329
+#: ../src/layout_util.c:1332 ../src/layout_util.c:1333
 msgid "Leave full screen"
 msgstr "Surt de la pantalla completa"
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1334
 msgid "_Cycle through overlay modes"
 msgstr "_Commuta a través dels modes de capa"
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1334
 msgid "Cycle through Overlay modes"
 msgstr "Commuta a través dels modes de capa"
 
-#: ../src/layout_util.c:1331
+#: ../src/layout_util.c:1335
 msgid "Cycle through histogram ch_annels"
 msgstr "Commuta a través dels c_anals  d'histograma"
 
-#: ../src/layout_util.c:1331
+#: ../src/layout_util.c:1335
 msgid "Cycle through histogram channels"
 msgstr "Commuta a través dels canals  d'histograma"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1336
 msgid "Cycle through histogram mo_des"
 msgstr "Commuta a través dels mo_des  d'histograma"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1336
 msgid "Cycle through histogram modes"
 msgstr "Commuta a través dels modes  d'histograma"
 
-#: ../src/layout_util.c:1333
+#: ../src/layout_util.c:1337
 msgid "_Hide file list"
 msgstr "Oculta la _llista de fitxers"
 
-#: ../src/layout_util.c:1333
+#: ../src/layout_util.c:1337
 msgid "Hide file list"
 msgstr "Oculta la llista de fitxers"
 
-#: ../src/layout_util.c:1334
+#: ../src/layout_util.c:1338
 msgid "_Pause slideshow"
 msgstr "_Pausa la seqüència de diapositives"
 
-#: ../src/layout_util.c:1334
+#: ../src/layout_util.c:1338
 msgid "Pause slideshow"
 msgstr "Pausa la seqüència de diapositives"
 
-#: ../src/layout_util.c:1335
+#: ../src/layout_util.c:1339
 msgid "_Refresh"
 msgstr "_Actualitza"
 
-#: ../src/layout_util.c:1335
+#: ../src/layout_util.c:1339
 msgid "Refresh"
 msgstr "Actualitza"
 
-#: ../src/layout_util.c:1336
+#: ../src/layout_util.c:1340
 msgid "_Contents"
 msgstr "C_ontinguts"
 
-#: ../src/layout_util.c:1336
+#: ../src/layout_util.c:1340
 msgid "Contents"
 msgstr "Continguts"
 
-#: ../src/layout_util.c:1337
+#: ../src/layout_util.c:1341
 msgid "_Keyboard shortcuts"
 msgstr "_Tecles de drecera"
 
-#: ../src/layout_util.c:1337
+#: ../src/layout_util.c:1341
 msgid "Keyboard shortcuts"
 msgstr "Tecles de drecera"
 
-#: ../src/layout_util.c:1338
+#: ../src/layout_util.c:1342
 msgid "_Release notes"
 msgstr "_Notes de la versió"
 
-#: ../src/layout_util.c:1338
+#: ../src/layout_util.c:1342
 msgid "Release notes"
 msgstr "Notes de la versió"
 
-#: ../src/layout_util.c:1339
+#: ../src/layout_util.c:1343
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/layout_util.c:1339 ../src/preferences.c:2108
+#: ../src/layout_util.c:1343 ../src/preferences.c:2108
 msgid "About"
 msgstr "Quant a"
 
-#: ../src/layout_util.c:1340
+#: ../src/layout_util.c:1344
 msgid "_Log Window"
 msgstr "Finestra de _Registre"
 
-#: ../src/layout_util.c:1340
+#: ../src/layout_util.c:1344
 msgid "Log Window"
 msgstr "Finestra de Registre"
 
-#: ../src/layout_util.c:1341
-msgid "E_xif window"
-msgstr "Finestra E_xif"
+#: ../src/layout_util.c:1345
+msgid "_Exif window"
+msgstr "Finestra _Exif"
 
-#: ../src/layout_util.c:1341
+#: ../src/layout_util.c:1345
 msgid "Exif window"
-msgstr "Finestra E_xif"
+msgstr "Finestra Exif"
 
-#: ../src/layout_util.c:1346
+#: ../src/layout_util.c:1350
 msgid "Show _Thumbnails"
 msgstr "Mostra les _miniatures"
 
-#: ../src/layout_util.c:1346
+#: ../src/layout_util.c:1350
 msgid "Show Thumbnails"
 msgstr "Mostra les miniatures"
 
-#: ../src/layout_util.c:1347
+#: ../src/layout_util.c:1351
 msgid "Show _Marks"
 msgstr "Mostra les _Marques"
 
-#: ../src/layout_util.c:1347
+#: ../src/layout_util.c:1351
 msgid "Show Marks"
 msgstr "Mostra les Marques"
 
-#: ../src/layout_util.c:1348
+#: ../src/layout_util.c:1352
 msgid "Pi_xel Info"
 msgstr "Informació del pí_xel"
 
-#: ../src/layout_util.c:1348
+#: ../src/layout_util.c:1352
 msgid "Show Pixel Info"
 msgstr "Mostra la informació del píxel"
 
-#: ../src/layout_util.c:1349
+#: ../src/layout_util.c:1353
 msgid "_Float file list"
 msgstr "_Llista de fitxers flotant"
 
-#: ../src/layout_util.c:1349
+#: ../src/layout_util.c:1353
 msgid "Float file list"
 msgstr "Llista de fitxers flotant"
 
-#: ../src/layout_util.c:1350
+#: ../src/layout_util.c:1354
 msgid "Hide tool_bar"
 msgstr "Oculta la _barra d'eines"
 
-#: ../src/layout_util.c:1350
+#: ../src/layout_util.c:1354
 msgid "Hide toolbar"
 msgstr "Oculta la barra d'eines"
 
-#: ../src/layout_util.c:1351
+#: ../src/layout_util.c:1355
 msgid "_Info sidebar"
 msgstr "Barra lateral d'_informació"
 
-#: ../src/layout_util.c:1351
+#: ../src/layout_util.c:1355
 msgid "Info sidebar"
 msgstr "Barra lateral d'informació"
 
-#: ../src/layout_util.c:1352
+#: ../src/layout_util.c:1356
 msgid "Sort _manager"
 msgstr "_Gestor d'ordenació"
 
-#: ../src/layout_util.c:1352
+#: ../src/layout_util.c:1356
 msgid "Sort manager"
 msgstr "Gestor d'ordenació"
 
-#: ../src/layout_util.c:1353
+#: ../src/layout_util.c:1357
 msgid "Toggle _slideshow"
 msgstr "_Commuta la projecció de diapositives"
 
-#: ../src/layout_util.c:1353
+#: ../src/layout_util.c:1357
 msgid "Toggle slideshow"
 msgstr "Commuta la projecció de diapositives"
 
-#: ../src/layout_util.c:1354
+#: ../src/layout_util.c:1358
 msgid "Use _color profiles"
 msgstr "Utilitza els perfils de _color"
 
-#: ../src/layout_util.c:1354
+#: ../src/layout_util.c:1358
 msgid "Use color profiles"
 msgstr "Utilitza els perfils de color"
 
-#: ../src/layout_util.c:1355
+#: ../src/layout_util.c:1359
 msgid "Use profile from _image"
 msgstr "Utilitza els perfils de la _imatge"
 
-#: ../src/layout_util.c:1355
+#: ../src/layout_util.c:1359
 msgid "Use profile from image"
 msgstr "Utilitza els perfils de la imatge"
 
-#: ../src/layout_util.c:1356
+#: ../src/layout_util.c:1360
 msgid "Toggle _grayscale"
 msgstr "Commuta l'escala de _grisos"
 
-#: ../src/layout_util.c:1356
+#: ../src/layout_util.c:1360
 msgid "Toggle grayscale"
 msgstr "Commuta l'escala de grisos"
 
-#: ../src/layout_util.c:1357
+#: ../src/layout_util.c:1361
 msgid "Image Overlay"
 msgstr "Imatge sobreposada"
 
-#: ../src/layout_util.c:1358
+#: ../src/layout_util.c:1362
 msgid "_Show Histogram"
 msgstr "_Mostra l'histograma"
 
-#: ../src/layout_util.c:1358
+#: ../src/layout_util.c:1362
 msgid "Show Histogram"
 msgstr "Mostra l'histograma"
 
-#: ../src/layout_util.c:1362
+#: ../src/layout_util.c:1366
 msgid "Image _List"
 msgstr "_Llista d'imatges"
 
-#: ../src/layout_util.c:1362
+#: ../src/layout_util.c:1366
 msgid "View Images as List"
 msgstr "Mostra les imatges en una llista"
 
-#: ../src/layout_util.c:1363
+#: ../src/layout_util.c:1367
 msgid "I_cons"
 msgstr "_Icones"
 
-#: ../src/layout_util.c:1363
+#: ../src/layout_util.c:1367
 msgid "View Images as Icons"
 msgstr "Mostra les imatges com a icones"
 
-#: ../src/layout_util.c:1367
-msgid "Folder _List"
-msgstr "_Lista de carpetes"
+#: ../src/layout_util.c:1371
+msgid "Folder Li_st"
+msgstr "Li_sta de carpetes"
 
-#: ../src/layout_util.c:1367
+#: ../src/layout_util.c:1371
 msgid "View Folders as List"
 msgstr "Mostra les carpetes en una llista"
 
-#: ../src/layout_util.c:1368
-msgid "Folder _Tree"
-msgstr "_Arbre de carpetes"
+#: ../src/layout_util.c:1372
+msgid "Folder T_ree"
+msgstr "A_rbre de carpetes"
 
-#: ../src/layout_util.c:1368
+#: ../src/layout_util.c:1372
 msgid "View Folders as Tree"
 msgstr "Mostra les carpetes en arbre"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1376
 msgid "_Horizontal"
 msgstr "_Horitzontal"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1376
 msgid "Split Horizontal"
 msgstr "Divideix _Horitzontalment"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1377
 msgid "_Vertical"
 msgstr "_Vertical"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1377
 msgid "Split Vertical"
 msgstr "Divideix _Verticalment"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1378
 msgid "_Quad"
 msgstr "_Quatre"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1378
 msgid "Split Quad"
 msgstr "Divideix en quatre"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1379
 msgid "_Single"
 msgstr "Sola"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1379
 msgid "Split Single"
 msgstr "Deixa sola"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1383
 msgid "Input _0: sRGB"
 msgstr "Entrada _0:sRGB"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1383
 msgid "Input 0: sRGB"
 msgstr "Entrada 0:sRGB"
 
-#: ../src/layout_util.c:1380
+#: ../src/layout_util.c:1384
 msgid "Input _1: AdobeRGB compatible"
 msgstr "Entrada_1: Compatible amb AdobeRGB"
 
-#: ../src/layout_util.c:1380
+#: ../src/layout_util.c:1384
 msgid "Input 1: AdobeRGB compatible"
 msgstr "Entrada_1: Compatible amb AdobeRGB"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1385
 msgid "Input _2"
 msgstr "Entrada _2"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1385
 msgid "Input 2"
 msgstr "Entrada 2"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1386
 msgid "Input _3"
 msgstr "Entrada _3"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1386
 msgid "Input 3"
 msgstr "Entrada 3"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1387
 msgid "Input _4"
 msgstr "Entrada _4"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1387
 msgid "Input 4"
 msgstr "Entrada 4"
 
-#: ../src/layout_util.c:1384
+#: ../src/layout_util.c:1388
 msgid "Input _5"
 msgstr "Entrada _5"
 
-#: ../src/layout_util.c:1384
+#: ../src/layout_util.c:1388
 msgid "Input 5"
 msgstr "Entrada 5"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1392
 msgid "Histogram on Red"
 msgstr "Histograma del vermell"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1393
 msgid "Histogram on Green"
 msgstr "Histograma del verd"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1394
 msgid "Histogram on Blue"
 msgstr "Histograma del blau"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1395
 msgid "Histogram on RGB"
 msgstr "Histograma del RGB"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1396
 msgid "Histogram on Value"
 msgstr "histograma segons el valor"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1400
 msgid "Linear Histogram"
 msgstr "histograma lineal"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1401
+msgid "_Log Histogram"
+msgstr "Histograma _logarítmic"
+
+#: ../src/layout_util.c:1401
 msgid "Log Histogram"
 msgstr "Histograma logarítmic"
 
-#: ../src/layout_util.c:1663
+#: ../src/layout_util.c:1667
 #, c-format
 msgid "Mark _%d"
 msgstr "Marca _%d"
 
-#: ../src/layout_util.c:1664 ../src/view_file.c:527
+#: ../src/layout_util.c:1668 ../src/view_file.c:540
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Posa marca %d"
 
-#: ../src/layout_util.c:1664
+#: ../src/layout_util.c:1668
 #, c-format
 msgid "Set mark %d"
 msgstr "Posa marca %d"
 
-#: ../src/layout_util.c:1665 ../src/view_file.c:528
+#: ../src/layout_util.c:1669 ../src/view_file.c:541
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Esborra marca %d"
 
-#: ../src/layout_util.c:1665
+#: ../src/layout_util.c:1669
 #, c-format
 msgid "Reset mark %d"
 msgstr "Esborra marca %d"
 
-#: ../src/layout_util.c:1666 ../src/layout_util.c:1667 ../src/view_file.c:529
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671 ../src/view_file.c:542
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Commuta la marca %d"
 
-#: ../src/layout_util.c:1666 ../src/layout_util.c:1667
+#: ../src/layout_util.c:1670 ../src/layout_util.c:1671
 #, c-format
 msgid "Toggle mark %d"
 msgstr "Commuta la marca %d"
 
-#: ../src/layout_util.c:1668 ../src/layout_util.c:1669 ../src/view_file.c:530
+#: ../src/layout_util.c:1672
 #, c-format
-msgid "_Select mark %d"
-msgstr "_Selecciona-ho la marca %d"
+msgid "Se_lect mark %d"
+msgstr "Se_lecciona la marca %d"
 
-#: ../src/layout_util.c:1668 ../src/layout_util.c:1669
+#: ../src/layout_util.c:1672 ../src/layout_util.c:1673
 #, c-format
 msgid "Select mark %d"
-msgstr "Selecciona-ho la marca %d"
+msgstr "Selecciona la marca %d"
 
-#: ../src/layout_util.c:1670 ../src/view_file.c:531
+#: ../src/layout_util.c:1673 ../src/view_file.c:543
 #, c-format
+msgid "_Select mark %d"
+msgstr "_Selecciona la marca %d"
+
+#: ../src/layout_util.c:1674 ../src/view_file.c:544
+#, c-format
 msgid "_Add mark %d"
 msgstr "_Afegeix la marca %d"
 
-#: ../src/layout_util.c:1670
+#: ../src/layout_util.c:1674
 #, c-format
 msgid "Add mark %d"
 msgstr "Afegeix la marca %d"
 
-#: ../src/layout_util.c:1671 ../src/view_file.c:532
+#: ../src/layout_util.c:1675 ../src/view_file.c:545
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Intersecció amb la marca %d"
 
-#: ../src/layout_util.c:1671
+#: ../src/layout_util.c:1675
 #, c-format
 msgid "Intersection with mark %d"
 msgstr "Intersecció amb la marca %d"
 
-#: ../src/layout_util.c:1672 ../src/view_file.c:533
+#: ../src/layout_util.c:1676 ../src/view_file.c:546
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_No seleccionis la marca %d"
 
-#: ../src/layout_util.c:1672
+#: ../src/layout_util.c:1676
 #, c-format
 msgid "Unselect mark %d"
 msgstr "No seleccionis la marca %d"
 
-#: ../src/layout_util.c:1673
+#: ../src/layout_util.c:1677
 #, c-format
 msgid "_Filter mark %d"
 msgstr "_Filtra la marca %d"
 
-#: ../src/layout_util.c:1673
+#: ../src/layout_util.c:1677
 #, c-format
 msgid "Filter mark %d"
 msgstr "Filtra la marca %d"
 
-#: ../src/layout_util.c:2109
+#: ../src/layout_util.c:2205
 #, c-format
 msgid "Number of files with unsaved metadata: %d"
 msgstr "Nombre de fitxers amb medades sense desar: %d"
 
-#: ../src/layout_util.c:2115
+#: ../src/layout_util.c:2211
 msgid "No unsaved metadata"
 msgstr "No hi ha metadades sense desar"
 
-#: ../src/layout_util.c:2162
+#: ../src/layout_util.c:2258
 #, c-format
 msgid ""
 "Image profile: %s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3030,31 +3043,31 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Perfil d'imatge: %s\n"
 "Perfil de pantalla: %s"
 
-#: ../src/layout_util.c:2170
+#: ../src/layout_util.c:2266
 msgid "Click to enable color management"
 msgstr "Fes clic per habilitar la gestió de color"
 
-#: ../src/layout_util.c:2175
+#: ../src/layout_util.c:2271
 msgid "Color profiles not supported"
 msgstr "Perfils de color no suportats"
 
-#: ../src/layout_util.c:2197
+#: ../src/layout_util.c:2293
 #, c-format
 msgid "Input _%d: %s"
 msgstr "Entrada _%d: %s"
 
 #. something went badly wrong
-#: ../src/lirc.c:193
+#: ../src/lirc.c:197
 #, c-format
 msgid "disconnected from LIRC\n"
 msgstr "s'ha desconnectat desde LIRC\n"
 
-#: ../src/lirc.c:208
+#: ../src/lirc.c:212
 #, c-format
 msgid "Could not init LIRC support\n"
 msgstr "No es pot iniciar el suport per LIRC\n"
 
-#: ../src/lirc.c:215
+#: ../src/lirc.c:219
 #, c-format
 msgid ""
 "could not read LIRC config file\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3069,7 +3082,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Log"
 msgstr "Registre"
 
-#: ../src/main.c:313
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3078,57 +3091,57 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Sintaxi: %s [opcions] [camí]\n"
 "\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:322
 msgid "valid options are:\n"
 msgstr "les opcions vàlides són:\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:323
 msgid "  +t, --with-tools           force show of tools\n"
 msgstr "  +t, --with-tools          força a mostrar les eines\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:324
 msgid "  -t, --without-tools        force hide of tools\n"
 msgstr "  -t, --without-tools       força a ocultar les eines\n"
 
-#: ../src/main.c:317
+#: ../src/main.c:325
 msgid "  -f, --fullscreen           start in full screen mode\n"
 msgstr "  -f, --fullscreen          inicia en mode de pantalla completa\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:326
 msgid "  -s, --slideshow            start in slideshow mode\n"
 msgstr ""
 "  -s, --slideshow           inicia en el mode de projecció de diapositives\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:327
 msgid "  -l, --list                 open collection window for command line\n"
 msgstr ""
 "  -l, --list                obre una finestra de col·lecció des d'una línia "
 "de comandes\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:328
 msgid "      --geometry=GEOMETRY    set main window location\n"
 msgstr ""
 "     --geometria=GEOMETRY   configura la situació de la finestra principal\n"
 
-#: ../src/main.c:321
+#: ../src/main.c:329
 msgid "  -r, --remote               send following commands to open window\n"
 msgstr ""
 "  -r, --remote              envia les següents comandes a la finestra "
 "oberta\n"
 
-#: ../src/main.c:322
+#: ../src/main.c:330
 msgid "  -rh,--remote-help          print remote command list\n"
 msgstr "  -rh,--remote-help         mostra la llista de comandes remotes\n"
 
-#: ../src/main.c:324
+#: ../src/main.c:332
 msgid "  --debug[=level]            turn on debug output\n"
 msgstr "  --debug[=nivell]          activa la sortida de depuració\n"
 
-#: ../src/main.c:326
+#: ../src/main.c:334
 msgid "  -v, --version              print version info\n"
 msgstr "  -v, --version             mostra la informació de versió\n"
 
-#: ../src/main.c:327
+#: ../src/main.c:335
 msgid ""
 "  -h, --help                 show this message\n"
 "\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3136,7 +3149,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "  -h, --help                 mostra aquest missatge d'ajuda\n"
 "\n"
 
-#: ../src/main.c:339
+#: ../src/main.c:347
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3145,11 +3158,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "invàlid o ignorat: %s\n"
 "Utilitzeu --help per les opcions\n"
 
-#: ../src/main.c:368
+#: ../src/main.c:376
 msgid "Invalid or ignored remote options: "
 msgstr "Opcions remotes invàlides o ignorades: "
 
-#: ../src/main.c:377
+#: ../src/main.c:385
 msgid ""
 "\n"
 "Use --remote-help for valid remote options.\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3157,22 +3170,22 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "\n"
 "Utilitzeu --remote-help per veure les opcions remotes vàlides.\n"
 
-#: ../src/main.c:479
+#: ../src/main.c:487
 #, c-format
 msgid "Creating %s dir:%s\n"
 msgstr "S'està creant el directori %s:%s\n"
 
-#: ../src/main.c:483
+#: ../src/main.c:491
 #, c-format
 msgid "Could not create dir:%s\n"
 msgstr "No s'ha pogut crear el directori:%s\n"
 
-#: ../src/main.c:535
+#: ../src/main.c:543
 #, c-format
 msgid "error saving file: %s\n"
 msgstr "s'ha produït un error en desar el fitxer: %s\n"
 
-#: ../src/main.c:554
+#: ../src/main.c:562
 #, c-format
 msgid ""
 "error saving file: %s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3181,20 +3194,20 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "s'ha produït un error en desar el fitxer: %s\n"
 "error: %s\n"
 
-#: ../src/main.c:659
+#: ../src/main.c:670
 msgid "exit"
 msgstr "surt"
 
-#: ../src/main.c:664
+#: ../src/main.c:675
 #, c-format
 msgid "Quit %s"
 msgstr "Surt %s"
 
-#: ../src/main.c:666
+#: ../src/main.c:677
 msgid "Collections have been modified. Quit anyway?"
 msgstr "Les col·leccions han estat modificades. Voleu sortir igualment?"
 
-#: ../src/main.c:860 ../src/remote.c:601
+#: ../src/main.c:878 ../src/remote.c:601
 msgid "Command line"
 msgstr "Línia de comandes"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3230,235 +3243,235 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Rotate _180"
 msgstr "Gira _180"
 
-#: ../src/metadata.c:1382
+#: ../src/metadata.c:1443
 msgid "People"
 msgstr "Gent"
 
-#: ../src/metadata.c:1383
+#: ../src/metadata.c:1444
 msgid "Family"
 msgstr "Família"
 
-#: ../src/metadata.c:1384
+#: ../src/metadata.c:1445
 msgid "Free time"
 msgstr "Temps lliure"
 
-#: ../src/metadata.c:1385
+#: ../src/metadata.c:1446
 msgid "Children"
 msgstr "quitxalla"
 
-#: ../src/metadata.c:1386
+#: ../src/metadata.c:1447
 msgid "Sport"
 msgstr "Esport"
 
-#: ../src/metadata.c:1387
+#: ../src/metadata.c:1448
 msgid "Culture"
 msgstr "Cultura"
 
-#: ../src/metadata.c:1388
+#: ../src/metadata.c:1449
 msgid "Festival"
 msgstr "Festival"
 
-#: ../src/metadata.c:1389
+#: ../src/metadata.c:1450
 msgid "Nature"
 msgstr "Natura"
 
-#: ../src/metadata.c:1390
+#: ../src/metadata.c:1451
 msgid "Animal"
 msgstr "Animal"
 
-#: ../src/metadata.c:1391
+#: ../src/metadata.c:1452
 msgid "Bird"
 msgstr "Ocell"
 
-#: ../src/metadata.c:1392
+#: ../src/metadata.c:1453
 msgid "Insect"
 msgstr "Insecte"
 
-#: ../src/metadata.c:1393
+#: ../src/metadata.c:1454
 msgid "Pets"
 msgstr "Domèstic"
 
-#: ../src/metadata.c:1394
+#: ../src/metadata.c:1455
 msgid "Wildlife"
 msgstr "Salvatge"
 
-#: ../src/metadata.c:1395
+#: ../src/metadata.c:1456
 msgid "Zoo"
 msgstr "Zoo"
 
-#: ../src/metadata.c:1396
+#: ../src/metadata.c:1457
 msgid "Plant"
 msgstr "Planta"
 
-#: ../src/metadata.c:1397
+#: ../src/metadata.c:1458
 msgid "Tree"
 msgstr "Arbre"
 
-#: ../src/metadata.c:1398
+#: ../src/metadata.c:1459
 msgid "Flower"
 msgstr "Flor"
 
-#: ../src/metadata.c:1399
+#: ../src/metadata.c:1460
 msgid "Water"
 msgstr "Aigua"
 
-#: ../src/metadata.c:1400
+#: ../src/metadata.c:1461
 msgid "River"
 msgstr "Riu"
 
-#: ../src/metadata.c:1401
+#: ../src/metadata.c:1462
 msgid "Lake"
 msgstr "Llac"
 
-#: ../src/metadata.c:1402
+#: ../src/metadata.c:1463
 msgid "Sea"
 msgstr "Mar"
 
-#: ../src/metadata.c:1403 ../src/print.c:375
+#: ../src/metadata.c:1464 ../src/print.c:375
 msgid "Landscape"
 msgstr "Apaïsat"
 
-#: ../src/metadata.c:1404
+#: ../src/metadata.c:1465
 msgid "Art"
 msgstr "Art"
 
-#: ../src/metadata.c:1405
+#: ../src/metadata.c:1466
 msgid "Statue"
 msgstr "Estatua"
 
-#: ../src/metadata.c:1406
+#: ../src/metadata.c:1467
 msgid "Painting"
 msgstr "Pintura"
 
-#: ../src/metadata.c:1407 ../src/metadata.c:1421
+#: ../src/metadata.c:1468 ../src/metadata.c:1482
 msgid "Historic"
 msgstr "Històric"
 
-#: ../src/metadata.c:1408 ../src/metadata.c:1422
+#: ../src/metadata.c:1469 ../src/metadata.c:1483
 msgid "Modern"
 msgstr "Modern"
 
-#: ../src/metadata.c:1409
+#: ../src/metadata.c:1470
 msgid "City"
 msgstr "Ciutat"
 
-#: ../src/metadata.c:1410
+#: ../src/metadata.c:1471
 msgid "Park"
 msgstr "Parc"
 
-#: ../src/metadata.c:1411
+#: ../src/metadata.c:1472
 msgid "Street"
 msgstr "Carrer"
 
-#: ../src/metadata.c:1412
+#: ../src/metadata.c:1473
 msgid "Square"
 msgstr "Plaça"
 
-#: ../src/metadata.c:1413
+#: ../src/metadata.c:1474
 msgid "Architecture"
 msgstr "Arquitectura"
 
-#: ../src/metadata.c:1414
+#: ../src/metadata.c:1475
 msgid "Buildings"
 msgstr "Edificis"
 
-#: ../src/metadata.c:1415
+#: ../src/metadata.c:1476
 msgid "House"
 msgstr "Casa"
 
-#: ../src/metadata.c:1416
+#: ../src/metadata.c:1477
 msgid "Cathedral"
 msgstr "Catedral"
 
-#: ../src/metadata.c:1417
+#: ../src/metadata.c:1478
 msgid "Palace"
 msgstr "Palau"
 
-#: ../src/metadata.c:1418
+#: ../src/metadata.c:1479
 msgid "Castle"
 msgstr "Castell"
 
-#: ../src/metadata.c:1419
+#: ../src/metadata.c:1480
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/metadata.c:1420
+#: ../src/metadata.c:1481
 msgid "Interior"
 msgstr "interior"
 
-#: ../src/metadata.c:1423
+#: ../src/metadata.c:1484
 msgid "Places"
 msgstr "Llocs"
 
-#: ../src/metadata.c:1424
+#: ../src/metadata.c:1485
 msgid "Conditions"
 msgstr "Condicions"
 
-#: ../src/metadata.c:1425
+#: ../src/metadata.c:1486
 msgid "Night"
 msgstr "Nit"
 
-#: ../src/metadata.c:1426
+#: ../src/metadata.c:1487
 msgid "Lights"
 msgstr "Llums"
 
-#: ../src/metadata.c:1427
+#: ../src/metadata.c:1488
 msgid "Reflections"
 msgstr "Reflexes"
 
-#: ../src/metadata.c:1428
+#: ../src/metadata.c:1489
 msgid "Sun"
 msgstr "Sol"
 
-#: ../src/metadata.c:1429
+#: ../src/metadata.c:1490
 msgid "Weather"
 msgstr "Clima"
 
-#: ../src/metadata.c:1430
+#: ../src/metadata.c:1491
 msgid "Fog"
 msgstr "Boira"
 
-#: ../src/metadata.c:1431
+#: ../src/metadata.c:1492
 msgid "Rain"
 msgstr "Pluja"
 
-#: ../src/metadata.c:1432
+#: ../src/metadata.c:1493
 msgid "Clouds"
 msgstr "Núvols"
 
-#: ../src/metadata.c:1433
+#: ../src/metadata.c:1494
 msgid "Snow"
 msgstr "Neu"
 
-#: ../src/metadata.c:1434
+#: ../src/metadata.c:1495
 msgid "Sunny weather"
 msgstr "Assolellat"
 
-#: ../src/metadata.c:1435
+#: ../src/metadata.c:1496
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/metadata.c:1436
+#: ../src/metadata.c:1497
 msgid "Edited"
 msgstr "Editada"
 
-#: ../src/metadata.c:1437
+#: ../src/metadata.c:1498
 msgid "Detail"
 msgstr "Detall"
 
-#: ../src/metadata.c:1438
+#: ../src/metadata.c:1499
 msgid "Macro"
 msgstr "Macro"
 
-#: ../src/metadata.c:1439 ../src/print.c:374
+#: ../src/metadata.c:1500 ../src/print.c:374
 msgid "Portrait"
 msgstr "Vertical"
 
-#: ../src/metadata.c:1440
+#: ../src/metadata.c:1501
 msgid "Black and White"
 msgstr "Blanc i negre"
 
-#: ../src/metadata.c:1441
+#: ../src/metadata.c:1502
 msgid "Perspective"
 msgstr "Perspectiva"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3488,7 +3501,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Sorting images..."
 msgstr "S'estan ordenant les imatges..."
 
-#: ../src/pan-view.c:1546 ../src/print.c:2650
+#: ../src/pan-view.c:1546 ../src/print.c:2601
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3500,8 +3513,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Date:"
 msgstr "Data:"
 
-#: ../src/pan-view.c:1552 ../src/preferences.c:1174 ../src/print.c:3263
-#: ../src/print.c:3474
+#: ../src/pan-view.c:1552 ../src/preferences.c:1174 ../src/print.c:3214
+#: ../src/print.c:3425
 msgid "Size:"
 msgstr "Mida:"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3569,19 +3582,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Large Thumbnails"
 msgstr "Miniatures Grans"
 
-#: ../src/pan-view.c:2411 ../src/pan-view.c:2870
+#: ../src/pan-view.c:2411 ../src/pan-view.c:2871
 msgid "1:10 (10%)"
 msgstr "1:10 (10%)"
 
-#: ../src/pan-view.c:2412 ../src/pan-view.c:2866
+#: ../src/pan-view.c:2412 ../src/pan-view.c:2867
 msgid "1:4 (25%)"
 msgstr "1:4 (25%)"
 
-#: ../src/pan-view.c:2413 ../src/pan-view.c:2862
+#: ../src/pan-view.c:2413 ../src/pan-view.c:2863
 msgid "1:3 (33%)"
 msgstr "1:3 (33%)"
 
-#: ../src/pan-view.c:2414 ../src/pan-view.c:2858
+#: ../src/pan-view.c:2414 ../src/pan-view.c:2859
 msgid "1:2 (50%)"
 msgstr "1:2 (50%)"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -3631,23 +3644,23 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Do not show this dialog again"
 msgstr "No tornis a mostrar aquesta finestra"
 
-#: ../src/pan-view.c:2838
+#: ../src/pan-view.c:2839
 msgid "Sort by E_xif date"
 msgstr "Ordena segons la data de l'Exif"
 
-#: ../src/pan-view.c:2844
+#: ../src/pan-view.c:2845
 msgid "_Show Exif information"
 msgstr "_Mostra la informació de l'Exif"
 
-#: ../src/pan-view.c:2846
+#: ../src/pan-view.c:2847
 msgid "Show im_age"
 msgstr "Mostra la im_atge"
 
-#: ../src/pan-view.c:2850
+#: ../src/pan-view.c:2851
 msgid "_None"
 msgstr "_Cap"
 
-#: ../src/pan-view.c:2854
+#: ../src/pan-view.c:2855
 msgid "_Full size"
 msgstr "_Mida Completa"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4158,7 +4171,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Behavior"
 msgstr "Comportament"
 
-#: ../src/preferences.c:1768 ../src/utilops.c:1971
+#: ../src/preferences.c:1768 ../src/utilops.c:1985
 msgid "Delete"
 msgstr "Suprimeix"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4259,7 +4272,6 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgstr "Reinicia els seleccionats"
 
 #: ../src/preferences.c:1959
-#, fuzzy
 msgid "Add Alt"
 msgstr "Afegeix Alt"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4336,7 +4348,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "jpeg, high quality"
 msgstr "jpeg, qualitat alta"
 
-#: ../src/print.c:365 ../src/print.c:3263
+#: ../src/print.c:365 ../src/print.c:3214
 msgid "points"
 msgstr "punts"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4444,141 +4456,141 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "No s'ha pogut obrir la canonada per escriure.\n"
 "\"%s\""
 
-#: ../src/print.c:1074 ../src/print.c:1515 ../src/ui_pathsel.c:432
+#: ../src/print.c:1074 ../src/print.c:1466 ../src/ui_pathsel.c:432
 #, c-format
 msgid "A file with name %s already exists."
 msgstr "Ja existeix un fitxer anomenat %s."
 
-#: ../src/print.c:1089 ../src/print.c:1570
+#: ../src/print.c:1089 ../src/print.c:1521
 #, c-format
 msgid "Failure writing to file %s"
 msgstr "Fallida en escriure al fitxer %s"
 
 #: ../src/print.c:1144 ../src/print.c:1181 ../src/print.c:1217
-#: ../src/print.c:1334 ../src/print.c:1425 ../src/print.c:1456
+#: ../src/print.c:1334 ../src/print.c:1407
 msgid "SIGPIPE error writing to printer."
 msgstr "S'ha produït l'error SIGPIPE en escriure a la impressora."
 
-#: ../src/print.c:1991
+#: ../src/print.c:1942
 #, c-format
 msgid "Page %d"
 msgstr "Pàgina %d"
 
-#: ../src/print.c:2013 ../src/print.c:2018
+#: ../src/print.c:1964 ../src/print.c:1969
 msgid "Printing error"
 msgstr "Error d'impressió"
 
-#: ../src/print.c:2017
+#: ../src/print.c:1968
 #, c-format
 msgid "An error occured printing to %s."
 msgstr "S'ha produït un error en imprimir a %s."
 
-#: ../src/print.c:2021
+#: ../src/print.c:1972
 msgid "Details"
 msgstr "Detalls"
 
-#: ../src/print.c:2638 ../src/print.c:3398
+#: ../src/print.c:2589 ../src/print.c:3349
 msgid "Print"
 msgstr "Imprimeix"
 
-#: ../src/print.c:2642
+#: ../src/print.c:2593
 #, c-format
 msgid "Printing %d pages to %s."
 msgstr "Imprimint %d pàgines a %s."
 
-#: ../src/print.c:2742
+#: ../src/print.c:2693
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/print.c:2817
+#: ../src/print.c:2768
 msgid "Units:"
 msgstr "Unitats:"
 
-#: ../src/print.c:2861
+#: ../src/print.c:2812
 msgid "Orientation:"
 msgstr "Orientació:"
 
-#: ../src/print.c:2993
+#: ../src/print.c:2944
 msgid "Destination:"
 msgstr "Destí:"
 
-#: ../src/print.c:3041
+#: ../src/print.c:2992
 msgid "&amp;lt;printer name&amp;gt;"
 msgstr "&amp;lt;nom de la impressora&amp;gt;"
 
-#: ../src/print.c:3130
+#: ../src/print.c:3081
 msgid "Unlimited"
 msgstr "Sense límit"
 
-#: ../src/print.c:3248
+#: ../src/print.c:3199
 msgid "Show"
 msgstr "Mostra"
 
-#: ../src/print.c:3261
+#: ../src/print.c:3212
 msgid "Font"
 msgstr "Font"
 
-#: ../src/print.c:3425
+#: ../src/print.c:3376
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/print.c:3437
+#: ../src/print.c:3388
 msgid "Image size:"
 msgstr "Mida de la imatge:"
 
-#: ../src/print.c:3441
+#: ../src/print.c:3392
 msgid "Proof size:"
 msgstr "Mida de la prova:"
 
-#: ../src/print.c:3457
+#: ../src/print.c:3408
 msgid "Text"
 msgstr "Text"
 
-#: ../src/print.c:3467
+#: ../src/print.c:3418
 msgid "Paper"
 msgstr "Paper"
 
-#: ../src/print.c:3490
+#: ../src/print.c:3441
 msgid "Margins"
 msgstr "Marges"
 
-#: ../src/print.c:3492
+#: ../src/print.c:3443
 msgid "Left:"
 msgstr "Esquerre:"
 
-#: ../src/print.c:3495
+#: ../src/print.c:3446
 msgid "Right:"
 msgstr "Dret:"
 
-#: ../src/print.c:3498
+#: ../src/print.c:3449
 msgid "Top:"
 msgstr "Superior:"
 
-#: ../src/print.c:3501
+#: ../src/print.c:3452
 msgid "Bottom:"
 msgstr "Inferior:"
 
-#: ../src/print.c:3510
+#: ../src/print.c:3461
 msgid "Printer"
 msgstr "Impressora"
 
-#: ../src/print.c:3516
+#: ../src/print.c:3467
 msgid "Custom printer:"
 msgstr "Impressora personalitzada:"
 
-#: ../src/print.c:3525
+#: ../src/print.c:3476
 msgid "File:"
 msgstr "Fitxer:"
 
-#: ../src/print.c:3534
+#: ../src/print.c:3485
 msgid "File format:"
 msgstr "Format del fitxer:"
 
-#: ../src/print.c:3539
+#: ../src/print.c:3490
 msgid "DPI:"
 msgstr "PPP:"
 
-#: ../src/print.c:3547
+#: ../src/print.c:3498
 msgid "Remember print settings"
 msgstr "Recorda els ajustos d'impressió"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4690,77 +4702,77 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "Remote not available\n"
 msgstr "Geeqie remot no està disponible\n"
 
-#: ../src/search.c:216
+#: ../src/search.c:212
 msgid "folder"
 msgstr "Carpeta"
 
-#: ../src/search.c:217
+#: ../src/search.c:213
 msgid "comments"
 msgstr "comentaris"
 
-#: ../src/search.c:218
+#: ../src/search.c:214
 msgid "results"
 msgstr "resultats"
 
-#: ../src/search.c:222 ../src/search.c:247
+#: ../src/search.c:218 ../src/search.c:243
 msgid "contains"
 msgstr "conté"
 
-#: ../src/search.c:223
+#: ../src/search.c:219
 msgid "is"
 msgstr "és"
 
-#: ../src/search.c:227 ../src/search.c:234
+#: ../src/search.c:223 ../src/search.c:230
 msgid "equal to"
 msgstr "igual que"
 
-#: ../src/search.c:228
+#: ../src/search.c:224
 msgid "less than"
 msgstr "menor que"
 
-#: ../src/search.c:229
+#: ../src/search.c:225
 msgid "greater than"
 msgstr "major que"
 
-#: ../src/search.c:230 ../src/search.c:237
+#: ../src/search.c:226 ../src/search.c:233
 msgid "between"
 msgstr "entre"
 
-#: ../src/search.c:235
+#: ../src/search.c:231
 msgid "before"
 msgstr "abans de"
 
-#: ../src/search.c:236
+#: ../src/search.c:232
 msgid "after"
 msgstr "després de"
 
-#: ../src/search.c:241
+#: ../src/search.c:237
 msgid "match all"
 msgstr "Fes-les coincidir totes"
 
-#: ../src/search.c:242
+#: ../src/search.c:238
 msgid "match any"
 msgstr "Qualsevol ocurrència"
 
-#: ../src/search.c:243
+#: ../src/search.c:239
 msgid "exclude"
 msgstr "exclou"
 
-#: ../src/search.c:248
+#: ../src/search.c:244
 msgid "miss"
 msgstr "perdre"
 
-#: ../src/search.c:299
+#: ../src/search.c:295
 #, c-format
 msgid "%s, %d files (%s, %d)"
 msgstr "%s, %d fitxers (%s, %d)"
 
-#: ../src/search.c:304
+#: ../src/search.c:300
 #, c-format
 msgid "%s, %d files"
 msgstr "%s, %d fitxers"
 
-#: ../src/search.c:322
+#: ../src/search.c:318
 msgid "Searching..."
 msgstr "Cercant..."
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -4868,8 +4880,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Ha fallat la càrrega a la memòria cau de la miniatura, intento tornar-la a "
 "crear.\n"
 
-#: ../src/trash.c:80 ../src/utilops.c:2428 ../src/utilops.c:2439
-#: ../src/utilops.c:2496
+#: ../src/trash.c:80 ../src/utilops.c:2448 ../src/utilops.c:2459
+#: ../src/utilops.c:2516
 msgid "Delete failed"
 msgstr "No es pot suprimir"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5023,8 +5035,8 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "No es pot carregar:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2130
-#: ../src/utilops.c:2157 ../src/utilops.c:2620
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2147
+#: ../src/utilops.c:2174 ../src/utilops.c:2640
 msgid "Rename failed"
 msgstr "Ha fallat el canvi de nom "
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5045,7 +5057,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../src/ui_pathsel.c:748 ../src/ui_pathsel.c:1049 ../src/utilops.c:2654
+#: ../src/ui_pathsel.c:748 ../src/ui_pathsel.c:1049 ../src/utilops.c:2674
 msgid "New folder"
 msgstr "Nova carpeta"
 
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5082,7 +5094,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../src/utilops.c:534
+#: ../src/utilops.c:547
 msgid ""
 "\n"
 " Continue multiple file operation?"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5090,11 +5102,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "\n"
 " Voleu continuar l'operació sobre múltiples fitxers?"
 
-#: ../src/utilops.c:541 ../src/utilops.c:976
+#: ../src/utilops.c:554 ../src/utilops.c:989
 msgid "Co_ntinue"
 msgstr "Co_ntinua"
 
-#: ../src/utilops.c:718
+#: ../src/utilops.c:731
 #, c-format
 msgid ""
 "Removal of folder contents failed at this file:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5105,7 +5117,7 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "\n"
 "%s"
 
-#: ../src/utilops.c:864
+#: ../src/utilops.c:877
 #, c-format
 msgid ""
 "%s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5114,103 +5126,103 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "%s\n"
 "No es pot iniciar la comanda externa.\n"
 
-#: ../src/utilops.c:944
+#: ../src/utilops.c:957
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s no és un directori"
 
-#: ../src/utilops.c:974
+#: ../src/utilops.c:987
 msgid "Really continue?"
 msgstr "Voleu continuar?"
 
-#: ../src/utilops.c:988
+#: ../src/utilops.c:1001
 msgid "This operation can't continue:"
 msgstr "Aquesta operació no pot continuar:"
 
-#: ../src/utilops.c:1351 ../src/utilops.c:1464 ../src/utilops.c:1848
+#: ../src/utilops.c:1364 ../src/utilops.c:1477 ../src/utilops.c:1861
 msgid "Discard changes"
 msgstr "_Descarta els canvis"
 
-#: ../src/utilops.c:1352 ../src/utilops.c:1465 ../src/utilops.c:1798
-#: ../src/utilops.c:1814
+#: ../src/utilops.c:1365 ../src/utilops.c:1478 ../src/utilops.c:1811
+#: ../src/utilops.c:1827
 msgid "File details"
 msgstr "Detalls del fitxer"
 
-#: ../src/utilops.c:1374 ../src/utilops.c:1472
+#: ../src/utilops.c:1387 ../src/utilops.c:1485
 msgid "Sidecars"
 msgstr "Sidecars"
 
-#: ../src/utilops.c:1376
+#: ../src/utilops.c:1389
 msgid "Write to file"
 msgstr "Escriu al fitxer"
 
-#: ../src/utilops.c:1416
+#: ../src/utilops.c:1429
 msgid "Choose the destination folder."
 msgstr "Seleccioneu la carpeta de destí."
 
-#: ../src/utilops.c:1474
+#: ../src/utilops.c:1487
 msgid "New name"
 msgstr "Nom nou"
 
-#: ../src/utilops.c:1504
+#: ../src/utilops.c:1517
 msgid "Manual rename"
 msgstr "Canviar el nom manualment"
 
-#: ../src/utilops.c:1509
+#: ../src/utilops.c:1522
 msgid "Original name:"
 msgstr "Nom original:"
 
-#: ../src/utilops.c:1512
+#: ../src/utilops.c:1525
 msgid "New name:"
 msgstr "Nou nom:"
 
-#: ../src/utilops.c:1525
+#: ../src/utilops.c:1538
 msgid "Auto rename"
 msgstr "Torna a anomenar automàticament"
 
-#: ../src/utilops.c:1531
+#: ../src/utilops.c:1544
 msgid "Begin text"
 msgstr "Comença un text"
 
-#: ../src/utilops.c:1539 ../src/utilops.c:1571
+#: ../src/utilops.c:1552 ../src/utilops.c:1584
 msgid "Start #"
 msgstr "Inici #"
 
-#: ../src/utilops.c:1545
+#: ../src/utilops.c:1558
 msgid "End text"
 msgstr "Fi del text"
 
-#: ../src/utilops.c:1553
+#: ../src/utilops.c:1566
 msgid "Padding:"
 msgstr "Separació:"
 
-#: ../src/utilops.c:1558
+#: ../src/utilops.c:1571
 msgid "Formatted rename"
 msgstr "Canvi de nom formatat"
 
-#: ../src/utilops.c:1563
+#: ../src/utilops.c:1576
 msgid "Format (* = original name, ## = numbers)"
 msgstr "Format (* = nom original, ## = números)"
 
-#: ../src/utilops.c:1701
+#: ../src/utilops.c:1714
 msgid "Another operation in progress.\n"
 msgstr "Hi ha una altra operació en progrés.\n"
 
-#: ../src/utilops.c:1757
+#: ../src/utilops.c:1770
 #, c-format
 msgid "File: '%s'\n"
 msgstr "Fitxer: '%s'\n"
 
-#: ../src/utilops.c:1762
+#: ../src/utilops.c:1775
 msgid "with sidecar files:\n"
 msgstr "amb fitxers sidecar:\n"
 
-#: ../src/utilops.c:1768
+#: ../src/utilops.c:1781
 #, c-format
 msgid " '%s'\n"
 msgstr "'%s'\n"
 
-#: ../src/utilops.c:1772
+#: ../src/utilops.c:1785
 msgid ""
 "\n"
 "Status: "
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5218,19 +5230,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "\n"
 "Estat: "
 
-#: ../src/utilops.c:1784
+#: ../src/utilops.c:1797
 msgid "no problem detected"
 msgstr "no es detecta cap problema"
 
-#: ../src/utilops.c:1800 ../src/utilops.c:1847
+#: ../src/utilops.c:1813 ../src/utilops.c:1860
 msgid "Exclude file"
 msgstr "Fitxer exclòs"
 
-#: ../src/utilops.c:1845 ../src/utilops.c:1870
+#: ../src/utilops.c:1858 ../src/utilops.c:1883
 msgid "Overview of changed metadata"
 msgstr "Sobrescriptura de les metadades canviades"
 
-#: ../src/utilops.c:1863
+#: ../src/utilops.c:1876
 #, c-format
 msgid ""
 "The following metadata tags will be written to\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5239,100 +5251,100 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Les seguents etiquetes de metadades seran escrites amb\n"
 "'%s'."
 
-#: ../src/utilops.c:1867
+#: ../src/utilops.c:1880
 #, c-format
 msgid "The following metadata tags will be written to the image file itself."
 msgstr "Les següents etiquetes de metadades seran escrites al fitxer d'imatge"
 
-#: ../src/utilops.c:1972
+#: ../src/utilops.c:1986
 msgid "Delete files?"
 msgstr "Suprimeix els fitxers?"
 
-#: ../src/utilops.c:1973
+#: ../src/utilops.c:1987
 msgid "This will delete the following files"
 msgstr "Això eliminarà els següents fitxers"
 
-#: ../src/utilops.c:1992
+#: ../src/utilops.c:2006
 msgid "Can't write metadata"
 msgstr "No es pot escriure les metadades"
 
-#: ../src/utilops.c:2015
+#: ../src/utilops.c:2029
 msgid "Write metadata"
 msgstr "Escriu les metadades"
 
-#: ../src/utilops.c:2016
+#: ../src/utilops.c:2030
 msgid "Write metadata?"
 msgstr "Escriu les metadades?"
 
-#: ../src/utilops.c:2017
+#: ../src/utilops.c:2031
 msgid "This will write the changed metadata into the following files"
 msgstr "Això escriurà les metadades modificades als següents fitxers"
 
-#: ../src/utilops.c:2019
+#: ../src/utilops.c:2033
 msgid "Metadata writting failed"
 msgstr "Ha fallat l'escriptura de les metadades"
 
-#: ../src/utilops.c:2038 ../src/utilops.c:2065
+#: ../src/utilops.c:2052 ../src/utilops.c:2079
 msgid "Move failed"
 msgstr "No s'ha pogut moure"
 
-#: ../src/utilops.c:2062
+#: ../src/utilops.c:2076
 msgid "Move files?"
 msgstr "Voleu moure els fitxers?"
 
-#: ../src/utilops.c:2063
+#: ../src/utilops.c:2077
 msgid "This will move the following files"
 msgstr "Això mourà els següents fitxers"
 
-#: ../src/utilops.c:2084 ../src/utilops.c:2111
+#: ../src/utilops.c:2101 ../src/utilops.c:2128
 msgid "Copy failed"
 msgstr "No s'ha pogut copiar"
 
-#: ../src/utilops.c:2108
+#: ../src/utilops.c:2125
 msgid "Copy files?"
 msgstr "Voleu copiar els fitxers?"
 
-#: ../src/utilops.c:2109 ../src/utilops.c:2240
+#: ../src/utilops.c:2126 ../src/utilops.c:2260
 msgid "This will copy the following files"
 msgstr "Aquesta acció copiarà els següents fitxers"
 
-#: ../src/utilops.c:2153 ../src/utilops.c:2616
+#: ../src/utilops.c:2170 ../src/utilops.c:2636
 msgid "Rename"
 msgstr "Torna a anomenar"
 
-#: ../src/utilops.c:2154
+#: ../src/utilops.c:2171
 msgid "Rename files?"
 msgstr "Voleu canviar els noms dels fitxers"
 
-#: ../src/utilops.c:2155
+#: ../src/utilops.c:2172
 msgid "This will rename the following files"
 msgstr "Això canviarà el nom dels següents fitxers"
 
-#: ../src/utilops.c:2204
+#: ../src/utilops.c:2224
 msgid "Can't run external editor"
 msgstr "No es pot executar l'editor extern"
 
-#: ../src/utilops.c:2238
+#: ../src/utilops.c:2258
 msgid "Editor"
 msgstr "Editor"
 
-#: ../src/utilops.c:2239
+#: ../src/utilops.c:2259
 msgid "Run editor?"
 msgstr "Inicia l'editor?"
 
-#: ../src/utilops.c:2242
+#: ../src/utilops.c:2262
 msgid "External command failed"
 msgstr "No s'ha pogut executar la comanda externa"
 
-#: ../src/utilops.c:2411 ../src/utilops.c:2484
+#: ../src/utilops.c:2431 ../src/utilops.c:2504
 msgid "Delete folder"
 msgstr "Elimina la carpeta"
 
-#: ../src/utilops.c:2412
+#: ../src/utilops.c:2432
 msgid "Delete symbolic link?"
 msgstr "Voleu eliminar l'enllaç simbòlic?"
 
-#: ../src/utilops.c:2414
+#: ../src/utilops.c:2434
 msgid ""
 "This will delete the symbolic link.\n"
 "The folder this link points to will not be deleted."
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5340,11 +5352,11 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Això esborrarà l'enllaç simbòlic. \n"
 "El contingut de l'enllaç no s'esborrarà."
 
-#: ../src/utilops.c:2416
+#: ../src/utilops.c:2436
 msgid "Link deletion failed"
 msgstr "No es pot suprimir l'enllaç"
 
-#: ../src/utilops.c:2426
+#: ../src/utilops.c:2446
 #, c-format
 msgid ""
 "Unable to remove folder %s\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5353,16 +5365,16 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "No es pot suprimir la carpeta %s\n"
 "No teniu permisos d'escriptura a la carpeta."
 
-#: ../src/utilops.c:2438 ../src/utilops.c:2495
+#: ../src/utilops.c:2458 ../src/utilops.c:2515
 #, c-format
 msgid "Unable to list contents of folder %s"
 msgstr "No es poden mostrar els continguts de la carpeta %s"
 
-#: ../src/utilops.c:2452 ../src/utilops.c:2460
+#: ../src/utilops.c:2472 ../src/utilops.c:2480
 msgid "Folder contains subfolders"
 msgstr "La carpeta inclou subcarpetes"
 
-#: ../src/utilops.c:2456
+#: ../src/utilops.c:2476
 #, c-format
 msgid ""
 "Unable to delete the folder:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5378,19 +5390,19 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Aquesta carpeta conté subcarpetes que haurien de ser mogudes per poder-la "
 "esborrar."
 
-#: ../src/utilops.c:2464
+#: ../src/utilops.c:2484
 msgid "Subfolders:"
 msgstr "Subcarpetes:"
 
-#: ../src/utilops.c:2485
+#: ../src/utilops.c:2505
 msgid "Delete folder?"
 msgstr "Voleu suprimir la carpeta?"
 
-#: ../src/utilops.c:2486
+#: ../src/utilops.c:2506
 msgid "The folder contains these files:"
 msgstr "La carpeta conté els següents fitxers:"
 
-#: ../src/utilops.c:2487
+#: ../src/utilops.c:2507
 msgid ""
 "This will delete the folder.\n"
 "The contents of this folder will also be deleted."
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5398,87 +5410,87 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Això esborrarà la carpeta. \n"
 "El contingut de la carpeta també s'esborrarà."
 
-#: ../src/utilops.c:2617
+#: ../src/utilops.c:2637
 msgid "Rename folder?"
 msgstr "Voleu canviar el nom de la carpeta"
 
-#: ../src/utilops.c:2618
+#: ../src/utilops.c:2638
 msgid "The folder contains the following files"
 msgstr "La carpeta conté els següents fitxers"
 
-#: ../src/utilops.c:2664
+#: ../src/utilops.c:2684
 msgid "Create Folder"
 msgstr "Crea una capreta"
 
-#: ../src/utilops.c:2665
+#: ../src/utilops.c:2685
 msgid "Create folder?"
 msgstr "Voleu crear la carpeta?"
 
-#: ../src/utilops.c:2668
+#: ../src/utilops.c:2688
 msgid "Can't create folder"
 msgstr "No es pot crear la carpeta"
 
-#: ../src/view_dir.c:396
+#: ../src/view_dir.c:397
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ../src/view_dir.c:398
+#: ../src/view_dir.c:399
 msgid "_Move"
 msgstr "_Mou"
 
-#: ../src/view_dir.c:644
+#: ../src/view_dir.c:645
 msgid "_Up to parent"
 msgstr "_Puja una carpeta"
 
-#: ../src/view_dir.c:649
+#: ../src/view_dir.c:650
 msgid "_Slideshow"
 msgstr "Seqüència de _diapositives"
 
-#: ../src/view_dir.c:651
+#: ../src/view_dir.c:652
 msgid "Slideshow recursive"
 msgstr "Seqüència de _diapositives recursiva"
 
-#: ../src/view_dir.c:655
+#: ../src/view_dir.c:656
 msgid "Find _duplicates..."
 msgstr "Busca _duplicats..."
 
-#: ../src/view_dir.c:657
+#: ../src/view_dir.c:658
 msgid "Find duplicates recursive..."
 msgstr "Busca duplicats recursivament..."
 
-#: ../src/view_dir.c:662
+#: ../src/view_dir.c:663
 msgid "_New folder..."
 msgstr "_Nova carpeta..."
 
-#: ../src/view_dir.c:676 ../src/view_file.c:606
+#: ../src/view_dir.c:677 ../src/view_file.c:619
 msgid "View as _List"
 msgstr "Veure com una _Llista"
 
-#: ../src/view_dir.c:679
+#: ../src/view_dir.c:680
 msgid "View as _Tree"
 msgstr "Veure com un _Arbre"
 
-#: ../src/view_dir.c:684
+#: ../src/view_dir.c:685
 msgid "Show _hidden files"
 msgstr "Mostra els fitxers _ocults"
 
-#: ../src/view_dir.c:687 ../src/view_file.c:624
+#: ../src/view_dir.c:688 ../src/view_file.c:637
 msgid "Re_fresh"
 msgstr "Ac_tualitza"
 
-#: ../src/view_file.c:609
+#: ../src/view_file.c:622
 msgid "View as _Icons"
 msgstr "Visualitza com a _icones"
 
-#: ../src/view_file.c:615
+#: ../src/view_file.c:628
 msgid "Show _thumbnails"
 msgstr "Mostra les _miniatures"
 
-#: ../src/view_file_icon.c:2171 ../src/view_file_list.c:826
+#: ../src/view_file_icon.c:2179 ../src/view_file_list.c:899
 msgid " [NO GROUPING]"
 msgstr "[NO S'AGRUPEN]"
 
-#: ../src/view_file_list.c:504
+#: ../src/view_file_list.c:512
 #, c-format
 msgid ""
 "Invalid file name:\n"
&amp;lt; at &amp;gt;&amp;lt; at &amp;gt; -5487,14 +5499,26 &amp;lt; at &amp;gt;&amp;lt; at &amp;gt;
 "Nom de fitxer invàlid:\n"
 "%s"
 
-#: ../src/view_file_list.c:505
+#: ../src/view_file_list.c:513
 msgid "Error renaming file"
 msgstr "Error en canviar el nom del fitxer"
 
-#: ../src/window.c:251
+#: ../src/window.c:252
 msgid "Help"
 msgstr "Ajuda"
 
+#~ msgid "_Image Overlay"
+#~ msgstr "_Imatge sobreposada"
+
+#~ msgid "Open _recent"
+#~ msgstr "Obre _recents"
+
+#~ msgid "Pan _view"
+#~ msgstr "Vista _panoràmica"
+
+#~ msgid "E_xif window"
+#~ msgstr "Finestra E_xif"
+
 #~ msgid "Advanced view"
 #~ msgstr "Vista avançada"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Geeqie-svn mailing list
Geeqie-svn&amp;lt; at &amp;gt;lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
&lt;/pre&gt;</description>
    <dc:creator>zas_-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f&lt; at &gt;public.gmane.org</dc:creator>
    <dc:date>2010-01-27T19:58:11</dc:date>
  </item>
  <textinput rdf:about="http://search.gmane.org/?group=$group=gmane.comp.gnome.apps.geeqie.scm">
    <title>Search Engine</title>
    <description>Search the mailing list at Gmane</description>
    <name>query</name>
    <link>http://search.gmane.org/?group=$group=gmane.comp.gnome.apps.geeqie.scm</link>
  </textinput>
</rdf:RDF>

