changeset 2555:5819e56e8932

Update translation files after more source file shuffling.
author Omari Stephens <xsdg@google.com>
date Mon, 10 Jul 2017 07:53:04 +0000
parents c09c62631ee3
children 628485fdb4b4
files po/ar.po po/be.po po/bg.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/eo.po po/es.po po/et.po po/eu.po po/fi.po po/fr.po po/hu.po po/id.po po/it.po po/ja.po po/ko.po po/nb.po po/nl.po po/pl.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sr.po po/sr@latin.po po/sv.po po/th.po po/tlh.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po
diffstat 37 files changed, 1295 insertions(+), 1110 deletions(-) [+]
line wrap: on
line diff
--- a/po/ar.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ar.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2004-10-19 16:58-0400\n"
 "Last-Translator: Youssef Assad\n"
 "Language-Team:  <youssef@devcabal.org>\n"
@@ -79,7 +79,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "الاسم"
 
@@ -815,7 +815,7 @@
 msgstr "فارغ"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "تحميل نماذج الصور المصغرة"
 
@@ -826,7 +826,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "اعرض فى نافذة جديدة"
 
@@ -870,20 +871,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "إنسخ..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "حرك..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "أعد تسمية..."
 
@@ -891,13 +894,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "إحذف..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "انسخ"
@@ -907,11 +910,11 @@
 msgid "Randomize"
 msgstr "عشوائى"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "رتب"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "إعرض إسم الملف على هيئة نص"
 
@@ -923,7 +926,8 @@
 msgid "Save collection _as..."
 msgstr "إحفظ المجموعة بإسم..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "ابحث عن النسخ المطابقة..."
 
@@ -1079,7 +1083,7 @@
 msgid "Select group _2 duplicates"
 msgstr "إختر الملفات المطابقة من المجموعة الثانية"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "أضف إلى مجموعة جديدة"
 
@@ -1103,13 +1107,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "الحجم"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "التاريخ"
 
@@ -2230,7 +2234,7 @@
 msgid "C_lose window"
 msgstr "اغلق النافذة"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "صاعد"
 
@@ -2661,7 +2665,7 @@
 msgid "Delete..."
 msgstr "إحذف..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "اعمل دون ترشيح الملفات"
@@ -2671,7 +2675,7 @@
 msgid "Enable file grouping"
 msgstr "اعمل دون ترشيح الملفات"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "اعمل دون ترشيح الملفات"
@@ -3580,7 +3584,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3590,7 +3594,7 @@
 msgid "Set mark %d"
 msgstr "اختر الكل"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3600,7 +3604,8 @@
 msgid "Reset mark %d"
 msgstr "اختر الكل"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3620,12 +3625,12 @@
 msgid "Select mark %d"
 msgstr "اختر الكل"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "اختر الكل"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "أضف علامة"
@@ -3635,7 +3640,7 @@
 msgid "Add mark %d"
 msgstr "أضف علامة"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3645,7 +3650,7 @@
 msgid "Intersection with mark %d"
 msgstr "اختر الكل"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6580,7 +6585,7 @@
 msgid "_New folder..."
 msgstr "دليل جديد..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "اعرض فى هيئة أيقونات"
@@ -6595,20 +6600,20 @@
 msgid "Show _hidden files"
 msgstr "اعرض الملفات و الدﻻئل المخفية"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "انعش"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "اعرض فى هيئة أيقونات"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "اعرض النماذج المصغّرة للصور"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/be.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/be.po	Mon Jul 10 07:53:04 2017 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2008-05-05 21:33+0300\n"
 "Last-Translator: Pavel Piatruk <piatruk.p@gmail.com>\n"
 "Language-Team: Belarusian (Official spelling) <i18n@mova.org>\n"
@@ -77,7 +77,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Імя"
 
@@ -805,7 +805,7 @@
 msgstr "Пуста"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Загружаем мініяцюры..."
 
@@ -816,7 +816,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Глядзець у _новым акне"
 
@@ -860,20 +861,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Капіяваць..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Перамесціць"
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Перайменаваць"
 
@@ -881,13 +884,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Выдаліць"
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Капіяваць"
@@ -897,11 +900,11 @@
 msgid "Randomize"
 msgstr "Выпадкова"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Сартаваць"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Паказаць _імёны файлаў"
 
@@ -913,7 +916,8 @@
 msgid "Save collection _as..."
 msgstr "Захаваць калекцыю _як..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Знайсці аднолькавыя..."
 
@@ -1068,7 +1072,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Выберыце групу _1 дублікатаў"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Дадаць у новую калекцыю"
 
@@ -1091,13 +1095,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Памер"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Дата"
 
@@ -2180,7 +2184,7 @@
 msgid "C_lose window"
 msgstr "_Закрыць акно"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Па ўзрастанню"
 
@@ -2598,7 +2602,7 @@
 msgid "Delete..."
 msgstr "_Выдаліць"
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Адключыць фільтрацыю файлаў"
@@ -2608,7 +2612,7 @@
 msgid "Enable file grouping"
 msgstr "Адключыць фільтрацыю файлаў"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Адключыць фільтрацыю файлаў"
@@ -3516,7 +3520,7 @@
 msgid "Mark _%d"
 msgstr "Закладка _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Устанавіць закладку %d"
@@ -3526,7 +3530,7 @@
 msgid "Set mark %d"
 msgstr "_Устанавіць закладку %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Скінуць закладку %d"
@@ -3536,7 +3540,8 @@
 msgid "Reset mark %d"
 msgstr "_Скінуць закладку %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Пераключыць закладку %d"
@@ -3556,12 +3561,12 @@
 msgid "Select mark %d"
 msgstr "_Вылучыць закладку %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Вылучыць закладку %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Дадаць закладку %d"
@@ -3571,7 +3576,7 @@
 msgid "Add mark %d"
 msgstr "_Дадаць закладку %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3581,7 +3586,7 @@
 msgid "Intersection with mark %d"
 msgstr "_Скінуць закладку %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6457,7 +6462,7 @@
 msgid "_New folder..."
 msgstr "_Новая тэчка..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Праглядаць як _іконкі"
@@ -6471,20 +6476,20 @@
 msgid "Show _hidden files"
 msgstr "Паказаць с_хаваныя"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Абнавіць"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Праглядаць як _іконкі"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Паказаць _мініяцюры"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/bg.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/bg.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2005-02-26 16:13+0200\n"
 "Last-Translator: Владимир Петров <vladux@users.sourceforge.net>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -76,7 +76,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Име"
 
@@ -799,7 +799,7 @@
 msgstr "Празно"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Зареждане на смалени..."
 
@@ -810,7 +810,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Преглед в _нов прозорец"
 
@@ -854,20 +855,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Копиране..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Пре_местване..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "П_реименуване..."
 
@@ -875,13 +878,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "Изтриван_е..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Копиране"
@@ -891,11 +894,11 @@
 msgid "Randomize"
 msgstr "Произволно"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Подреждане"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Показване име на _файл"
 
@@ -907,7 +910,8 @@
 msgid "Save collection _as..."
 msgstr "Запазване на колекция кат_о..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Откриване на _дубликати..."
 
@@ -1061,7 +1065,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Избиране на _останалите от всяка група дубликати"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Добавяне към нова колекция"
 
@@ -1085,13 +1089,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Големина"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Дата"
 
@@ -2209,7 +2213,7 @@
 msgid "C_lose window"
 msgstr "_Затваряне на прозореца"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Възходящо"
 
@@ -2631,7 +2635,7 @@
 msgid "Delete..."
 msgstr "Изтриван_е..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Забрана за филтриране на файлове"
@@ -2641,7 +2645,7 @@
 msgid "Enable file grouping"
 msgstr "Забрана за филтриране на файлове"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Забрана за филтриране на файлове"
@@ -3534,7 +3538,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3544,7 +3548,7 @@
 msgid "Set mark %d"
 msgstr "Маркиране на всички"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3554,7 +3558,8 @@
 msgid "Reset mark %d"
 msgstr "Маркиране на всички"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3574,12 +3579,12 @@
 msgid "Select mark %d"
 msgstr "Маркиране на всички"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Маркиране на всички"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Добавяне на отметка"
@@ -3589,7 +3594,7 @@
 msgid "Add mark %d"
 msgstr "Добавяне на отметка"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3599,7 +3604,7 @@
 msgid "Intersection with mark %d"
 msgstr "Маркиране на всички"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6492,7 +6497,7 @@
 msgid "_New folder..."
 msgstr "_Нова папка..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Преглед като _икони"
@@ -6507,20 +6512,20 @@
 msgid "Show _hidden files"
 msgstr "Показване на скрити"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Презаре_ждане"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Преглед като _икони"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Пока_зване на смалени изображения"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/ca.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ca.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2012-07-07 12:32+0200\n"
 "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net> <>\n"
@@ -73,7 +73,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nom"
 
@@ -774,7 +774,7 @@
 msgstr "Buida"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "S'estan carregant les miniatures..."
 
@@ -785,7 +785,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Visualitza en una finestra _nova"
 
@@ -827,20 +828,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Copia..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Mou..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Can_via el nom..."
 
@@ -848,13 +851,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Suprimeix..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Copia el camí"
 
@@ -862,11 +865,11 @@
 msgid "Randomize"
 msgstr "Barreja-les"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordena"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Mostra el _nom del fitxer"
 
@@ -878,7 +881,8 @@
 msgid "Save collection _as..."
 msgstr "_Anomena i desa la col·lecció..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Cerca imatges duplicades"
 
@@ -1028,7 +1032,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Seleccioneu duplicats del grup_ 2 duplicats"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Afegeix a una nova col·lecció"
 
@@ -1051,13 +1055,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Mida"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2118,7 +2122,7 @@
 msgid "C_lose window"
 msgstr "_Tanca la finestra"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Ascendent"
 
@@ -2508,7 +2512,7 @@
 msgid "Delete..."
 msgstr "Suprimeix..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Habilita els _grups de fitxers"
 
@@ -2516,7 +2520,7 @@
 msgid "Enable file grouping"
 msgstr "Habilita els grups de fitxers"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "I_nhabilita els grups de fitxers"
 
@@ -3327,7 +3331,7 @@
 msgid "Mark _%d"
 msgstr "Marca _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Posa marca %d"
@@ -3337,7 +3341,7 @@
 msgid "Set mark %d"
 msgstr "Posa marca %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Esborra marca %d"
@@ -3347,7 +3351,8 @@
 msgid "Reset mark %d"
 msgstr "Esborra marca %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Commuta la marca %d"
@@ -3367,12 +3372,12 @@
 msgid "Select mark %d"
 msgstr "Selecciona la marca %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Selecciona la marca %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Afegeix la marca %d"
@@ -3382,7 +3387,7 @@
 msgid "Add mark %d"
 msgstr "Afegeix la marca %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Intersecció amb la marca %d"
@@ -3392,7 +3397,7 @@
 msgid "Intersection with mark %d"
 msgstr "Intersecció amb la marca %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_No seleccionis la marca %d"
@@ -6267,7 +6272,7 @@
 msgid "_New folder..."
 msgstr "_Nova carpeta..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Veure com una _Llista"
 
@@ -6279,19 +6284,19 @@
 msgid "Show _hidden files"
 msgstr "Mostra els fitxers _ocults"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Ac_tualitza"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Visualitza com a _icones"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Mostra les _miniatures"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[NO S'AGRUPEN]"
 
--- a/po/cs.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/cs.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2009-07-29 23:02+0200\n"
 "Last-Translator: Vladimír Nádvorník <nadvornik@suse.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -72,7 +72,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Název"
 
@@ -774,7 +774,7 @@
 msgstr "Prázdná"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Nahrávám náhledy..."
 
@@ -785,7 +785,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "_Zobrazit v novém okně"
 
@@ -827,20 +828,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "Ko_pírovat..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Pře_sunout..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Pře_jmenovat..."
 
@@ -848,13 +851,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "S_mazat..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Kopírovat cestu k souboru"
 
@@ -862,11 +865,11 @@
 msgid "Randomize"
 msgstr "Promíchat"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Třídit"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "_Zobrazit název souboru"
 
@@ -878,7 +881,8 @@
 msgid "Save collection _as..."
 msgstr "Uložit kolekci j_ako..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Hledat d_uplikáty..."
 
@@ -1028,7 +1032,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Vybrat skupinu duplikátů _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Přidat do nové kolekce"
 
@@ -1051,13 +1055,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Velikost"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2118,7 +2122,7 @@
 msgid "C_lose window"
 msgstr "_Zavřít okno"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Vzestupně"
 
@@ -2508,7 +2512,7 @@
 msgid "Delete..."
 msgstr "Odstranit..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Povolit sdružování _souborů"
 
@@ -2516,7 +2520,7 @@
 msgid "Enable file grouping"
 msgstr "Povolit sdružování souborů"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Vypnout sdružování soubo_rů"
 
@@ -3329,7 +3333,7 @@
 msgid "Mark _%d"
 msgstr "Značka _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Nastavit značku %d"
@@ -3339,7 +3343,7 @@
 msgid "Set mark %d"
 msgstr "Nastavit značku %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Vynu_lovat značku %d"
@@ -3349,7 +3353,8 @@
 msgid "Reset mark %d"
 msgstr "Vynulovat značku %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Překlopit značku %d"
@@ -3369,12 +3374,12 @@
 msgid "Select mark %d"
 msgstr "Vybrat značku %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Vybrat značku %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Přidat značku %d"
@@ -3384,7 +3389,7 @@
 msgid "Add mark %d"
 msgstr "Přidat značku %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "Průni_k se značkou %d"
@@ -3394,7 +3399,7 @@
 msgid "Intersection with mark %d"
 msgstr "Průnik se značkou %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Odebrat značku %d"
@@ -6260,7 +6265,7 @@
 msgid "_New folder..."
 msgstr "_Nový adresář..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Zobrazit jako _seznam"
 
@@ -6272,19 +6277,19 @@
 msgid "Show _hidden files"
 msgstr "Zobrazit _skryté soubory"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Obnovit"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Zobrazit jako _ikony"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Zobrazit ná_hledy"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [BEZ SDRUŽOVÁNÍ]"
 
--- a/po/da.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/da.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2001-11-24 21:25+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <sslug-locale@sslug.dk>\n"
@@ -73,7 +73,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Navn"
 
@@ -819,7 +819,7 @@
 msgstr "Tom"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Indlæser miniaturer..."
 
@@ -831,7 +831,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Vis i nyt vindue"
@@ -877,14 +878,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Kopiér..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Flyt..."
@@ -892,7 +895,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Omdøb..."
@@ -901,14 +904,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Slet..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Kopiér"
@@ -918,12 +921,12 @@
 msgid "Randomize"
 msgstr "Tilfældig"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Sortér"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Vis skjulte"
@@ -938,7 +941,8 @@
 msgid "Save collection _as..."
 msgstr "Gem samling som..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Find dubletter..."
@@ -1099,7 +1103,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Føj til ny samling"
 
@@ -1124,13 +1128,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Størrelse"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Dato"
 
@@ -2252,7 +2256,7 @@
 msgid "C_lose window"
 msgstr "Luk vindue"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr ""
 
@@ -2687,7 +2691,7 @@
 msgid "Delete..."
 msgstr "Slet..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr ""
 
@@ -2695,7 +2699,7 @@
 msgid "Enable file grouping"
 msgstr ""
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr ""
 
@@ -3602,7 +3606,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3612,7 +3616,7 @@
 msgid "Set mark %d"
 msgstr "Vælg alle"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3622,7 +3626,8 @@
 msgid "Reset mark %d"
 msgstr "Vælg alle"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3642,12 +3647,12 @@
 msgid "Select mark %d"
 msgstr "Vælg alle"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Vælg alle"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Redigerer"
@@ -3657,7 +3662,7 @@
 msgid "Add mark %d"
 msgstr "Redigerer"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3667,7 +3672,7 @@
 msgid "Intersection with mark %d"
 msgstr "Vælg alle"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6599,7 +6604,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Dimensioner"
@@ -6614,22 +6619,22 @@
 msgid "Show _hidden files"
 msgstr "Vis skjulte"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Genindlæs"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Dimensioner"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Gem miniaturer"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/de.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/de.po	Mon Jul 10 07:53:04 2017 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2017-02-16 00:19+0100\n"
 "Last-Translator: Klaus Ethgen <Klaus@Ethgen.de>\n"
 "Language-Team: \n"
@@ -77,7 +77,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Name"
 
@@ -778,7 +778,7 @@
 msgstr "Leer"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Lade Vorschaubilder..."
 
@@ -789,7 +789,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "In _neuem Fenster anzeigen"
 
@@ -830,20 +831,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Verschieben..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
@@ -851,13 +854,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Löschen..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Kopiere Pfad"
 
@@ -865,11 +868,11 @@
 msgid "Randomize"
 msgstr "Mischen"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "_Dateinamen anzeigen"
 
@@ -881,7 +884,8 @@
 msgid "Save collection _as..."
 msgstr "Sammlung speichern _als..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Duplikate suchen..."
 
@@ -1031,7 +1035,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Duplikate der Gruppe _2 auswählen"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Füge zu neuer Sammlung hinzu"
 
@@ -1054,13 +1058,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Größe"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2120,7 +2124,7 @@
 msgid "C_lose window"
 msgstr "Fenster s_chließen"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -2506,7 +2510,7 @@
 msgid "Delete..."
 msgstr "Löschen ..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Gruppierung von Dateien _einschalten"
 
@@ -2514,7 +2518,7 @@
 msgid "Enable file grouping"
 msgstr "Gruppierung von Dateien einschalten"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Gruppierung von Dateien _ausschalten"
 
@@ -3320,7 +3324,7 @@
 msgid "Mark _%d"
 msgstr "Markierung _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Setze Markierung %d"
@@ -3330,7 +3334,7 @@
 msgid "Set mark %d"
 msgstr "Setze Markierung %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Entfe_rne Markierung %d"
@@ -3340,7 +3344,8 @@
 msgid "Reset mark %d"
 msgstr "Markierung %d zurücksetzen"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Markierung %d umschal_ten"
@@ -3360,12 +3365,12 @@
 msgid "Select mark %d"
 msgstr "Markierung %d selektieren"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "Wähle Bilder mit Markierung %d aus"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "Füge Bilder mit Markierung %d zur Auswahl hinzu"
@@ -3375,7 +3380,7 @@
 msgid "Add mark %d"
 msgstr "Markierung %d hinzufügen"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "Schnittmenge mit Markierung %d wählen"
@@ -3385,7 +3390,7 @@
 msgid "Intersection with mark %d"
 msgstr "Schnittmenge mit Markierung %d bilden"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "Bilder mit Markierung %d abwählen"
@@ -6235,7 +6240,7 @@
 msgid "_New folder..."
 msgstr "Neues _Verzeichnis..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Als _Liste anzeigen"
 
@@ -6247,19 +6252,19 @@
 msgid "Show _hidden files"
 msgstr "Versteckte Dateien anzeigen"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "A_ktualisieren"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "_Iconansicht"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "_Vorschaubilder anzeigen"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[KEINE GRUPPIERUNG]"
 
--- a/po/el.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/el.po	Mon Jul 10 07:53:04 2017 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2016-06-28 18:33+0300\n"
 "Last-Translator: Nikos Papadopoulos <nikos <231036448@freemail.gr>>\n"
 "Language-Team: Greek <231036448@freemail.gr>\n"
@@ -69,7 +69,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Όνομα"
 
@@ -770,7 +770,7 @@
 msgstr "Κενό"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Φόρτωση των μικρογραφιών..."
 
@@ -781,7 +781,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Προβολή σε _νέο παράθυρο"
 
@@ -823,20 +824,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "Αντιγρα_φή..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Μετα_κίνηση..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
@@ -844,13 +847,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Διαγραφή..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Αντιγραφή διαδρομής"
 
@@ -858,11 +861,11 @@
 msgid "Randomize"
 msgstr "Τυχαιοποίηση"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ταξινόμηση"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Εμφάνιση _κειμένου με το όνομα"
 
@@ -874,7 +877,8 @@
 msgid "Save collection _as..."
 msgstr "Αποθήκευση της συλλογής _ως..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Ανα_ζήτηση πανομοιότυπων..."
 
@@ -1024,7 +1028,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Επιλογή των πανομοιότυπων της ομάδας _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Προσθήκη σε νέα συλλογή"
 
@@ -1047,13 +1051,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Μέγεθος"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -2113,7 +2117,7 @@
 msgid "C_lose window"
 msgstr "Κ_λείσιμο του παραθύρου"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Αύξουσα"
 
@@ -2504,7 +2508,7 @@
 msgid "Delete..."
 msgstr "Διαγραφή..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Απενερ_γοποίηση της ομαδοποίησης των αρχείων"
 
@@ -2512,7 +2516,7 @@
 msgid "Enable file grouping"
 msgstr "Απενεργοποίηση της ομαδοποίησης των αρχείων"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Απενεργοποίηση της ομαδοποίησης τω_ν αρχείων"
 
@@ -3322,7 +3326,7 @@
 msgid "Mark _%d"
 msgstr "Σημάδι _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "Όρι_σε το σημάδι %d"
@@ -3332,7 +3336,7 @@
 msgid "Set mark %d"
 msgstr "Όρισε το σημάδι %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Επαναπρο_σδιορισμός του σημαδιού %d"
@@ -3342,7 +3346,8 @@
 msgid "Reset mark %d"
 msgstr "Επαναπροσδιορισμός του σημαδιού %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Εναλλαγή _του σημαδιού %d"
@@ -3362,12 +3367,12 @@
 msgid "Select mark %d"
 msgstr "Επιλογή του σημαδιού %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "Επιλογή του _σημαδιού %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "Προσθήκη του σημ_αδιού %d"
@@ -3377,7 +3382,7 @@
 msgid "Add mark %d"
 msgstr "Προσθήκη του σημαδιού %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "Δ_ιασταύρωση με το σημάδι %d"
@@ -3387,7 +3392,7 @@
 msgid "Intersection with mark %d"
 msgstr "Διασταύρωση με το σημάδι %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "Αποεπιλογή του σημα_διού %d"
@@ -6258,7 +6263,7 @@
 msgid "_New folder..."
 msgstr "_Νέος φάκελος..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Προβολή ως _Κατάστιχο"
 
@@ -6270,19 +6275,19 @@
 msgid "Show _hidden files"
 msgstr "Προβολή των _κρυφών αρχείων"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Α_νανέωση"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Προβολή ως Ε_ικονίδια"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Προβολή _μικρογραφιών"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[ΧΩΡΙΣ ΟΜΑΔΟΠΟΙΗΣΗ]"
 
--- a/po/eo.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/eo.po	Mon Jul 10 07:53:04 2017 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-10-28 09:40+0200\n"
 "Last-Translator: Antonio C. Codazzi <f_sophia@libero.it>\n"
 "Language-Team: \n"
@@ -79,7 +79,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nomo"
 
@@ -800,7 +800,7 @@
 msgstr "Malplena"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Ŝargante miniaturojn..."
 
@@ -811,7 +811,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Videbligu en _nova fenestro"
 
@@ -855,20 +856,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopiu..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Movu..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Renomu..."
 
@@ -876,13 +879,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "Fori_gu..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Kopiu"
@@ -892,11 +895,11 @@
 msgid "Randomize"
 msgstr "Hazarda"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordigu"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Montru dosiernomajn _tekstojn"
 
@@ -908,7 +911,8 @@
 msgid "Save collection _as..."
 msgstr "Ko_nservu kolekton kiel..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Trovu _duplikatojn..."
 
@@ -1062,7 +1066,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Elektu duplikatojn de grupo _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Aldonu al nova kolekto"
 
@@ -1086,13 +1090,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Grandeco"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Dato"
 
@@ -2210,7 +2214,7 @@
 msgid "C_lose window"
 msgstr "Fe_rmu fenestron"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Ascendante"
 
@@ -2632,7 +2636,7 @@
 msgid "Delete..."
 msgstr "Fori_gu..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Malaktivigu Dosierajn Filtrilojn"
@@ -2642,7 +2646,7 @@
 msgid "Enable file grouping"
 msgstr "Malaktivigu Dosierajn Filtrilojn"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Malaktivigu Dosierajn Filtrilojn"
@@ -3535,7 +3539,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3545,7 +3549,7 @@
 msgid "Set mark %d"
 msgstr "Elektu ĉion"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3555,7 +3559,8 @@
 msgid "Reset mark %d"
 msgstr "Elektu ĉion"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3575,12 +3580,12 @@
 msgid "Select mark %d"
 msgstr "Elektu ĉion"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Elektu ĉion"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Aldonu Legosignon"
@@ -3590,7 +3595,7 @@
 msgid "Add mark %d"
 msgstr "Aldonu Legosignon"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3600,7 +3605,7 @@
 msgid "Intersection with mark %d"
 msgstr "Elektu ĉion"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6471,7 +6476,7 @@
 msgid "_New folder..."
 msgstr "_Nova dosierujo..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Montru kiel _ikonoj"
@@ -6486,20 +6491,20 @@
 msgid "Show _hidden files"
 msgstr "Montru kaŝitajn dosierojn"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Ĝis_datigu"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Montru kiel _ikonoj"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Montru _miniaturojn"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/es.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/es.po	Mon Jul 10 07:53:04 2017 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2009-11-03 00:36+0100\n"
 "Last-Translator: Redy Rodríguez <redy@users.sf.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -76,7 +76,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nombre"
 
@@ -778,7 +778,7 @@
 msgstr "Vacía"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Cargando miniaturas..."
 
@@ -789,7 +789,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Ver en una ventana _nueva"
 
@@ -831,20 +832,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Copiar..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Mover..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
@@ -852,13 +855,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "Borrar..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Path de copia"
 
@@ -866,11 +869,11 @@
 msgid "Randomize"
 msgstr "Aleatorio"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "M_ostrar nombres de archivos"
 
@@ -882,7 +885,8 @@
 msgid "Save collection _as..."
 msgstr "G_uardar colección como..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Buscar _duplicados..."
 
@@ -1032,7 +1036,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Seleccionar duplicados del grupo _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Añadir a nueva colección"
 
@@ -1055,13 +1059,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Tamaño"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Fecha"
 
@@ -2122,7 +2126,7 @@
 msgid "C_lose window"
 msgstr "Cerrar _ventana"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -2512,7 +2516,7 @@
 msgid "Delete..."
 msgstr "Borrar..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Activar a_grupar archivos"
 
@@ -2520,7 +2524,7 @@
 msgid "Enable file grouping"
 msgstr "Activar agrupar archivos"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Desactivar agrupar archivos"
 
@@ -3333,7 +3337,7 @@
 msgid "Mark _%d"
 msgstr "Marca _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Poner Marca %d"
@@ -3343,7 +3347,7 @@
 msgid "Set mark %d"
 msgstr "Poner marca %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Quitar Marca %d"
@@ -3353,7 +3357,8 @@
 msgid "Reset mark %d"
 msgstr "Quitar marca %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Cambiar Marca %d"
@@ -3373,12 +3378,12 @@
 msgid "Select mark %d"
 msgstr "Seleccionar marca %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Seleccionar marca %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Añadir marca %d"
@@ -3388,7 +3393,7 @@
 msgid "Add mark %d"
 msgstr "Añadir marca %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Intersección con Marca %d"
@@ -3398,7 +3403,7 @@
 msgid "Intersection with mark %d"
 msgstr "Intersección con marca %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Deseleccionar marca %d"
@@ -6278,7 +6283,7 @@
 msgid "_New folder..."
 msgstr "N_ueva carpeta..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Ver como _Lista"
 
@@ -6290,19 +6295,19 @@
 msgid "Show _hidden files"
 msgstr "Mostrar arc_hivos ocultos"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Actualizar"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Ver como _Iconos"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "_Mostrar miniaturas"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [NO AGRUPAR]"
 
--- a/po/et.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/et.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2002-07-31 15:40+0200\n"
 "Last-Translator: Ilmar Kerm <ikerm@hot.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nimi"
 
@@ -824,7 +824,7 @@
 msgstr "Tühi"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Laen pisipilte..."
 
@@ -836,7 +836,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Ava uues aknas"
@@ -882,14 +883,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Kopeeri..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Liiguta..."
@@ -897,7 +900,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Muuda nime..."
@@ -906,14 +909,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Kustuta..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Kopeeri"
@@ -923,12 +926,12 @@
 msgid "Randomize"
 msgstr "Segamini"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Sorteerimine"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Näita peidetud faile"
@@ -943,7 +946,8 @@
 msgid "Save collection _as..."
 msgstr "Salvesta kollektsioon kui..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Otsi duplikaadid..."
@@ -1104,7 +1108,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Lisa uude kollektsiooni"
 
@@ -1129,13 +1133,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Suurus"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -2255,7 +2259,7 @@
 msgid "C_lose window"
 msgstr "Sulge aken"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Tõusev järjestus"
 
@@ -2688,7 +2692,7 @@
 msgid "Delete..."
 msgstr "Kustuta..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Blokeeri failide filtreerimine"
@@ -2698,7 +2702,7 @@
 msgid "Enable file grouping"
 msgstr "Blokeeri failide filtreerimine"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Blokeeri failide filtreerimine"
@@ -3607,7 +3611,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3617,7 +3621,7 @@
 msgid "Set mark %d"
 msgstr "Vali kõik"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3627,7 +3631,8 @@
 msgid "Reset mark %d"
 msgstr "Vali kõik"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3647,12 +3652,12 @@
 msgid "Select mark %d"
 msgstr "Vali kõik"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Vali kõik"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Redaktorid"
@@ -3662,7 +3667,7 @@
 msgid "Add mark %d"
 msgstr "Redaktorid"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3672,7 +3677,7 @@
 msgid "Intersection with mark %d"
 msgstr "Vali kõik"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6642,7 +6647,7 @@
 msgid "_New folder..."
 msgstr "Uus kataloog..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Nimekiri ikoonidena"
@@ -6657,22 +6662,22 @@
 msgid "Show _hidden files"
 msgstr "Näita peidetud faile"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Uuenda"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Nimekiri ikoonidena"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Näita pisipilte"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/eu.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/eu.po	Mon Jul 10 07:53:04 2017 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-10-14 23:08+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -77,7 +77,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Izena"
 
@@ -798,7 +798,7 @@
 msgstr "Hutsik"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Argazkitxoak kargatzen..."
 
@@ -809,7 +809,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Leiho _berrian ikusi"
 
@@ -853,20 +854,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
@@ -874,13 +877,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Ezabatu..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "K_opiatu"
@@ -890,11 +893,11 @@
 msgid "Randomize"
 msgstr "Ausazkoa"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordenatu"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Erakutsi fitxategi-izen _testua"
 
@@ -906,7 +909,8 @@
 msgid "Save collection _as..."
 msgstr "Gorde bilduma _horrela..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Bikoi_ztuak bilatu..."
 
@@ -1060,7 +1064,7 @@
 msgid "Select group _2 duplicates"
 msgstr "_2 Taldearen bikoiztutakoak hautatu"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Bilduma berria gehitu"
 
@@ -1084,13 +1088,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Tamaina"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2208,7 +2212,7 @@
 msgid "C_lose window"
 msgstr "Leihoa it_xi"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Gorantz"
 
@@ -2630,7 +2634,7 @@
 msgid "Delete..."
 msgstr "_Ezabatu..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Fitxategi Iragaztea Ezgaitu"
@@ -2640,7 +2644,7 @@
 msgid "Enable file grouping"
 msgstr "Fitxategi Iragaztea Ezgaitu"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Fitxategi Iragaztea Ezgaitu"
@@ -3533,7 +3537,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3543,7 +3547,7 @@
 msgid "Set mark %d"
 msgstr "Hautatu dena"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3553,7 +3557,8 @@
 msgid "Reset mark %d"
 msgstr "Hautatu dena"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3573,12 +3578,12 @@
 msgid "Select mark %d"
 msgstr "Hautatu dena"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Hautatu dena"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Laster-marka gehitu"
@@ -3588,7 +3593,7 @@
 msgid "Add mark %d"
 msgstr "Laster-marka gehitu"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3598,7 +3603,7 @@
 msgid "Intersection with mark %d"
 msgstr "Hautatu dena"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6467,7 +6472,7 @@
 msgid "_New folder..."
 msgstr "Ka_rpeta berria..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Ikonoak bezala _ikusi"
@@ -6482,20 +6487,20 @@
 msgid "Show _hidden files"
 msgstr "Erakutsi ezkutukoak"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Freskatu"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Ikonoak bezala _ikusi"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Ar_gazkitxoak bistarazi"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/fi.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/fi.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-10-14 02:26+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
@@ -79,7 +79,7 @@
 # src/dupe.c:1652 src/dupe.c:1941
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nimi"
 
@@ -880,7 +880,7 @@
 
 # src/collect-table.c:100 src/dupe.c:668 src/filelist.c:1813
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Ladataan pienoiskuvia..."
 
@@ -894,7 +894,8 @@
 # src/menu.c:906 src/menu.c:964
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Näytä _uudessa ikkunassa"
 
@@ -948,7 +949,8 @@
 # src/menu.c:969
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
@@ -956,7 +958,8 @@
 # src/menu.c:971
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Sii_rrä..."
 
@@ -965,7 +968,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Nimeä uudelleen..."
 
@@ -975,14 +978,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Poista..."
 
 # src/utilops.c:592
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Kopioi"
@@ -994,11 +997,11 @@
 msgstr "Satunnainen"
 
 # src/menu.c:559
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Lajittele"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "_Näytä tiedostonimet"
 
@@ -1013,7 +1016,8 @@
 msgstr "T_allenna kokoelma nimellä..."
 
 # src/collect-table.c:644 src/menu.c:885
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Etsi kaks_oiskappaleita..."
 
@@ -1193,7 +1197,7 @@
 msgstr "Valitse ryhmän _2 kaksoiskappaleet"
 
 # src/dupe.c:1398
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Lisää uuteen kokoelmaan"
 
@@ -1221,14 +1225,14 @@
 # src/dupe.c:1653 src/dupe.c:1942
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Koko"
 
 # src/dupe.c:1654 src/dupe.c:1943
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Päiväys"
 
@@ -2424,7 +2428,7 @@
 msgstr "_Sulje ikkuna"
 
 # src/window.c:87
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -2906,7 +2910,7 @@
 msgstr "_Poista..."
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Ei tiedostojen suodatusta"
@@ -2918,7 +2922,7 @@
 msgstr "Ei tiedostojen suodatusta"
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Ei tiedostojen suodatusta"
@@ -3923,7 +3927,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3934,7 +3938,7 @@
 msgid "Set mark %d"
 msgstr "Valitse kaikki"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3945,7 +3949,8 @@
 msgid "Reset mark %d"
 msgstr "Valitse kaikki"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3969,12 +3974,12 @@
 msgstr "Valitse kaikki"
 
 # src/collect-table.c:627 src/dupe.c:1391 src/dupe.c:1563
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Valitse kaikki"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Lisää kirjanmerkki"
@@ -3984,7 +3989,7 @@
 msgid "Add mark %d"
 msgstr "Lisää kirjanmerkki"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3995,7 +4000,7 @@
 msgid "Intersection with mark %d"
 msgstr "Valitse kaikki"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -7150,7 +7155,7 @@
 msgstr "_Uusi kansio..."
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Näytä _kuvakkeina"
@@ -7168,22 +7173,22 @@
 msgstr "Näytä piilotetut"
 
 # src/menu.c:891 src/menu.c:920
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "V_irkistä"
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Näytä _kuvakkeina"
 
 # src/preferences.c:603
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Näytä _pienoiskuvat"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/fr.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/fr.po	Mon Jul 10 07:53:04 2017 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2012-08-16 23:32+0100\n"
 "Last-Translator: Laurent Monin <i18n@norz.org>\n"
 "Language-Team: french <geeqie-devel@lists.sourceforge.net>\n"
@@ -82,7 +82,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nom"
 
@@ -783,7 +783,7 @@
 msgstr "Vide"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Chargement des vignettes..."
 
@@ -794,7 +794,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Voir dans une _nouvelle fenêtre"
 
@@ -836,20 +837,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Copier..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Déplacer..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Renommer..."
 
@@ -857,13 +860,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Supprimer..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Copier chemin"
 
@@ -871,11 +874,11 @@
 msgid "Randomize"
 msgstr "Tri aléatoire"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Trier"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Montrer le _nom de fichier"
 
@@ -887,7 +890,8 @@
 msgid "Save collection _as..."
 msgstr "Enregistrer collection _sous..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Rechercher les _doublons..."
 
@@ -1037,7 +1041,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Sélectionner les doubles du groupe _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Ajouter à la nouvelle collection"
 
@@ -1060,13 +1064,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Taille"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Date"
 
@@ -2128,7 +2132,7 @@
 msgid "C_lose window"
 msgstr "Fermer _la fenêtre"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -2518,7 +2522,7 @@
 msgid "Delete..."
 msgstr "Supprimer..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "_Grouper les fichiers"
 
@@ -2526,7 +2530,7 @@
 msgid "Enable file grouping"
 msgstr "Grouper les fichiers"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Dégrouper les _fichiers"
 
@@ -3337,7 +3341,7 @@
 msgid "Mark _%d"
 msgstr "Marque _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Ajout marque %d"
@@ -3347,7 +3351,7 @@
 msgid "Set mark %d"
 msgstr "Ajout marque %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Suppression marque %d"
@@ -3357,7 +3361,8 @@
 msgid "Reset mark %d"
 msgstr "Suppression marque %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Bascule marque %d"
@@ -3377,12 +3382,12 @@
 msgid "Select mark %d"
 msgstr "Sélectionner la marque %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Sélectionner la marque %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "Ajouter la marque %d"
@@ -3392,7 +3397,7 @@
 msgid "Add mark %d"
 msgstr "Ajouter marque %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Intersection avec marque %d"
@@ -3402,7 +3407,7 @@
 msgid "Intersection with mark %d"
 msgstr "Intersection avec marque %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Déselection marque %d"
@@ -6284,7 +6289,7 @@
 msgid "_New folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Vue en _Liste"
 
@@ -6296,19 +6301,19 @@
 msgid "Show _hidden files"
 msgstr "Montrer les fichiers cac_hés"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Ra_fraîchir"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Voir en _Icônes"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Montrer les vigne_ttes"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [DÉGROUPÉ]"
 
--- a/po/hu.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/hu.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2004-02-22 17:20+0100\n"
 "Last-Translator: Sári Gábor <saga@externet.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -82,7 +82,7 @@
 # src/dupe.c:1652 src/dupe.c:1941
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Név"
 
@@ -909,7 +909,7 @@
 
 # src/collect-table.c:100 src/dupe.c:668 src/filelist.c:1813
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Indexképek betöltése..."
 
@@ -923,7 +923,8 @@
 # src/menu.c:906 src/menu.c:964
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Nézet új _ablakban"
 
@@ -977,7 +978,8 @@
 # src/menu.c:969
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Másolás..."
 
@@ -985,7 +987,8 @@
 # src/menu.c:971
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "M_ozgatás..."
 
@@ -994,7 +997,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Át_nevezés..."
 
@@ -1004,14 +1007,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Törlés..."
 
 # src/utilops.c:592
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Másolás"
@@ -1023,12 +1026,12 @@
 msgstr "Véletlen"
 
 # src/menu.c:559
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Rendezés"
 
 # src/ui_pathsel.c:764
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Fájlnév mu_tatása"
 
@@ -1043,7 +1046,8 @@
 msgstr "Gyűjtemény mentése min_t..."
 
 # src/collect-table.c:644 src/menu.c:885
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Duplikációk keresése..."
 
@@ -1226,7 +1230,7 @@
 msgstr ""
 
 # src/dupe.c:1398
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Hozzáadás egy új gyűjteményhez"
 
@@ -1254,14 +1258,14 @@
 # src/dupe.c:1653 src/dupe.c:1942
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Méret"
 
 # src/dupe.c:1654 src/dupe.c:1943
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Dátum"
 
@@ -2454,7 +2458,7 @@
 msgstr "Ablak _bezárása"
 
 # src/window.c:87
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Növekvő"
 
@@ -2944,7 +2948,7 @@
 msgstr "_Törlés..."
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Fájl szűrés letiltása"
@@ -2956,7 +2960,7 @@
 msgstr "Fájl szűrés letiltása"
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Fájl szűrés letiltása"
@@ -3980,7 +3984,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3991,7 +3995,7 @@
 msgid "Set mark %d"
 msgstr "Mindet kijelölni"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -4002,7 +4006,8 @@
 msgid "Reset mark %d"
 msgstr "Mindet kijelölni"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -4026,12 +4031,12 @@
 msgstr "Mindet kijelölni"
 
 # src/collect-table.c:627 src/dupe.c:1391 src/dupe.c:1563
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Mindet kijelölni"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Könyvjelző hozzáadása"
@@ -4041,7 +4046,7 @@
 msgid "Add mark %d"
 msgstr "Könyvjelző hozzáadása"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -4052,7 +4057,7 @@
 msgid "Intersection with mark %d"
 msgstr "Mindet kijelölni"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -7280,7 +7285,7 @@
 msgstr "Új mappa..."
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "_Ikonnézet"
@@ -7298,22 +7303,22 @@
 msgstr "Rejtett fájlok mutatása"
 
 # src/menu.c:891 src/menu.c:920
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Frissítés"
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "_Ikonnézet"
 
 # src/preferences.c:603
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Inde_xképek megjelenítése"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/id.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/id.po	Mon Jul 10 07:53:04 2017 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2003-04-14 11:03GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -77,7 +77,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nama"
 
@@ -826,7 +826,7 @@
 msgstr "Kosong"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Memuatkan thumb..."
 
@@ -838,7 +838,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Lihat di jendela baru"
@@ -884,14 +885,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Salin..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Pindah..."
@@ -899,7 +902,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Ganti nama..."
@@ -908,14 +911,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Hapus..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Salin"
@@ -925,12 +928,12 @@
 msgid "Randomize"
 msgstr "Acak"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Urutkan"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Tampilkan sembunyi"
@@ -945,7 +948,8 @@
 msgid "Save collection _as..."
 msgstr "Simpan koleksi sebagai..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Cari duplikat..."
@@ -1105,7 +1109,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Tambah ke koleksi baru"
 
@@ -1130,13 +1134,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Ukuran"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Tanggal"
 
@@ -2256,7 +2260,7 @@
 msgid "C_lose window"
 msgstr "Tutup jendela"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Menaik"
 
@@ -2689,7 +2693,7 @@
 msgid "Delete..."
 msgstr "Hapus..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Tiadakan File Filtering"
@@ -2699,7 +2703,7 @@
 msgid "Enable file grouping"
 msgstr "Tiadakan File Filtering"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Tiadakan File Filtering"
@@ -3608,7 +3612,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3618,7 +3622,7 @@
 msgid "Set mark %d"
 msgstr "Pilih semua"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3628,7 +3632,8 @@
 msgid "Reset mark %d"
 msgstr "Pilih semua"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3648,12 +3653,12 @@
 msgid "Select mark %d"
 msgstr "Pilih semua"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Pilih semua"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Editor"
@@ -3663,7 +3668,7 @@
 msgid "Add mark %d"
 msgstr "Editor"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3673,7 +3678,7 @@
 msgid "Intersection with mark %d"
 msgstr "Pilih semua"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6652,7 +6657,7 @@
 msgid "_New folder..."
 msgstr "Folder baru..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Lihat sebagai ikon"
@@ -6667,22 +6672,22 @@
 msgid "Show _hidden files"
 msgstr "Tampilkan sembunyi"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Refresh"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Lihat sebagai ikon"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Tampilkan thumbnail"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/it.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/it.po	Mon Jul 10 07:53:04 2017 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-06-12 09:40+0200\n"
 "Last-Translator: Kostantino <ciclope10ATalice.it>\n"
 "Language-Team: italiano <it@li.org>\n"
@@ -78,7 +78,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nome"
 
@@ -799,7 +799,7 @@
 msgstr "Vuota"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Sto caricando le miniature..."
 
@@ -810,7 +810,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Visualizza in una _nuova finestra"
 
@@ -854,20 +855,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Copia..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Muovi..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
@@ -875,13 +878,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "E_limina..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Copia"
@@ -891,11 +894,11 @@
 msgid "Randomize"
 msgstr "Casuale"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Mostra i _testi dei file"
 
@@ -907,7 +910,8 @@
 msgid "Save collection _as..."
 msgstr "Salva la collezione _come..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Trova _duplicati..."
 
@@ -1061,7 +1065,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Seleziona i duplicati del gruppo _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Aggiungi alla nuova collezione"
 
@@ -1085,13 +1089,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Dimensione"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2213,7 +2217,7 @@
 msgid "C_lose window"
 msgstr "Chi_udi la finestra"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -2635,7 +2639,7 @@
 msgid "Delete..."
 msgstr "E_limina..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Disabilita i filtri sui file"
@@ -2645,7 +2649,7 @@
 msgid "Enable file grouping"
 msgstr "Disabilita i filtri sui file"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Disabilita i filtri sui file"
@@ -3538,7 +3542,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3548,7 +3552,7 @@
 msgid "Set mark %d"
 msgstr "Seleziona tutto"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3558,7 +3562,8 @@
 msgid "Reset mark %d"
 msgstr "Seleziona tutto"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3578,12 +3583,12 @@
 msgid "Select mark %d"
 msgstr "Seleziona tutto"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Seleziona tutto"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Aggiungi segnalibro"
@@ -3593,7 +3598,7 @@
 msgid "Add mark %d"
 msgstr "Aggiungi segnalibro"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3603,7 +3608,7 @@
 msgid "Intersection with mark %d"
 msgstr "Seleziona tutto"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6483,7 +6488,7 @@
 msgid "_New folder..."
 msgstr "_Nuova cartella..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Vedi come _icone"
@@ -6498,20 +6503,20 @@
 msgid "Show _hidden files"
 msgstr "Mostra i file nascosti"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Ag_giorna"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Vedi come _icone"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Mostra le _miniature"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/ja.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ja.po	Mon Jul 10 07:53:04 2017 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2005-02-17 15:45+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -77,7 +77,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "名前"
 
@@ -798,7 +798,7 @@
 msgstr "空です"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "サムネイルを開く..."
 
@@ -809,7 +809,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "新しいウィンドウで表示(_N)"
 
@@ -853,20 +854,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "移動(_M)..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
@@ -874,13 +877,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "削除(_D)..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "コピー(_C)"
@@ -890,11 +893,11 @@
 msgid "Randomize"
 msgstr "ランダム"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "ソート(_S)"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "ファイル名表示(_T)"
 
@@ -906,7 +909,8 @@
 msgid "Save collection _as..."
 msgstr "別名でコレクションの保存(_A)..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "複製の検索(_F)..."
 
@@ -1060,7 +1064,7 @@
 msgid "Select group _2 duplicates"
 msgstr "複製グループ2の選択(_2)"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "新しいコレクションの追加"
 
@@ -1084,13 +1088,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "サイズ"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "日付"
 
@@ -2208,7 +2212,7 @@
 msgid "C_lose window"
 msgstr "ウィンドウを閉じる(_L)"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "昇順にする"
 
@@ -2630,7 +2634,7 @@
 msgid "Delete..."
 msgstr "削除(_D)..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "フィルタリングしない"
@@ -2640,7 +2644,7 @@
 msgid "Enable file grouping"
 msgstr "フィルタリングしない"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "フィルタリングしない"
@@ -3533,7 +3537,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3543,7 +3547,7 @@
 msgid "Set mark %d"
 msgstr "全て選択"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3553,7 +3557,8 @@
 msgid "Reset mark %d"
 msgstr "全て選択"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3573,12 +3578,12 @@
 msgid "Select mark %d"
 msgstr "全て選択"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "全て選択"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "ブックマークへ追加します"
@@ -3588,7 +3593,7 @@
 msgid "Add mark %d"
 msgstr "ブックマークへ追加します"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3598,7 +3603,7 @@
 msgid "Intersection with mark %d"
 msgstr "全て選択"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6483,7 +6488,7 @@
 msgid "_New folder..."
 msgstr "新しいフォルダ(_N)..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "アイコン表示(_I)"
@@ -6498,20 +6503,20 @@
 msgid "Show _hidden files"
 msgstr "隠す"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "更新(_F)"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "アイコン表示(_I)"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "サムネイルの表示(_T)"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/ko.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ko.po	Mon Jul 10 07:53:04 2017 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-01-29 01:15-0500\n"
 "Last-Translator: Hyun-Jin Moon <moonhyunjin@gmail.com>\n"
 "Language-Team: Korean\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "이름"
 
@@ -758,7 +758,7 @@
 msgstr ""
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr ""
 
@@ -769,7 +769,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr ""
 
@@ -813,20 +814,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "복사(_C)"
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "옮기기(_M)"
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)"
 
@@ -834,13 +837,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "지우기(_D)"
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr ""
 
@@ -848,11 +851,11 @@
 msgid "Randomize"
 msgstr ""
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "정렬(_S)"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr ""
 
@@ -864,7 +867,8 @@
 msgid "Save collection _as..."
 msgstr "앨범 다른 이름으로 저장(_a)"
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "중복 파일 찾기(_F)"
 
@@ -1012,7 +1016,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr ""
 
@@ -1035,13 +1039,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr ""
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr ""
 
@@ -2104,7 +2108,7 @@
 msgid "C_lose window"
 msgstr "창닫기(_C)"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr ""
 
@@ -2508,7 +2512,7 @@
 msgid "Delete..."
 msgstr "지우기(_D)"
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr ""
 
@@ -2516,7 +2520,7 @@
 msgid "Enable file grouping"
 msgstr ""
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr ""
 
@@ -3373,7 +3377,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3383,7 +3387,7 @@
 msgid "Set mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3393,7 +3397,8 @@
 msgid "Reset mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3413,12 +3418,12 @@
 msgid "Select mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr ""
@@ -3428,7 +3433,7 @@
 msgid "Add mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3438,7 +3443,7 @@
 msgid "Intersection with mark %d"
 msgstr "전체 선택"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6180,7 +6185,7 @@
 msgid "_New folder..."
 msgstr "새 폴더(_e)"
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "아이콘으로 보기(_i)"
@@ -6195,20 +6200,20 @@
 msgid "Show _hidden files"
 msgstr "파일 탐색기 여닫기(_H)"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "새로고침(_F)"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "아이콘으로 보기(_i)"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr ""
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/nb.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/nb.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2001-12-06 16:27+0100\n"
 "Last-Translator: Torgeir Ness Sundli <torgeir@mp3bil.no>\n"
 "Language-Team: Norwegian <?>\n"
@@ -74,7 +74,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Navn"
 
@@ -823,7 +823,7 @@
 msgstr "Tom"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Åpner thumbnails..."
 
@@ -835,7 +835,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Vis i nytt vindu"
@@ -881,14 +882,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Kopier..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Flytt..."
@@ -896,7 +899,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Omdøp..."
@@ -905,14 +908,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Slett..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Kopier"
@@ -922,12 +925,12 @@
 msgid "Randomize"
 msgstr "Tilfeldig"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Sorter"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Vis skjulte"
@@ -942,7 +945,8 @@
 msgid "Save collection _as..."
 msgstr "Lagre samling som..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Finn dubletter..."
@@ -1103,7 +1107,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Legg til til ny samling"
 
@@ -1128,13 +1132,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Størrelse"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Dato"
 
@@ -2255,7 +2259,7 @@
 msgid "C_lose window"
 msgstr "Lukk vindu"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -2690,7 +2694,7 @@
 msgid "Delete..."
 msgstr "Slett..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Deaktiver fil filtrering"
@@ -2700,7 +2704,7 @@
 msgid "Enable file grouping"
 msgstr "Deaktiver fil filtrering"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Deaktiver fil filtrering"
@@ -3609,7 +3613,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3619,7 +3623,7 @@
 msgid "Set mark %d"
 msgstr "Velg alle"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3629,7 +3633,8 @@
 msgid "Reset mark %d"
 msgstr "Velg alle"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3649,12 +3654,12 @@
 msgid "Select mark %d"
 msgstr "Velg alle"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Velg alle"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Redigerere"
@@ -3664,7 +3669,7 @@
 msgid "Add mark %d"
 msgstr "Redigerere"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3674,7 +3679,7 @@
 msgid "Intersection with mark %d"
 msgstr "Velg alle"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6643,7 +6648,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Dimensjoner"
@@ -6658,22 +6663,22 @@
 msgid "Show _hidden files"
 msgstr "Vis skjulte"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Oppdater"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Dimensjoner"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Lagre thumbnails"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/nl.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/nl.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-01-13 18:35+0100\n"
 "Last-Translator: Marcel Pol <mpol@gmx.net>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -72,7 +72,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Naam"
 
@@ -781,7 +781,7 @@
 msgstr "Legen"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Miniaturen worden geladen..."
 
@@ -792,7 +792,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Weergeven in _nieuw venster"
 
@@ -834,20 +835,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopiëren..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Ver_plaatsen..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Hernoemen..."
 
@@ -855,13 +858,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Verwijderen..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Kopiëren pad"
 
@@ -869,11 +872,11 @@
 msgid "Randomize"
 msgstr "Willekeurig"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Sorteren"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Bestandsnaam _tekst tonen"
 
@@ -885,7 +888,8 @@
 msgid "Save collection _as..."
 msgstr "Collectie opslaan _als..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Dubbele zoeken..."
 
@@ -1035,7 +1039,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Groep _2 dubbele selecteren"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Toevoegen aan nieuwe collectie"
 
@@ -1058,13 +1062,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Grootte"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2142,7 +2146,7 @@
 msgid "C_lose window"
 msgstr "Venster sl_uiten"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Oplopend"
 
@@ -2533,7 +2537,7 @@
 msgid "Delete..."
 msgstr "Verwijderen..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Bestands_groepering inschakelen"
 
@@ -2541,7 +2545,7 @@
 msgid "Enable file grouping"
 msgstr "Bestandsgroepering inschakelen"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Bestandsgroeper_ing uitschakelen"
 
@@ -3401,7 +3405,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3411,7 +3415,7 @@
 msgid "Set mark %d"
 msgstr "Alles selecteren"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3421,7 +3425,8 @@
 msgid "Reset mark %d"
 msgstr "Alles selecteren"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3441,12 +3446,12 @@
 msgid "Select mark %d"
 msgstr "Alles selecteren"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Alles selecteren"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Favoriet toevoegen"
@@ -3456,7 +3461,7 @@
 msgid "Add mark %d"
 msgstr "Favoriet toevoegen"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3466,7 +3471,7 @@
 msgid "Intersection with mark %d"
 msgstr "Alles selecteren"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6393,7 +6398,7 @@
 msgid "_New folder..."
 msgstr "_Nieuw map..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Als _pictogrammen weergeven"
@@ -6408,20 +6413,20 @@
 msgid "Show _hidden files"
 msgstr "Verborgen weergeven"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Herladen"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Als _pictogrammen weergeven"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "_Miniaturen tonen"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/pl.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/pl.po	Mon Jul 10 07:53:04 2017 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2017-01-08 17:41+0100\n"
 "Last-Translator: Tomasz Golinski <tomaszg@math.uwb.edu.pl>\n"
 "Language-Team: \n"
@@ -70,7 +70,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nazwa"
 
@@ -770,7 +770,7 @@
 msgstr "Pusta"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Wczytywanie miniatur..."
 
@@ -781,7 +781,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Podgląd w _nowym oknie"
 
@@ -823,20 +824,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopiuj..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "P_rzenieś..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Zm_ień nazwę..."
 
@@ -844,13 +847,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Usuń..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "S_kopiuj ścieżkę"
 
@@ -858,11 +861,11 @@
 msgid "Randomize"
 msgstr "Losowo"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Uporządkuj"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Pokaż nazwę pliku"
 
@@ -874,7 +877,8 @@
 msgid "Save collection _as..."
 msgstr "Zapisz kolekcję jako..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Wyszukaj duplikaty..."
 
@@ -1024,7 +1028,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Wybierz _drugą grupę duplikatów"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Dodaj do nowej kolekcji"
 
@@ -1047,13 +1051,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Rozmiar"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2112,7 +2116,7 @@
 msgid "C_lose window"
 msgstr "Zamknij okno"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Rosnąco"
 
@@ -2501,7 +2505,7 @@
 msgid "Delete..."
 msgstr "_Usuń..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Włącz _grupowanie plików"
 
@@ -2509,7 +2513,7 @@
 msgid "Enable file grouping"
 msgstr "Włącz grupowanie plików"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Wyłącz grupowanie plików"
 
@@ -3317,7 +3321,7 @@
 msgid "Mark _%d"
 msgstr "Znacznik _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "U_staw znacznik %d"
@@ -3327,7 +3331,7 @@
 msgid "Set mark %d"
 msgstr "Ustaw znacznik %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Usuń znacznik %d"
@@ -3337,7 +3341,8 @@
 msgid "Reset mark %d"
 msgstr "Usuń znacznik %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Przełącz znacznik %d"
@@ -3357,12 +3362,12 @@
 msgid "Select mark %d"
 msgstr "Wybierz znacznik %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "Wybierz znacznik %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "Dodaj znacznik %d"
@@ -3372,7 +3377,7 @@
 msgid "Add mark %d"
 msgstr "Dodaj znacznik %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Część wspólna ze znacznikiem %d"
@@ -3382,7 +3387,7 @@
 msgid "Intersection with mark %d"
 msgstr "Część wspólna ze znacznikiem %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Odznacz znacznik %d"
@@ -6215,7 +6220,7 @@
 msgid "_New folder..."
 msgstr "Nowy _folder..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Wyświetlanie jako _lista"
 
@@ -6227,19 +6232,19 @@
 msgid "Show _hidden files"
 msgstr "Wyświetlanie ukrytych plików"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Odśwież"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Wyświetlanie jako _ikony"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Pokaż _miniaturki"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr "[BEZ GRUPOWANIA]"
 
--- a/po/pt_BR.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/pt_BR.po	Mon Jul 10 07:53:04 2017 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-05-14 10:28-0300\n"
 "Last-Translator: Sérgio Brandão Cipolla <secipolla@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -73,7 +73,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nome"
 
@@ -775,7 +775,7 @@
 msgstr "Vazio"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Carregando miniaturas..."
 
@@ -786,7 +786,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Visualizar em uma _nova janela"
 
@@ -828,20 +829,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "Co_piar..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Mover..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Renomear..."
 
@@ -849,13 +852,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Apagar..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Copiar o caminho"
 
@@ -863,11 +866,11 @@
 msgid "Randomize"
 msgstr "Aleatorizar"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Exibir o _nome do arquivo"
 
@@ -879,7 +882,8 @@
 msgid "Save collection _as..."
 msgstr "Salvar a coleção _como..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Procurar por _duplicatas..."
 
@@ -1029,7 +1033,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Selecionar duplicatas do grupo _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Adicionar a uma nova coleção"
 
@@ -1052,13 +1056,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Tamanho"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2118,7 +2122,7 @@
 msgid "C_lose window"
 msgstr "_Fechar a janela"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Crescente"
 
@@ -2508,7 +2512,7 @@
 msgid "Delete..."
 msgstr "Apagar..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Habilitar o a_grupamento de arquivos"
 
@@ -2516,7 +2520,7 @@
 msgid "Enable file grouping"
 msgstr "Habilitar o agrupamento de arquivos"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Desabilitar o agrupame_nto de arquivos"
 
@@ -3329,7 +3333,7 @@
 msgid "Mark _%d"
 msgstr "Marcação _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Marcar a marcação %d"
@@ -3339,7 +3343,7 @@
 msgid "Set mark %d"
 msgstr "Marcar a marcação %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Desmarcar a marcação %d"
@@ -3349,7 +3353,8 @@
 msgid "Reset mark %d"
 msgstr "Desmarcar a marcação %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Marcar/D_esmarcar a marcação %d"
@@ -3369,12 +3374,12 @@
 msgid "Select mark %d"
 msgstr "Selecionar a marcação %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Selecionar a marcação %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Adicionar a marcação %d"
@@ -3384,7 +3389,7 @@
 msgid "Add mark %d"
 msgstr "Adicionar a marcação %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Interseção com a marcação %d"
@@ -3394,7 +3399,7 @@
 msgid "Intersection with mark %d"
 msgstr "Interseção com a marcação %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "De_sselecionar a marcação %d"
@@ -6272,7 +6277,7 @@
 msgid "_New folder..."
 msgstr "_Novo diretório..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Visualizar em _Lista"
 
@@ -6284,19 +6289,19 @@
 msgid "Show _hidden files"
 msgstr "Exibir arquivos _ocultos"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Atualizar"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Visualizar em _Ícones"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Exibir _miniaturas"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [SEM AGRUPAMENTO]"
 
--- a/po/ro.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ro.po	Mon Jul 10 07:53:04 2017 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2009-07-24 17:16+0200\n"
 "Last-Translator: Sabin Iacob <iacobs@gmail.com>\n"
 "Language-Team: Romanian <rtfs-project@sourceforge.net>\n"
@@ -72,7 +72,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Nume"
 
@@ -774,7 +774,7 @@
 msgstr "Gol"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Încarc miniaturile..."
 
@@ -785,7 +785,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Vizualizează în fereastră _nouă"
 
@@ -827,20 +828,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Copiere..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Mutare..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Redenumire..."
 
@@ -848,13 +851,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Ştergere..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Copiază cale"
 
@@ -862,11 +865,11 @@
 msgid "Randomize"
 msgstr "Amestecă"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Sortare"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Afişează numele fişierelor"
 
@@ -878,7 +881,8 @@
 msgid "Save collection _as..."
 msgstr "Salvează colecţia c_a..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Caută duplicatele..."
 
@@ -1028,7 +1032,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Selecţie duplicate-grup _1"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Adaugă la colecţia nouă"
 
@@ -1051,13 +1055,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Mărime"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Data"
 
@@ -2118,7 +2122,7 @@
 msgid "C_lose window"
 msgstr "Î_nchide fereastra"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Ascendentă"
 
@@ -2508,7 +2512,7 @@
 msgid "Delete..."
 msgstr "Șterge..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Activează _grupare fișiere"
 
@@ -2516,7 +2520,7 @@
 msgid "Enable file grouping"
 msgstr "Activează grupare fișiere"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Dezactivează g_rupare fişiere"
 
@@ -3329,7 +3333,7 @@
 msgid "Mark _%d"
 msgstr "Marcaj _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Setează marcaj %d"
@@ -3339,7 +3343,7 @@
 msgid "Set mark %d"
 msgstr "Setează marcaj %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Resetează marcaj %d"
@@ -3349,7 +3353,8 @@
 msgid "Reset mark %d"
 msgstr "Resetează marcaj %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Comu_tă marcaj %d"
@@ -3369,12 +3374,12 @@
 msgid "Select mark %d"
 msgstr "Selectează marcaj %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Selectează marcaj %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Adaugă marcaj %d"
@@ -3384,7 +3389,7 @@
 msgid "Add mark %d"
 msgstr "Adaugă marcaj %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Intersectează cu marcaj %d"
@@ -3394,7 +3399,7 @@
 msgid "Intersection with mark %d"
 msgstr "Intersectează cu marcaj %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Deselectează marcaj %d"
@@ -6263,7 +6268,7 @@
 msgid "_New folder..."
 msgstr "Dosar _nou..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Afișează ca _listă"
 
@@ -6275,19 +6280,19 @@
 msgid "Show _hidden files"
 msgstr "Afișează fişierele _ascunse"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Actualizează"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Afișează ca _icon-uri"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Afişare miniaturi"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [FĂRĂ GRUPARE]"
 
--- a/po/ru.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/ru.po	Mon Jul 10 07:53:04 2017 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-02-12 20:23+0300\n"
 "Last-Translator: Denis Silakov <d_uragan@rambler.ru>\n"
 "Language-Team: Russian <gnome-cyr@lists.gnome.org>\n"
@@ -81,7 +81,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Название"
 
@@ -781,7 +781,7 @@
 msgstr "Пусто"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Загружаются миниатюры..."
 
@@ -792,7 +792,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Просмотр в _новом окне"
 
@@ -834,20 +835,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Копировать..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Переместить..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Пере_именовать..."
 
@@ -855,13 +858,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Удалить..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Копировать путь"
 
@@ -869,11 +872,11 @@
 msgid "Randomize"
 msgstr "Случайно"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "Со_ртировать"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Показать _названия файлов"
 
@@ -885,7 +888,8 @@
 msgid "Save collection _as..."
 msgstr "Сохранить коллекцию _как..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "На_йти повторяющиеся..."
 
@@ -1035,7 +1039,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Выбрать повторяющуюся группу _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Добавить в новую коллекцию"
 
@@ -1058,13 +1062,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Размер файла"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Дата"
 
@@ -2133,7 +2137,7 @@
 msgid "C_lose window"
 msgstr "_Закрыть окно"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "По увеличению"
 
@@ -2525,7 +2529,7 @@
 msgid "Delete..."
 msgstr "Удалить..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "_Выключить отбор файлов"
 
@@ -2533,7 +2537,7 @@
 msgid "Enable file grouping"
 msgstr "Включить отбор файлов"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "В_ыключить отбор файлов"
 
@@ -3346,7 +3350,7 @@
 msgid "Mark _%d"
 msgstr "Закладка _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Установить закладку %d"
@@ -3356,7 +3360,7 @@
 msgid "Set mark %d"
 msgstr "Установить закладку %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Сбр_осить закладку %d"
@@ -3366,7 +3370,8 @@
 msgid "Reset mark %d"
 msgstr "Сбросить закладку %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "Пе_реключиться на закладку %d"
@@ -3386,12 +3391,12 @@
 msgid "Select mark %d"
 msgstr "Выделить закладку %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Выделить закладку %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Добавить закладку %d"
@@ -3401,7 +3406,7 @@
 msgid "Add mark %d"
 msgstr "Добавить закладку %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Пересечение с закладкой %d"
@@ -3411,7 +3416,7 @@
 msgid "Intersection with mark %d"
 msgstr "Пересечение с закладкой %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Снять выделение с закладки %d"
@@ -6285,7 +6290,7 @@
 msgid "_New folder..."
 msgstr "_Создать каталог..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Показать как _список"
 
@@ -6297,19 +6302,19 @@
 msgid "Show _hidden files"
 msgstr "Показать _скрытые файлы"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "О_бновить"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Показать как _пиктограммы"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Показать м_иниатюры"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [БЕЗ ГРУППИРОВКИ]"
 
--- a/po/sk.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/sk.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-11-08 17:32+0100\n"
 "Last-Translator: Peter Tuhársky <tuharsky@misbb.sk>\n"
 "Language-Team: Peter Tuhársky <tuharsky@misbb.sk>\n"
@@ -85,7 +85,7 @@
 # src/dupe.c:1652 src/dupe.c:1941
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Meno"
 
@@ -892,7 +892,7 @@
 
 # src/collect-table.c:100 src/dupe.c:668 src/filelist.c:1811
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Načítavam náhľady..."
 
@@ -906,7 +906,8 @@
 # src/menu.c:906 src/menu.c:964
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Zobraziť v _novom okne"
 
@@ -960,7 +961,8 @@
 # src/menu.c:969
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
@@ -968,7 +970,8 @@
 # src/menu.c:971
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Presunúť..."
 
@@ -977,7 +980,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
@@ -987,14 +990,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Odstrániť..."
 
 # src/utilops.c:592
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Kopírovať cestu"
 
@@ -1005,12 +1008,12 @@
 msgstr "Náhodne"
 
 # src/menu.c:559
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Usporiadať"
 
 # src/ui_pathsel.c:764
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Zobraziť _text mena súboru"
 
@@ -1025,7 +1028,8 @@
 msgstr "Uložiť zbierku _ako..."
 
 # src/collect-table.c:644 src/menu.c:885
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Nájsť duplikáty..."
 
@@ -1206,7 +1210,7 @@
 msgstr "Vybrať skupinu _2 duplikátov"
 
 # src/dupe.c:1398
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Pridať do novej zbierky"
 
@@ -1233,14 +1237,14 @@
 # src/dupe.c:1653 src/dupe.c:1942
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Veľkosť"
 
 # src/dupe.c:1654 src/dupe.c:1943
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Dátum"
 
@@ -2396,7 +2400,7 @@
 msgstr "_Zavrieť okno"
 
 # src/window.c:87
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Vzostupne"
 
@@ -2873,7 +2877,7 @@
 msgstr "_Odstrániť..."
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Vypnúť filtrovanie súborov"
@@ -2885,7 +2889,7 @@
 msgstr "Vypnúť filtrovanie súborov"
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Vypnúť filtrovanie súborov"
@@ -3910,7 +3914,7 @@
 msgid "Mark _%d"
 msgstr "Značka _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Nastaviť značku %d"
@@ -3920,7 +3924,7 @@
 msgid "Set mark %d"
 msgstr "_Nastaviť značku %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Vynulovať značku %d"
@@ -3930,7 +3934,8 @@
 msgid "Reset mark %d"
 msgstr "_Vynulovať značku %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Prepnúť značku %d"
@@ -3953,12 +3958,12 @@
 msgstr "_Vybrať značku %d"
 
 # src/collect-table.c:627 src/dupe.c:1391 src/dupe.c:1563
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Vybrať značku %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Pridať značku %d"
@@ -3968,7 +3973,7 @@
 msgid "Add mark %d"
 msgstr "_Pridať značku %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Prienik so značkou %d"
@@ -3978,7 +3983,7 @@
 msgid "Intersection with mark %d"
 msgstr "_Prienik so značkou %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Odznačiť značku %d"
@@ -7133,7 +7138,7 @@
 msgstr "_Nový priečinok..."
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Zobraziť ako _ikony"
@@ -7150,22 +7155,22 @@
 msgstr "Ukázať _skryté súbory"
 
 # src/menu.c:891 src/menu.c:920
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Obnoviť"
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Zobraziť ako _ikony"
 
 # src/preferences.c:603
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Zobraziť _náhľady"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/sl.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/sl.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: fixme\n"
 "Last-Translator: Matej Erman <matej.erman@guest.arnes.si>\n"
 "Language-Team: slovene <sl@li.org>\n"
@@ -74,7 +74,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Ime"
 
@@ -824,7 +824,7 @@
 msgstr "Prazno"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Nalagam miniature..."
 
@@ -836,7 +836,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Poglej v novem oknu"
@@ -882,14 +883,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Prepiši..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Premakni..."
@@ -897,7 +900,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Preimenuj..."
@@ -906,14 +909,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Zbriši..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Prepiši"
@@ -923,12 +926,12 @@
 msgid "Randomize"
 msgstr "Naključno"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Razvrsti"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Pokaži vse datoteke"
@@ -943,7 +946,8 @@
 msgid "Save collection _as..."
 msgstr "Shrani zbirko kot..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Najdi dvojnike..."
@@ -1104,7 +1108,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Dodaj k novi zbirki"
 
@@ -1129,13 +1133,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Velikost"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2257,7 +2261,7 @@
 msgid "C_lose window"
 msgstr "Zapri okno"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr ""
 
@@ -2693,7 +2697,7 @@
 msgid "Delete..."
 msgstr "Zbriši..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Onemogoči filtritanje datotek"
@@ -2703,7 +2707,7 @@
 msgid "Enable file grouping"
 msgstr "Onemogoči filtritanje datotek"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Onemogoči filtritanje datotek"
@@ -3607,7 +3611,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3617,7 +3621,7 @@
 msgid "Set mark %d"
 msgstr "Izberi vse"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3627,7 +3631,8 @@
 msgid "Reset mark %d"
 msgstr "Izberi vse"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3647,12 +3652,12 @@
 msgid "Select mark %d"
 msgstr "Izberi vse"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Izberi vse"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Urejevalniki"
@@ -3662,7 +3667,7 @@
 msgid "Add mark %d"
 msgstr "Urejevalniki"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3672,7 +3677,7 @@
 msgid "Intersection with mark %d"
 msgstr "Izberi vse"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6634,7 +6639,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Mere"
@@ -6649,22 +6654,22 @@
 msgid "Show _hidden files"
 msgstr "Pokaži skrite"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Osveži"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Mere"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Predpomnilnik za miniature"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/sr.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/sr.po	Mon Jul 10 07:53:04 2017 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-01-05 17:36+0000\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Назив"
 
@@ -777,7 +777,7 @@
 msgstr "Празно"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Учитавам умањене приказе..."
 
@@ -788,7 +788,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Прикажи у _новом прозору"
 
@@ -830,20 +831,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Умножи..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Премест_и..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "П_реименуј..."
 
@@ -851,13 +854,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Обриши..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "Умно_жи путању"
 
@@ -865,11 +868,11 @@
 msgid "Randomize"
 msgstr "Начини насумичним"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "Поре_ђај"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "_Текст са именом датотеке"
 
@@ -881,7 +884,8 @@
 msgid "Save collection _as..."
 msgstr "Сачувај збирку _као..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "На_ђи дупликате..."
 
@@ -1031,7 +1035,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Изабери дупликате из _2. групе"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Додај у нову збирку"
 
@@ -1054,13 +1058,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Величина"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Датум"
 
@@ -2121,7 +2125,7 @@
 msgid "C_lose window"
 msgstr "_Затвори прозор"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Растуће"
 
@@ -2509,7 +2513,7 @@
 msgid "Delete..."
 msgstr "Обриши..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "_Групиши датотеке"
 
@@ -2517,7 +2521,7 @@
 msgid "Enable file grouping"
 msgstr "Групиши датотеке"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Не г_рупиши датотеке"
 
@@ -3328,7 +3332,7 @@
 msgid "Mark _%d"
 msgstr "Маркер _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Постави маркер %d"
@@ -3338,7 +3342,7 @@
 msgid "Set mark %d"
 msgstr "Поставља маркер %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Врати маркер %d"
@@ -3348,7 +3352,8 @@
 msgid "Reset mark %d"
 msgstr "Враћа маркер %d на претходну вредност"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "П_рикажи маркер %d"
@@ -3368,12 +3373,12 @@
 msgid "Select mark %d"
 msgstr "Изабира маркер %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Изабери маркер %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Додај маркер %d"
@@ -3383,7 +3388,7 @@
 msgid "Add mark %d"
 msgstr "Додаје маркер %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3393,7 +3398,7 @@
 msgid "Intersection with mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6194,7 +6199,7 @@
 msgid "_New folder..."
 msgstr "Нова _фасцикла..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Гледај као _списак"
 
@@ -6206,19 +6211,19 @@
 msgid "Show _hidden files"
 msgstr "Прикажи _скривене датотеке"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Освежи"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Гледај као _иконице"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Прикажи _умањене приказе"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [негруписано]"
 
--- a/po/sr@latin.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/sr@latin.po	Mon Jul 10 07:53:04 2017 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2010-01-05 17:36+0000\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Naziv"
 
@@ -777,7 +777,7 @@
 msgstr "Prazno"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Učitavam umanjene prikaze..."
 
@@ -788,7 +788,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Prikaži u _novom prozoru"
 
@@ -830,20 +831,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "Premest_i..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "P_reimenuj..."
 
@@ -851,13 +854,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Obriši..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "Umno_ži putanju"
 
@@ -865,11 +868,11 @@
 msgid "Randomize"
 msgstr "Načini nasumičnim"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "Pore_đaj"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "_Tekst sa imenom datoteke"
 
@@ -881,7 +884,8 @@
 msgid "Save collection _as..."
 msgstr "Sačuvaj zbirku _kao..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Na_đi duplikate..."
 
@@ -1031,7 +1035,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Izaberi duplikate iz _2. grupe"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Dodaj u novu zbirku"
 
@@ -1054,13 +1058,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Veličina"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2121,7 +2125,7 @@
 msgid "C_lose window"
 msgstr "_Zatvori prozor"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Rastuće"
 
@@ -2509,7 +2513,7 @@
 msgid "Delete..."
 msgstr "Obriši..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "_Grupiši datoteke"
 
@@ -2517,7 +2521,7 @@
 msgid "Enable file grouping"
 msgstr "Grupiši datoteke"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Ne g_rupiši datoteke"
 
@@ -3328,7 +3332,7 @@
 msgid "Mark _%d"
 msgstr "Marker _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "_Postavi marker %d"
@@ -3338,7 +3342,7 @@
 msgid "Set mark %d"
 msgstr "Postavlja marker %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "_Vrati marker %d"
@@ -3348,7 +3352,8 @@
 msgid "Reset mark %d"
 msgstr "Vraća marker %d na prethodnu vrednost"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "P_rikaži marker %d"
@@ -3368,12 +3373,12 @@
 msgid "Select mark %d"
 msgstr "Izabira marker %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Izaberi marker %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Dodaj marker %d"
@@ -3383,7 +3388,7 @@
 msgid "Add mark %d"
 msgstr "Dodaje marker %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3393,7 +3398,7 @@
 msgid "Intersection with mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6195,7 +6200,7 @@
 msgid "_New folder..."
 msgstr "Nova _fascikla..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Gledaj kao _spisak"
 
@@ -6207,19 +6212,19 @@
 msgid "Show _hidden files"
 msgstr "Prikaži _skrivene datoteke"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Osveži"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Gledaj kao _ikonice"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Prikaži _umanjene prikaze"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [negrupisano]"
 
--- a/po/sv.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/sv.po	Mon Jul 10 07:53:04 2017 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2011-02-14 16:11+0100\n"
 "Last-Translator: Tore Ericsson <tore.ericsson@telia.com>\n"
 "Language-Team: Swedish\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Namn"
 
@@ -777,7 +777,7 @@
 msgstr "Tom"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Läser in miniatyrbilder..."
 
@@ -788,7 +788,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Visa i _nytt fönster"
 
@@ -830,20 +831,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Flytta..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
@@ -851,13 +854,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Ta bort..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "_Kopiera filnamn"
 
@@ -865,11 +868,11 @@
 msgid "Randomize"
 msgstr "Slumpa"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Visa _filnamnstext"
 
@@ -881,7 +884,8 @@
 msgid "Save collection _as..."
 msgstr "Spara kollektionen s_om..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "Hitta _dubletter..."
 
@@ -1031,7 +1035,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Markera dubletter i grupp _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Lägg till i ny kollektion"
 
@@ -1054,13 +1058,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Storlek"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Datum"
 
@@ -2119,7 +2123,7 @@
 msgid "C_lose window"
 msgstr "_Stäng fönster"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -2509,7 +2513,7 @@
 msgid "Delete..."
 msgstr "Ta bort..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "Aktivera fil_gruppering"
 
@@ -2517,7 +2521,7 @@
 msgid "Enable file grouping"
 msgstr "Aktivera filgruppering"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "Avaktivera filgrupperi_ng"
 
@@ -3330,7 +3334,7 @@
 msgid "Mark _%d"
 msgstr "Märke _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "Märke %d _på"
@@ -3340,7 +3344,7 @@
 msgid "Set mark %d"
 msgstr "Märke %d på"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "Märke %d _av"
@@ -3350,7 +3354,8 @@
 msgid "Reset mark %d"
 msgstr "Märke %d av"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "_Växla märke %d"
@@ -3370,12 +3375,12 @@
 msgid "Select mark %d"
 msgstr "Urval märke %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "_Urval märke %d"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "_Lägg till märke %d"
@@ -3385,7 +3390,7 @@
 msgid "Add mark %d"
 msgstr "Lägg till märke %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "_Skärning med märke %d"
@@ -3395,7 +3400,7 @@
 msgid "Intersection with mark %d"
 msgstr "Skärning med märke %d"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "_Bortval märke %d"
@@ -6249,7 +6254,7 @@
 msgid "_New folder..."
 msgstr "Ny _mapp..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "Visa som _lista"
 
@@ -6261,19 +6266,19 @@
 msgid "Show _hidden files"
 msgstr "Visa _dolda filer"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "Upp_datera"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "Visa som _ikoner"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Visa _miniatyrbilder"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [INGEN GRUPPINDELNING]"
 
--- a/po/th.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/th.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2002-02-25 20:55GMT\n"
 "Last-Translator: Phanumas Thanyaboon <maskung@hotmail.com>\n"
 "Language-Team: thai <th@li.org>\n"
@@ -75,7 +75,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "ชื่อ"
 
@@ -824,7 +824,7 @@
 msgstr "ว่าง"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "กำลังโหลดรูปเล็ก..."
 
@@ -836,7 +836,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "มองในหน้าต่างใหม่"
@@ -882,14 +883,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "คัดลอก..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "ย้าย..."
@@ -897,7 +900,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "เปลี่ยนชื่อ..."
@@ -906,14 +909,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "ลบ..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "คัดลอก"
@@ -923,12 +926,12 @@
 msgid "Randomize"
 msgstr "สุ่ม"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "เรียง"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "แสดงสิ่งที่ซ่อน"
@@ -943,7 +946,8 @@
 msgid "Save collection _as..."
 msgstr "บันทึก collection เป็น..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "หาตัวซ้ำ..."
@@ -1104,7 +1108,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "เพิ่มไปยัง collection ใหม่"
 
@@ -1129,13 +1133,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "ขนาด"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "วันที่"
 
@@ -2256,7 +2260,7 @@
 msgid "C_lose window"
 msgstr "ปิดหน้าต่าง"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "มากไปน้อย"
 
@@ -2691,7 +2695,7 @@
 msgid "Delete..."
 msgstr "ลบ..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "ยกเลิกการกรองแฟ้ม"
@@ -2701,7 +2705,7 @@
 msgid "Enable file grouping"
 msgstr "ยกเลิกการกรองแฟ้ม"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "ยกเลิกการกรองแฟ้ม"
@@ -3610,7 +3614,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3620,7 +3624,7 @@
 msgid "Set mark %d"
 msgstr "เลือกทั้งหมด"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3630,7 +3634,8 @@
 msgid "Reset mark %d"
 msgstr "เลือกทั้งหมด"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3650,12 +3655,12 @@
 msgid "Select mark %d"
 msgstr "เลือกทั้งหมด"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "เลือกทั้งหมด"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "อิดิเตอร์"
@@ -3665,7 +3670,7 @@
 msgid "Add mark %d"
 msgstr "อิดิเตอร์"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3675,7 +3680,7 @@
 msgid "Intersection with mark %d"
 msgstr "เลือกทั้งหมด"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6640,7 +6645,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Dimensions"
@@ -6655,22 +6660,22 @@
 msgid "Show _hidden files"
 msgstr "แสดงสิ่งที่ซ่อน"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "รีเฟรช"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Dimensions"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "แคชรูปเล็ก"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/tlh.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/tlh.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2016-04-30 10:15+0100\n"
 "Last-Translator: Klaus Ethgen <Klaus@Ethgen.de>\n"
 "Language-Team: \n"
@@ -73,7 +73,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr ""
 
@@ -746,7 +746,7 @@
 msgstr ""
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr ""
 
@@ -757,7 +757,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr ""
 
@@ -798,20 +799,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr ""
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr ""
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr ""
 
@@ -819,13 +822,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr ""
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr ""
 
@@ -833,11 +836,11 @@
 msgid "Randomize"
 msgstr ""
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr ""
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr ""
 
@@ -849,7 +852,8 @@
 msgid "Save collection _as..."
 msgstr ""
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr ""
 
@@ -995,7 +999,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr ""
 
@@ -1018,13 +1022,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr ""
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr ""
 
@@ -2076,7 +2080,7 @@
 msgid "C_lose window"
 msgstr ""
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr ""
 
@@ -2456,7 +2460,7 @@
 msgid "Delete..."
 msgstr ""
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr ""
 
@@ -2464,7 +2468,7 @@
 msgid "Enable file grouping"
 msgstr ""
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr ""
 
@@ -3255,7 +3259,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3265,7 +3269,7 @@
 msgid "Set mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3275,7 +3279,8 @@
 msgid "Reset mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3295,12 +3300,12 @@
 msgid "Select mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr ""
@@ -3310,7 +3315,7 @@
 msgid "Add mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3320,7 +3325,7 @@
 msgid "Intersection with mark %d"
 msgstr ""
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6006,7 +6011,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr ""
 
@@ -6018,19 +6023,19 @@
 msgid "Show _hidden files"
 msgstr ""
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr ""
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr ""
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr ""
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/tr.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/tr.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2000-04-07 17:09+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Translation Team <gnotrap@gmx.net>\n"
@@ -76,7 +76,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 #, fuzzy
 msgid "Name"
 msgstr "Yeniden adlandır"
@@ -814,7 +814,7 @@
 msgstr ""
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Tırnakları yükliyorum .."
 
@@ -826,7 +826,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Yeni penerede göster"
@@ -874,14 +875,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Kopyala ..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Taşı ..."
@@ -889,7 +892,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Yeniden adlandır .."
@@ -898,14 +901,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Sil .."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Kopyala"
@@ -915,11 +918,11 @@
 msgid "Randomize"
 msgstr "Tesadüfen"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr ""
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr ""
 
@@ -933,7 +936,8 @@
 msgid "Save collection _as..."
 msgstr "Seçenekler ..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Yeniden adlandır .."
@@ -1094,7 +1098,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 #, fuzzy
 msgid "Add to new collection"
 msgstr "%s'yi silemedim \n"
@@ -1119,14 +1123,14 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 #, fuzzy
 msgid "Size"
 msgstr "Boy :"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 #, fuzzy
 msgid "Date"
 msgstr "Sil"
@@ -2240,7 +2244,7 @@
 msgid "C_lose window"
 msgstr "Pencereyi kapat"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr ""
 
@@ -2678,7 +2682,7 @@
 msgid "Delete..."
 msgstr "Sil .."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Dosya filtralarını kapat"
@@ -2688,7 +2692,7 @@
 msgid "Enable file grouping"
 msgstr "Dosya filtralarını kapat"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Dosya filtralarını kapat"
@@ -3580,7 +3584,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3590,7 +3594,7 @@
 msgid "Set mark %d"
 msgstr "Silerken bir hata oluştu"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3600,7 +3604,8 @@
 msgid "Reset mark %d"
 msgstr "Silerken bir hata oluştu"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3620,12 +3625,12 @@
 msgid "Select mark %d"
 msgstr "Silerken bir hata oluştu"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Silerken bir hata oluştu"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Düzenle"
@@ -3635,7 +3640,7 @@
 msgid "Add mark %d"
 msgstr "Düzenle"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3645,7 +3650,7 @@
 msgid "Intersection with mark %d"
 msgstr "Silerken bir hata oluştu"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6611,7 +6616,7 @@
 msgid "_New folder..."
 msgstr ""
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Tırnaklar"
@@ -6626,22 +6631,22 @@
 msgid "Show _hidden files"
 msgstr "Tırnakları arabellekte tut"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Yenile"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Tırnaklar"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Tırnakları arabellekte tut"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/uk.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/uk.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2002-05-07 17:15+0200\n"
 "Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n"
 "Language-Team:  <linux@linux.org.ua>\n"
@@ -74,7 +74,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Назва"
 
@@ -823,7 +823,7 @@
 msgstr "Порожньо"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Завантаження піктограм..."
 
@@ -835,7 +835,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 #, fuzzy
 msgid "View in _new window"
 msgstr "Переглянути в новому вікні"
@@ -881,14 +882,16 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 #, fuzzy
 msgid "_Copy..."
 msgstr "Копіювати..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 #, fuzzy
 msgid "_Move..."
 msgstr "Перенести..."
@@ -896,7 +899,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 #, fuzzy
 msgid "_Rename..."
 msgstr "Переіменувати..."
@@ -905,14 +908,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 #, fuzzy
 msgid "_Delete..."
 msgstr "Видалити..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "Копіювати"
@@ -922,12 +925,12 @@
 msgid "Randomize"
 msgstr "Довільно"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 #, fuzzy
 msgid "_Sort"
 msgstr "Сортувати"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 #, fuzzy
 msgid "Show filename _text"
 msgstr "Показати приховані"
@@ -942,7 +945,8 @@
 msgid "Save collection _as..."
 msgstr "Зберегти колекцію як..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 #, fuzzy
 msgid "_Find duplicates..."
 msgstr "Знайти дублікати..."
@@ -1103,7 +1107,7 @@
 msgid "Select group _2 duplicates"
 msgstr ""
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Додати до нової колекції"
 
@@ -1128,13 +1132,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Розмір"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Дата"
 
@@ -2255,7 +2259,7 @@
 msgid "C_lose window"
 msgstr "Закрити вікно"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Наростаючий"
 
@@ -2688,7 +2692,7 @@
 msgid "Delete..."
 msgstr "Видалити..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Заборонити фільтрування файлів"
@@ -2698,7 +2702,7 @@
 msgid "Enable file grouping"
 msgstr "Заборонити фільтрування файлів"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Заборонити фільтрування файлів"
@@ -3607,7 +3611,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3617,7 +3621,7 @@
 msgid "Set mark %d"
 msgstr "Виділити все"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3627,7 +3631,8 @@
 msgid "Reset mark %d"
 msgstr "Виділити все"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3647,12 +3652,12 @@
 msgid "Select mark %d"
 msgstr "Виділити все"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Виділити все"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Редактори"
@@ -3662,7 +3667,7 @@
 msgid "Add mark %d"
 msgstr "Редактори"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3672,7 +3677,7 @@
 msgid "Intersection with mark %d"
 msgstr "Виділити все"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6645,7 +6650,7 @@
 msgid "_New folder..."
 msgstr "Новий каталог..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Як піктограми"
@@ -6660,22 +6665,22 @@
 msgid "Show _hidden files"
 msgstr "Показати приховані"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 #, fuzzy
 msgid "Re_fresh"
 msgstr "Оновити"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Як піктограми"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 #, fuzzy
 msgid "Show _thumbnails"
 msgstr "Показувати піктограми"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/vi.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/vi.po	Mon Jul 10 07:53:04 2017 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2006-10-14 10:09+0700\n"
 "Last-Translator: pclouds <pclouds@vnlinux.org>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -74,7 +74,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "Tên"
 
@@ -794,7 +794,7 @@
 msgstr "Rỗng"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "Đang nạp ảnh mẫu..."
 
@@ -805,7 +805,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "Xem trong cửa sổ mớ_i"
 
@@ -849,20 +850,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
@@ -870,13 +873,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "_Xóa..."
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "_Sao chép"
@@ -886,11 +889,11 @@
 msgid "Randomize"
 msgstr "Ngẫu nhiên"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "_Sắp xếp"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "Hiện _tên tập tin"
 
@@ -902,7 +905,8 @@
 msgid "Save collection _as..."
 msgstr "Lưu tập ảnh _là..."
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "_Tìm trùng lặp..."
 
@@ -1056,7 +1060,7 @@
 msgid "Select group _2 duplicates"
 msgstr "Chọn nhóm lặp _2"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "Thêm vào tập ảnh mới"
 
@@ -1080,13 +1084,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "Kích thước"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "Ngày"
 
@@ -2203,7 +2207,7 @@
 msgid "C_lose window"
 msgstr "Đón_g cửa sổ"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "Xuôi"
 
@@ -2628,7 +2632,7 @@
 msgid "Delete..."
 msgstr "_Xóa..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "Tắt lọc tập tin"
@@ -2638,7 +2642,7 @@
 msgid "Enable file grouping"
 msgstr "Tắt lọc tập tin"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "Tắt lọc tập tin"
@@ -3531,7 +3535,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3541,7 +3545,7 @@
 msgid "Set mark %d"
 msgstr "Chọn tất cả"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3551,7 +3555,8 @@
 msgid "Reset mark %d"
 msgstr "Chọn tất cả"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -3571,12 +3576,12 @@
 msgid "Select mark %d"
 msgstr "Chọn tất cả"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "Chọn tất cả"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "Thêm Đánh dấu"
@@ -3586,7 +3591,7 @@
 msgid "Add mark %d"
 msgstr "Thêm Đánh dấu"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -3596,7 +3601,7 @@
 msgid "Intersection with mark %d"
 msgstr "Chọn tất cả"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -6466,7 +6471,7 @@
 msgid "_New folder..."
 msgstr "Tạo _thư mục mới..."
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "Xem dạng ả_nh"
@@ -6481,20 +6486,20 @@
 msgid "Show _hidden files"
 msgstr "Hiện tập tin ẩn"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "_Cập nhật"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "Xem dạng ả_nh"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "Hiện ảnh _mẫu"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""
 
--- a/po/zh_CN.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/zh_CN.po	Mon Jul 10 07:53:04 2017 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2013-12-31 23:45+0100\n"
 "Last-Translator: Levin <zjlevin@hotmail.com>\n"
 "Language-Team: Levin <zjlevin@hotmail.com>\n"
@@ -76,7 +76,7 @@
 
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "名称"
 
@@ -774,7 +774,7 @@
 msgstr "空"
 
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "载入缩略图..."
 
@@ -785,7 +785,8 @@
 
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "在新窗口中查看(_n)"
 
@@ -827,20 +828,22 @@
 
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "复制... (_C)"
 
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "移动... (_M)"
 
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "重命名... (_R)"
 
@@ -848,13 +851,13 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "删除... (_D)"
 
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 msgid "_Copy path"
 msgstr "复制路径(_C)"
 
@@ -862,11 +865,11 @@
 msgid "Randomize"
 msgstr "随机化"
 
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "显示文件名(_t)"
 
@@ -878,7 +881,8 @@
 msgid "Save collection _as..."
 msgstr "保存图片集为...(_a)"
 
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "查找重复项... (_F)"
 
@@ -1028,7 +1032,7 @@
 msgid "Select group _2 duplicates"
 msgstr "选取第2组重复项"
 
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "添加到新图片集"
 
@@ -1051,13 +1055,13 @@
 
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "大小"
 
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "日期"
 
@@ -2167,7 +2171,7 @@
 msgid "C_lose window"
 msgstr "关闭窗口 (_l)"
 
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "升序"
 
@@ -2556,7 +2560,7 @@
 msgid "Delete..."
 msgstr "删除..."
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 msgid "Enable file _grouping"
 msgstr "允许文件编组 (_g)"
 
@@ -2565,7 +2569,7 @@
 msgid "Enable file grouping"
 msgstr "允许文件编组 (_g)"
 
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 msgid "Disable file groupi_ng"
 msgstr "禁止文件编组 (_n)"
 
@@ -3379,7 +3383,7 @@
 msgid "Mark _%d"
 msgstr "标记 _%d"
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr "设置标记 %d (_S)"
@@ -3389,7 +3393,7 @@
 msgid "Set mark %d"
 msgstr "设置标记 %d"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr "重置标记 %d (_R)"
@@ -3399,7 +3403,8 @@
 msgid "Reset mark %d"
 msgstr "重置标记 %d"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "切换标记 %d (_T)"
@@ -3419,12 +3424,12 @@
 msgid "Select mark %d"
 msgstr "选择标记 %d"
 
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, c-format
 msgid "_Select mark %d"
 msgstr "选择标记 %d (_S)"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, c-format
 msgid "_Add mark %d"
 msgstr "添加标记 %d (_A)"
@@ -3434,7 +3439,7 @@
 msgid "Add mark %d"
 msgstr "添加标记 %d"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "与标记 %d 共有的 (_I)"
@@ -3444,7 +3449,7 @@
 msgid "Intersection with mark %d"
 msgstr "与标记 %d 共有的"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "取消选择标记 %d (_U)"
@@ -6272,7 +6277,7 @@
 msgid "_New folder..."
 msgstr "新建文件夹...(_N)"
 
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 msgid "View as _List"
 msgstr "以列表形式查看"
 
@@ -6284,19 +6289,19 @@
 msgid "Show _hidden files"
 msgstr "显示隐藏文件 (_h)"
 
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "刷新 (_f)"
 
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 msgid "View as _Icons"
 msgstr "以图标形式查看"
 
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "显示缩略图 (_t)"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [不编组]"
 
--- a/po/zh_TW.po	Sun Jul 09 06:20:35 2017 +0000
+++ b/po/zh_TW.po	Mon Jul 10 07:53:04 2017 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-10 07:49+0000\n"
+"POT-Creation-Date: 2017-07-10 07:52+0000\n"
 "PO-Revision-Date: 2005-08-13 13:22+0800\n"
 "Last-Translator: S.J. Luo <crystal@mickey.ee.nctu.edu.tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -79,7 +79,7 @@
 # src/dupe.c:1652 src/dupe.c:1941
 #: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c:2739
 #: ../src/dupe.c:3278 ../src/print.c:3209 ../src/search.c:3084
-#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1990
+#: ../src/utilops.c:505 ../src/view_file/view_file_list.c:1931
 msgid "Name"
 msgstr "名稱"
 
@@ -891,7 +891,7 @@
 
 # src/collect-table.c:100 src/dupe.c:668 src/filelist.c:1811
 #: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
-#: ../src/view_file.c:871 ../src/view_file.c:974
+#: ../src/view_file/view_file.c:826 ../src/view_file/view_file.c:935
 msgid "Loading thumbs..."
 msgstr "正在載入預覽小圖..."
 
@@ -905,7 +905,8 @@
 # src/menu.c:906 src/menu.c:964
 #: ../src/collect-table.c:906 ../src/dupe.c:2325 ../src/dupe.c:2638
 #: ../src/img-view.c:1282 ../src/layout_image.c:676
-#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043 ../src/view_file.c:618
+#: ../src/pan-view/pan-view.c:2226 ../src/search.c:1043
+#: ../src/view_file/view_file.c:581
 msgid "View in _new window"
 msgstr "在新視窗中檢視(_N)"
 
@@ -959,7 +960,8 @@
 # src/menu.c:969
 #: ../src/collect-table.c:938 ../src/dupe.c:2348 ../src/img-view.c:1286
 #: ../src/layout_image.c:684 ../src/layout_util.c:1731
-#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062 ../src/view_file.c:622
+#: ../src/pan-view/pan-view.c:2230 ../src/search.c:1062
+#: ../src/view_file/view_file.c:585
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
@@ -967,7 +969,8 @@
 # src/menu.c:971
 #: ../src/collect-table.c:940 ../src/dupe.c:2350 ../src/img-view.c:1287
 #: ../src/layout_image.c:686 ../src/layout_util.c:1732
-#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064 ../src/view_file.c:624
+#: ../src/pan-view/pan-view.c:2232 ../src/search.c:1064
+#: ../src/view_file/view_file.c:587
 msgid "_Move..."
 msgstr "移動(_M)..."
 
@@ -976,7 +979,7 @@
 #: ../src/collect-table.c:942 ../src/dupe.c:2352 ../src/img-view.c:1288
 #: ../src/layout_image.c:688 ../src/layout_util.c:1733
 #: ../src/pan-view/pan-view.c:2234 ../src/search.c:1066 ../src/view_dir.c:674
-#: ../src/view_file.c:626
+#: ../src/view_file/view_file.c:589
 msgid "_Rename..."
 msgstr "更改名稱(_R)..."
 
@@ -986,14 +989,14 @@
 #: ../src/layout_image.c:690 ../src/layout_util.c:1734
 #: ../src/layout_util.c:1735 ../src/layout_util.c:1736
 #: ../src/pan-view/pan-view.c:2236 ../src/search.c:1068 ../src/view_dir.c:676
-#: ../src/view_file.c:628
+#: ../src/view_file/view_file.c:591
 msgid "_Delete..."
 msgstr "刪除(_D)..."
 
 # src/utilops.c:592
 #: ../src/collect-table.c:946 ../src/dupe.c:2356 ../src/img-view.c:1290
 #: ../src/layout_image.c:693 ../src/pan-view/pan-view.c:2238
-#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file.c:630
+#: ../src/search.c:1070 ../src/view_dir.c:679 ../src/view_file/view_file.c:593
 #, fuzzy
 msgid "_Copy path"
 msgstr "複製(_C)"
@@ -1006,12 +1009,12 @@
 msgstr "隨機"
 
 # src/menu.c:559
-#: ../src/collect-table.c:954 ../src/view_file.c:652
+#: ../src/collect-table.c:954 ../src/view_file/view_file.c:615
 msgid "_Sort"
 msgstr "排列(_S)"
 
 # src/ui_pathsel.c:764
-#: ../src/collect-table.c:957 ../src/view_file.c:668
+#: ../src/collect-table.c:957 ../src/view_file/view_file.c:631
 msgid "Show filename _text"
 msgstr "顯示檔案名稱(_T)"
 
@@ -1026,7 +1029,8 @@
 msgstr "另存圖像集為(_A)..."
 
 # src/collect-table.c:644 src/menu.c:885
-#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727
+#: ../src/view_file/view_file.c:602
 msgid "_Find duplicates..."
 msgstr "尋找重複檔案(_F)..."
 
@@ -1209,7 +1213,7 @@
 msgstr "選擇第 2 群為重複"
 
 # src/dupe.c:1398
-#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file/view_file.c:605
 msgid "Add to new collection"
 msgstr "加入至新的圖像集"
 
@@ -1237,14 +1241,14 @@
 # src/dupe.c:1653 src/dupe.c:1942
 #: ../src/dupe.c:2741 ../src/dupe.c:3279 ../src/preferences.c:1604
 #: ../src/print.c:3215 ../src/search.c:3085
-#: ../src/view_file/view_file_list.c:1994
+#: ../src/view_file/view_file_list.c:1935
 msgid "Size"
 msgstr "檔案大小"
 
 # src/dupe.c:1654 src/dupe.c:1943
 #: ../src/dupe.c:2742 ../src/dupe.c:3280 ../src/exif.c:336
 #: ../src/exif-common.c:565 ../src/print.c:3213 ../src/search.c:3086
-#: ../src/view_file/view_file_list.c:1998
+#: ../src/view_file/view_file_list.c:1939
 msgid "Date"
 msgstr "日期"
 
@@ -2445,7 +2449,7 @@
 msgstr "關閉視窗(_L)"
 
 # src/window.c:87
-#: ../src/layout.c:401 ../src/view_file.c:649
+#: ../src/layout.c:401 ../src/view_file/view_file.c:612
 msgid "Ascending"
 msgstr "遞增"
 
@@ -2932,7 +2936,7 @@
 msgstr "刪除(_D)..."
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1737 ../src/view_file.c:633
+#: ../src/layout_util.c:1737 ../src/view_file/view_file.c:596
 #, fuzzy
 msgid "Enable file _grouping"
 msgstr "關閉檔案過濾器"
@@ -2944,7 +2948,7 @@
 msgstr "關閉檔案過濾器"
 
 # src/preferences.c:823
-#: ../src/layout_util.c:1738 ../src/view_file.c:635
+#: ../src/layout_util.c:1738 ../src/view_file/view_file.c:598
 #, fuzzy
 msgid "Disable file groupi_ng"
 msgstr "關閉檔案過濾器"
@@ -3970,7 +3974,7 @@
 msgid "Mark _%d"
 msgstr ""
 
-#: ../src/layout_util.c:2204 ../src/view_file.c:570
+#: ../src/layout_util.c:2204 ../src/view_file/view_file.c:533
 #, c-format
 msgid "_Set mark %d"
 msgstr ""
@@ -3981,7 +3985,7 @@
 msgid "Set mark %d"
 msgstr "全部選取"
 
-#: ../src/layout_util.c:2205 ../src/view_file.c:571
+#: ../src/layout_util.c:2205 ../src/view_file/view_file.c:534
 #, c-format
 msgid "_Reset mark %d"
 msgstr ""
@@ -3992,7 +3996,8 @@
 msgid "Reset mark %d"
 msgstr "全部選取"
 
-#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
+#: ../src/view_file/view_file.c:535
 #, c-format
 msgid "_Toggle mark %d"
 msgstr ""
@@ -4016,12 +4021,12 @@
 msgstr "全部選取"
 
 # src/collect-table.c:627 src/dupe.c:1391 src/dupe.c:1563
-#: ../src/layout_util.c:2209 ../src/view_file.c:573
+#: ../src/layout_util.c:2209 ../src/view_file/view_file.c:536
 #, fuzzy, c-format
 msgid "_Select mark %d"
 msgstr "全部選取"
 
-#: ../src/layout_util.c:2210 ../src/view_file.c:574
+#: ../src/layout_util.c:2210 ../src/view_file/view_file.c:537
 #, fuzzy, c-format
 msgid "_Add mark %d"
 msgstr "新增書籤"
@@ -4031,7 +4036,7 @@
 msgid "Add mark %d"
 msgstr "新增書籤"
 
-#: ../src/layout_util.c:2211 ../src/view_file.c:575
+#: ../src/layout_util.c:2211 ../src/view_file/view_file.c:538
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr ""
@@ -4042,7 +4047,7 @@
 msgid "Intersection with mark %d"
 msgstr "全部選取"
 
-#: ../src/layout_util.c:2212 ../src/view_file.c:576
+#: ../src/layout_util.c:2212 ../src/view_file/view_file.c:539
 #, c-format
 msgid "_Unselect mark %d"
 msgstr ""
@@ -7269,7 +7274,7 @@
 msgstr "新資料夾(_N)..."
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_dir.c:685 ../src/view_file.c:655
+#: ../src/view_dir.c:685 ../src/view_file/view_file.c:618
 #, fuzzy
 msgid "View as _List"
 msgstr "圖像尺寸(I)"
@@ -7288,22 +7293,22 @@
 msgstr "顯示隱藏檔案"
 
 # src/menu.c:891 src/menu.c:920
-#: ../src/view_dir.c:696 ../src/view_file.c:673
+#: ../src/view_dir.c:696 ../src/view_file/view_file.c:636
 msgid "Re_fresh"
 msgstr "重新整理(_F)"
 
 # src/dupe.c:1655 src/dupe.c:1944
-#: ../src/view_file.c:658
+#: ../src/view_file/view_file.c:621
 #, fuzzy
 msgid "View as _Icons"
 msgstr "圖像尺寸(I)"
 
 # src/preferences.c:603
-#: ../src/view_file.c:664
+#: ../src/view_file/view_file.c:627
 msgid "Show _thumbnails"
 msgstr "將預覽小圖儲存在緩衝區(_T)"
 
-#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
+#: ../src/view_file/view_file_icon.c:1962 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr ""