X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=po%2Fzh_CN.po;h=f537cd44dbc3ac2b9acadb4e1c9b37114e8b2366;hp=dc58c57112dffba7d4523dde2ec45d5a7b15ac8d;hb=1bc4a19f66e15c4867c31d39a62623ba80e7924a;hpb=70074e6364d2a56232b4fa0a391b7021f7c5e126

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dc58c571..f537cd44 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geeqie-1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-19 17:35+0100\n"
+"POT-Creation-Date: 2017-07-10 07:49+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"
@@ -61,306 +61,381 @@ msgstr ""
 msgid "UFRaw Batch recursive"
 msgstr ""
 
-#: ../src/advanced_exif.c:328 ../src/cache_maint.c:1111 ../src/preferences.c:94
-#: ../src/preferences.c:1754
+#: ../src/advanced_exif.c:336 ../src/cache_maint.c:1265
+#: ../src/preferences.c:109 ../src/preferences.c:1890
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../src/advanced_exif.c:376 ../src/preferences.c:1668
+#: ../src/advanced_exif.c:384 ../src/preferences.c:1804
 msgid "Description"
 msgstr "描述"
 
-#: ../src/advanced_exif.c:377
+#: ../src/advanced_exif.c:385
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_exif.c:378 ../src/desktop_file.c:515 ../src/dupe.c:2642
-#: ../src/dupe.c:3129 ../src/print.c:3199 ../src/search.c:2790
-#: ../src/utilops.c:462 ../src/view_file_list.c:1980
+#: ../src/advanced_exif.c:386 ../src/desktop_file.c:535 ../src/dupe.c: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
 msgid "Name"
 msgstr "名称"
 
-#: ../src/advanced_exif.c:379
+#: ../src/advanced_exif.c:387
 msgid "Tag"
 msgstr "标签"
 
-#: ../src/advanced_exif.c:380
+#: ../src/advanced_exif.c:388
 msgid "Format"
 msgstr "格式"
 
-#: ../src/advanced_exif.c:381
+#: ../src/advanced_exif.c:389
 msgid "Elements"
 msgstr "信息数"
 
 #. default sidebar
-#: ../src/bar.c:167
+#: ../src/bar.c:183
 msgid "Histogram"
 msgstr "直方图"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:184
 msgid "Title"
 msgstr "标题"
 
-#: ../src/bar.c:169 ../src/search.c:2717
+#: ../src/bar.c:185 ../src/search.c:2966
 msgid "Keywords"
 msgstr "关键词"
 
-#: ../src/bar.c:170 ../src/search.c:2729
+#: ../src/bar.c:186 ../src/search.c:2978
 msgid "Comment"
 msgstr "注释"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:187
+#, fuzzy
+msgid "Rating"
+msgstr "打印出错"
+
+#: ../src/bar.c:188
 msgid "Exif"
 msgstr "Exif 信息"
 
 #. other pre-configured panes
-#: ../src/bar.c:173
+#: ../src/bar.c:190
 msgid "File info"
 msgstr "文件信息"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:191
 msgid "Location and GPS"
 msgstr "位置和GPS"
 
-#: ../src/bar.c:175 ../src/exif.c:348
+#: ../src/bar.c:192 ../src/exif.c:342
 msgid "Copyright"
 msgstr "版权"
 
-#: ../src/bar.c:178 ../src/bar_gps.c:756
+#: ../src/bar.c:195 ../src/bar_gps.c:1017
 msgid "GPS Map"
 msgstr "GPS 地图"
 
-#: ../src/bar.c:297
+#: ../src/bar.c:315
 msgid "Move to _top"
 msgstr "移到顶部 (_t)"
 
-#: ../src/bar.c:298 ../src/ui_bookmark.c:407
+#: ../src/bar.c:316 ../src/ui_bookmark.c:416
 msgid "Move _up"
 msgstr "上移(_u)"
 
-#: ../src/bar.c:299 ../src/ui_bookmark.c:409
+#: ../src/bar.c:317 ../src/ui_bookmark.c:418
 msgid "Move _down"
 msgstr "下移(_d)"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:318
 msgid "Move to _bottom"
 msgstr "移到底部 (_b)"
 
-#: ../src/bar.c:302
+#: ../src/bar.c:320
 msgid "Remove"
 msgstr "移去"
 
-#: ../src/bar_comment.c:195
+#: ../src/bar.c:692
+#, fuzzy
+msgid "Add Pane"
+msgstr "添加图像"
+
+#: ../src/bar_comment.c:216
 msgid "Add text to selected files"
 msgstr "添加文本到所选图片"
 
-#: ../src/bar_comment.c:196
+#: ../src/bar_comment.c:217
 msgid "Replace existing text in selected files"
 msgstr "替换文本到所选图片"
 
-#: ../src/bar_exif.c:213
+#: ../src/bar_exif.c:221
 msgid "<empty label, fixme>"
 msgstr "<空标签，修复我>"
 
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559
 msgid "Configure entry"
 msgstr "设置条目"
 
 #. for the pane
-#: ../src/bar_exif.c:541 ../src/bar_exif.c:551 ../src/bar_exif.c:624
+#: ../src/bar_exif.c:549 ../src/bar_exif.c:559 ../src/bar_exif.c:632
 msgid "Add entry"
 msgstr "添加条目"
 
-#: ../src/bar_exif.c:557
+#: ../src/bar_exif.c:565
 msgid "Key:"
 msgstr "键值:"
 
-#: ../src/bar_exif.c:566
+#: ../src/bar_exif.c:574 ../src/preferences.c:1488
 msgid "Title:"
 msgstr "标题:"
 
-#: ../src/bar_exif.c:575
+#: ../src/bar_exif.c:583
 msgid "Show only if set"
 msgstr "仅当文件设置了相关内容后才显示"
 
-#: ../src/bar_exif.c:576
+#: ../src/bar_exif.c:584
 msgid "Editable (supported only for XMP)"
 msgstr "可编辑 (仅被 XMP 支持)"
 
 #. for the entry
-#: ../src/bar_exif.c:612
+#: ../src/bar_exif.c:620
 #, c-format
 msgid "Configure \"%s\""
 msgstr "设置 \"%s\""
 
-#: ../src/bar_exif.c:613 ../src/bar_keywords.c:1189
+#: ../src/bar_exif.c:621 ../src/bar_keywords.c:1304
 #, c-format
 msgid "Remove \"%s\""
 msgstr "移去 \"%s\""
 
-#: ../src/bar_exif.c:625
+#: ../src/bar_exif.c:633
 msgid "Show hidden entries"
 msgstr "显示隐藏条目"
 
-#: ../src/bar_gps.c:483
+#: ../src/bar_gps.c:187
+#, c-format
+msgid ""
+"\n"
+"Do you want to geocode image %s?"
+msgstr ""
+
+#: ../src/bar_gps.c:192
+#, c-format
+msgid ""
+"\n"
+"Do you want to geocode %i images?"
+msgstr ""
+
+#: ../src/bar_gps.c:197
+#, c-format
+msgid ""
+"\n"
+"This image is already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:202
+#, c-format
+msgid ""
+"\n"
+"One image is already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:207
+#, c-format
+msgid ""
+"\n"
+"%i Images are already geocoded!"
+msgstr ""
+
+#: ../src/bar_gps.c:212
+#, fuzzy, c-format
+msgid ""
+"\n"
+"\n"
+"Position: %s \n"
+msgstr "位置: %s"
+
+#: ../src/bar_gps.c:214
+#, fuzzy
+msgid "Geocode images"
+msgstr "预载入下一张图片"
+
+#: ../src/bar_gps.c:218
+#, fuzzy
+msgid "Write lat/long to meta-data?"
+msgstr "写入元数据吗?"
+
+#: ../src/bar_gps.c:728
 #, fuzzy, c-format
 msgid "Zoom %i"
 msgstr "放大"
 
-#: ../src/bar_gps.c:501
+#: ../src/bar_gps.c:746
 #, fuzzy, c-format
 msgid "Zoom level %i"
 msgstr "放大"
 
-#: ../src/bar_gps.c:506
+#: ../src/bar_gps.c:751
 #, fuzzy
 msgid "Loading map"
 msgstr "载入缩略图..."
 
-#: ../src/bar_gps.c:572
+#: ../src/bar_gps.c:817
 msgid "Enable markers"
 msgstr ""
 
-#: ../src/bar_gps.c:574
+#: ../src/bar_gps.c:819
 msgid "Centre map on marker"
 msgstr ""
 
-#: ../src/bar_gps.c:596
+#: ../src/bar_gps.c:841
 msgid ""
 "Move map centre to marker\n"
 " is disabled"
 msgstr ""
 
-#: ../src/bar_gps.c:601
+#: ../src/bar_gps.c:846
 msgid ""
 "Move map centre to marker\n"
 " is enabled"
 msgstr ""
 
-#: ../src/bar_gps.c:610
-msgid "Map Centreing"
-msgstr ""
+#: ../src/bar_gps.c:850
+#, fuzzy
+msgid "Map centering"
+msgstr "色彩抖动方式:"
 
 #. use the same strings as in layout_util.c
-#: ../src/bar_histogram.c:249 ../src/layout_util.c:1430
+#: ../src/bar_histogram.c:257 ../src/layout_util.c:1871
 msgid "Histogram on _Red"
 msgstr "直方图 红 (_R)"
 
-#: ../src/bar_histogram.c:250 ../src/layout_util.c:1431
+#: ../src/bar_histogram.c:258 ../src/layout_util.c:1872
 msgid "Histogram on _Green"
 msgstr "直方图 绿 (_G)"
 
-#: ../src/bar_histogram.c:251 ../src/layout_util.c:1432
+#: ../src/bar_histogram.c:259 ../src/layout_util.c:1873
 msgid "Histogram on _Blue"
 msgstr "直方图 蓝 (_B)"
 
-#: ../src/bar_histogram.c:252 ../src/layout_util.c:1433
+#: ../src/bar_histogram.c:260 ../src/layout_util.c:1874
 msgid "_Histogram on RGB"
 msgstr "直方图 RGB (_H)"
 
-#: ../src/bar_histogram.c:253 ../src/layout_util.c:1434
+#: ../src/bar_histogram.c:261 ../src/layout_util.c:1875
 msgid "Histogram on _Value"
 msgstr "直方图 值 (_V)"
 
-#: ../src/bar_histogram.c:257 ../src/layout_util.c:1438
+#: ../src/bar_histogram.c:265 ../src/layout_util.c:1879
 msgid "Li_near Histogram"
 msgstr "线性直方图 (_n)"
 
-#: ../src/bar_histogram.c:258
+#: ../src/bar_histogram.c:266
 msgid "L_og Histogram"
 msgstr "对数直方图(_o)"
 
-#: ../src/bar_keywords.c:403
+#: ../src/bar_keywords.c:463
 msgid "Add keywords to selected files"
 msgstr "添加关键词到所选图片"
 
-#: ../src/bar_keywords.c:404
+#: ../src/bar_keywords.c:464
 msgid "Replace existing keywords in selected files"
 msgstr "替换关键词到所选图片"
 
-#: ../src/bar_keywords.c:875
+#: ../src/bar_keywords.c:935
 msgid "Edit keyword"
 msgstr "编辑关键词"
 
-#: ../src/bar_keywords.c:875
-msgid "Add keywords"
+#: ../src/bar_keywords.c:935 ../src/bar_keywords.c:942
+#: ../src/bar_keywords.c:1258
+#, fuzzy
+msgid "New keyword"
 msgstr "添加关键词"
 
-#: ../src/bar_keywords.c:882
+#: ../src/bar_keywords.c:942
 msgid "Configure keyword"
 msgstr "设置关键词"
 
-#: ../src/bar_keywords.c:882 ../src/bar_keywords.c:1143
-msgid "Add keyword"
-msgstr "添加关键词"
-
-#: ../src/bar_keywords.c:888
+#: ../src/bar_keywords.c:948
 msgid "Keyword:"
 msgstr "关键词:"
 
-#: ../src/bar_keywords.c:897
+#: ../src/bar_keywords.c:957
 msgid "Keyword type:"
 msgstr "关键词类型:"
 
-#: ../src/bar_keywords.c:899
+#: ../src/bar_keywords.c:959
 msgid "Active keyword"
 msgstr "可选择"
 
-#: ../src/bar_keywords.c:902
+#: ../src/bar_keywords.c:962
 msgid "Helper"
 msgstr "仅分类"
 
-#: ../src/bar_keywords.c:1147
+#: ../src/bar_keywords.c:1262
 msgid "Add keyword to all selected images"
 msgstr "添加关键词到所有选择的图片"
 
-#: ../src/bar_keywords.c:1167
+#: ../src/bar_keywords.c:1282
 #, c-format
 msgid "Hide \"%s\""
 msgstr "隐藏 \"%s\""
 
-#: ../src/bar_keywords.c:1174
+#: ../src/bar_keywords.c:1289
 #, c-format
 msgid "Mark %d"
 msgstr "标记 %d"
 
-#: ../src/bar_keywords.c:1179
+#: ../src/bar_keywords.c:1294
 #, c-format
 msgid "Connect \"%s\" to mark"
 msgstr "关联 \"%s\" 到标记"
 
-#: ../src/bar_keywords.c:1186
+#: ../src/bar_keywords.c:1301
 #, c-format
 msgid "Edit \"%s\""
 msgstr "编辑 \"%s\""
 
-#: ../src/bar_keywords.c:1196
+#: ../src/bar_keywords.c:1311
 #, c-format
 msgid "Disconnect \"%s\" from mark %s"
 msgstr "取消关联 \"%s\" 到标记 %s"
 
 #. for the pane
-#: ../src/bar_keywords.c:1208 ../src/bar_keywords.c:1217
+#: ../src/bar_keywords.c:1323 ../src/bar_keywords.c:1337
 msgid "Expand checked"
 msgstr "展开勾选"
 
-#: ../src/bar_keywords.c:1209 ../src/bar_keywords.c:1218
+#: ../src/bar_keywords.c:1324 ../src/bar_keywords.c:1338
 msgid "Collapse unchecked"
 msgstr "收拢未勾选"
 
-#: ../src/bar_keywords.c:1210 ../src/bar_keywords.c:1219
+#: ../src/bar_keywords.c:1325 ../src/bar_keywords.c:1339
 msgid "Hide unchecked"
 msgstr "隐藏未勾选"
 
-#: ../src/bar_keywords.c:1211
+#: ../src/bar_keywords.c:1326
+msgid "Revert all hidden"
+msgstr ""
+
+#: ../src/bar_keywords.c:1328
 msgid "Show all"
 msgstr "显示全部"
 
-#: ../src/bar_keywords.c:1214
+#: ../src/bar_keywords.c:1329
+#, fuzzy
+msgid "Collapse all"
+msgstr "收拢未勾选"
+
+#: ../src/bar_keywords.c:1330
+msgid "Revert"
+msgstr ""
+
+#: ../src/bar_keywords.c:1334
 msgid "On any change"
 msgstr "当任何改变时"
 
-#: ../src/bar_sort.c:449
+#: ../src/bar_sort.c:500
 #, c-format
 msgid ""
 "The collection:\n"
@@ -371,11 +446,11 @@ msgstr ""
 "%s\n"
 "已存在."
 
-#: ../src/bar_sort.c:450
+#: ../src/bar_sort.c:501
 msgid "Collection exists"
 msgstr "图片集已存在"
 
-#: ../src/bar_sort.c:464 ../src/collect.c:1043 ../src/collect-dlg.c:85
+#: ../src/bar_sort.c:515 ../src/collect.c:1060 ../src/collect-dlg.c:93
 #, c-format
 msgid ""
 "Failed to save the collection:\n"
@@ -384,55 +459,56 @@ msgstr ""
 "保存图片集失败:\n"
 "%s"
 
-#: ../src/bar_sort.c:465 ../src/collect.c:1044 ../src/collect-dlg.c:86
+#: ../src/bar_sort.c:516 ../src/collect.c:1061 ../src/collect-dlg.c:94
 msgid "Save Failed"
 msgstr "保存失败"
 
-#: ../src/bar_sort.c:500 ../src/bar_sort.c:670
+#: ../src/bar_sort.c:551 ../src/bar_sort.c:723
 msgid "Add Bookmark"
 msgstr "添加书签"
 
-#: ../src/bar_sort.c:504
+#: ../src/bar_sort.c:555
 msgid "Add Collection"
 msgstr "添加图片集"
 
-#: ../src/bar_sort.c:521 ../src/ui_bookmark.c:288
+#: ../src/bar_sort.c:572 ../src/shortcuts.c:109 ../src/ui_bookmark.c:297
 msgid "Name:"
 msgstr "名称:"
 
-#: ../src/bar_sort.c:597
+#: ../src/bar_sort.c:650
 msgid "Sort Manager"
 msgstr "快捷整理"
 
-#: ../src/bar_sort.c:606 ../src/pan-view.c:2194 ../src/ui_pathsel.c:1097
+#: ../src/bar_sort.c:659 ../src/pan-view/pan-view.c:1823
+#: ../src/ui_pathsel.c:1107
 msgid "Folders"
 msgstr "文件夹"
 
-#: ../src/bar_sort.c:607 ../src/options.c:160
+#: ../src/bar_sort.c:660 ../src/options.c:190
 msgid "Collections"
 msgstr "图片集"
 
-#: ../src/bar_sort.c:615 ../src/utilops.c:2137
+#: ../src/bar_sort.c:668 ../src/utilops.c:2283
 msgid "Copy"
 msgstr "复制"
 
-#: ../src/bar_sort.c:618 ../src/utilops.c:2088
+#: ../src/bar_sort.c:671 ../src/utilops.c:2233
 msgid "Move"
 msgstr "移动"
 
-#: ../src/bar_sort.c:657
+#: ../src/bar_sort.c:710
 msgid "Add image"
 msgstr "添加图像"
 
-#: ../src/bar_sort.c:660
+#: ../src/bar_sort.c:713
 msgid "Add selection"
 msgstr "添加所选项"
 
-#: ../src/bar_sort.c:673
+#: ../src/bar_sort.c:726
 msgid "Undo last image"
 msgstr "撤销上一图片"
 
-#: ../src/cache.c:163
+#: ../src/cache.c:172
 #, c-format
 msgid ""
 "error saving sim cache data: %s\n"
@@ -441,77 +517,77 @@ msgstr ""
 "保存模拟缓存数据出错: %s\n"
 "error: %s\n"
 
-#: ../src/cache_maint.c:110 ../src/cache_maint.c:549 ../src/cache_maint.c:765
-#: ../src/editors.c:1177
+#: ../src/cache_maint.c:123 ../src/cache_maint.c:612 ../src/cache_maint.c:880
+#: ../src/editors.c:1189
 msgid "done"
 msgstr "完成"
 
-#: ../src/cache_maint.c:288
+#: ../src/cache_maint.c:313
 msgid "Removing old metadata..."
 msgstr "移除旧的元数据..."
 
-#: ../src/cache_maint.c:292
+#: ../src/cache_maint.c:317
 msgid "Clearing cached thumbnails..."
 msgstr "清理缓存的缩略图..."
 
-#: ../src/cache_maint.c:296 ../src/cache_maint.c:923
+#: ../src/cache_maint.c:321 ../src/cache_maint.c:1053
 msgid "Removing old thumbnails..."
 msgstr "移除旧的缩略图..."
 
-#: ../src/cache_maint.c:299 ../src/cache_maint.c:926
+#: ../src/cache_maint.c:324 ../src/cache_maint.c:1056
 msgid "Maintenance"
 msgstr "维护"
 
-#: ../src/cache_maint.c:660
+#: ../src/cache_maint.c:732
 msgid "Invalid folder"
 msgstr "无效的文件夹"
 
-#: ../src/cache_maint.c:661
+#: ../src/cache_maint.c:733
 msgid "The specified folder can not be found."
 msgstr "找不到指定文件夹."
 
-#: ../src/cache_maint.c:692 ../src/cache_maint.c:706 ../src/cache_maint.c:1102
+#: ../src/cache_maint.c:796 ../src/cache_maint.c:810 ../src/cache_maint.c:1256
 msgid "Create thumbnails"
 msgstr "创建缩略图"
 
-#: ../src/cache_maint.c:700 ../src/cache_maint.c:933
+#: ../src/cache_maint.c:804 ../src/cache_maint.c:1063
 msgid "S_tart"
 msgstr "开始 (_t)"
 
-#: ../src/cache_maint.c:713 ../src/preferences.c:1941
+#: ../src/cache_maint.c:817 ../src/preferences.c:2141
 msgid "Folder:"
 msgstr "文件夹:"
 
-#: ../src/cache_maint.c:716
+#: ../src/cache_maint.c:820
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../src/cache_maint.c:720
+#: ../src/cache_maint.c:824
 msgid "Include subfolders"
 msgstr "包括子目录"
 
-#: ../src/cache_maint.c:721
+#: ../src/cache_maint.c:825
 msgid "Store thumbnails local to source images"
 msgstr "存储缩略图到源图像位置"
 
-#: ../src/cache_maint.c:730 ../src/cache_maint.c:942
+#: ../src/cache_maint.c:834 ../src/cache_maint.c:1072
 msgid "click start to begin"
 msgstr "点击开始按钮执行"
 
-#: ../src/cache_maint.c:869 ../src/editors.c:1103
+#: ../src/cache_maint.c:992 ../src/editors.c:1115
 msgid "running..."
 msgstr "运行中..."
 
-#: ../src/cache_maint.c:918
+#: ../src/cache_maint.c:1048
 msgid "Clearing thumbnails..."
 msgstr "清理缩略图..."
 
-#: ../src/cache_maint.c:984 ../src/cache_maint.c:987 ../src/cache_maint.c:1080
-#: ../src/cache_maint.c:1097
+#: ../src/cache_maint.c:1131 ../src/cache_maint.c:1134
+#: ../src/cache_maint.c:1232 ../src/cache_maint.c:1251
 msgid "Clear cache"
 msgstr "清除缓存"
 
-#: ../src/cache_maint.c:988
+#: ../src/cache_maint.c:1135
 msgid ""
 "This will remove all thumbnails that have\n"
 "been saved to disk, continue?"
@@ -519,73 +595,78 @@ msgstr ""
 "这将会移除所有已被保存\n"
 "到硬盘的缩略图, 继续吗？"
 
-#: ../src/cache_maint.c:1030
+#: ../src/cache_maint.c:1180
 #, c-format
 msgid "Location: %s"
 msgstr "位置: %s"
 
-#: ../src/cache_maint.c:1055
+#: ../src/cache_maint.c:1205
 msgid "Cache Maintenance"
 msgstr "缓存维护"
 
-#: ../src/cache_maint.c:1065
+#: ../src/cache_maint.c:1217
 msgid "Cache and Data Maintenance"
 msgstr "缓存与数据维护"
 
-#: ../src/cache_maint.c:1069
+#: ../src/cache_maint.c:1221
 msgid "Thumbnail cache"
 msgstr "缩略图缓存"
 
-#: ../src/cache_maint.c:1075 ../src/cache_maint.c:1092
-#: ../src/cache_maint.c:1117
+#: ../src/cache_maint.c:1227 ../src/cache_maint.c:1246
+#: ../src/cache_maint.c:1271
 msgid "Clean up"
 msgstr "清理"
 
-#: ../src/cache_maint.c:1078 ../src/cache_maint.c:1095
+#: ../src/cache_maint.c:1230 ../src/cache_maint.c:1249
 msgid "Remove orphaned or outdated thumbnails."
 msgstr "移除无用或过期的缩略图."
 
-#: ../src/cache_maint.c:1083 ../src/cache_maint.c:1100
-msgid "Delete all cached thumbnails."
+#: ../src/cache_maint.c:1235
+#, fuzzy
+msgid "Delete all cached data."
 msgstr "删除所有缓存的缩略图."
 
-#: ../src/cache_maint.c:1086
+#: ../src/cache_maint.c:1238
 msgid "Shared thumbnail cache"
 msgstr "共享的缩略图缓存"
 
-#: ../src/cache_maint.c:1106
+#: ../src/cache_maint.c:1254
+msgid "Delete all cached thumbnails."
+msgstr "删除所有缓存的缩略图."
+
+#: ../src/cache_maint.c:1260
 msgid "Render"
 msgstr "生成"
 
-#: ../src/cache_maint.c:1109
+#: ../src/cache_maint.c:1263
 msgid "Render thumbnails for a specific folder."
 msgstr "对指定文件夹生成缩略图"
 
-#: ../src/cache_maint.c:1120
+#: ../src/cache_maint.c:1274
 msgid "Remove orphaned keywords and comments."
 msgstr "移除无用的关键词和注释"
 
 #. When does this occur ??
-#: ../src/collect.c:331 ../src/image.c:160 ../src/image-overlay.c:532
-#: ../src/image-overlay.c:609
+#: ../src/collect.c:339 ../src/image.c:172 ../src/image-overlay.c:545
+#: ../src/image-overlay.c:622
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../src/collect.c:335
+#: ../src/collect.c:343
 #, c-format
 msgid "Untitled (%d)"
 msgstr "未命名 (%d)"
 
-#: ../src/collect.c:968
+#: ../src/collect.c:985
 #, c-format
 msgid "%s - Collection - %s"
 msgstr "%s - 图片集 - %s"
 
-#: ../src/collect.c:1080 ../src/collect.c:1084
+#: ../src/collect.c:1097 ../src/collect.c:1101
 msgid "Close collection"
 msgstr "关闭图片集"
 
-#: ../src/collect.c:1085
+#: ../src/collect.c:1102
 msgid ""
 "Collection has been modified.\n"
 "Save first?"
@@ -593,11 +674,11 @@ msgstr ""
 "图片集已被修改.\n"
 "要保存吗？"
 
-#: ../src/collect.c:1088
+#: ../src/collect.c:1105
 msgid "_Discard"
 msgstr "放弃 (_D)"
 
-#: ../src/collect-dlg.c:59
+#: ../src/collect-dlg.c:67
 #, c-format
 msgid ""
 "Specified path:\n"
@@ -608,67 +689,67 @@ msgstr ""
 "%s\n"
 "是个文件夹，图片集是文件"
 
-#: ../src/collect-dlg.c:60
+#: ../src/collect-dlg.c:68
 msgid "Invalid filename"
 msgstr "无效文件名"
 
-#: ../src/collect-dlg.c:69
+#: ../src/collect-dlg.c:77
 msgid "Overwrite File"
 msgstr "覆盖文件"
 
-#: ../src/collect-dlg.c:74
+#: ../src/collect-dlg.c:82
 msgid "Overwrite existing file?"
 msgstr "覆盖已存在的文件？"
 
-#: ../src/collect-dlg.c:76
+#: ../src/collect-dlg.c:84
 msgid "_Overwrite"
 msgstr "覆盖 (_O)"
 
-#: ../src/collect-dlg.c:127
+#: ../src/collect-dlg.c:135
 #, c-format
 msgid "No such file '%s'."
 msgstr "没有这样的文件 '%s'."
 
-#: ../src/collect-dlg.c:132
+#: ../src/collect-dlg.c:140
 #, c-format
 msgid "'%s' is a directory, not a collection file."
 msgstr "'%s' 是个目录, 不是图片集文件."
 
-#: ../src/collect-dlg.c:137
+#: ../src/collect-dlg.c:145
 #, c-format
 msgid "You do not have read permissions on the file '%s'."
 msgstr "你没有文件 '%s' 的读取权限. "
 
-#: ../src/collect-dlg.c:143
+#: ../src/collect-dlg.c:151
 msgid "Can not open collection file"
 msgstr "不能打开图片集"
 
-#: ../src/collect-dlg.c:195
+#: ../src/collect-dlg.c:203
 msgid "Save collection"
 msgstr "保存图片集"
 
-#: ../src/collect-dlg.c:202
+#: ../src/collect-dlg.c:210
 msgid "Open collection"
 msgstr "打开图片集"
 
-#: ../src/collect-dlg.c:210
+#: ../src/collect-dlg.c:218
 msgid "Append collection"
 msgstr "加入图片集"
 
-#: ../src/collect-dlg.c:211
+#: ../src/collect-dlg.c:219
 msgid "_Append"
 msgstr "加入(_A)"
 
-#: ../src/collect-dlg.c:228
+#: ../src/collect-dlg.c:236
 msgid "Collection Files"
 msgstr "图片集文件"
 
-#: ../src/collect-io.c:348
+#: ../src/collect-io.c:356
 #, c-format
 msgid "failed to open collection (write) \"%s\"\n"
 msgstr "打开图片集 (写) 失败 \"%s\"\n"
 
-#: ../src/collect-io.c:373
+#: ../src/collect-io.c:381
 #, c-format
 msgid ""
 "error saving collection file: %s\n"
@@ -687,168 +768,175 @@ msgstr "%s, %d 图片 (%s, %d)"
 msgid "%s, %d images"
 msgstr "%s, %d 图片"
 
-#: ../src/collect-table.c:223 ../src/layout_util.c:1229
-#: ../src/layout_util.c:2153
+#: ../src/collect-table.c:223 ../src/layout_util.c:1652
+#: ../src/layout_util.c:2621
 msgid "Empty"
 msgstr "空"
 
-#: ../src/collect-table.c:237 ../src/dupe.c:1314 ../src/search.c:320
-#: ../src/view_file.c:835 ../src/view_file.c:938
+#: ../src/collect-table.c:237 ../src/dupe.c:1362 ../src/search.c:365
+#: ../src/view_file.c:871 ../src/view_file.c:974
 msgid "Loading thumbs..."
 msgstr "载入缩略图..."
 
-#: ../src/collect-table.c:868 ../src/dupe.c:2237 ../src/dupe.c:2550
-#: ../src/layout_util.c:1276 ../src/search.c:996
+#: ../src/collect-table.c:904 ../src/dupe.c:2323 ../src/dupe.c:2636
+#: ../src/layout_util.c:1700 ../src/search.c:1041
 msgid "_View"
 msgstr "查看 (_V)"
 
-#: ../src/collect-table.c:870 ../src/dupe.c:2239 ../src/dupe.c:2552
-#: ../src/img-view.c:1268 ../src/layout_image.c:499 ../src/pan-view.c:2617
-#: ../src/search.c:998 ../src/view_file.c:588
+#: ../src/collect-table.c: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
 msgid "View in _new window"
 msgstr "在新窗口中查看(_n)"
 
-#: ../src/collect-table.c:873 ../src/dupe.c:2273 ../src/dupe.c:2560
-#: ../src/search.c:1028
+#: ../src/collect-table.c:909 ../src/dupe.c:2359 ../src/dupe.c:2646
+#: ../src/search.c:1073
 msgid "Rem_ove"
 msgstr "移去(_o)"
 
-#: ../src/collect-table.c:876
+#: ../src/collect-table.c:912
 msgid "Append from file list"
 msgstr "从文件列表加入"
 
-#: ../src/collect-table.c:878
+#: ../src/collect-table.c:914
 msgid "Append from collection..."
 msgstr "从图片集加入..."
 
-#: ../src/collect-table.c:882
+#: ../src/collect-table.c:918
 msgid "_Selection"
 msgstr "选择(_S)"
 
-#: ../src/collect-table.c:884 ../src/dupe.c:2242 ../src/dupe.c:2555
-#: ../src/layout_util.c:1324 ../src/search.c:1001
+#: ../src/collect-table.c:920 ../src/dupe.c:2328 ../src/dupe.c:2641
+#: ../src/layout_util.c:1755 ../src/search.c:1046
 msgid "Select all"
 msgstr "全选"
 
-#: ../src/collect-table.c:886 ../src/dupe.c:2244 ../src/dupe.c:2557
-#: ../src/layout_util.c:1325 ../src/search.c:1003
+#: ../src/collect-table.c:922 ../src/dupe.c:2330 ../src/dupe.c:2643
+#: ../src/layout_util.c:1756 ../src/search.c:1048
 msgid "Select none"
 msgstr "不选"
 
-#: ../src/collect-table.c:888
+#: ../src/collect-table.c:924
 msgid "Invert selection"
 msgstr "反转选择"
 
-#: ../src/collect-table.c:900 ../src/dupe.c:2262 ../src/img-view.c:1272
-#: ../src/layout_image.c:507 ../src/layout_util.c:1307 ../src/pan-view.c:2621
-#: ../src/search.c:1017 ../src/view_file.c:592
+#: ../src/collect-table.c:926
+#, fuzzy
+msgid "Rectangular selection"
+msgstr "图标形式查看时块状选取"
+
+#: ../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
 msgid "_Copy..."
 msgstr "复制... (_C)"
 
-#: ../src/collect-table.c:902 ../src/dupe.c:2264 ../src/img-view.c:1273
-#: ../src/layout_image.c:509 ../src/layout_util.c:1308 ../src/pan-view.c:2623
-#: ../src/search.c:1019 ../src/view_file.c:594
+#: ../src/collect-table.c: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
 msgid "_Move..."
 msgstr "移动... (_M)"
 
-#: ../src/collect-table.c:904 ../src/dupe.c:2266 ../src/img-view.c:1274
-#: ../src/layout_image.c:511 ../src/layout_util.c:1309 ../src/pan-view.c:2625
-#: ../src/search.c:1021 ../src/view_dir.c:665 ../src/view_file.c:596
+#: ../src/collect-table.c: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
 msgid "_Rename..."
 msgstr "重命名... (_R)"
 
-#: ../src/collect-table.c:906 ../src/dupe.c:2268 ../src/img-view.c:1275
-#: ../src/layout_image.c:513 ../src/layout_util.c:1310
-#: ../src/layout_util.c:1311 ../src/layout_util.c:1312 ../src/pan-view.c:2627
-#: ../src/search.c:1023 ../src/view_dir.c:667 ../src/view_file.c:598
+#: ../src/collect-table.c:944 ../src/dupe.c:2354 ../src/img-view.c:1289
+#: ../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
 msgid "_Delete..."
 msgstr "删除... (_D)"
 
-#: ../src/collect-table.c:908 ../src/dupe.c:2270 ../src/img-view.c:1276
-#: ../src/layout_image.c:516 ../src/pan-view.c:2629 ../src/search.c:1025
-#: ../src/view_dir.c:670 ../src/view_file.c:600
+#: ../src/collect-table.c: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
 msgid "_Copy path"
 msgstr "复制路径(_C)"
 
-#: ../src/collect-table.c:914
+#: ../src/collect-table.c:952
 msgid "Randomize"
 msgstr "随机化"
 
-#: ../src/collect-table.c:916 ../src/view_file.c:616
+#: ../src/collect-table.c:954 ../src/view_file.c:652
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: ../src/collect-table.c:919 ../src/view_file.c:632
+#: ../src/collect-table.c:957 ../src/view_file.c:668
 msgid "Show filename _text"
 msgstr "显示文件名(_t)"
 
-#: ../src/collect-table.c:922
+#: ../src/collect-table.c:960
 msgid "_Save collection"
 msgstr "保存图片集(_S)"
 
-#: ../src/collect-table.c:924
+#: ../src/collect-table.c:962
 msgid "Save collection _as..."
 msgstr "保存图片集为...(_a)"
 
-#: ../src/collect-table.c:927 ../src/layout_util.c:1303
+#: ../src/collect-table.c:965 ../src/layout_util.c:1727 ../src/view_file.c:639
 msgid "_Find duplicates..."
 msgstr "查找重复项... (_F)"
 
-#: ../src/collect-table.c:929 ../src/dupe.c:2259 ../src/layout_util.c:1305
-#: ../src/search.c:1014
+#: ../src/collect-table.c:967 ../src/dupe.c:2345 ../src/layout_util.c:1729
+#: ../src/search.c:1059
 msgid "Print..."
 msgstr "打印..."
 
-#: ../src/collect-table.c:2094 ../src/dupe.c:3319 ../src/img-view.c:1430
+#: ../src/collect-table.c:2156 ../src/dupe.c:3500 ../src/img-view.c:1444
 msgid "Dropped list includes folders."
 msgstr "扔掉的列表包括文件夹."
 
-#: ../src/collect-table.c:2096 ../src/dupe.c:3321 ../src/img-view.c:1432
+#: ../src/collect-table.c:2158 ../src/dupe.c:3502 ../src/img-view.c:1446
 msgid "_Add contents"
 msgstr "添加内容 (_A)"
 
-#: ../src/collect-table.c:2098 ../src/dupe.c:3322 ../src/img-view.c:1433
+#: ../src/collect-table.c:2160 ../src/dupe.c:3503 ../src/img-view.c:1447
 msgid "Add contents _recursive"
 msgstr "添加内容 包括子目录 (_r)"
 
-#: ../src/collect-table.c:2100 ../src/dupe.c:3323 ../src/img-view.c:1434
+#: ../src/collect-table.c:2162 ../src/dupe.c:3504 ../src/img-view.c:1448
 msgid "_Skip folders"
 msgstr "跳过文件夹 (_S)"
 
-#: ../src/collect-table.c:2103 ../src/dupe.c:3325 ../src/img-view.c:1436
-#: ../src/view_dir.c:417
+#: ../src/collect-table.c:2165 ../src/dupe.c:3506 ../src/img-view.c:1450
+#: ../src/view_dir.c:426
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/color-man.c:426 ../src/exif.c:233 ../src/exif-common.c:436
+#: ../src/color-man.c:434 ../src/exif.c:227 ../src/exif-common.c:448
 msgid "sRGB"
 msgstr ""
 
-#: ../src/color-man.c:428
+#: ../src/color-man.c:436
 msgid "Adobe RGB compatible"
 msgstr "Adobe RGB 兼容"
 
-#: ../src/color-man.c:445
+#: ../src/color-man.c:453
 msgid "Custom profile"
 msgstr "自定义配置文件"
 
-#: ../src/desktop_file.c:74 ../src/desktop_file.c:86 ../src/desktop_file.c:92
+#: ../src/desktop_file.c:83 ../src/desktop_file.c:95 ../src/desktop_file.c:101
 msgid "Can't save"
 msgstr "不能保存"
 
-#: ../src/desktop_file.c:74
+#: ../src/desktop_file.c:83
 msgid "Please specify file name."
 msgstr "请指定文件名"
 
-#: ../src/desktop_file.c:86
+#: ../src/desktop_file.c:95
 msgid "Could not create directory"
 msgstr "不能创建目录"
 
-#: ../src/desktop_file.c:182 ../src/desktop_file.c:534
+#: ../src/desktop_file.c:191 ../src/desktop_file.c:554
 msgid "Desktop file"
 msgstr "桌面文件"
 
-#: ../src/desktop_file.c:291 ../src/ui_pathsel.c:485
+#: ../src/desktop_file.c:300 ../src/ui_pathsel.c:494
 #, c-format
 msgid ""
 "Unable to delete file:\n"
@@ -857,17 +945,17 @@ msgstr ""
 "不能删除文件:\n"
 "%s"
 
-#: ../src/desktop_file.c:292 ../src/ui_pathsel.c:486 ../src/utilops.c:1975
-#: ../src/utilops.c:2002 ../src/utilops.c:2522
+#: ../src/desktop_file.c:301 ../src/ui_pathsel.c:495 ../src/utilops.c:2119
+#: ../src/utilops.c:2146 ../src/utilops.c:2668
 msgid "File deletion failed"
 msgstr "文件删除失败"
 
-#: ../src/desktop_file.c:336 ../src/desktop_file.c:344 ../src/ui_pathsel.c:528
-#: ../src/ui_pathsel.c:536
+#: ../src/desktop_file.c:345 ../src/desktop_file.c:353 ../src/ui_pathsel.c:537
+#: ../src/ui_pathsel.c:545
 msgid "Delete file"
 msgstr "删除文件"
 
-#: ../src/desktop_file.c:342 ../src/ui_pathsel.c:534
+#: ../src/desktop_file.c:351 ../src/ui_pathsel.c:543
 #, c-format
 msgid ""
 "About to delete the file:\n"
@@ -876,175 +964,190 @@ msgstr ""
 "将要删除这些文件:\n"
 " %s"
 
-#: ../src/desktop_file.c:374
+#: ../src/desktop_file.c:383
 msgid "new.desktop"
 msgstr ""
 
-#: ../src/desktop_file.c:453
+#: ../src/desktop_file.c:467
 msgid "Editors"
 msgstr "外部编辑器"
 
-#: ../src/desktop_file.c:524
+#: ../src/desktop_file.c:544
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../src/desktop_file.c:543 ../src/dupe.c:2648 ../src/dupe.c:3133
-#: ../src/print.c:3201 ../src/search.c:2794 ../src/ui_pathsel.c:1109
-#: ../src/utilops.c:458
+#: ../src/desktop_file.c:563 ../src/dupe.c:2745 ../src/dupe.c:3282
+#: ../src/print.c:3211 ../src/search.c:3088 ../src/ui_pathsel.c:1119
+#: ../src/utilops.c:501
 msgid "Path"
 msgstr "路径"
 
-#: ../src/dupe.c:100
+#: ../src/dupe.c:108
 msgid "Drop files to compare them."
 msgstr "拖入文件来比较它们."
 
-#: ../src/dupe.c:104
+#: ../src/dupe.c:112
 #, c-format
 msgid "%d files"
 msgstr "%d 文件"
 
-#: ../src/dupe.c:108
+#: ../src/dupe.c:116
 #, c-format
 msgid "%d matches found in %d files"
 msgstr "%d 匹配的文件在 %d 文件中"
 
-#: ../src/dupe.c:113
+#: ../src/dupe.c:121
 msgid "[set 1]"
 msgstr "[文件组 1]"
 
-#: ../src/dupe.c:1440
+#: ../src/dupe.c:1488
 msgid "Reading checksums..."
 msgstr "读取检验码..."
 
-#: ../src/dupe.c:1473
+#: ../src/dupe.c:1521
 msgid "Reading dimensions..."
 msgstr "读取图像尺寸..."
 
-#: ../src/dupe.c:1507
+#: ../src/dupe.c:1555
 msgid "Reading similarity data..."
 msgstr "读取相似度数据..."
 
-#: ../src/dupe.c:1543 ../src/dupe.c:1574
+#: ../src/dupe.c:1591 ../src/dupe.c:1622
 msgid "Comparing..."
 msgstr "比较中..."
 
-#: ../src/dupe.c:1554 ../src/pan-view.c:996
+#: ../src/dupe.c:1602 ../src/pan-view/pan-view.c:1011
 msgid "Sorting..."
 msgstr "排序中..."
 
-#: ../src/dupe.c:2246
+#: ../src/dupe.c:2332
 msgid "Select group _1 duplicates"
 msgstr "选取第1组重复项"
 
-#: ../src/dupe.c:2248
+#: ../src/dupe.c:2334
 msgid "Select group _2 duplicates"
 msgstr "选取第2组重复项"
 
-#: ../src/dupe.c:2257 ../src/search.c:1012
+#: ../src/dupe.c:2343 ../src/search.c:1057 ../src/view_file.c:642
 msgid "Add to new collection"
 msgstr "添加到新图片集"
 
-#: ../src/dupe.c:2275 ../src/dupe.c:2562 ../src/search.c:1030
+#: ../src/dupe.c:2361 ../src/dupe.c:2648 ../src/search.c:1075
 msgid "C_lear"
 msgstr "清除"
 
-#: ../src/dupe.c:2278 ../src/dupe.c:2565
+#: ../src/dupe.c:2364 ../src/dupe.c:2651
 msgid "Close _window"
 msgstr "关闭窗口 (_w)"
 
-#: ../src/dupe.c:2438
+#: ../src/dupe.c:2524
 #, c-format
 msgid "%d files (set 2)"
 msgstr "%d 文件 (文件组 2)"
 
-#: ../src/dupe.c:2643
+#: ../src/dupe.c:2740
 msgid "Name case-insensitive"
 msgstr "名称(忽略大小写)"
 
-#: ../src/dupe.c:2644 ../src/dupe.c:3130 ../src/preferences.c:1476
-#: ../src/print.c:3205 ../src/search.c:2791 ../src/view_file_list.c:1984
+#: ../src/dupe.c: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
 msgid "Size"
 msgstr "大小"
 
-#: ../src/dupe.c:2645 ../src/dupe.c:3131 ../src/exif.c:342
-#: ../src/exif-common.c:553 ../src/print.c:3203 ../src/search.c:2792
-#: ../src/view_file_list.c:1988
+#: ../src/dupe.c: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
 msgid "Date"
 msgstr "日期"
 
-#: ../src/dupe.c:2646 ../src/dupe.c:3132 ../src/print.c:3207
-#: ../src/search.c:2793
+#: ../src/dupe.c:2743 ../src/dupe.c:3281 ../src/print.c:3217
+#: ../src/search.c:3087
 msgid "Dimensions"
 msgstr "尺寸"
 
-#: ../src/dupe.c:2647
+#: ../src/dupe.c:2744
 msgid "Checksum"
 msgstr "检验码"
 
-#: ../src/dupe.c:2649
+#: ../src/dupe.c:2746
 msgid "Similarity (high)"
 msgstr "相似度(高)"
 
-#: ../src/dupe.c:2650
+#: ../src/dupe.c:2747
 msgid "Similarity"
 msgstr "相似度"
 
-#: ../src/dupe.c:2651
+#: ../src/dupe.c:2748
 msgid "Similarity (low)"
 msgstr "相似度(低)"
 
-#: ../src/dupe.c:2652
+#: ../src/dupe.c:2749
 msgid "Similarity (custom)"
 msgstr "相似度(自定)"
 
-#: ../src/dupe.c:3083
+#: ../src/dupe.c:3232
 msgid "Find duplicates"
 msgstr "查找重复项"
 
-#: ../src/dupe.c:3165
+#: ../src/dupe.c:3314
 msgid "Compare to:"
 msgstr " 比较于:"
 
-#: ../src/dupe.c:3178
+#: ../src/dupe.c:3327
 msgid "Compare by:"
 msgstr "比较:"
 
-#: ../src/dupe.c:3186 ../src/preferences.c:1316 ../src/search.c:2807
+#: ../src/dupe.c:3335 ../src/preferences.c:1436 ../src/search.c:3101
 msgid "Thumbnails"
 msgstr "缩略图"
 
-#: ../src/dupe.c:3193
+#: ../src/dupe.c:3343
+#, fuzzy
+msgid "Ignore Rotation"
+msgstr "方向 (_O)"
+
+#: ../src/dupe.c:3351
 msgid "Compare two file sets"
 msgstr "比较两个文件分组"
 
-#: ../src/editors.c:281
+#: ../src/dupe.c:3371 ../src/menu.c:219
+msgid "Sort"
+msgstr "排序"
+
+#: ../src/dupe.c:3379
+#, fuzzy
+msgid "Custom Threshold"
+msgstr "自定相似度阀值:"
+
+#: ../src/editors.c:289
 #, c-format
 msgid "Desktop file '%s' should not include extension in Icon key: '%s'\n"
 msgstr ""
 
 #. flash fired (bit 0)
-#: ../src/editors.c:335 ../src/exif.c:226 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:220 ../src/exif-common.c:374
 msgid "yes"
 msgstr "是"
 
-#: ../src/editors.c:335 ../src/exif.c:225 ../src/exif-common.c:362
+#: ../src/editors.c:343 ../src/exif.c:219 ../src/exif-common.c:374
 msgid "no"
 msgstr "否"
 
-#: ../src/editors.c:507
+#: ../src/editors.c:515
 msgid "stopping..."
 msgstr "停止中..."
 
-#: ../src/editors.c:528
+#: ../src/editors.c:536
 msgid "Edit command results"
 msgstr "编辑命令结果"
 
-#: ../src/editors.c:531
+#: ../src/editors.c:539
 #, c-format
 msgid "Output of %s"
 msgstr "%s 的输出"
 
-#: ../src/editors.c:1054
+#: ../src/editors.c:1066
 #, c-format
 msgid ""
 "Failed to run command:\n"
@@ -1053,2099 +1156,2324 @@ msgstr ""
 "运行命令失败:\n"
 "%s\n"
 
-#: ../src/editors.c:1181
+#: ../src/editors.c:1193
 msgid "stopped by user"
 msgstr "真得要继续吗？"
 
-#: ../src/editors.c:1266
+#: ../src/editors.c:1278
 #, c-format
 msgid ""
 "%s\n"
 "\"%s\""
 msgstr ""
 
-#: ../src/editors.c:1268
+#: ../src/editors.c:1280
 msgid "Invalid editor command"
 msgstr "无效编辑器命令"
 
-#: ../src/editors.c:1355
+#: ../src/editors.c:1367
 msgid "Editor template is empty."
 msgstr "编辑器模板为空."
 
-#: ../src/editors.c:1356
+#: ../src/editors.c:1368
 msgid "Editor template has incorrect syntax."
 msgstr "编辑器模板有错误的语法"
 
-#: ../src/editors.c:1357
+#: ../src/editors.c:1369
 msgid "Editor template uses incompatible macros."
 msgstr "编辑器模板使用了不兼容的宏."
 
-#: ../src/editors.c:1358
+#: ../src/editors.c:1370
 msgid "Can't find matching file type."
 msgstr "不能发现匹配的文件类型."
 
-#: ../src/editors.c:1359
+#: ../src/editors.c:1371
 msgid "Can't execute external editor."
 msgstr "不能执行外部编辑器"
 
-#: ../src/editors.c:1360
+#: ../src/editors.c:1372
 msgid "External editor returned error status."
 msgstr "外部编辑器返回出错消息."
 
-#: ../src/editors.c:1361
+#: ../src/editors.c:1373
 msgid "File was skipped."
 msgstr "文件被跳过."
 
-#: ../src/editors.c:1362
+#: ../src/editors.c:1374
 msgid "Unknown error."
 msgstr "未知错误."
 
-#: ../src/exif.c:148 ../src/exif.c:161 ../src/exif.c:175 ../src/exif.c:200
-#: ../src/exif.c:317 ../src/exif.c:664 ../src/exif-common.c:338
-#: ../src/exif-common.c:341 ../src/exif-common.c:408
+#: ../src/exif.c:142 ../src/exif.c:155 ../src/exif.c:169 ../src/exif.c:194
+#: ../src/exif.c:311 ../src/exif.c:658 ../src/exif-common.c:350
+#: ../src/exif-common.c:353 ../src/exif-common.c:420
 msgid "unknown"
 msgstr "未知"
 
-#: ../src/exif.c:149
+#: ../src/exif.c:143
 #, fuzzy
 msgid "top left"
 msgstr "桌面文件"
 
-#: ../src/exif.c:150
+#: ../src/exif.c:144
 #, fuzzy
 msgid "top right"
 msgstr "版权"
 
-#: ../src/exif.c:151
+#: ../src/exif.c:145
 msgid "bottom right"
 msgstr ""
 
-#: ../src/exif.c:152
+#: ../src/exif.c:146
 msgid "bottom left"
 msgstr ""
 
-#: ../src/exif.c:153
+#: ../src/exif.c:147
 msgid "left top"
 msgstr ""
 
-#: ../src/exif.c:154
+#: ../src/exif.c:148
 #, fuzzy
 msgid "right top"
 msgstr "右边 X"
 
-#: ../src/exif.c:155
+#: ../src/exif.c:149
 msgid "right bottom"
 msgstr ""
 
-#: ../src/exif.c:156
+#: ../src/exif.c:150
 #, fuzzy
 msgid "left bottom"
 msgstr "移到底部 (_b)"
 
-#: ../src/exif.c:163
+#: ../src/exif.c:157
 #, fuzzy
 msgid "inch"
 msgstr "英寸"
 
-#: ../src/exif.c:164
+#: ../src/exif.c:158
 #, fuzzy
 msgid "centimeter"
 msgstr "厘米"
 
-#: ../src/exif.c:176
+#: ../src/exif.c:170
 msgid "average"
 msgstr ""
 
-#: ../src/exif.c:177
+#: ../src/exif.c:171
 msgid "center weighted"
 msgstr ""
 
-#: ../src/exif.c:178
+#: ../src/exif.c:172
 msgid "spot"
 msgstr ""
 
-#: ../src/exif.c:179
+#: ../src/exif.c:173
 msgid "multi-spot"
 msgstr ""
 
-#: ../src/exif.c:180
+#: ../src/exif.c:174
 msgid "multi-segment"
 msgstr ""
 
-#: ../src/exif.c:181
+#: ../src/exif.c:175
 #, fuzzy
 msgid "partial"
 msgstr "部分匹配"
 
-#: ../src/exif.c:182 ../src/exif.c:220
+#: ../src/exif.c:176 ../src/exif.c:214
 msgid "other"
 msgstr ""
 
-#: ../src/exif.c:187 ../src/exif.c:239
+#: ../src/exif.c:181 ../src/exif.c:233
 msgid "not defined"
 msgstr ""
 
-#: ../src/exif.c:188 ../src/exif.c:267 ../src/exif.c:274
+#: ../src/exif.c:182 ../src/exif.c:261 ../src/exif.c:268
 msgid "manual"
 msgstr ""
 
-#: ../src/exif.c:189 ../src/exif.c:260 ../src/exif.c:296 ../src/exif.c:303
-#: ../src/exif.c:310
+#: ../src/exif.c:183 ../src/exif.c:254 ../src/exif.c:290 ../src/exif.c:297
+#: ../src/exif.c:304
 #, fuzzy
 msgid "normal"
 msgstr "标准"
 
-#: ../src/exif.c:190
+#: ../src/exif.c:184
 #, fuzzy
 msgid "aperture"
 msgstr "光圈"
 
-#: ../src/exif.c:191
+#: ../src/exif.c:185
 #, fuzzy
 msgid "shutter"
 msgstr "ä¿¡"
 
-#: ../src/exif.c:192
+#: ../src/exif.c:186
 msgid "creative"
 msgstr ""
 
-#: ../src/exif.c:193
+#: ../src/exif.c:187
 #, fuzzy
 msgid "action"
 msgstr "动作"
 
-#: ../src/exif.c:194 ../src/exif.c:281
+#: ../src/exif.c:188 ../src/exif.c:275
 #, fuzzy
 msgid "portrait"
 msgstr "纵向"
 
-#: ../src/exif.c:195 ../src/exif.c:280
+#: ../src/exif.c:189 ../src/exif.c:274
 #, fuzzy
 msgid "landscape"
 msgstr "横向"
 
-#: ../src/exif.c:201
+#: ../src/exif.c:195
 msgid "daylight"
 msgstr ""
 
-#: ../src/exif.c:202
+#: ../src/exif.c:196
 msgid "fluorescent"
 msgstr ""
 
-#: ../src/exif.c:203
+#: ../src/exif.c:197
 msgid "tungsten (incandescent)"
 msgstr ""
 
-#: ../src/exif.c:204
+#: ../src/exif.c:198
 #, fuzzy
 msgid "flash"
 msgstr "闪光灯"
 
-#: ../src/exif.c:205
+#: ../src/exif.c:199
 msgid "fine weather"
 msgstr ""
 
-#: ../src/exif.c:206
+#: ../src/exif.c:200
 msgid "cloudy weather"
 msgstr ""
 
-#: ../src/exif.c:207
+#: ../src/exif.c:201
 msgid "shade"
 msgstr ""
 
-#: ../src/exif.c:208
+#: ../src/exif.c:202
 msgid "daylight fluorescent"
 msgstr ""
 
-#: ../src/exif.c:209
+#: ../src/exif.c:203
 msgid "day white fluorescent"
 msgstr ""
 
-#: ../src/exif.c:210
+#: ../src/exif.c:204
 msgid "cool white fluorescent"
 msgstr ""
 
-#: ../src/exif.c:211
+#: ../src/exif.c:205
 msgid "white fluorescent"
 msgstr ""
 
-#: ../src/exif.c:212
+#: ../src/exif.c:206
 msgid "standard light A"
 msgstr ""
 
-#: ../src/exif.c:213
+#: ../src/exif.c:207
 msgid "standard light B"
 msgstr ""
 
-#: ../src/exif.c:214
+#: ../src/exif.c:208
 msgid "standard light C"
 msgstr ""
 
-#: ../src/exif.c:215
+#: ../src/exif.c:209
 msgid "D55"
 msgstr ""
 
-#: ../src/exif.c:216
+#: ../src/exif.c:210
 msgid "D65"
 msgstr ""
 
-#: ../src/exif.c:217
+#: ../src/exif.c:211
 msgid "D75"
 msgstr ""
 
-#: ../src/exif.c:218
+#: ../src/exif.c:212
 msgid "D50"
 msgstr ""
 
-#: ../src/exif.c:219
+#: ../src/exif.c:213
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: ../src/exif.c:227
+#: ../src/exif.c:221
 msgid "yes, not detected by strobe"
 msgstr ""
 
-#: ../src/exif.c:228
+#: ../src/exif.c:222
 msgid "yes, detected by strobe"
 msgstr ""
 
-#: ../src/exif.c:234
+#: ../src/exif.c:228
 msgid "uncalibrated"
 msgstr ""
 
-#: ../src/exif.c:240
+#: ../src/exif.c:234
 msgid "1 chip color area"
 msgstr ""
 
-#: ../src/exif.c:241
+#: ../src/exif.c:235
 msgid "2 chip color area"
 msgstr ""
 
-#: ../src/exif.c:242
+#: ../src/exif.c:236
 msgid "3 chip color area"
 msgstr ""
 
-#: ../src/exif.c:243
+#: ../src/exif.c:237
 msgid "color sequential area"
 msgstr ""
 
-#: ../src/exif.c:244
+#: ../src/exif.c:238
 #, fuzzy
 msgid "trilinear"
 msgstr "双线性"
 
-#: ../src/exif.c:245
+#: ../src/exif.c:239
 msgid "color sequential linear"
 msgstr ""
 
-#: ../src/exif.c:250
+#: ../src/exif.c:244
 msgid "digital still camera"
 msgstr ""
 
-#: ../src/exif.c:255
+#: ../src/exif.c:249
 msgid "direct photo"
 msgstr ""
 
-#: ../src/exif.c:261
+#: ../src/exif.c:255
 #, fuzzy
 msgid "custom"
 msgstr "自定义"
 
-#: ../src/exif.c:266 ../src/exif.c:273 ../src/exif-common.c:376
+#: ../src/exif.c:260 ../src/exif.c:267 ../src/exif-common.c:388
 msgid "auto"
 msgstr "自动"
 
-#: ../src/exif.c:268
+#: ../src/exif.c:262
 #, fuzzy
 msgid "auto bracket"
 msgstr "自动重命名"
 
-#: ../src/exif.c:279
+#: ../src/exif.c:273
 #, fuzzy
 msgid "standard"
 msgstr "日历"
 
-#: ../src/exif.c:282
+#: ../src/exif.c:276
 msgid "night scene"
 msgstr ""
 
-#: ../src/exif.c:287
+#: ../src/exif.c:281
 msgid "none"
 msgstr ""
 
-#: ../src/exif.c:288
+#: ../src/exif.c:282
 #, fuzzy
 msgid "low gain up"
 msgstr "清理"
 
-#: ../src/exif.c:289
+#: ../src/exif.c:283
 msgid "high gain up"
 msgstr ""
 
-#: ../src/exif.c:290
+#: ../src/exif.c:284
 msgid "low gain down"
 msgstr ""
 
-#: ../src/exif.c:291
+#: ../src/exif.c:285
 msgid "high gain down"
 msgstr ""
 
-#: ../src/exif.c:297 ../src/exif.c:311
+#: ../src/exif.c:291 ../src/exif.c:305
 msgid "soft"
 msgstr ""
 
-#: ../src/exif.c:298 ../src/exif.c:312
+#: ../src/exif.c:292 ../src/exif.c:306
 msgid "hard"
 msgstr ""
 
-#: ../src/exif.c:304
+#: ../src/exif.c:298
 msgid "low"
 msgstr ""
 
-#: ../src/exif.c:305
+#: ../src/exif.c:299
 msgid "high"
 msgstr ""
 
-#: ../src/exif.c:318
+#: ../src/exif.c:312
 msgid "macro"
 msgstr ""
 
-#: ../src/exif.c:319
+#: ../src/exif.c:313
 msgid "close"
 msgstr ""
 
-#: ../src/exif.c:320
+#: ../src/exif.c:314
 msgid "distant"
 msgstr ""
 
-#: ../src/exif.c:330
+#: ../src/exif.c:324
 #, fuzzy
 msgid "Image Width"
 msgstr "图片列表(_L)"
 
-#: ../src/exif.c:331
+#: ../src/exif.c:325
 #, fuzzy
 msgid "Image Height"
 msgstr "图片列表(_L)"
 
-#: ../src/exif.c:332
+#: ../src/exif.c:326
 msgid "Bits per Sample/Pixel"
 msgstr ""
 
-#: ../src/exif.c:333
+#: ../src/exif.c:327
 #, fuzzy
 msgid "Compression"
 msgstr " 比较于:"
 
-#: ../src/exif.c:334
+#: ../src/exif.c:328
 #, fuzzy
 msgid "Image description"
 msgstr "描述"
 
-#: ../src/exif.c:335
+#: ../src/exif.c:329
 #, fuzzy
 msgid "Camera make"
 msgstr "相机"
 
-#: ../src/exif.c:336
+#: ../src/exif.c:330
 #, fuzzy
 msgid "Camera model"
 msgstr "相机"
 
-#: ../src/exif.c:337
+#: ../src/exif.c:331
 #, fuzzy
 msgid "Orientation"
 msgstr "方向 (_O)"
 
-#: ../src/exif.c:338
+#: ../src/exif.c:332
 #, fuzzy
 msgid "X resolution"
 msgstr "分辨率"
 
-#: ../src/exif.c:339
+#: ../src/exif.c:333
 #, fuzzy
 msgid "Y Resolution"
 msgstr "分辨率"
 
-#: ../src/exif.c:340
+#: ../src/exif.c:334
 #, fuzzy
 msgid "Resolution units"
 msgstr "分辨率"
 
-#: ../src/exif.c:341
+#: ../src/exif.c:335
 msgid "Firmware"
 msgstr ""
 
-#: ../src/exif.c:343
+#: ../src/exif.c:337
 msgid "White point"
 msgstr ""
 
-#: ../src/exif.c:344
+#: ../src/exif.c:338
 msgid "Primary chromaticities"
 msgstr ""
 
-#: ../src/exif.c:345
+#: ../src/exif.c:339
 msgid "YCbCy coefficients"
 msgstr ""
 
-#: ../src/exif.c:346
+#: ../src/exif.c:340
 #, fuzzy
 msgid "YCbCr positioning"
 msgstr "GPS 位置"
 
-#: ../src/exif.c:347
+#: ../src/exif.c:341
 msgid "Black white reference"
 msgstr ""
 
-#: ../src/exif.c:349
+#: ../src/exif.c:343
 msgid "SubIFD Exif offset"
 msgstr ""
 
 #. subIFD follows
-#: ../src/exif.c:351
+#: ../src/exif.c:345
 #, fuzzy
 msgid "Exposure time (seconds)"
 msgstr "超时 (秒):"
 
-#: ../src/exif.c:352
+#: ../src/exif.c:346
 msgid "FNumber"
 msgstr ""
 
-#: ../src/exif.c:353
+#: ../src/exif.c:347
 #, fuzzy
 msgid "Exposure program"
 msgstr "曝光偏差"
 
-#: ../src/exif.c:354
+#: ../src/exif.c:348
 #, fuzzy
 msgid "Spectral Sensitivity"
 msgstr "ISO 感光度"
 
-#: ../src/exif.c:355 ../src/exif.c:391 ../src/exif-common.c:557
+#: ../src/exif.c:349 ../src/exif.c:385 ../src/exif-common.c:569
 msgid "ISO sensitivity"
 msgstr "ISO 感光度"
 
-#: ../src/exif.c:356
+#: ../src/exif.c:350
 msgid "Optoelectric conversion factor"
 msgstr ""
 
-#: ../src/exif.c:357
+#: ../src/exif.c:351
 #, fuzzy
 msgid "Exif version"
 msgstr "Exif 窗口"
 
-#: ../src/exif.c:358
+#: ../src/exif.c:352
 msgid "Date original"
 msgstr ""
 
-#: ../src/exif.c:359
+#: ../src/exif.c:353
 msgid "Date digitized"
 msgstr ""
 
-#: ../src/exif.c:360
+#: ../src/exif.c:354
 #, fuzzy
 msgid "Pixel format"
 msgstr "文件格式:"
 
-#: ../src/exif.c:361
+#: ../src/exif.c:355
 #, fuzzy
 msgid "Compression ratio"
 msgstr " 比较于:"
 
-#: ../src/exif.c:362 ../src/exif-common.c:554
+#: ../src/exif.c:356 ../src/exif-common.c:566
 msgid "Shutter speed"
 msgstr "快门速度"
 
-#: ../src/exif.c:363 ../src/exif-common.c:555
+#: ../src/exif.c:357 ../src/exif-common.c:567
 msgid "Aperture"
 msgstr "光圈"
 
-#: ../src/exif.c:364
+#: ../src/exif.c:358
 msgid "Brightness"
 msgstr ""
 
-#: ../src/exif.c:365 ../src/exif-common.c:556
+#: ../src/exif.c:359 ../src/exif-common.c:568
 msgid "Exposure bias"
 msgstr "曝光偏差"
 
-#: ../src/exif.c:366
+#: ../src/exif.c:360
 #, fuzzy
 msgid "Maximum aperture"
 msgstr "最大容量:"
 
-#: ../src/exif.c:367 ../src/exif-common.c:560
+#: ../src/exif.c:361 ../src/exif-common.c:572
 msgid "Subject distance"
 msgstr "主体距离"
 
-#: ../src/exif.c:368
+#: ../src/exif.c:362
 #, fuzzy
 msgid "Metering mode"
 msgstr "色彩抖动方式:"
 
-#: ../src/exif.c:369
+#: ../src/exif.c:363
 msgid "Light source"
 msgstr ""
 
-#: ../src/exif.c:370 ../src/exif-common.c:561
+#: ../src/exif.c:364 ../src/exif-common.c:573
 msgid "Flash"
 msgstr "闪光灯"
 
-#: ../src/exif.c:371 ../src/exif-common.c:558
+#: ../src/exif.c:365 ../src/exif-common.c:570
 msgid "Focal length"
 msgstr "焦距"
 
-#: ../src/exif.c:372
+#: ../src/exif.c:366
 #, fuzzy
 msgid "Subject area"
 msgstr "主体距离"
 
-#: ../src/exif.c:373
+#: ../src/exif.c:367
 msgid "MakerNote"
 msgstr ""
 
-#: ../src/exif.c:374
+#: ../src/exif.c:368
 #, fuzzy
 msgid "UserComment"
 msgstr "注释"
 
-#: ../src/exif.c:375
+#: ../src/exif.c:369
 msgid "Subsecond time"
 msgstr ""
 
-#: ../src/exif.c:376
+#: ../src/exif.c:370
 msgid "Subsecond time original"
 msgstr ""
 
-#: ../src/exif.c:377
+#: ../src/exif.c:371
 msgid "Subsecond time digitized"
 msgstr ""
 
-#: ../src/exif.c:378
+#: ../src/exif.c:372
 msgid "FlashPix version"
 msgstr ""
 
-#: ../src/exif.c:379
+#: ../src/exif.c:373
 #, fuzzy
 msgid "Colorspace"
 msgstr "色彩配置"
 
 #. ExifImageWidth, ExifImageHeight can also be unsigned short
-#: ../src/exif.c:381 ../src/preferences.c:2171
+#: ../src/exif.c:375 ../src/preferences.c:2371
 msgid "Width"
 msgstr "宽"
 
-#: ../src/exif.c:382 ../src/preferences.c:2173
+#: ../src/exif.c:376 ../src/preferences.c:2373
 msgid "Height"
 msgstr "高"
 
-#: ../src/exif.c:383
+#: ../src/exif.c:377
 msgid "Audio data"
 msgstr ""
 
-#: ../src/exif.c:384
+#: ../src/exif.c:378
 msgid "ExifR98 extension"
 msgstr ""
 
-#: ../src/exif.c:385
+#: ../src/exif.c:379
 #, fuzzy
 msgid "Flash strength"
 msgstr "焦距"
 
-#: ../src/exif.c:386
+#: ../src/exif.c:380
 msgid "Spatial frequency response"
 msgstr ""
 
-#: ../src/exif.c:387
+#: ../src/exif.c:381
 msgid "X Pixel density"
 msgstr ""
 
-#: ../src/exif.c:388
+#: ../src/exif.c:382
 msgid "Y Pixel density"
 msgstr ""
 
-#: ../src/exif.c:389
+#: ../src/exif.c:383
 msgid "Pixel density units"
 msgstr ""
 
-#: ../src/exif.c:390
+#: ../src/exif.c:384
 #, fuzzy
 msgid "Subject location"
 msgstr "选择项"
 
-#: ../src/exif.c:392
+#: ../src/exif.c:386
 #, fuzzy
 msgid "Sensor type"
 msgstr "关键词类型:"
 
-#: ../src/exif.c:393
+#: ../src/exif.c:387
 #, fuzzy
 msgid "Source type"
 msgstr "源"
 
-#: ../src/exif.c:394
+#: ../src/exif.c:388
 #, fuzzy
 msgid "Scene type"
 msgstr "文件类型"
 
-#: ../src/exif.c:395
+#: ../src/exif.c:389
 msgid "Color filter array pattern"
 msgstr ""
 
 #. tags a4xx were added for Exif 2.2 (not just these - some above, as well)
-#: ../src/exif.c:397
+#: ../src/exif.c:391
 #, fuzzy
 msgid "Render process"
 msgstr "生成"
 
-#: ../src/exif.c:398
+#: ../src/exif.c:392
 #, fuzzy
 msgid "Exposure mode"
 msgstr "曝光偏差"
 
-#: ../src/exif.c:399
+#: ../src/exif.c:393
 msgid "White balance"
 msgstr ""
 
-#: ../src/exif.c:400
+#: ../src/exif.c:394
 msgid "Digital zoom ratio"
 msgstr ""
 
-#: ../src/exif.c:401
+#: ../src/exif.c:395
 #, fuzzy
 msgid "Focal length (35mm)"
 msgstr "焦距 35mm"
 
-#: ../src/exif.c:402
+#: ../src/exif.c:396
 msgid "Scene capture type"
 msgstr ""
 
-#: ../src/exif.c:403
+#: ../src/exif.c:397
 msgid "Gain control"
 msgstr ""
 
-#: ../src/exif.c:404
+#: ../src/exif.c:398
 #, fuzzy
 msgid "Contrast"
 msgstr "内容"
 
-#: ../src/exif.c:405
+#: ../src/exif.c:399 ../src/preferences.c:2015
 #, fuzzy
 msgid "Saturation"
 msgstr "导航"
 
-#: ../src/exif.c:406
+#: ../src/exif.c:400
 msgid "Sharpness"
 msgstr ""
 
-#: ../src/exif.c:407
+#: ../src/exif.c:401
 msgid "Device setting"
 msgstr ""
 
-#: ../src/exif.c:408
+#: ../src/exif.c:402
 #, fuzzy
 msgid "Subject range"
 msgstr "主体距离"
 
-#: ../src/exif.c:409
+#: ../src/exif.c:403
 #, fuzzy
 msgid "Image serial number"
 msgstr "图像搜索"
 
-#: ../src/exif-common.c:337
+#: ../src/exif.c:1110
+msgid "Can't get image comment: not compiled with Exiv2.\n"
+msgstr ""
+
+#: ../src/exif.c:1116
+msgid "Can't set image comment: not compiled with Exiv2.\n"
+msgstr ""
+
+#: ../src/exif-common.c:349
 msgid "infinity"
 msgstr "无限远"
 
-#: ../src/exif-common.c:366
+#: ../src/exif-common.c:378
 msgid "mode:"
 msgstr "模式:"
 
-#: ../src/exif-common.c:370 ../src/trash.c:205
+#: ../src/exif-common.c:382 ../src/trash.c:213
 msgid "on"
 msgstr "开"
 
-#: ../src/exif-common.c:373 ../src/trash.c:210
+#: ../src/exif-common.c:385 ../src/trash.c:218
 msgid "off"
 msgstr "关"
 
-#: ../src/exif-common.c:382
+#: ../src/exif-common.c:394
 msgid "not detected by strobe"
 msgstr ""
 
-#: ../src/exif-common.c:383
+#: ../src/exif-common.c:395
 msgid "detected by strobe"
 msgstr ""
 
 #. we ignore flash function (bit 5)
 #. red-eye (bit 6)
-#: ../src/exif-common.c:388
+#: ../src/exif-common.c:400
 msgid "red-eye reduction"
 msgstr "红眼消除"
 
-#: ../src/exif-common.c:408
+#: ../src/exif-common.c:420
 msgid "dot"
 msgstr "点"
 
-#: ../src/exif-common.c:441
+#: ../src/exif-common.c:453
 msgid "AdobeRGB"
 msgstr ""
 
-#: ../src/exif-common.c:449
+#: ../src/exif-common.c:461
 msgid "embedded"
 msgstr "内嵌的"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Above Sea Level"
 msgstr "高于海平面"
 
-#: ../src/exif-common.c:544
+#: ../src/exif-common.c:556
 msgid "Below Sea Level"
 msgstr "低于海平面"
 
-#: ../src/exif-common.c:552
+#: ../src/exif-common.c:564
 msgid "Camera"
 msgstr "相机"
 
-#: ../src/exif-common.c:559
+#: ../src/exif-common.c:571
 msgid "Focal length 35mm"
 msgstr "焦距 35mm"
 
-#: ../src/exif-common.c:562
+#: ../src/exif-common.c:574
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../src/exif-common.c:563
+#: ../src/exif-common.c:575
 msgid "Color profile"
 msgstr "色彩配置"
 
-#: ../src/exif-common.c:564
+#: ../src/exif-common.c:576
 msgid "GPS position"
 msgstr "GPS 位置"
 
-#: ../src/exif-common.c:565
+#: ../src/exif-common.c:577
 msgid "GPS altitude"
 msgstr "GPS海拔高度"
 
-#: ../src/exif-common.c:566
+#: ../src/exif-common.c:578
 msgid "File size"
 msgstr "文件大小"
 
-#: ../src/exif-common.c:567
+#: ../src/exif-common.c:579
 msgid "File date"
 msgstr "文件日期"
 
-#: ../src/exif-common.c:568
+#: ../src/exif-common.c:580
 msgid "File mode"
 msgstr "文件模式"
 
-#: ../src/filedata.c:101
+#: ../src/filedata.c:109
 #, c-format
 msgid "%d bytes"
 msgstr "%d 字节"
 
-#: ../src/filedata.c:105
+#: ../src/filedata.c:113
 #, c-format
 msgid "%.1f K"
 msgstr ""
 
-#: ../src/filedata.c:109
+#: ../src/filedata.c:117
 #, c-format
 msgid "%.1f MB"
 msgstr ""
 
-#: ../src/filedata.c:114
+#: ../src/filedata.c:122
 #, c-format
 msgid "%.1f GB"
 msgstr ""
 
-#: ../src/filedata.c:2458
+#: ../src/filedata.c:2555
 msgid "file or directory does not exist"
 msgstr "文件或目录不存在"
 
-#: ../src/filedata.c:2464
+#: ../src/filedata.c:2561
 msgid "destination already exists"
 msgstr "目标文件已存在"
 
-#: ../src/filedata.c:2470
+#: ../src/filedata.c:2567
 msgid "destination can't be overwritten"
 msgstr "目标文件不能覆盖"
 
-#: ../src/filedata.c:2476
+#: ../src/filedata.c:2573
 msgid "destination directory is not writable"
 msgstr "目标目录不可写"
 
-#: ../src/filedata.c:2482
+#: ../src/filedata.c:2579
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
-#: ../src/filedata.c:2488
+#: ../src/filedata.c:2585
 msgid "source directory is not writable"
 msgstr "源目录不可写"
 
-#: ../src/filedata.c:2494
+#: ../src/filedata.c:2591
 msgid "no read permission"
 msgstr "无读取权限"
 
-#: ../src/filedata.c:2500
+#: ../src/filedata.c:2597
 msgid "file is readonly"
 msgstr "文件为只读"
 
-#: ../src/filedata.c:2506
+#: ../src/filedata.c:2603
 msgid "destination already exists and will be overwritten"
 msgstr "目标文件已存在并将被覆盖"
 
-#: ../src/filedata.c:2512
+#: ../src/filedata.c:2609
 msgid "source and destination are the same"
 msgstr "源和目标相同"
 
-#: ../src/filedata.c:2518
+#: ../src/filedata.c:2615
 msgid "source and destination have different extension"
 msgstr "源和目标扩展名不一致"
 
-#: ../src/filedata.c:2524
+#: ../src/filedata.c:2621
 msgid "there are unsaved metadata changes for the file"
 msgstr "文件有未保存的元数据更改"
 
-#: ../src/filedata.c:2530
+#: ../src/filedata.c:2627
 #, fuzzy
 msgid "another destination file has the same filename"
 msgstr "源和目标相同"
 
-#: ../src/fullscreen.c:234 ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368 ../src/preferences.c:1489
+#: ../src/fullscreen.c:242 ../src/layout_util.c:1797 ../src/layout_util.c:1798
+#: ../src/layout_util.c:1799 ../src/preferences.c:1617
 msgid "Full screen"
 msgstr "全屏"
 
-#: ../src/fullscreen.c:403
+#: ../src/fullscreen.c:413
 msgid "Full size"
 msgstr "全尺寸"
 
-#: ../src/fullscreen.c:411
+#: ../src/fullscreen.c:421
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../src/fullscreen.c:417
+#: ../src/fullscreen.c:427
 msgid "Screen"
 msgstr "屏幕"
 
-#: ../src/fullscreen.c:651
+#: ../src/fullscreen.c:661
 msgid "Determined by Window Manager"
 msgstr "由窗口管理器决定"
 
-#: ../src/fullscreen.c:652
+#: ../src/fullscreen.c:662
 msgid "Active screen"
 msgstr "当前屏幕"
 
-#: ../src/fullscreen.c:654
+#: ../src/fullscreen.c:664
 msgid "Active monitor"
 msgstr "当前显示器"
 
-#: ../src/histogram.c:113
+#: ../src/histogram.c:121
 msgid "Log Histogram on Red"
 msgstr "对数直方图 红"
 
-#: ../src/histogram.c:114
+#: ../src/histogram.c:122
 msgid "Log Histogram on Green"
 msgstr "对数直方图 绿"
 
-#: ../src/histogram.c:115
+#: ../src/histogram.c:123
 msgid "Log Histogram on Blue"
 msgstr "对数直方图 蓝"
 
-#: ../src/histogram.c:116
+#: ../src/histogram.c:124
 msgid "Log Histogram on RGB"
 msgstr "对数直方图 RGB"
 
-#: ../src/histogram.c:117
+#: ../src/histogram.c:125
 msgid "Log Histogram on value"
 msgstr "对数直方图 值"
 
-#: ../src/histogram.c:122
+#: ../src/histogram.c:130
 msgid "Linear Histogram on Red"
 msgstr "线性直方图 红"
 
-#: ../src/histogram.c:123
+#: ../src/histogram.c:131
 msgid "Linear Histogram on Green"
 msgstr "线性直方图 绿"
 
-#: ../src/histogram.c:124
+#: ../src/histogram.c:132
 msgid "Linear Histogram on Blue"
 msgstr "线性直方图 蓝"
 
-#: ../src/histogram.c:125
+#: ../src/histogram.c:133
 msgid "Linear Histogram on RGB"
 msgstr "线性直方图 RGB"
 
-#: ../src/histogram.c:126
+#: ../src/histogram.c:134
 msgid "Linear Histogram on value"
 msgstr "线性直方图 值"
 
-#: ../src/history_list.c:131
+#: ../src/history_list.c:140
 #, c-format
 msgid "Unable to write history lists to: %s\n"
 msgstr "无法保存历史记录至: %s\n"
 
-#: ../src/image.c:161
+#: ../src/image.c:173
 #, c-format
 msgid " (Collection %s)"
 msgstr " (图片集 %s)"
 
-#: ../src/image_load_jpeg.c:177
+#: ../src/image_load_jpeg.c:163
 #, c-format
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "解码 JPEG 图像文件出错 (%s)"
 
-#: ../src/img-view.c:1253 ../src/layout_image.c:483 ../src/layout_util.c:1333
-#: ../src/layout_util.c:1334 ../src/layout_util.c:1349
-#: ../src/layout_util.c:1350 ../src/pan-view.c:2602
+#: ../src/img-view.c:1266 ../src/layout_image.c:659 ../src/layout_util.c:1764
+#: ../src/layout_util.c:1765 ../src/layout_util.c:1780
+#: ../src/layout_util.c:1781 ../src/pan-view/pan-view.c:2211
 msgid "Zoom _in"
 msgstr "放大 (_i)"
 
-#: ../src/img-view.c:1254 ../src/layout_image.c:484 ../src/layout_util.c:1335
-#: ../src/layout_util.c:1336 ../src/layout_util.c:1351
-#: ../src/layout_util.c:1352 ../src/pan-view.c:2604
+#: ../src/img-view.c:1267 ../src/layout_image.c:660 ../src/layout_util.c:1766
+#: ../src/layout_util.c:1767 ../src/layout_util.c:1782
+#: ../src/layout_util.c:1783 ../src/pan-view/pan-view.c:2213
 msgid "Zoom _out"
 msgstr "缩小 (_o)"
 
-#: ../src/img-view.c:1255 ../src/layout_image.c:485 ../src/layout_util.c:1337
-#: ../src/layout_util.c:1338 ../src/layout_util.c:1353
-#: ../src/layout_util.c:1354 ../src/pan-view.c:2606
+#: ../src/img-view.c:1268 ../src/layout_image.c:661 ../src/layout_util.c:1768
+#: ../src/layout_util.c:1769 ../src/layout_util.c:1784
+#: ../src/layout_util.c:1785 ../src/pan-view/pan-view.c:2215
 msgid "Zoom _1:1"
 msgstr "缩放 _1:1"
 
-#: ../src/img-view.c:1256 ../src/layout_image.c:486
+#: ../src/img-view.c:1269 ../src/layout_image.c:662
 msgid "Fit image to _window"
 msgstr "适应图像到窗口 (_w)"
 
-#: ../src/img-view.c:1264 ../src/layout_image.c:495 ../src/layout_util.c:1331
+#: ../src/img-view.c:1278 ../src/layout_image.c:672 ../src/layout_util.c:1762
 msgid "Set as _wallpaper"
 msgstr "设置为墙纸 (_w)"
 
-#: ../src/img-view.c:1269 ../src/layout_image.c:502
+#: ../src/img-view.c:1283 ../src/layout_image.c:679
 msgid "_Go to directory view"
 msgstr "转至目录查看"
 
-#: ../src/img-view.c:1282 ../src/layout_image.c:523
+#: ../src/img-view.c:1296 ../src/layout_image.c:700
 msgid "_Stop slideshow"
 msgstr "停止播片 (_S)"
 
-#: ../src/img-view.c:1285 ../src/layout_image.c:526
+#: ../src/img-view.c:1299 ../src/layout_image.c:703
 msgid "Continue slides_how"
 msgstr "继续播片 (_h)"
 
-#: ../src/img-view.c:1290 ../src/img-view.c:1298 ../src/layout_image.c:531
-#: ../src/layout_image.c:538
+#: ../src/img-view.c:1304 ../src/img-view.c:1312 ../src/layout_image.c:708
+#: ../src/layout_image.c:715
 msgid "Pause slides_how"
 msgstr "暂停播片 (_h)"
 
-#: ../src/img-view.c:1296 ../src/layout_image.c:537
+#: ../src/img-view.c:1310 ../src/layout_image.c:714
 msgid "_Start slideshow"
 msgstr "开始播片 (_S)"
 
-#: ../src/img-view.c:1304 ../src/layout_image.c:548 ../src/pan-view.c:2675
+#: ../src/img-view.c:1318 ../src/layout_image.c:725
+#: ../src/pan-view/pan-view.c:2284
 msgid "Exit _full screen"
 msgstr "退出全屏 (_f)"
 
-#: ../src/img-view.c:1308 ../src/layout_image.c:544 ../src/pan-view.c:2679
+#: ../src/img-view.c:1322 ../src/layout_image.c:721
+#: ../src/pan-view/pan-view.c:2288
 msgid "_Full screen"
 msgstr "全屏 (_F)"
 
-#: ../src/img-view.c:1312 ../src/layout_util.c:1316 ../src/pan-view.c:2683
+#: ../src/img-view.c:1326 ../src/layout_util.c:1740
+#: ../src/pan-view/pan-view.c:2292
 msgid "C_lose window"
 msgstr "关闭窗口 (_l)"
 
-#: ../src/layout.c:358 ../src/view_file.c:613
+#: ../src/layout.c:401 ../src/view_file.c:649
 msgid "Ascending"
 msgstr "升序"
 
-#: ../src/layout.c:428
+#: ../src/layout.c:481
+msgid "Scroll to top left corner"
+msgstr "滚动至左上角"
+
+#: ../src/layout.c:486
+msgid "Scroll to image center"
+msgstr "滚动至图像中心"
+
+#: ../src/layout.c:491
+msgid "Keep the region from previous image"
+msgstr "保持之前图像所在区域"
+
+#: ../src/layout.c:578
 msgid " Slideshow"
 msgstr "播片"
 
-#: ../src/layout.c:432
+#: ../src/layout.c:582
 msgid " Paused"
 msgstr "暂停"
 
-#: ../src/layout.c:448
+#: ../src/layout.c:598
 #, c-format
 msgid "%s, %d files (%s, %d)%s"
 msgstr "%s, %d 文件 (%s, %d)%s"
 
-#: ../src/layout.c:455
+#: ../src/layout.c:605
 #, c-format
 msgid "%s, %d files%s"
 msgstr "%s, %d 文件%s"
 
-#: ../src/layout.c:460
+#: ../src/layout.c:610
 #, c-format
 msgid "%d files%s"
 msgstr "%d 文件%s"
 
-#: ../src/layout.c:506
+#: ../src/layout.c:656
 #, c-format
 msgid "(no read permission) %s bytes"
 msgstr "(无读取权限) %s 字节"
 
-#: ../src/layout.c:510
+#: ../src/layout.c:660
 #, c-format
 msgid "( ? x ? ) %s bytes"
 msgstr "( ? x ? ) %s 字节"
 
-#: ../src/layout.c:518
+#: ../src/layout.c:668
 #, c-format
 msgid "( %d x %d ) %s bytes"
 msgstr "( %d x %d ) %s 字节"
 
-#: ../src/layout.c:1243 ../src/layout_config.c:58
+#: ../src/layout.c:754
+#, fuzzy
+msgid "Select sort order"
+msgstr "选择文件夹"
+
+#: ../src/layout.c:759
+#, fuzzy
+msgid "Folder contents (files selected)"
+msgstr "文件夹包括子目录"
+
+#: ../src/layout.c:768
+#, fuzzy
+msgid "(Image dimensions) Image size"
+msgstr "图像尺寸为"
+
+#: ../src/layout.c:778
+#, fuzzy
+msgid "Select zoom mode"
+msgstr "选择文件夹"
+
+#. expand only in small format
+#: ../src/layout.c:788
+msgid "[Pixel x,y coord]: (Pixel R,G,B value)"
+msgstr ""
+
+#: ../src/layout.c:1424 ../src/layout_config.c:67
 msgid "Tools"
 msgstr "工具栏"
 
-#: ../src/layout.c:1865
+#: ../src/layout.c:2051
 msgid "Window options and layout"
 msgstr "窗口选项和布局"
 
-#: ../src/layout.c:1924
+#: ../src/layout.c:2116
 msgid "General options"
 msgstr "一般选项"
 
-#: ../src/layout.c:1926
+#: ../src/layout.c:2118
 msgid "Home path (empty to use your home directory)"
 msgstr "主路径 (留空为使用你的主目录)"
 
-#: ../src/layout.c:1934
+#: ../src/layout.c:2126
 msgid "Use current"
 msgstr "使用当前目录"
 
-#: ../src/layout.c:1937
+#: ../src/layout.c:2129
 msgid "Show date in directories list view"
 msgstr "目录列表查看时显示日期"
 
-#: ../src/layout.c:1940
+#: ../src/layout.c:2132
 msgid "Exit program when this window is closed"
 msgstr "此窗口关闭后退出程序"
 
-#: ../src/layout.c:1943
+#: ../src/layout.c:2135
 msgid "Start-up directory:"
 msgstr "启动目录:"
 
-#: ../src/layout.c:1945
+#: ../src/layout.c:2137
 msgid "No change"
 msgstr "不作更改"
 
-#: ../src/layout.c:1948
+#: ../src/layout.c:2140
 msgid "Restore last path"
 msgstr "恢复上次的目录"
 
-#: ../src/layout.c:1951
+#: ../src/layout.c:2143
 msgid "Home path"
 msgstr "主路径"
 
-#: ../src/layout.c:1955 ../src/print.c:3365 ../src/print.c:3372
+#: ../src/layout.c:2147 ../src/print.c:3375 ../src/print.c:3382
 msgid "Layout"
 msgstr "布局"
 
-#: ../src/layout.c:2198
+#: ../src/layout.c:2394
 msgid "Invalid geometry\n"
 msgstr "无效的形状\n"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:1602 ../src/ui_pathsel.c:1173
+#: ../src/layout_config.c:67 ../src/preferences.c:1736 ../src/ui_pathsel.c:1186
 msgid "Files"
 msgstr "文件"
 
-#: ../src/layout_config.c:58 ../src/preferences.c:92 ../src/preferences.c:1375
-#: ../src/print.c:123
+#: ../src/layout_config.c:67 ../src/preferences.c:107 ../src/preferences.c:1512
+#: ../src/print.c:133
 msgid "Image"
 msgstr "图像"
 
-#: ../src/layout_config.c:349
+#: ../src/layout_config.c:358
 msgid "(drag to change order)"
 msgstr "(拖放来改变顺序)"
 
-#: ../src/layout_image.c:553
+#: ../src/layout_image.c:728
+msgid "_Animate"
+msgstr ""
+
+#: ../src/layout_image.c:732
 msgid "Hide file _list"
 msgstr "隐藏文件列表(_l)"
 
-#: ../src/layout_image.c:1616
+#: ../src/layout_image.c:1912
 #, c-format
 msgid "[%*d,%*d]: RGB(%3d,%3d,%3d)"
 msgstr ""
 
-#: ../src/layout_image.c:1624
+#: ../src/layout_image.c:1920
 #, c-format
 msgid "[%*s,%*s]: RGB(---,---,---)"
 msgstr ""
 
-#: ../src/layout_util.c:1269
+#: ../src/layout_util.c:514
+#, fuzzy
+msgid "Operation failed:\n"
+msgstr "文件删除失败"
+
+#: ../src/layout_util.c:517
+#, fuzzy
+msgid "Cannot create tmp file"
+msgstr "不能创建临时文件"
+
+#: ../src/layout_util.c:520
+#, fuzzy
+msgid "File: "
+msgstr "文件:"
+
+#: ../src/layout_util.c:524
+#, fuzzy
+msgid "Image orientation"
+msgstr "方向 (_O)"
+
+#: ../src/layout_util.c:1692
 msgid "_File"
 msgstr "文件 (_F)"
 
-#: ../src/layout_util.c:1270
+#: ../src/layout_util.c:1693
 msgid "_Go"
 msgstr "转至 (_G)"
 
-#: ../src/layout_util.c:1271 ../src/menu.c:109
+#: ../src/layout_util.c:1694 ../src/menu.c:117
 msgid "_Edit"
 msgstr "编辑 (_E)"
 
-#: ../src/layout_util.c:1272
+#: ../src/layout_util.c:1695
 msgid "_Select"
 msgstr "选择 (_S)"
 
-#: ../src/layout_util.c:1273 ../src/menu.c:284
+#: ../src/layout_util.c:1696 ../src/menu.c:370
 msgid "_Orientation"
 msgstr "方向 (_O)"
 
-#: ../src/layout_util.c:1274
+#: ../src/layout_util.c:1697
+#, fuzzy
+msgid "_Rating"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1698
 msgid "E_xternal Editors"
 msgstr "外部编辑器 (_x)"
 
-#: ../src/layout_util.c:1275
+#: ../src/layout_util.c:1699
 msgid "P_references"
 msgstr "偏好设置 (_r)"
 
-#: ../src/layout_util.c:1277
+#: ../src/layout_util.c:1701
 msgid "_Files and Folders"
 msgstr "文件和文件夹 (_F)"
 
-#: ../src/layout_util.c:1278
+#: ../src/layout_util.c:1702
 msgid "_Zoom"
 msgstr "缩放 (_Z)"
 
-#: ../src/layout_util.c:1279
+#: ../src/layout_util.c:1703
 msgid "_Color Management"
 msgstr "色彩管理 (_C)"
 
-#: ../src/layout_util.c:1280
+#: ../src/layout_util.c:1704
 msgid "_Connected Zoom"
 msgstr "关联缩放 (_C)"
 
-#: ../src/layout_util.c:1281
+#: ../src/layout_util.c:1705
 msgid "Spli_t"
 msgstr "分割 (_t)"
 
-#: ../src/layout_util.c:1282
+#: ../src/layout_util.c:1706
 msgid "Stere_o"
 msgstr "立体图片 (_o)"
 
-#: ../src/layout_util.c:1283 ../src/layout_util.c:1399
+#: ../src/layout_util.c:1707 ../src/layout_util.c:1838
 msgid "Image _Overlay"
 msgstr "显示叠加 (_O)"
 
-#: ../src/layout_util.c:1284
+#: ../src/layout_util.c:1708
 msgid "_Help"
 msgstr "帮助 (_H)"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1710
 msgid "_First Image"
 msgstr "首个图片 (_F)"
 
-#: ../src/layout_util.c:1286
+#: ../src/layout_util.c:1710
 msgid "First Image"
 msgstr "首个图片"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1711 ../src/layout_util.c:1712
+#: ../src/layout_util.c:1713
 msgid "_Previous Image"
 msgstr "上一图片 (_P)"
 
-#: ../src/layout_util.c:1287 ../src/layout_util.c:1288
-#: ../src/layout_util.c:1289
+#: ../src/layout_util.c:1711 ../src/layout_util.c:1712
+#: ../src/layout_util.c:1713
 msgid "Previous Image"
 msgstr "上一图片"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1714 ../src/layout_util.c:1715
+#: ../src/layout_util.c:1716
 msgid "_Next Image"
 msgstr "下一图片 (_N)"
 
-#: ../src/layout_util.c:1290 ../src/layout_util.c:1291
-#: ../src/layout_util.c:1292
+#: ../src/layout_util.c:1714 ../src/layout_util.c:1715
+#: ../src/layout_util.c:1716
 msgid "Next Image"
 msgstr "下一图片"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1717
 msgid "_Last Image"
 msgstr "最后图片 (_L)"
 
-#: ../src/layout_util.c:1293
+#: ../src/layout_util.c:1717
 msgid "Last Image"
 msgstr "最后图片"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1718
 msgid "_Back"
 msgstr "返回 (_B)"
 
-#: ../src/layout_util.c:1294
+#: ../src/layout_util.c:1718
 msgid "Back"
 msgstr "返回"
 
-#: ../src/layout_util.c:1295
+#: ../src/layout_util.c:1719
 msgid "_Home"
 msgstr "主目录 (_H)"
 
-#: ../src/layout_util.c:1295 ../src/options.c:156 ../src/ui_bookmark.c:549
-#: ../src/ui_pathsel.c:1045
+#: ../src/layout_util.c:1719 ../src/options.c:186 ../src/ui_bookmark.c:566
+#: ../src/ui_pathsel.c:1055
 msgid "Home"
 msgstr "主目录"
 
-#: ../src/layout_util.c:1296
+#: ../src/layout_util.c:1720
 msgid "_Up"
 msgstr ""
 
-#: ../src/layout_util.c:1296
+#: ../src/layout_util.c:1720
 msgid "Up"
 msgstr ""
 
-#: ../src/layout_util.c:1298
+#: ../src/layout_util.c:1722
 msgid "New _window"
 msgstr "新建窗口 (_w)"
 
-#: ../src/layout_util.c:1298
+#: ../src/layout_util.c:1722
 msgid "New window"
 msgstr "新建窗口"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1723
 msgid "_New collection"
 msgstr "新建图片集 (_N)"
 
-#: ../src/layout_util.c:1299
+#: ../src/layout_util.c:1723
 msgid "New collection"
 msgstr "新建图片集"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1724
 msgid "_Open collection..."
 msgstr "打开图片集... (_O)"
 
-#: ../src/layout_util.c:1300
+#: ../src/layout_util.c:1724
 msgid "Open collection..."
 msgstr "打开图片集..."
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1725
 msgid "Open recen_t"
 msgstr "最近打开的文件 (_t)"
 
-#: ../src/layout_util.c:1301
+#: ../src/layout_util.c:1725
 msgid "Open recent"
 msgstr "打开最近打开的文件"
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1726
 msgid "_Search..."
 msgstr "搜索... (_S)"
 
-#: ../src/layout_util.c:1302
+#: ../src/layout_util.c:1726
 msgid "Search..."
 msgstr "搜索..."
 
-#: ../src/layout_util.c:1303
+#: ../src/layout_util.c:1727
 msgid "Find duplicates..."
 msgstr "查找重复项"
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1728
 msgid "Pa_n view"
 msgstr "图片概览 (_n)"
 
-#: ../src/layout_util.c:1304
+#: ../src/layout_util.c:1728
 msgid "Pan view"
 msgstr "图片概览"
 
-#: ../src/layout_util.c:1305
+#: ../src/layout_util.c:1729
 msgid "_Print..."
 msgstr "打印... (_P)"
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1730
 msgid "N_ew folder..."
 msgstr "新建文件夹... (_e)"
 
-#: ../src/layout_util.c:1306
+#: ../src/layout_util.c:1730
 msgid "New folder..."
 msgstr "新建文件夹..."
 
-#: ../src/layout_util.c:1307
+#: ../src/layout_util.c:1731
 msgid "Copy..."
 msgstr "复制..."
 
-#: ../src/layout_util.c:1308
+#: ../src/layout_util.c:1732
 msgid "Move..."
 msgstr "移动..."
 
-#: ../src/layout_util.c:1309
+#: ../src/layout_util.c:1733
 msgid "Rename..."
 msgstr "重命名..."
 
-#: ../src/layout_util.c:1310 ../src/layout_util.c:1311
-#: ../src/layout_util.c:1312
+#: ../src/layout_util.c:1734 ../src/layout_util.c:1735
+#: ../src/layout_util.c:1736
 msgid "Delete..."
 msgstr "删除..."
 
-#: ../src/layout_util.c:1313 ../src/view_file.c:603
+#: ../src/layout_util.c:1737 ../src/view_file.c:633
 msgid "Enable file _grouping"
 msgstr "允许文件编组 (_g)"
 
-#: ../src/layout_util.c:1313
+#: ../src/layout_util.c:1737
 #, fuzzy
 msgid "Enable file grouping"
 msgstr "允许文件编组 (_g)"
 
-#: ../src/layout_util.c:1314 ../src/view_file.c:605
+#: ../src/layout_util.c:1738 ../src/view_file.c:635
 msgid "Disable file groupi_ng"
 msgstr "禁止文件编组 (_n)"
 
-#: ../src/layout_util.c:1314
+#: ../src/layout_util.c:1738
 #, fuzzy
 msgid "Disable file grouping"
 msgstr "禁止文件编组 (_n)"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1739
 msgid "_Copy path to clipboard"
 msgstr "复制路径到剪贴板 (_C)"
 
-#: ../src/layout_util.c:1315
+#: ../src/layout_util.c:1739
 msgid "Copy path to clipboard"
 msgstr "复制路径到剪贴板"
 
-#: ../src/layout_util.c:1316
+#: ../src/layout_util.c:1740
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1741
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/layout_util.c:1317
+#: ../src/layout_util.c:1741
 msgid "Quit"
 msgstr "退出"
 
-#: ../src/layout_util.c:1318 ../src/menu.c:226
+#: ../src/layout_util.c:1742 ../src/menu.c:312
 msgid "_Rotate clockwise"
 msgstr "顺时针旋转 (_R)"
 
-#: ../src/layout_util.c:1318
+#: ../src/layout_util.c:1742
 msgid "Rotate clockwise"
 msgstr "顺时针旋转"
 
-#: ../src/layout_util.c:1319 ../src/menu.c:229
+#: ../src/layout_util.c:1743
+msgid "_Rating 0"
+msgstr ""
+
+#: ../src/layout_util.c:1743
+#, fuzzy
+msgid "Rating 0"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1744
+msgid "_Rating 1"
+msgstr ""
+
+#: ../src/layout_util.c:1744
+#, fuzzy
+msgid "Rating 1"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1745
+msgid "_Rating 2"
+msgstr ""
+
+#: ../src/layout_util.c:1745
+#, fuzzy
+msgid "Rating 2"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1746
+msgid "_Rating 3"
+msgstr ""
+
+#: ../src/layout_util.c:1746
+#, fuzzy
+msgid "Rating 3"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1747
+msgid "_Rating 4"
+msgstr ""
+
+#: ../src/layout_util.c:1747
+#, fuzzy
+msgid "Rating 4"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1748
+msgid "_Rating 5"
+msgstr ""
+
+#: ../src/layout_util.c:1748
+#, fuzzy
+msgid "Rating 5"
+msgstr "打印出错"
+
+#: ../src/layout_util.c:1749
+msgid "_Rating -1"
+msgstr ""
+
+#: ../src/layout_util.c:1749
+msgid "Rating -1"
+msgstr ""
+
+#: ../src/layout_util.c:1750 ../src/menu.c:315
 msgid "Rotate _counterclockwise"
 msgstr "逆时针旋转 (_c)"
 
-#: ../src/layout_util.c:1319
+#: ../src/layout_util.c:1750
 msgid "Rotate counterclockwise"
 msgstr "逆时针旋转"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1751
 msgid "Rotate 1_80"
 msgstr "旋转 1_80"
 
-#: ../src/layout_util.c:1320
+#: ../src/layout_util.c:1751
 msgid "Rotate 180"
 msgstr "旋转 180"
 
-#: ../src/layout_util.c:1321 ../src/menu.c:235
+#: ../src/layout_util.c:1752 ../src/menu.c:321
 msgid "_Mirror"
 msgstr "左右翻转 (_M)"
 
-#: ../src/layout_util.c:1321
+#: ../src/layout_util.c:1752
 msgid "Mirror"
 msgstr "左右翻转"
 
-#: ../src/layout_util.c:1322 ../src/menu.c:238
+#: ../src/layout_util.c:1753 ../src/menu.c:324
 msgid "_Flip"
 msgstr "上下翻转 (_F)"
 
-#: ../src/layout_util.c:1322
+#: ../src/layout_util.c:1753
 msgid "Flip"
 msgstr "上下翻转"
 
-#: ../src/layout_util.c:1323 ../src/menu.c:241
+#: ../src/layout_util.c:1754 ../src/menu.c:327
 msgid "_Original state"
 msgstr "初始状态 (_O)"
 
-#: ../src/layout_util.c:1323
+#: ../src/layout_util.c:1754
 msgid "Original state"
 msgstr "初始状态"
 
-#: ../src/layout_util.c:1324
+#: ../src/layout_util.c:1755
 msgid "Select _all"
 msgstr "全选 (_a)"
 
-#: ../src/layout_util.c:1325
+#: ../src/layout_util.c:1756
 msgid "Select _none"
 msgstr "不选 (_n)"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1757
 msgid "_Invert Selection"
 msgstr "反选 (_I)"
 
-#: ../src/layout_util.c:1326
+#: ../src/layout_util.c:1757
 msgid "Invert Selection"
 msgstr "反选"
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1758
 msgid "P_references..."
 msgstr "偏好设置... (_r)"
 
-#: ../src/layout_util.c:1327
+#: ../src/layout_util.c:1758
 msgid "Preferences..."
 msgstr "偏好设置..."
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1759
 msgid "Configure _Editors..."
 msgstr "设置外部编辑器... (_E)"
 
-#: ../src/layout_util.c:1328
+#: ../src/layout_util.c:1759
 msgid "Configure Editors..."
 msgstr "设置外部编辑器"
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1760
 msgid "_Configure this window..."
 msgstr "设置此窗口... (_C)"
 
-#: ../src/layout_util.c:1329
+#: ../src/layout_util.c:1760
 msgid "Configure this window..."
 msgstr "设置此窗口"
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1761
 msgid "_Thumbnail maintenance..."
 msgstr "缩略图维护... (_T)"
 
-#: ../src/layout_util.c:1330
+#: ../src/layout_util.c:1761
 msgid "Thumbnail maintenance..."
 msgstr "缩略图维护..."
 
-#: ../src/layout_util.c:1331
+#: ../src/layout_util.c:1762
 msgid "Set as wallpaper"
 msgstr "设置为墙纸"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1763
 msgid "_Save metadata"
 msgstr "保存元数据 (_S)"
 
-#: ../src/layout_util.c:1332
+#: ../src/layout_util.c:1763
 #, fuzzy
 msgid "Save metadata"
 msgstr "保存元数据 (_S)"
 
-#: ../src/layout_util.c:1333 ../src/layout_util.c:1334
+#: ../src/layout_util.c:1764 ../src/layout_util.c:1765
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../src/layout_util.c:1335 ../src/layout_util.c:1336
+#: ../src/layout_util.c:1766 ../src/layout_util.c:1767
 msgid "Zoom out"
 msgstr "缩小"
 
-#: ../src/layout_util.c:1337 ../src/layout_util.c:1338
+#: ../src/layout_util.c:1768 ../src/layout_util.c:1769
 msgid "Zoom 1:1"
 msgstr "缩放 1:1"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1770 ../src/layout_util.c:1771
+#: ../src/layout_util.c:1786 ../src/layout_util.c:1787
 msgid "_Zoom to fit"
 msgstr "缩放以适应 (_Z)"
 
-#: ../src/layout_util.c:1339 ../src/layout_util.c:1340
+#: ../src/layout_util.c:1770 ../src/layout_util.c:1771
 msgid "Zoom to fit"
 msgstr "缩放以适应"
 
-#: ../src/layout_util.c:1341 ../src/layout_util.c:1357
+#: ../src/layout_util.c:1772 ../src/layout_util.c:1788
 msgid "Fit _Horizontally"
 msgstr "适应宽度 (_H)"
 
-#: ../src/layout_util.c:1341
+#: ../src/layout_util.c:1772
 msgid "Fit Horizontally"
 msgstr "适应宽度"
 
-#: ../src/layout_util.c:1342 ../src/layout_util.c:1358
+#: ../src/layout_util.c:1773 ../src/layout_util.c:1789
 msgid "Fit _Vertically"
 msgstr "适应高度 (_V)"
 
-#: ../src/layout_util.c:1342
+#: ../src/layout_util.c:1773
 msgid "Fit Vertically"
 msgstr "适应高度"
 
-#: ../src/layout_util.c:1343 ../src/layout_util.c:1359
+#: ../src/layout_util.c:1774 ../src/layout_util.c:1790
 msgid "Zoom _2:1"
 msgstr "缩放 _2:1"
 
-#: ../src/layout_util.c:1343
+#: ../src/layout_util.c:1774
 msgid "Zoom 2:1"
 msgstr "缩放 2:1"
 
-#: ../src/layout_util.c:1344 ../src/layout_util.c:1360
+#: ../src/layout_util.c:1775 ../src/layout_util.c:1791
 msgid "Zoom _3:1"
 msgstr "缩放 _3:1"
 
-#: ../src/layout_util.c:1344
+#: ../src/layout_util.c:1775
 msgid "Zoom 3:1"
 msgstr "缩放 3:1"
 
-#: ../src/layout_util.c:1345 ../src/layout_util.c:1361
+#: ../src/layout_util.c:1776 ../src/layout_util.c:1792
 msgid "Zoom _4:1"
 msgstr "缩放 _4:1"
 
-#: ../src/layout_util.c:1345
+#: ../src/layout_util.c:1776
 msgid "Zoom 4:1"
 msgstr "缩放 4:1"
 
-#: ../src/layout_util.c:1346 ../src/layout_util.c:1362
+#: ../src/layout_util.c:1777 ../src/layout_util.c:1793
 msgid "Zoom 1:2"
 msgstr "缩放 1:2"
 
-#: ../src/layout_util.c:1347 ../src/layout_util.c:1363
+#: ../src/layout_util.c:1778 ../src/layout_util.c:1794
 msgid "Zoom 1:3"
 msgstr "缩放 1:3"
 
-#: ../src/layout_util.c:1348 ../src/layout_util.c:1364
+#: ../src/layout_util.c:1779 ../src/layout_util.c:1795
 msgid "Zoom 1:4"
 msgstr "缩放 1:4"
 
-#: ../src/layout_util.c:1349 ../src/layout_util.c:1350
+#: ../src/layout_util.c:1780 ../src/layout_util.c:1781
 msgid "Connected Zoom in"
 msgstr "关联放大"
 
-#: ../src/layout_util.c:1351 ../src/layout_util.c:1352
+#: ../src/layout_util.c:1782 ../src/layout_util.c:1783
 msgid "Connected Zoom out"
 msgstr "关联缩小"
 
-#: ../src/layout_util.c:1353 ../src/layout_util.c:1354
+#: ../src/layout_util.c:1784 ../src/layout_util.c:1785
 msgid "Connected Zoom 1:1"
 msgstr "关联缩放 1:1"
 
-#: ../src/layout_util.c:1355 ../src/layout_util.c:1356
+#: ../src/layout_util.c:1786 ../src/layout_util.c:1787
 msgid "Connected Zoom to fit"
 msgstr "关联缩放以适应窗口"
 
-#: ../src/layout_util.c:1357
+#: ../src/layout_util.c:1788
 msgid "Connected Fit Horizontally"
 msgstr "关联缩放适应宽度"
 
-#: ../src/layout_util.c:1358
+#: ../src/layout_util.c:1789
 msgid "Connected Fit Vertically"
 msgstr "关联缩放适应高度"
 
-#: ../src/layout_util.c:1359
+#: ../src/layout_util.c:1790
 msgid "Connected Zoom 2:1"
 msgstr "关联缩放 2:1"
 
-#: ../src/layout_util.c:1360
+#: ../src/layout_util.c:1791
 msgid "Connected Zoom 3:1"
 msgstr "关联缩放 3:1"
 
-#: ../src/layout_util.c:1361
+#: ../src/layout_util.c:1792
 msgid "Connected Zoom 4:1"
 msgstr "关联缩放 4:1"
 
-#: ../src/layout_util.c:1362
+#: ../src/layout_util.c:1793
 msgid "Connected Zoom 1:2"
 msgstr "关联缩放 1:2"
 
-#: ../src/layout_util.c:1363
+#: ../src/layout_util.c:1794
 msgid "Connected Zoom 1:3"
 msgstr "关联缩放 1:3"
 
-#: ../src/layout_util.c:1364
+#: ../src/layout_util.c:1795
 msgid "Connected Zoom 1:4"
 msgstr "关联缩放 1:4"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1796
 msgid "_View in new window"
 msgstr "在新窗口中查看(_V)"
 
-#: ../src/layout_util.c:1365
+#: ../src/layout_util.c:1796
 msgid "View in new window"
 msgstr "在新窗口中查看"
 
-#: ../src/layout_util.c:1366 ../src/layout_util.c:1367
-#: ../src/layout_util.c:1368
+#: ../src/layout_util.c:1797 ../src/layout_util.c:1798
+#: ../src/layout_util.c:1799
 msgid "F_ull screen"
 msgstr "全屏 (_u)"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1800 ../src/layout_util.c:1801
 msgid "_Leave full screen"
 msgstr "退出全屏 (_L)"
 
-#: ../src/layout_util.c:1369 ../src/layout_util.c:1370
+#: ../src/layout_util.c:1800 ../src/layout_util.c:1801
 msgid "Leave full screen"
 msgstr "退出全屏"
 
-#: ../src/layout_util.c:1371
+#: ../src/layout_util.c:1802
 msgid "_Cycle through overlay modes"
 msgstr "切换显示覆盖模式 (_C)"
 
-#: ../src/layout_util.c:1371
+#: ../src/layout_util.c:1802
 msgid "Cycle through Overlay modes"
 msgstr "切换显示叠加模式"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1803
 msgid "Cycle through histogram ch_annels"
 msgstr "切换直方图通道 (_a)"
 
-#: ../src/layout_util.c:1372
+#: ../src/layout_util.c:1803
 msgid "Cycle through histogram channels"
 msgstr "切换直方图通道"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1804
 msgid "Cycle through histogram mo_des"
 msgstr "切换直方图模式 (_d)"
 
-#: ../src/layout_util.c:1373
+#: ../src/layout_util.c:1804
 msgid "Cycle through histogram modes"
 msgstr "切换直方图模式"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1805
 msgid "_Hide file list"
 msgstr "隐藏文件列表 (_H)"
 
-#: ../src/layout_util.c:1374
+#: ../src/layout_util.c:1805
 msgid "Hide file list"
 msgstr "隐藏文件列表"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1806
 msgid "_Pause slideshow"
 msgstr "暂停播片 (_P)"
 
-#: ../src/layout_util.c:1375
+#: ../src/layout_util.c:1806
 msgid "Pause slideshow"
 msgstr "暂停播片"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1807
 msgid "_Refresh"
 msgstr "刷新 (_R)"
 
-#: ../src/layout_util.c:1376
+#: ../src/layout_util.c:1807
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1808
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/layout_util.c:1377
+#: ../src/layout_util.c:1808
 msgid "Contents"
 msgstr "内容"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1809
 msgid "_Keyboard shortcuts"
 msgstr "快捷键(_K)"
 
-#: ../src/layout_util.c:1378
+#: ../src/layout_util.c:1809
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1810
+#, fuzzy
+msgid "_Keyboard map"
+msgstr "键盘"
+
+#: ../src/layout_util.c:1810
+#, fuzzy
+msgid "Keyboard map"
+msgstr "键盘"
+
+#: ../src/layout_util.c:1811
 msgid "_Release notes"
 msgstr "版本说明(_P)"
 
-#: ../src/layout_util.c:1379
+#: ../src/layout_util.c:1811
 msgid "Release notes"
 msgstr "版本说明"
 
-#: ../src/layout_util.c:1380
+#: ../src/layout_util.c:1812
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/layout_util.c:1380 ../src/preferences.c:2328
+#: ../src/layout_util.c:1812 ../src/preferences.c:2534
 msgid "About"
 msgstr "关于"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1813
 msgid "_Log Window"
 msgstr "日志窗口(_L)"
 
-#: ../src/layout_util.c:1381
+#: ../src/layout_util.c:1813
 msgid "Log Window"
 msgstr "日志窗口"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1814
 msgid "_Exif window"
 msgstr "Exif 窗口 (_E)"
 
-#: ../src/layout_util.c:1382
+#: ../src/layout_util.c:1814
 msgid "Exif window"
 msgstr "Exif 窗口"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1815
 msgid "_Cycle through stereo modes"
 msgstr "切换立体图片模式 (_C)"
 
-#: ../src/layout_util.c:1383
+#: ../src/layout_util.c:1815
 msgid "Cycle through stereo modes"
 msgstr "切换立体图片模式"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1816
+#, fuzzy
+msgid "_Next Pane"
+msgstr "下一图片 (_N)"
+
+#: ../src/layout_util.c:1816
+#, fuzzy
+msgid "Next Pane"
+msgstr "下一图片"
+
+#: ../src/layout_util.c:1817
+#, fuzzy
+msgid "_Previous Pane"
+msgstr "上一图片 (_P)"
+
+#: ../src/layout_util.c:1817
+#, fuzzy
+msgid "Previous Pane"
+msgstr "上一图片"
+
+#: ../src/layout_util.c:1818
+msgid "_Up Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1818
+msgid "Up Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1819
+msgid "_Down Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1819
+msgid "Down Pane"
+msgstr ""
+
+#: ../src/layout_util.c:1820
+#, fuzzy
+msgid "_Write orientation to file"
+msgstr "写入文件"
+
+#: ../src/layout_util.c:1820
+#, fuzzy
+msgid "Write orientation to file"
+msgstr "写入文件"
+
+#: ../src/layout_util.c:1821
+msgid "_Write orientation to file (preserve timestamp)"
+msgstr ""
+
+#: ../src/layout_util.c:1821
+msgid "Write orientation to file (preserve timestamp)"
+msgstr ""
+
+#: ../src/layout_util.c:1826
 msgid "Show _Thumbnails"
 msgstr "显示缩略图(_T)"
 
-#: ../src/layout_util.c:1388
+#: ../src/layout_util.c:1826
 msgid "Show Thumbnails"
 msgstr "显示缩略图"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1827
 msgid "Show _Marks"
 msgstr "显示标记 (_M)"
 
-#: ../src/layout_util.c:1389
+#: ../src/layout_util.c:1827
 msgid "Show Marks"
 msgstr "显示标记"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1828
 msgid "Pi_xel Info"
 msgstr "像素信息 (_x)"
 
-#: ../src/layout_util.c:1390
+#: ../src/layout_util.c:1828
 msgid "Show Pixel Info"
 msgstr "显示像素信息"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1829
 msgid "_Float file list"
 msgstr "浮动文件列表(_F)"
 
-#: ../src/layout_util.c:1391
+#: ../src/layout_util.c:1829
 msgid "Float file list"
 msgstr "浮动文件列表"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1830
 msgid "Hide tool_bar"
 msgstr "隐藏工具栏(_b)"
 
-#: ../src/layout_util.c:1392
+#: ../src/layout_util.c:1830
 msgid "Hide toolbar"
 msgstr "隐藏工具栏"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1831
 msgid "_Info sidebar"
 msgstr "信息边栏 (_I)"
 
-#: ../src/layout_util.c:1393
+#: ../src/layout_util.c:1831
 msgid "Info sidebar"
 msgstr "信息边栏"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1832
 msgid "Sort _manager"
 msgstr "快捷整理 (_m)"
 
-#: ../src/layout_util.c:1394
+#: ../src/layout_util.c:1832
 msgid "Sort manager"
 msgstr "快捷整理"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1833
+#, fuzzy
+msgid "Hide Bars"
+msgstr "隐藏 \"%s\""
+
+#: ../src/layout_util.c:1834
 msgid "Toggle _slideshow"
 msgstr "切换播片开启/关闭 (_s)"
 
-#: ../src/layout_util.c:1395
+#: ../src/layout_util.c:1834
 msgid "Toggle slideshow"
 msgstr "切换播片开启/关闭"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1835
 msgid "Use _color profiles"
 msgstr "使用色彩配置 (_c)"
 
-#: ../src/layout_util.c:1396
+#: ../src/layout_util.c:1835
 #, fuzzy
 msgid "Use color profiles"
 msgstr "使用色彩配置 (_c)"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1836
 msgid "Use profile from _image"
 msgstr "使用图像文件的色彩配置 (_i)"
 
-#: ../src/layout_util.c:1397
+#: ../src/layout_util.c:1836
 msgid "Use profile from image"
 msgstr "使用图像文件的色彩配置"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1837
 msgid "Toggle _grayscale"
 msgstr "切换灰度模式 (_g)"
 
-#: ../src/layout_util.c:1398
+#: ../src/layout_util.c:1837
 msgid "Toggle grayscale"
 msgstr "切换灰度模式"
 
-#: ../src/layout_util.c:1399
+#: ../src/layout_util.c:1838
 msgid "Image Overlay"
 msgstr "显示叠加"
 
-#: ../src/layout_util.c:1400
+#: ../src/layout_util.c:1839
 msgid "_Show Histogram"
 msgstr "显示直方图 (_S)"
 
-#: ../src/layout_util.c:1400
+#: ../src/layout_util.c:1839
 msgid "Show Histogram"
 msgstr "显示直方图"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1840
+#, fuzzy
+msgid "Rectangular Selection"
+msgstr "图标形式查看时块状选取"
+
+#: ../src/layout_util.c:1841
+msgid "GIF _animation"
+msgstr ""
+
+#: ../src/layout_util.c:1841
+msgid "Toggle GIF animation"
+msgstr ""
+
+#: ../src/layout_util.c:1842
+#, fuzzy
+msgid "_Exif rotate"
+msgstr "使用 Exif 日期"
+
+#: ../src/layout_util.c:1842
+#, fuzzy
+msgid "Exif rotate"
+msgstr "使用 Exif 日期"
+
+#: ../src/layout_util.c:1846
 msgid "Image _List"
 msgstr "图片列表(_L)"
 
-#: ../src/layout_util.c:1404
+#: ../src/layout_util.c:1846
 msgid "View Images as List"
 msgstr "以列表查看图像"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1847
 msgid "I_cons"
 msgstr "图标(_c)"
 
-#: ../src/layout_util.c:1405
+#: ../src/layout_util.c:1847
 msgid "View Images as Icons"
 msgstr "以图标查看图像"
 
-#: ../src/layout_util.c:1409
-msgid "Folder Li_st"
-msgstr "文件夹列表(_i)"
-
-#: ../src/layout_util.c:1409
-msgid "View Folders as List"
-msgstr "以列表查看文件夹"
-
-#: ../src/layout_util.c:1410
-msgid "Folder T_ree"
-msgstr "文件夹树(_r)"
+#: ../src/layout_util.c:1851
+#, fuzzy
+msgid "T_oggle Folder View"
+msgstr "切换播片开启/关闭"
 
-#: ../src/layout_util.c:1410
-msgid "View Folders as Tree"
-msgstr "以树状查看文件夹"
+#: ../src/layout_util.c:1851
+#, fuzzy
+msgid "Toggle Folders View"
+msgstr "切换播片开启/关闭"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1855
 msgid "_Horizontal"
 msgstr "æ°´å¹³ (_H)"
 
-#: ../src/layout_util.c:1414
+#: ../src/layout_util.c:1855
 msgid "Split Horizontal"
 msgstr "水平分割"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1856
 msgid "_Vertical"
 msgstr "垂直 (_V)"
 
-#: ../src/layout_util.c:1415
+#: ../src/layout_util.c:1856
 msgid "Split Vertical"
 msgstr "垂直分割"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1857
 msgid "_Quad"
 msgstr "四分 (_Q)"
 
-#: ../src/layout_util.c:1416
+#: ../src/layout_util.c:1857
 msgid "Split Quad"
 msgstr "分割-四分"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1858
 msgid "_Single"
 msgstr "单张 (_S)"
 
-#: ../src/layout_util.c:1417
+#: ../src/layout_util.c:1858
 msgid "Split Single"
 msgstr "分割-单张"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1862
 msgid "Input _0: sRGB"
 msgstr "输入 _0: sRGB"
 
-#: ../src/layout_util.c:1421
+#: ../src/layout_util.c:1862
 msgid "Input 0: sRGB"
 msgstr "输入 0: sRGB"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1863
 msgid "Input _1: AdobeRGB compatible"
 msgstr "输入 _1: AdobeRGB 兼容"
 
-#: ../src/layout_util.c:1422
+#: ../src/layout_util.c:1863
 msgid "Input 1: AdobeRGB compatible"
 msgstr "输入 1: AdobeRGB兼容"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1864
 msgid "Input _2"
 msgstr "输入 _2"
 
-#: ../src/layout_util.c:1423
+#: ../src/layout_util.c:1864
 msgid "Input 2"
 msgstr "输入 2"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1865
 msgid "Input _3"
 msgstr "输入 _3"
 
-#: ../src/layout_util.c:1424
+#: ../src/layout_util.c:1865
 msgid "Input 3"
 msgstr "输入 3"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1866
 msgid "Input _4"
 msgstr "输入 _4"
 
-#: ../src/layout_util.c:1425
+#: ../src/layout_util.c:1866
 msgid "Input 4"
 msgstr "输入 4"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1867
 msgid "Input _5"
 msgstr "输入 _5"
 
-#: ../src/layout_util.c:1426
+#: ../src/layout_util.c:1867
 msgid "Input 5"
 msgstr "输入 5"
 
-#: ../src/layout_util.c:1430
+#: ../src/layout_util.c:1871
 msgid "Histogram on Red"
 msgstr "直方图 红"
 
-#: ../src/layout_util.c:1431
+#: ../src/layout_util.c:1872
 msgid "Histogram on Green"
 msgstr "直方图 绿"
 
-#: ../src/layout_util.c:1432
+#: ../src/layout_util.c:1873
 msgid "Histogram on Blue"
 msgstr "直方图 蓝"
 
-#: ../src/layout_util.c:1433
+#: ../src/layout_util.c:1874
 msgid "Histogram on RGB"
 msgstr "直方图 RGB"
 
-#: ../src/layout_util.c:1434
+#: ../src/layout_util.c:1875
 msgid "Histogram on Value"
 msgstr "直方图 值"
 
-#: ../src/layout_util.c:1438
+#: ../src/layout_util.c:1879
 msgid "Linear Histogram"
 msgstr "线性直方图"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1880
 msgid "_Log Histogram"
 msgstr "对数直方图 (_L)"
 
-#: ../src/layout_util.c:1439
+#: ../src/layout_util.c:1880
 msgid "Log Histogram"
 msgstr "对数直方图"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1884
 msgid "_Auto"
 msgstr "自动 (_A)"
 
-#: ../src/layout_util.c:1443
+#: ../src/layout_util.c:1884
 msgid "Stereo Auto"
 msgstr "立体图片-自动"
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1885
 msgid "_Side by Side"
 msgstr "并排 (_S)"
 
-#: ../src/layout_util.c:1444
+#: ../src/layout_util.c:1885
 msgid "Stereo Side by Side"
 msgstr "立体图片-并排"
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1886
 msgid "_Cross"
 msgstr "交叉 (_C)"
 
-#: ../src/layout_util.c:1445
+#: ../src/layout_util.c:1886
 msgid "Stereo Cross"
 msgstr "立体图片-交叉"
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1887
 msgid "_Off"
 msgstr "关闭 (_O)"
 
-#: ../src/layout_util.c:1446
+#: ../src/layout_util.c:1887
 msgid "Stereo Off"
 msgstr "立体图片-关"
 
-#: ../src/layout_util.c:1735
+#: ../src/layout_util.c:2203
 #, c-format
 msgid "Mark _%d"
 msgstr "标记 _%d"
 
-#: ../src/layout_util.c:1736 ../src/view_file.c:540
+#: ../src/layout_util.c:2204 ../src/view_file.c:570
 #, c-format
 msgid "_Set mark %d"
 msgstr "设置标记 %d (_S)"
 
-#: ../src/layout_util.c:1736
+#: ../src/layout_util.c:2204
 #, c-format
 msgid "Set mark %d"
 msgstr "设置标记 %d"
 
-#: ../src/layout_util.c:1737 ../src/view_file.c:541
+#: ../src/layout_util.c:2205 ../src/view_file.c:571
 #, c-format
 msgid "_Reset mark %d"
 msgstr "重置标记 %d (_R)"
 
-#: ../src/layout_util.c:1737
+#: ../src/layout_util.c:2205
 #, c-format
 msgid "Reset mark %d"
 msgstr "重置标记 %d"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739 ../src/view_file.c:542
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207 ../src/view_file.c:572
 #, c-format
 msgid "_Toggle mark %d"
 msgstr "切换标记 %d (_T)"
 
-#: ../src/layout_util.c:1738 ../src/layout_util.c:1739
+#: ../src/layout_util.c:2206 ../src/layout_util.c:2207
 #, c-format
 msgid "Toggle mark %d"
 msgstr "切换标记 %d"
 
-#: ../src/layout_util.c:1740
+#: ../src/layout_util.c:2208
 #, c-format
 msgid "Se_lect mark %d"
 msgstr "选择标记 %d (_l)"
 
-#: ../src/layout_util.c:1740 ../src/layout_util.c:1741
+#: ../src/layout_util.c:2208 ../src/layout_util.c:2209
 #, c-format
 msgid "Select mark %d"
 msgstr "选择标记 %d"
 
-#: ../src/layout_util.c:1741 ../src/view_file.c:543
+#: ../src/layout_util.c:2209 ../src/view_file.c:573
 #, c-format
 msgid "_Select mark %d"
 msgstr "选择标记 %d (_S)"
 
-#: ../src/layout_util.c:1742 ../src/view_file.c:544
+#: ../src/layout_util.c:2210 ../src/view_file.c:574
 #, c-format
 msgid "_Add mark %d"
 msgstr "添加标记 %d (_A)"
 
-#: ../src/layout_util.c:1742
+#: ../src/layout_util.c:2210
 #, c-format
 msgid "Add mark %d"
 msgstr "添加标记 %d"
 
-#: ../src/layout_util.c:1743 ../src/view_file.c:545
+#: ../src/layout_util.c:2211 ../src/view_file.c:575
 #, c-format
 msgid "_Intersection with mark %d"
 msgstr "与标记 %d 共有的 (_I)"
 
-#: ../src/layout_util.c:1743
+#: ../src/layout_util.c:2211
 #, c-format
 msgid "Intersection with mark %d"
 msgstr "与标记 %d 共有的"
 
-#: ../src/layout_util.c:1744 ../src/view_file.c:546
+#: ../src/layout_util.c:2212 ../src/view_file.c:576
 #, c-format
 msgid "_Unselect mark %d"
 msgstr "取消选择标记 %d (_U)"
 
-#: ../src/layout_util.c:1744
+#: ../src/layout_util.c:2212
 #, c-format
 msgid "Unselect mark %d"
 msgstr "取消选择标记 %d"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:2213
 #, c-format
 msgid "_Filter mark %d"
 msgstr "过滤为标记 %d (_F)"
 
-#: ../src/layout_util.c:1745
+#: ../src/layout_util.c:2213
 #, c-format
 msgid "Filter mark %d"
 msgstr "过滤为标记 %d"
 
-#: ../src/layout_util.c:2127
+#: ../src/layout_util.c:2595
 #, c-format
 msgid "Number of files with unsaved metadata: %d"
 msgstr "未保存元数据的文件数: %d"
 
-#: ../src/layout_util.c:2133
+#: ../src/layout_util.c:2601
 msgid "No unsaved metadata"
 msgstr "没有未保存的元数据"
 
-#: ../src/layout_util.c:2180
+#: ../src/layout_util.c:2648
 #, c-format
 msgid ""
 "Image profile: %s\n"
@@ -3154,26 +3482,26 @@ msgstr ""
 "图像色彩配置: %s\n"
 "屏幕色彩配置: %s"
 
-#: ../src/layout_util.c:2188
+#: ../src/layout_util.c:2656
 msgid "Click to enable color management"
 msgstr "点击启用色彩管理"
 
-#: ../src/layout_util.c:2193
+#: ../src/layout_util.c:2661
 msgid "Color profiles not supported"
 msgstr "色彩配置文件不支持"
 
-#: ../src/layout_util.c:2215
+#: ../src/layout_util.c:2683
 #, c-format
 msgid "Input _%d: %s"
 msgstr "输入 _%d: %s"
 
 #. something went badly wrong
-#: ../src/lirc.c:197
+#: ../src/lirc.c:209
 #, fuzzy, c-format
 msgid "disconnected from LIRC\n"
 msgstr "关联放大"
 
-#: ../src/lirc.c:222
+#: ../src/lirc.c:234
 #, c-format
 msgid ""
 "could not read LIRC config file\n"
@@ -3181,109 +3509,125 @@ msgid ""
 "know how to create a proper config file\n"
 msgstr ""
 
-#: ../src/logwindow.c:76
+#: ../src/logwindow.c:131
 msgid "Log"
 msgstr "日志"
 
-#: ../src/main.c:321
+#: ../src/logwindow.c:159 ../src/preferences.c:2197
+msgid "Debug level:"
+msgstr "调试等级:"
+
+#: ../src/main.c:352
 #, c-format
 msgid ""
 "Usage: %s [options] [path]\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:322
+#: ../src/main.c:353
 #, fuzzy
 msgid "valid options are:\n"
 msgstr ""
 "无效文件名:\n"
 "%s"
 
-#: ../src/main.c:323
+#: ../src/main.c:354
 msgid "  +t, --with-tools                 force show of tools\n"
 msgstr ""
 
-#: ../src/main.c:324
+#: ../src/main.c:355
 msgid "  -t, --without-tools              force hide of tools\n"
 msgstr ""
 
-#: ../src/main.c:325
+#: ../src/main.c:356
 msgid "  -f, --fullscreen                 start in full screen mode\n"
 msgstr ""
 
-#: ../src/main.c:326
+#: ../src/main.c:357
 msgid "  -s, --slideshow                  start in slideshow mode\n"
 msgstr ""
 
-#: ../src/main.c:327
+#: ../src/main.c:358
 msgid ""
 "  -l, --list [files] [collections] open collection window for command line\n"
 msgstr ""
 
-#: ../src/main.c:328
+#: ../src/main.c:359
 msgid "      --blank                      start with blank file list\n"
 msgstr ""
 
-#: ../src/main.c:329
+#: ../src/main.c:360
 msgid "      --geometry=XxY+XOFF+YOFF     set main window location\n"
 msgstr ""
 
-#: ../src/main.c:330
+#: ../src/main.c:361
 msgid ""
 "  -r, --remote                     send following commands to open window\n"
 msgstr ""
 
-#: ../src/main.c:331
+#: ../src/main.c:362
 msgid "  -rh,--remote-help                print remote command list\n"
 msgstr ""
 
-#: ../src/main.c:333
+#: ../src/main.c:364
 msgid "      --debug[=level]              turn on debug output\n"
 msgstr ""
 
-#: ../src/main.c:335
+#: ../src/main.c:365
+msgid "  -g:<regexp>, --grep:<regexp>     filter debug output\n"
+msgstr ""
+
+#: ../src/main.c:367
+msgid "  +w, --show-log-window            show log window\n"
+msgstr ""
+
+#: ../src/main.c:368
+msgid "  -o:<file>, --log-file:<file>     save log data to file\n"
+msgstr ""
+
+#: ../src/main.c:369
 msgid "  -v, --version                    print version info\n"
 msgstr ""
 
-#: ../src/main.c:336
+#: ../src/main.c:370
 msgid ""
 "  -h, --help                       show this message\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:349
+#: ../src/main.c:383
 #, c-format
 msgid ""
 "invalid or ignored: %s\n"
 "Use --help for options\n"
 msgstr ""
 
-#: ../src/main.c:378
+#: ../src/main.c:412
 msgid "Invalid or ignored remote options: "
 msgstr ""
 
-#: ../src/main.c:387
+#: ../src/main.c:421
 msgid ""
 "\n"
 "Use --remote-help for valid remote options.\n"
 msgstr ""
 
-#: ../src/main.c:489
+#: ../src/main.c:523
 #, c-format
 msgid "Creating %s dir:%s\n"
 msgstr ""
 
-#: ../src/main.c:493
+#: ../src/main.c:527
 #, fuzzy, c-format
 msgid "Could not create dir:%s\n"
 msgstr "不能创建文件夹"
 
-#: ../src/main.c:545
+#: ../src/main.c:579
 #, fuzzy, c-format
 msgid "error saving file: %s\n"
 msgstr "保存设置文件出错: %s\n"
 
-#: ../src/main.c:564
+#: ../src/main.c:598
 #, fuzzy, c-format
 msgid ""
 "error saving file: %s\n"
@@ -3292,456 +3636,450 @@ msgstr ""
 "保存配置文件出错: %s\n"
 "错误: %s\n"
 
-#: ../src/main.c:672
+#: ../src/main.c:708
 msgid "exit"
 msgstr "退出"
 
-#: ../src/main.c:677
+#: ../src/main.c:713
 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"
 
-#: ../src/main.c:679
+#: ../src/main.c:715
 msgid "Collections have been modified. Quit anyway?"
 msgstr "图片集已修改. 不保存退出吗？"
 
-#: ../src/main.c:885 ../src/remote.c:601
+#: ../src/main.c:930 ../src/remote.c:680
 msgid "Command line"
 msgstr "命令行"
 
-#: ../src/menu.c:133
+#: ../src/menu.c:141
 msgid "Sort by size"
 msgstr "按大小排序"
 
-#: ../src/menu.c:136
+#: ../src/menu.c:144
 msgid "Sort by date"
 msgstr "按日期排序"
 
-#: ../src/menu.c:139
+#: ../src/menu.c:147
 #, fuzzy
 msgid "Sort by file creation date"
 msgstr "以 Exif 日期排序 (_x)"
 
-#: ../src/menu.c:142
+#: ../src/menu.c:150
 #, fuzzy
 msgid "Sort by Exif-date"
 msgstr "以 Exif 日期排序 (_x)"
 
-#: ../src/menu.c:145
+#: ../src/menu.c:153
 msgid "Unsorted"
 msgstr "未排序"
 
-#: ../src/menu.c:148
+#: ../src/menu.c:156
 msgid "Sort by path"
 msgstr "按路径排序"
 
-#: ../src/menu.c:151
+#: ../src/menu.c:159
 msgid "Sort by number"
 msgstr "按数字排序"
 
-#: ../src/menu.c:155
+#: ../src/menu.c:162
+#, fuzzy
+msgid "Sort by rating"
+msgstr "按日期排序"
+
+#: ../src/menu.c:166
 msgid "Sort by name"
 msgstr "按名称排序"
 
-#: ../src/menu.c:207
-msgid "Sort"
-msgstr "排序"
+#: ../src/menu.c:232 ../src/menu.c:241
+msgid "Zoom to original size"
+msgstr "缩放到原尺寸"
+
+#: ../src/menu.c:235
+msgid "Fit image to window"
+msgstr "适应图像到窗口"
+
+#: ../src/menu.c:238
+msgid "Leave Zoom at previous setting"
+msgstr "保持之前缩放比率"
+
+#: ../src/menu.c:293 ../src/preferences.c:1514
+msgid "Zoom"
+msgstr "缩放"
 
-#: ../src/menu.c:232
+#: ../src/menu.c:318
 msgid "Rotate _180"
 msgstr "旋转 _180"
 
-#: ../src/metadata.c:1599
+#: ../src/metadata.c:1700
 msgid "People"
 msgstr ""
 
-#: ../src/metadata.c:1600
+#: ../src/metadata.c:1701
 msgid "Family"
 msgstr ""
 
-#: ../src/metadata.c:1601
+#: ../src/metadata.c:1702
 msgid "Free time"
 msgstr ""
 
-#: ../src/metadata.c:1602
+#: ../src/metadata.c:1703
 msgid "Children"
 msgstr ""
 
-#: ../src/metadata.c:1603
+#: ../src/metadata.c:1704
 msgid "Sport"
 msgstr ""
 
-#: ../src/metadata.c:1604
+#: ../src/metadata.c:1705
 msgid "Culture"
 msgstr ""
 
-#: ../src/metadata.c:1605
+#: ../src/metadata.c:1706
 msgid "Festival"
 msgstr ""
 
-#: ../src/metadata.c:1606
+#: ../src/metadata.c:1707
 msgid "Nature"
 msgstr ""
 
-#: ../src/metadata.c:1607
+#: ../src/metadata.c:1708
 msgid "Animal"
 msgstr ""
 
-#: ../src/metadata.c:1608
+#: ../src/metadata.c:1709
 msgid "Bird"
 msgstr ""
 
-#: ../src/metadata.c:1609
+#: ../src/metadata.c:1710
 msgid "Insect"
 msgstr ""
 
-#: ../src/metadata.c:1610
+#: ../src/metadata.c:1711
 msgid "Pets"
 msgstr ""
 
-#: ../src/metadata.c:1611
+#: ../src/metadata.c:1712
 msgid "Wildlife"
 msgstr ""
 
-#: ../src/metadata.c:1612
+#: ../src/metadata.c:1713
 #, fuzzy
 msgid "Zoo"
 msgstr "缩放"
 
-#: ../src/metadata.c:1613
+#: ../src/metadata.c:1714
 msgid "Plant"
 msgstr ""
 
-#: ../src/metadata.c:1614
+#: ../src/metadata.c:1715
 msgid "Tree"
 msgstr ""
 
-#: ../src/metadata.c:1615
+#: ../src/metadata.c:1716
 msgid "Flower"
 msgstr ""
 
-#: ../src/metadata.c:1616
+#: ../src/metadata.c:1717
 msgid "Water"
 msgstr ""
 
-#: ../src/metadata.c:1617
+#: ../src/metadata.c:1718
 msgid "River"
 msgstr ""
 
-#: ../src/metadata.c:1618
+#: ../src/metadata.c:1719
 msgid "Lake"
 msgstr ""
 
-#: ../src/metadata.c:1619
+#: ../src/metadata.c:1720
 #, fuzzy
 msgid "Sea"
 msgstr "搜索:"
 
-#: ../src/metadata.c:1620 ../src/print.c:375
+#: ../src/metadata.c:1721 ../src/print.c:385
 msgid "Landscape"
 msgstr "横向"
 
-#: ../src/metadata.c:1621
+#: ../src/metadata.c:1722
 msgid "Art"
 msgstr ""
 
-#: ../src/metadata.c:1622
+#: ../src/metadata.c:1723
 #, fuzzy
 msgid "Statue"
 msgstr "状态"
 
-#: ../src/metadata.c:1623
+#: ../src/metadata.c:1724
 #, fuzzy
 msgid "Painting"
 msgstr "打印出错"
 
-#: ../src/metadata.c:1624 ../src/metadata.c:1638
+#: ../src/metadata.c:1725 ../src/metadata.c:1739
 #, fuzzy
 msgid "Historic"
 msgstr "直方图"
 
-#: ../src/metadata.c:1625 ../src/metadata.c:1639
+#: ../src/metadata.c:1726 ../src/metadata.c:1740
 msgid "Modern"
 msgstr ""
 
-#: ../src/metadata.c:1626
+#: ../src/metadata.c:1727
 msgid "City"
 msgstr ""
 
-#: ../src/metadata.c:1627
+#: ../src/metadata.c:1728
 msgid "Park"
 msgstr ""
 
-#: ../src/metadata.c:1628
+#: ../src/metadata.c:1729
 msgid "Street"
 msgstr ""
 
-#: ../src/metadata.c:1629
+#: ../src/metadata.c:1730
 msgid "Square"
 msgstr ""
 
-#: ../src/metadata.c:1630
+#: ../src/metadata.c:1731
 #, fuzzy
 msgid "Architecture"
 msgstr "光圈"
 
-#: ../src/metadata.c:1631
+#: ../src/metadata.c:1732
 msgid "Buildings"
 msgstr ""
 
-#: ../src/metadata.c:1632
+#: ../src/metadata.c:1733
 msgid "House"
 msgstr ""
 
-#: ../src/metadata.c:1633
+#: ../src/metadata.c:1734
 msgid "Cathedral"
 msgstr ""
 
-#: ../src/metadata.c:1634
+#: ../src/metadata.c:1735
 msgid "Palace"
 msgstr ""
 
-#: ../src/metadata.c:1635
+#: ../src/metadata.c:1736
 msgid "Castle"
 msgstr ""
 
-#: ../src/metadata.c:1636
+#: ../src/metadata.c:1737
 msgid "Bridge"
 msgstr ""
 
-#: ../src/metadata.c:1637
+#: ../src/metadata.c:1738
 msgid "Interior"
 msgstr ""
 
-#: ../src/metadata.c:1640
+#: ../src/metadata.c:1741
 msgid "Places"
 msgstr ""
 
-#: ../src/metadata.c:1641
+#: ../src/metadata.c:1742
 #, fuzzy
 msgid "Conditions"
 msgstr "图片集"
 
-#: ../src/metadata.c:1642
+#: ../src/metadata.c:1743
 #, fuzzy
 msgid "Night"
 msgstr "高"
 
-#: ../src/metadata.c:1643
+#: ../src/metadata.c:1744
 #, fuzzy
 msgid "Lights"
 msgstr "高"
 
-#: ../src/metadata.c:1644
+#: ../src/metadata.c:1745
 #, fuzzy
 msgid "Reflections"
 msgstr "选择项"
 
-#: ../src/metadata.c:1645
+#: ../src/metadata.c:1746
 msgid "Sun"
 msgstr ""
 
-#: ../src/metadata.c:1646
+#: ../src/metadata.c:1747
 msgid "Weather"
 msgstr ""
 
-#: ../src/metadata.c:1647
+#: ../src/metadata.c:1748
 #, fuzzy
 msgid "Fog"
 msgstr "日志"
 
-#: ../src/metadata.c:1648
+#: ../src/metadata.c:1749
 msgid "Rain"
 msgstr ""
 
-#: ../src/metadata.c:1649
+#: ../src/metadata.c:1750
 msgid "Clouds"
 msgstr ""
 
-#: ../src/metadata.c:1650
+#: ../src/metadata.c:1751
 msgid "Snow"
 msgstr ""
 
-#: ../src/metadata.c:1651
+#: ../src/metadata.c:1752
 msgid "Sunny weather"
 msgstr ""
 
-#: ../src/metadata.c:1652
+#: ../src/metadata.c:1753
 #, fuzzy
 msgid "Photo"
 msgstr "照片 6x4"
 
-#: ../src/metadata.c:1653
+#: ../src/metadata.c:1754
 #, fuzzy
 msgid "Edited"
 msgstr "编辑 (_E)"
 
-#: ../src/metadata.c:1654
+#: ../src/metadata.c:1755
 #, fuzzy
 msgid "Detail"
 msgstr "详情"
 
-#: ../src/metadata.c:1655
+#: ../src/metadata.c:1756
 msgid "Macro"
 msgstr ""
 
-#: ../src/metadata.c:1656 ../src/print.c:374
+#: ../src/metadata.c:1757 ../src/print.c:384
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../src/metadata.c:1657
+#: ../src/metadata.c:1758
 msgid "Black and White"
 msgstr ""
 
-#: ../src/metadata.c:1658
+#: ../src/metadata.c:1759
 msgid "Perspective"
 msgstr ""
 
-#: ../src/options.c:158 ../src/ui_bookmark.c:560
+#: ../src/options.c:188 ../src/ui_bookmark.c:577
 #, fuzzy
 msgid "Desktop"
 msgstr "桌面文件"
 
-#: ../src/pan-view.c:423
+#: ../src/pan-view/pan-view.c:438
 #, c-format
 msgid "%d images, %s"
 msgstr "%d 文件, %s"
 
-#: ../src/pan-view.c:433
+#: ../src/pan-view/pan-view.c:448
 #, c-format
 msgid "The pan view does not support the folder \"%s\"."
 msgstr "图片概览不支持文件夹 \"%s\"."
 
-#: ../src/pan-view.c:434
+#: ../src/pan-view/pan-view.c:449
 msgid "Folder not supported"
 msgstr "文件夹不支持"
 
-#: ../src/pan-view.c:986 ../src/pan-view.c:1002
+#: ../src/pan-view/pan-view.c:1001 ../src/pan-view/pan-view.c:1017
 msgid "Reading image data..."
 msgstr "读取图像数据..."
 
-#: ../src/pan-view.c:1061
+#: ../src/pan-view/pan-view.c:1076
 msgid "Sorting images..."
 msgstr "排序图像..."
 
-#: ../src/pan-view.c:1365 ../src/print.c:2599
+#: ../src/pan-view/pan-view.c:1385 ../src/print.c:2609
 msgid "Filename:"
 msgstr "文件名:"
 
-#: ../src/pan-view.c:1367 ../src/pan-view.c:2183 ../src/preferences.c:1493
+#: ../src/pan-view/pan-view.c:1387 ../src/pan-view/pan-view.c:1812
+#: ../src/preferences.c:1621
 msgid "Location:"
 msgstr "位置:"
 
-#: ../src/pan-view.c:1369 ../src/pan-view.c:1735
+#: ../src/pan-view/pan-view.c:1389 ../src/pan-view/pan-view-search.c:377
 msgid "Date:"
 msgstr "日期:"
 
-#: ../src/pan-view.c:1371 ../src/preferences.c:1319 ../src/print.c:3212
-#: ../src/print.c:3417
+#: ../src/pan-view/pan-view.c:1391 ../src/preferences.c:1439
+#: ../src/print.c:3222 ../src/print.c:3427
 msgid "Size:"
 msgstr "大小:"
 
-#: ../src/pan-view.c:1473
-msgid "path found"
-msgstr "发现路径"
-
-#: ../src/pan-view.c:1473
-msgid "filename found"
-msgstr "未找到文件名"
-
-#: ../src/pan-view.c:1521
-msgid "partial match"
-msgstr "部分匹配"
-
-#: ../src/pan-view.c:1732 ../src/pan-view.c:1765
-msgid "no match"
-msgstr "无匹配"
-
-#: ../src/pan-view.c:2071 ../src/search.c:2169
+#: ../src/pan-view/pan-view.c:1698 ../src/search.c:2392
 msgid "Folder not found"
 msgstr "文件夹未找到"
 
-#: ../src/pan-view.c:2072
+#: ../src/pan-view/pan-view.c:1699
 msgid "The entered path is not a folder"
 msgstr "输入的路径不是文件夹"
 
-#: ../src/pan-view.c:2167
+#: ../src/pan-view/pan-view.c:1796
 msgid "Pan View"
 msgstr "图片概览"
 
-#: ../src/pan-view.c:2192
+#: ../src/pan-view/pan-view.c:1821
 msgid "Timeline"
 msgstr "时间轴"
 
-#: ../src/pan-view.c:2193
+#: ../src/pan-view/pan-view.c:1822
 msgid "Calendar"
 msgstr "日历"
 
-#: ../src/pan-view.c:2195
+#: ../src/pan-view/pan-view.c:1824
 msgid "Folders (flower)"
 msgstr "文件夹 (花)"
 
-#: ../src/pan-view.c:2196
+#: ../src/pan-view/pan-view.c:1825
 msgid "Grid"
 msgstr "网格"
 
-#: ../src/pan-view.c:2205
+#: ../src/pan-view/pan-view.c:1834
 msgid "Dots"
 msgstr "点"
 
-#: ../src/pan-view.c:2206
+#: ../src/pan-view/pan-view.c:1835
 msgid "No Images"
 msgstr "无图像"
 
-#: ../src/pan-view.c:2207
+#: ../src/pan-view/pan-view.c:1836
 msgid "Small Thumbnails"
 msgstr "小缩略图"
 
-#: ../src/pan-view.c:2208
+#: ../src/pan-view/pan-view.c:1837
 msgid "Normal Thumbnails"
 msgstr "标准缩略图"
 
-#: ../src/pan-view.c:2209
+#: ../src/pan-view/pan-view.c:1838
 msgid "Large Thumbnails"
 msgstr "大缩略图"
 
-#: ../src/pan-view.c:2210 ../src/pan-view.c:2665
+#: ../src/pan-view/pan-view.c:1839 ../src/pan-view/pan-view.c:2274
 msgid "1:10 (10%)"
 msgstr ""
 
-#: ../src/pan-view.c:2211 ../src/pan-view.c:2661
+#: ../src/pan-view/pan-view.c:1840 ../src/pan-view/pan-view.c:2270
 msgid "1:4 (25%)"
 msgstr ""
 
-#: ../src/pan-view.c:2212 ../src/pan-view.c:2657
+#: ../src/pan-view/pan-view.c:1841 ../src/pan-view/pan-view.c:2266
 msgid "1:3 (33%)"
 msgstr ""
 
-#: ../src/pan-view.c:2213 ../src/pan-view.c:2653
+#: ../src/pan-view/pan-view.c:1842 ../src/pan-view/pan-view.c:2262
 msgid "1:2 (50%)"
 msgstr ""
 
-#: ../src/pan-view.c:2214
+#: ../src/pan-view/pan-view.c:1843
 msgid "1:1 (100%)"
 msgstr ""
 
-#: ../src/pan-view.c:2262
-msgid "Find:"
-msgstr "查找:"
-
-#: ../src/pan-view.c:2313
-msgid "Find"
-msgstr "查找"
-
-#: ../src/pan-view.c:2380
+#: ../src/pan-view/pan-view.c:1989
 msgid "Pan View Performance"
 msgstr "图片概览性能"
 
-#: ../src/pan-view.c:2387
+#: ../src/pan-view/pan-view.c:1996
 msgid "Pan view performance may be poor."
 msgstr "图片概览性能可能很低."
 
-#: ../src/pan-view.c:2388
+#: ../src/pan-view/pan-view.c:1997
 msgid ""
 "To improve performance of thumbnails in the pan view the following options "
 "can be enabled. Note that both options must be enabled to notice a change in "
@@ -3750,135 +4088,207 @@ msgstr ""
 "为了提高图片概览显示缩略图的性能，可以开启以下选项．注意只有两个选项都启用才"
 "能发现性能的明显提高."
 
-#: ../src/pan-view.c:2396 ../src/preferences.c:1322
+#: ../src/pan-view/pan-view.c:2005 ../src/preferences.c:1442
 msgid "Cache thumbnails"
 msgstr "缓存缩略图"
 
-#: ../src/pan-view.c:2398
+#: ../src/pan-view/pan-view.c:2007
 msgid "Use shared thumbnail cache"
 msgstr "使用共享的缩略图缓存"
 
-#: ../src/pan-view.c:2404
+#: ../src/pan-view/pan-view.c:2013
 msgid "Do not show this dialog again"
 msgstr "不要再显示此对话框"
 
-#: ../src/pan-view.c:2633
+#: ../src/pan-view/pan-view.c:2242
 msgid "Sort by E_xif date"
 msgstr "以 Exif 日期排序 (_x)"
 
-#: ../src/pan-view.c:2639
+#: ../src/pan-view/pan-view.c:2248
 msgid "_Show Exif information"
 msgstr "显示 Exif 信息 (_S)"
 
-#: ../src/pan-view.c:2641
+#: ../src/pan-view/pan-view.c:2250
 msgid "Show im_age"
 msgstr "显示图像 (_a)"
 
-#: ../src/pan-view.c:2645
+#: ../src/pan-view/pan-view.c:2254
 msgid "_None"
 msgstr "无 (_N)"
 
-#: ../src/pan-view.c:2649
+#: ../src/pan-view/pan-view.c:2258
 msgid "_Full size"
 msgstr "全尺寸 (_F)"
 
-#: ../src/preferences.c:91
+#: ../src/pan-view/pan-view-filter.c:48
+msgid "Require"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:48
+msgid "R"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:51
+#, fuzzy
+msgid "Exclude"
+msgstr "不包括"
+
+#: ../src/pan-view/pan-view-filter.c:51
+msgid "E"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:54
+#, fuzzy
+msgid "Include"
+msgstr "不包括"
+
+#: ../src/pan-view/pan-view-filter.c:54
+msgid "I"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:57
+msgid "Group"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:57
+msgid "G"
+msgstr ""
+
+#: ../src/pan-view/pan-view-filter.c:71
+#, fuzzy
+msgid "Keyword Filter:"
+msgstr "关键词类型:"
+
+#: ../src/pan-view/pan-view-filter.c:104 ../src/preferences.c:1784
+msgid "Filter"
+msgstr "过滤器"
+
+#: ../src/pan-view/pan-view-filter.c:139
+#, fuzzy
+msgid "Removed keyword…"
+msgstr "可选择"
+
+#: ../src/pan-view/pan-view-search.c:41
+msgid "Find:"
+msgstr "查找:"
+
+#: ../src/pan-view/pan-view-search.c:66
+msgid "Find"
+msgstr "查找"
+
+#: ../src/pan-view/pan-view-search.c:115
+msgid "path found"
+msgstr "发现路径"
+
+#: ../src/pan-view/pan-view-search.c:115
+msgid "filename found"
+msgstr "未找到文件名"
+
+#: ../src/pan-view/pan-view-search.c:163
+msgid "partial match"
+msgstr "部分匹配"
+
+#: ../src/pan-view/pan-view-search.c:374 ../src/pan-view/pan-view-search.c:407
+msgid "no match"
+msgstr "无匹配"
+
+#: ../src/preferences.c:106
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/preferences.c:93
+#: ../src/preferences.c:108
 msgid "RAW Image"
 msgstr "RAW 图像"
 
-#: ../src/preferences.c:446
+#: ../src/preferences.c:507
 msgid "Nearest (worst, but fastest)"
 msgstr "相邻的 (最差但速度最快)"
 
-#: ../src/preferences.c:448
+#: ../src/preferences.c:509
 msgid "Tiles"
 msgstr "区块"
 
-#: ../src/preferences.c:450
+#: ../src/preferences.c:511
 msgid "Bilinear"
 msgstr "双线性"
 
-#: ../src/preferences.c:452
+#: ../src/preferences.c:513
 msgid "Hyper (best, but slowest)"
 msgstr "顶级的 (最好但速度最慢)"
 
-#: ../src/preferences.c:517 ../src/print.c:380
+#: ../src/preferences.c:578 ../src/print.c:390
 msgid "Custom"
 msgstr "自定义"
 
-#: ../src/preferences.c:600
+#: ../src/preferences.c:661
 msgid "Single image"
 msgstr "单张图片"
 
-#: ../src/preferences.c:602
+#: ../src/preferences.c:663
 msgid "Anaglyph Red-Cyan"
 msgstr "Anaglyph 红-蓝"
 
-#: ../src/preferences.c:604
+#: ../src/preferences.c:665
 #, fuzzy
 msgid "Anaglyph Green-Magenta"
 msgstr "Anaglyph 灰 红-蓝"
 
-#: ../src/preferences.c:606
+#: ../src/preferences.c:667
 msgid "Anaglyph Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:608
+#: ../src/preferences.c:669
 msgid "Anaglyph Gray Red-Cyan"
 msgstr "Anaglyph 灰 红-蓝"
 
-#: ../src/preferences.c:610
+#: ../src/preferences.c:671
 #, fuzzy
 msgid "Anaglyph Gray Green-Magenta"
 msgstr "Anaglyph 灰 红-蓝"
 
-#: ../src/preferences.c:612
+#: ../src/preferences.c:673
 #, fuzzy
 msgid "Anaglyph Gray Yellow-Blue"
 msgstr "Anaglyph 灰 红-蓝"
 
-#: ../src/preferences.c:614
+#: ../src/preferences.c:675
 #, fuzzy
 msgid "Anaglyph Dubois Red-Cyan"
 msgstr "Anaglyph 红-蓝"
 
-#: ../src/preferences.c:616
+#: ../src/preferences.c:677
 msgid "Anaglyph Dubois Green-Magenta"
 msgstr ""
 
-#: ../src/preferences.c:618
+#: ../src/preferences.c:679
 msgid "Anaglyph Dubois Yellow-Blue"
 msgstr ""
 
-#: ../src/preferences.c:621
+#: ../src/preferences.c:682
 msgid "Side by Side"
 msgstr "并排"
 
-#: ../src/preferences.c:622
+#: ../src/preferences.c:683
 msgid "Side by Side Half size"
 msgstr "并排 一半大小"
 
-#: ../src/preferences.c:629
+#: ../src/preferences.c:690
 msgid "Top - Bottom"
 msgstr "上-下"
 
-#: ../src/preferences.c:630
+#: ../src/preferences.c:691
 msgid "Top - Bottom Half size"
 msgstr "上-下 一半大小"
 
-#: ../src/preferences.c:639 ../src/preferences.c:2169
+#: ../src/preferences.c:700 ../src/preferences.c:2369
 msgid "Fixed position"
 msgstr "固定位置"
 
-#: ../src/preferences.c:936 ../src/preferences.c:939
+#: ../src/preferences.c:997 ../src/preferences.c:1000
 msgid "Reset filters"
 msgstr "重置过滤器"
 
-#: ../src/preferences.c:940
+#: ../src/preferences.c:1001
 msgid ""
 "This will reset the file filters to the defaults.\n"
 "Continue?"
@@ -3886,19 +4296,19 @@ msgstr ""
 "将会重置文件过滤器到默认设置:\n"
 "要继续吗？"
 
-#: ../src/preferences.c:967 ../src/preferences.c:970
+#: ../src/preferences.c:1028 ../src/preferences.c:1031
 msgid "Clear trash"
 msgstr "清理回收站"
 
-#: ../src/preferences.c:971
+#: ../src/preferences.c:1032
 msgid "This will remove the trash contents."
 msgstr "将会移除回收站内容."
 
-#: ../src/preferences.c:1015 ../src/preferences.c:1018
+#: ../src/preferences.c:1076 ../src/preferences.c:1079
 msgid "Reset image overlay template string"
 msgstr "重置显示叠加模板字符串"
 
-#: ../src/preferences.c:1019
+#: ../src/preferences.c:1080
 msgid ""
 "This will reset the image overlay template string to the default.\n"
 "Continue?"
@@ -3906,186 +4316,188 @@ msgstr ""
 "将会重置显示叠加模板字符串到默认设置.\n"
 "要继续吗？"
 
-#: ../src/preferences.c:1314
+#: ../src/preferences.c:1434
 msgid "General"
 msgstr "常规"
 
-#: ../src/preferences.c:1320 ../src/preferences.c:1380
+#: ../src/preferences.c:1440 ../src/preferences.c:1517
 msgid "Quality:"
 msgstr "显示品质:"
 
-#: ../src/preferences.c:1328
+#: ../src/preferences.c:1448
 msgid "Use standard thumbnail cache, shared with other applications"
 msgstr "使用标准缩略图缓存，与其他应用程序共享的"
 
-#: ../src/preferences.c:1334
+#: ../src/preferences.c:1454
 msgid ""
 "Store thumbnails in '.thumbnails' folder, local to image folder (non-"
 "standard)"
 msgstr "储存缩略图到 '.thumbnails' 文件夹，位于图像所在文件夹 (非标准)"
 
-#: ../src/preferences.c:1337
+#: ../src/preferences.c:1457
 msgid "Use EXIF thumbnails when available (EXIF thumbnails may be outdated)"
 msgstr "使用 EXIF 内嵌缩略图当可用 (EXIF 内嵌缩略图可能是过期的)"
 
-#: ../src/preferences.c:1340
+#: ../src/preferences.c:1460
 msgid "Slide show"
 msgstr "播片"
 
-#: ../src/preferences.c:1343
+#: ../src/preferences.c:1463
 msgid "Delay between image change:"
 msgstr "图像变换延迟:"
 
-#: ../src/preferences.c:1343
+#: ../src/preferences.c:1463
 msgid "seconds"
 msgstr "秒"
 
-#: ../src/preferences.c:1349
+#: ../src/preferences.c:1469
 msgid "Random"
 msgstr "随机的"
 
-#: ../src/preferences.c:1350
+#: ../src/preferences.c:1470
 msgid "Repeat"
 msgstr "重复的"
 
-#: ../src/preferences.c:1352
+#: ../src/preferences.c:1472
 msgid "Image loading and caching"
 msgstr "图像载入和缓冲"
 
-#: ../src/preferences.c:1354
+#: ../src/preferences.c:1474
 msgid "Decoded image cache size (Mb):"
 msgstr "图像解码缓存大小 (Mb):"
 
-#: ../src/preferences.c:1356
+#: ../src/preferences.c:1476
 msgid "Preload next image"
 msgstr "预载入下一张图片"
 
-#: ../src/preferences.c:1359
+#: ../src/preferences.c:1479
 msgid "Refresh on file change"
 msgstr "当文件改变时刷新"
 
-#: ../src/preferences.c:1377
-msgid "Zoom"
-msgstr "缩放"
+#: ../src/preferences.c:1482
+#, fuzzy
+msgid "Info sidebar heights"
+msgstr "信息边栏"
+
+#: ../src/preferences.c:1483
+msgid "NOTE! Geeqie must be restarted for changes to take effect"
+msgstr ""
+
+#: ../src/preferences.c:1485
+#, fuzzy
+msgid "Keywords:"
+msgstr "关键词"
+
+#: ../src/preferences.c:1491
+#, fuzzy
+msgid "Comment:"
+msgstr "注释"
+
+#: ../src/preferences.c:1494
+#, fuzzy
+msgid "Rating:"
+msgstr "打印出错"
 
-#: ../src/preferences.c:1383
+#: ../src/preferences.c:1520
 msgid "Use GPU acceleration via Clutter library"
 msgstr ""
 
-#: ../src/preferences.c:1387
+#: ../src/preferences.c:1524
 msgid "Two pass rendering (apply HQ zoom and color correction in second pass)"
 msgstr "双重渲染 (在第二遍处理时应用高质量缩放和色彩校正)"
 
-#: ../src/preferences.c:1390
-msgid "Allow enlargement of image for zoom to fit"
+#: ../src/preferences.c:1528
+#, fuzzy
+msgid "Allow enlargement of image for zoom to fit (max. size in %)"
 msgstr "当缩放以适应窗口时允许放大图像"
 
-#: ../src/preferences.c:1394
-msgid "Limit image size when autofitting (%):"
+#: ../src/preferences.c:1536
+#, fuzzy, c-format
+msgid "Limit image size when autofitting (% of window):"
 msgstr "当自动适应时图像大小限制 (%):"
 
-#: ../src/preferences.c:1402
+#: ../src/preferences.c:1544
 msgid "Zoom increment:"
 msgstr "缩放增量:"
 
-#: ../src/preferences.c:1407
-msgid "When new image is selected:"
-msgstr "当新图像被选择时:"
-
-#: ../src/preferences.c:1411
-msgid "Zoom to original size"
-msgstr "缩放到原尺寸"
-
-#: ../src/preferences.c:1414
-msgid "Fit image to window"
-msgstr "适应图像到窗口"
-
-#: ../src/preferences.c:1417
-msgid "Leave Zoom at previous setting"
-msgstr "保持之前缩放比率"
-
-#: ../src/preferences.c:1423
-msgid "Scroll to top left corner"
-msgstr "滚动至左上角"
-
-#: ../src/preferences.c:1426
-msgid "Scroll to image center"
-msgstr "滚动至图像中心"
-
-#: ../src/preferences.c:1429
-msgid "Keep the region from previous image"
-msgstr "保持之前图像所在区域"
-
-#: ../src/preferences.c:1434
+#: ../src/preferences.c:1549
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/preferences.c:1436
+#: ../src/preferences.c:1551
 msgid "Use custom border color in window mode"
 msgstr "当窗口模式时使用自定的边框颜色"
 
-#: ../src/preferences.c:1439
+#: ../src/preferences.c:1554
 msgid "Use custom border color in fullscreen mode"
 msgstr "当全屏模式时使用自定的边框颜色"
 
-#: ../src/preferences.c:1442
+#: ../src/preferences.c:1557
 msgid "Border color"
 msgstr "边框颜色"
 
-#: ../src/preferences.c:1445
+#: ../src/preferences.c:1562
+msgid "Alpha channel color 1"
+msgstr ""
+
+#: ../src/preferences.c:1565
+msgid "Alpha channel color 2"
+msgstr ""
+
+#: ../src/preferences.c:1571
 msgid "Convenience"
 msgstr "便捷"
 
-#: ../src/preferences.c:1447
-msgid "Auto rotate image using Exif information"
-msgstr "根据 Exif 信息自动旋转图像"
-
-#: ../src/preferences.c:1450
+#: ../src/preferences.c:1573
 #, fuzzy
 msgid "Auto rotate proofs using Exif information"
 msgstr "根据 Exif 信息自动旋转图像"
 
-#: ../src/preferences.c:1467
+#: ../src/preferences.c:1590
 msgid "Windows"
 msgstr "窗口"
 
-#: ../src/preferences.c:1469
+#: ../src/preferences.c:1592
 msgid "State"
 msgstr "状态"
 
-#: ../src/preferences.c:1471
+#: ../src/preferences.c:1594
 msgid "Remember window positions"
 msgstr "记住窗口位置"
 
-#: ../src/preferences.c:1473
+#: ../src/preferences.c:1597
+msgid "Use saved window positions also for new windows"
+msgstr ""
+
+#: ../src/preferences.c:1601
 msgid "Remember tool state (float/hidden)"
 msgstr "记住工具栏状态 (浮动/隐藏)"
 
-#: ../src/preferences.c:1478
+#: ../src/preferences.c:1606
 msgid "Fit window to image when tools are hidden/floating"
 msgstr "当工具栏隐藏/浮动时适应窗口到图像大小"
 
-#: ../src/preferences.c:1482
+#: ../src/preferences.c:1610
 msgid "Limit size when auto-sizing window (%):"
 msgstr "当自动调整窗口大小时限制大小为 (%):"
 
-#: ../src/preferences.c:1497
+#: ../src/preferences.c:1625
 msgid "Smooth image flip"
 msgstr "平滑图片切换"
 
-#: ../src/preferences.c:1499
+#: ../src/preferences.c:1627
 msgid "Disable screen saver"
 msgstr "禁用屏保"
 
-#: ../src/preferences.c:1503
+#: ../src/preferences.c:1631
 msgid "Overlay Screen Display"
 msgstr "显示叠加内容"
 
-#: ../src/preferences.c:1505
+#: ../src/preferences.c:1633
 msgid "Image overlay template"
 msgstr "显示叠加模板"
 
-#: ../src/preferences.c:1518
+#: ../src/preferences.c:1646
 #, fuzzy
 msgid ""
 "<i>%name%</i> results in the filename of the picture.\n"
@@ -4122,379 +4534,398 @@ msgstr ""
 "\",\n"
 "如果有空行, 它将被移除. 这样所添加的多行记录没有信息时不会显示.\n"
 
-#: ../src/preferences.c:1535 ../src/print.c:3210
+#: ../src/preferences.c:1663 ../src/print.c:3220
 msgid "Font"
 msgstr "字体"
 
-#: ../src/preferences.c:1540 ../src/print.c:3400
+#: ../src/preferences.c:1675 ../src/print.c:3410
 msgid "Text"
 msgstr "文字"
 
-#: ../src/preferences.c:1545
+#: ../src/preferences.c:1680
 msgid "Background"
 msgstr ""
 
-#: ../src/preferences.c:1552 ../src/preferences.c:1728
-#: ../src/preferences.c:2098
+#: ../src/preferences.c:1686 ../src/preferences.c:1864
+#: ../src/preferences.c:2298
 msgid "Defaults"
 msgstr "默认设置"
 
-#: ../src/preferences.c:1606
+#: ../src/preferences.c:1740
 msgid "Show hidden files or folders"
 msgstr "显示隐藏文件或文件夹"
 
-#: ../src/preferences.c:1608
+#: ../src/preferences.c:1742
 msgid "Show parent folder (..)"
 msgstr ""
 
-#: ../src/preferences.c:1610
+#: ../src/preferences.c:1744
 msgid "Case sensitive sort"
 msgstr "大小写区别排序"
 
-#: ../src/preferences.c:1612
+#: ../src/preferences.c:1746
+msgid "Natural sort order"
+msgstr ""
+
+#: ../src/preferences.c:1748
 #, fuzzy
 msgid "Disable file extension checks"
 msgstr "取消文件过滤"
 
-#: ../src/preferences.c:1615
+#: ../src/preferences.c:1751
 msgid "Disable File Filtering"
 msgstr "取消文件过滤"
 
-#: ../src/preferences.c:1619
+#: ../src/preferences.c:1755
 msgid "Grouping sidecar extensions"
 msgstr "编组的 sidecar扩展名"
 
-#: ../src/preferences.c:1626
+#: ../src/preferences.c:1762
 msgid "File types"
 msgstr "文件类型"
 
-#: ../src/preferences.c:1648
-msgid "Filter"
-msgstr "过滤器"
-
-#: ../src/preferences.c:1683
+#: ../src/preferences.c:1819
 msgid "Class"
 msgstr "类型"
 
-#: ../src/preferences.c:1700
+#: ../src/preferences.c:1836
 msgid "Writable"
 msgstr "可写的"
 
-#: ../src/preferences.c:1711
+#: ../src/preferences.c:1847
 msgid "Sidecar is allowed"
 msgstr "允许Sidecar"
 
-#: ../src/preferences.c:1757
+#: ../src/preferences.c:1893
 msgid "Metadata writing process"
 msgstr "元数据写入过程"
 
-#: ../src/preferences.c:1759
+#: ../src/preferences.c:1895
 msgid "Warning: Geeqie is built without Exiv2. Some options are disabled."
 msgstr "警告: Geeqie 在没有 Exiv2 下创建，一些选项被禁用."
 
-#: ../src/preferences.c:1761
+#: ../src/preferences.c:1897
 msgid ""
 "Metadata are written in the following order. The process ends after first "
 "success."
 msgstr "元数据按以下顺序尝试写入. 当一旦写入成功后过程就终止."
 
-#: ../src/preferences.c:1764
+#: ../src/preferences.c:1900
+#, fuzzy
 msgid ""
-"1) Save metadata in image files, resp. sidecar files, according to the XMP "
+"1) Save metadata in image files, or sidecar files, according to the XMP "
 "standard"
 msgstr "1) 保存元数据到图像文件或相应的 sidecar 文件, 依照 XMP 标准"
 
-#: ../src/preferences.c:1770
+#: ../src/preferences.c:1906
 msgid ""
 "2) Save metadata in '.metadata' folder, local to image folder (non-standard)"
 msgstr "2) 保存元数据到 '.metadata' 文件夹, 位于图像文件夹内 (非标准)"
 
-#: ../src/preferences.c:1773
+#: ../src/preferences.c:1909
 #, c-format
 msgid "3) Save metadata in Geeqie private directory '%s'"
 msgstr "3) 保存元数据到 Geeqie 私有目录 '%s' 内"
 
-#: ../src/preferences.c:1779
+#: ../src/preferences.c:1915
 msgid "Step 1: Write to image files"
 msgstr "步骤1: 写入图像文件"
 
-#: ../src/preferences.c:1787
+#: ../src/preferences.c:1923
 msgid ""
 "Store metadata also in legacy IPTC tags (converted according to IPTC4XMP "
 "standard)"
 msgstr "同时以旧式 IPTC 标签储存元数据 (依照 IPTC4XMP 标准转换)"
 
-#: ../src/preferences.c:1790
+#: ../src/preferences.c:1926
 msgid "Warn if the image files are unwritable"
 msgstr "当文件不可写时发出警告"
 
-#: ../src/preferences.c:1793
+#: ../src/preferences.c:1929
 msgid "Ask before writing to image files"
 msgstr "写入图像文件前询问"
 
-#: ../src/preferences.c:1796
+#: ../src/preferences.c:1932
+msgid "Create sidecar files named image.ext.xmp (as opposed to image.xmp)"
+msgstr ""
+
+#: ../src/preferences.c:1935
 msgid "Step 2 and 3: write to Geeqie private files"
 msgstr "步骤2和3: 写入 Geeqie 私有文件"
 
-#: ../src/preferences.c:1801
+#: ../src/preferences.c:1940
 msgid ""
 "Use GQview legacy metadata format (supports only keywords and comments) "
 "instead of XMP"
 msgstr "使用旧式 GQview 元数据格式 (仅支持关键词和注释) 而不是 XMP"
 
-#: ../src/preferences.c:1805
+#: ../src/preferences.c:1944
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: ../src/preferences.c:1806
+#: ../src/preferences.c:1945
 msgid ""
 "Write the same description tags (keywords, comment, etc.) to all grouped "
 "sidecars"
 msgstr "写入相同的描述标签 (关键词,注释等) 到所有编组的 sidecar"
 
-#: ../src/preferences.c:1809
+#: ../src/preferences.c:1948
 msgid "Allow keywords to differ only in case"
 msgstr "允许关键词只有大小写区别"
 
-#: ../src/preferences.c:1812
+#: ../src/preferences.c:1951
 msgid "Write altered image orientation to the metadata"
 msgstr "写入改变的图像方向到元数据"
 
-#: ../src/preferences.c:1818
+#: ../src/preferences.c:1957
 msgid "Auto-save options"
 msgstr "自动保存选项"
 
-#: ../src/preferences.c:1820
+#: ../src/preferences.c:1959
 msgid "Write metadata after timeout"
 msgstr "写入元数据在超时后"
 
-#: ../src/preferences.c:1826
+#: ../src/preferences.c:1965
 msgid "Timeout (seconds):"
 msgstr "超时 (秒):"
 
-#: ../src/preferences.c:1829
+#: ../src/preferences.c:1968
 msgid "Write metadata on image change"
 msgstr "写入元数据当图像改变"
 
-#: ../src/preferences.c:1832
+#: ../src/preferences.c:1971
 msgid "Write metadata on directory change"
 msgstr "写入元数据当目录改变"
 
-#: ../src/preferences.c:1846
+#: ../src/preferences.c:2011
+msgid "Perceptual"
+msgstr ""
+
+#: ../src/preferences.c:2013
+msgid "Relative Colorimetric"
+msgstr ""
+
+#: ../src/preferences.c:2017
+msgid "Absolute Colorimetric"
+msgstr ""
+
+#: ../src/preferences.c:2042
 msgid "Color management"
 msgstr "色彩管理"
 
-#: ../src/preferences.c:1848
+#: ../src/preferences.c:2044
 msgid "Input profiles"
 msgstr "输入配置"
 
-#: ../src/preferences.c:1856
+#: ../src/preferences.c:2052
 msgid "Type"
 msgstr "类别"
 
-#: ../src/preferences.c:1859
+#: ../src/preferences.c:2055
 msgid "Menu name"
 msgstr "菜单名"
 
-#: ../src/preferences.c:1862
+#: ../src/preferences.c:2058
 msgid "File"
 msgstr "文件"
 
-#: ../src/preferences.c:1870
+#: ../src/preferences.c:2066
 #, c-format
 msgid "Input %d:"
 msgstr "输入 %d:"
 
-#: ../src/preferences.c:1886 ../src/preferences.c:1906
+#: ../src/preferences.c:2082 ../src/preferences.c:2102
 msgid "Select color profile"
 msgstr "选择色彩配置文件"
 
-#: ../src/preferences.c:1894
+#: ../src/preferences.c:2090
 msgid "Screen profile"
 msgstr "屏幕配置"
 
-#: ../src/preferences.c:1898
+#: ../src/preferences.c:2094
 msgid "Use system screen profile if available"
 msgstr "使用系统屏幕配置如果可用"
 
-#: ../src/preferences.c:1903
+#: ../src/preferences.c:2099
 msgid "Screen:"
 msgstr "屏幕:"
 
-#: ../src/preferences.c:1925 ../src/preferences.c:1966
+#: ../src/preferences.c:2105
+#, fuzzy
+msgid "Render Intent:"
+msgstr "生成"
+
+#: ../src/preferences.c:2125 ../src/preferences.c:2166
 msgid "Behavior"
 msgstr "行为"
 
-#: ../src/preferences.c:1927 ../src/utilops.c:1998
+#: ../src/preferences.c:2127 ../src/utilops.c:2142
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/preferences.c:1929
+#: ../src/preferences.c:2129
 msgid "Confirm file delete"
 msgstr "删除时要求确认"
 
-#: ../src/preferences.c:1931
+#: ../src/preferences.c:2131
 msgid "Enable Delete key"
 msgstr "允许使用 Delete 按键"
 
-#: ../src/preferences.c:1934
+#: ../src/preferences.c:2134
 msgid "Safe delete"
 msgstr "安全删除"
 
-#: ../src/preferences.c:1952
+#: ../src/preferences.c:2152
 msgid "Maximum size:"
 msgstr "最大容量:"
 
-#: ../src/preferences.c:1952
+#: ../src/preferences.c:2152
 msgid "MB"
 msgstr ""
 
-#: ../src/preferences.c:1954
+#: ../src/preferences.c:2154
 msgid "Set to 0 for unlimited size"
 msgstr "设置为 0 取消容量限制"
 
-#: ../src/preferences.c:1955
+#: ../src/preferences.c:2155
 msgid "View"
 msgstr "查看"
 
-#: ../src/preferences.c:1968
-msgid "Rectangular selection in icon view"
-msgstr "图标形式查看时块状选取"
-
-#: ../src/preferences.c:1971
+#: ../src/preferences.c:2168
 msgid "Descend folders in tree view"
 msgstr "树状查看时文件夹降序"
 
-#: ../src/preferences.c:1974
+#: ../src/preferences.c:2171
 msgid "In place renaming"
 msgstr "就地重命名修改"
 
-#: ../src/preferences.c:1977
-msgid "Open recent list maximum size"
+#: ../src/preferences.c:2174
+msgid "List directory view uses single click to enter"
+msgstr ""
+
+#: ../src/preferences.c:2177
+#, fuzzy
+msgid "Recent folder list maximum size"
 msgstr "最近打开文件的列表最大数量"
 
-#: ../src/preferences.c:1980
+#: ../src/preferences.c:2180
 msgid "Drag'n drop icon size"
 msgstr "拖放图标大小"
 
-#: ../src/preferences.c:1983
+#: ../src/preferences.c:2183
 msgid "Navigation"
 msgstr "导航"
 
-#: ../src/preferences.c:1985
+#: ../src/preferences.c:2185
 msgid "Progressive keyboard scrolling"
 msgstr "逐渐加速地键盘滚动"
 
-#: ../src/preferences.c:1987
+#: ../src/preferences.c:2187
+msgid "Keyboard scrolling step multiplier:"
+msgstr ""
+
+#: ../src/preferences.c:2189
 msgid "Mouse wheel scrolls image"
 msgstr "鼠标飞轮滚动图像"
 
-#: ../src/preferences.c:1990
-#, fuzzy
-msgid "Similarities"
-msgstr "相似度"
-
-#: ../src/preferences.c:1992
-msgid "Custom similarity threshold:"
-msgstr "自定相似度阀值:"
-
-#: ../src/preferences.c:1994
-msgid "Rotation invariant duplicate check"
+#: ../src/preferences.c:2191
+msgid "Navigation by left or middle click on image"
 msgstr ""
 
-#: ../src/preferences.c:1998
+#: ../src/preferences.c:2195
 msgid "Debugging"
 msgstr "调试"
 
-#: ../src/preferences.c:2000
-msgid "Debug level:"
-msgstr "调试等级:"
+#: ../src/preferences.c:2200
+#, fuzzy
+msgid "Log Window max. lines:"
+msgstr "日志窗口"
 
-#: ../src/preferences.c:2018
+#: ../src/preferences.c:2218
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../src/preferences.c:2020
+#: ../src/preferences.c:2220
 msgid "Accelerators"
 msgstr "快捷键"
 
-#: ../src/preferences.c:2039
+#: ../src/preferences.c:2239
 msgid "Action"
 msgstr "动作"
 
-#: ../src/preferences.c:2061
+#: ../src/preferences.c:2261
 msgid "KEY"
 msgstr "按键"
 
-#: ../src/preferences.c:2072
+#: ../src/preferences.c:2272
 msgid "Tooltip"
 msgstr "提示信息"
 
-#: ../src/preferences.c:2103
+#: ../src/preferences.c:2303
 msgid "Reset selected"
 msgstr "重置所选项"
 
-#: ../src/preferences.c:2119
+#: ../src/preferences.c:2319
 msgid "Stereo"
 msgstr "立体图片"
 
-#: ../src/preferences.c:2121 ../src/preferences.c:2124
+#: ../src/preferences.c:2321 ../src/preferences.c:2324
 msgid "Windowed stereo mode"
 msgstr "窗口立体图片模式"
 
-#: ../src/preferences.c:2128 ../src/preferences.c:2153
+#: ../src/preferences.c:2328 ../src/preferences.c:2353
 msgid "Mirror left image"
 msgstr "水平翻转左边图像"
 
-#: ../src/preferences.c:2131 ../src/preferences.c:2156
+#: ../src/preferences.c:2331 ../src/preferences.c:2356
 msgid "Flip left image"
 msgstr "上下翻转左边图像"
 
-#: ../src/preferences.c:2134 ../src/preferences.c:2159
+#: ../src/preferences.c:2334 ../src/preferences.c:2359
 msgid "Mirror right image"
 msgstr "水平翻转右边图像"
 
-#: ../src/preferences.c:2137 ../src/preferences.c:2162
+#: ../src/preferences.c:2337 ../src/preferences.c:2362
 msgid "Flip right image"
 msgstr "上下翻转右边图像"
 
-#: ../src/preferences.c:2139 ../src/preferences.c:2164
+#: ../src/preferences.c:2339 ../src/preferences.c:2364
 msgid "Swap left and right images"
 msgstr "交换左右图像"
 
-#: ../src/preferences.c:2141 ../src/preferences.c:2166
+#: ../src/preferences.c:2341 ../src/preferences.c:2366
 msgid "Disable stereo mode on single image source"
 msgstr "当源文件唯一时取消立体图片模式"
 
-#: ../src/preferences.c:2144 ../src/preferences.c:2150
+#: ../src/preferences.c:2344 ../src/preferences.c:2350
 msgid "Fullscreen stereo mode"
 msgstr "全屏立体图片模式"
 
-#: ../src/preferences.c:2145
+#: ../src/preferences.c:2345
 msgid "Use different settings for fullscreen"
 msgstr "全屏时使用不同设置"
 
-#: ../src/preferences.c:2175
+#: ../src/preferences.c:2375
 msgid "Left X"
 msgstr "左图 X"
 
-#: ../src/preferences.c:2177
+#: ../src/preferences.c:2377
 msgid "Left Y"
 msgstr "左图 Y"
 
-#: ../src/preferences.c:2179
+#: ../src/preferences.c:2379
 msgid "Right X"
 msgstr "右边 X"
 
-#: ../src/preferences.c:2181
+#: ../src/preferences.c:2381
 msgid "Right Y"
 msgstr "右图 Y"
 
-#: ../src/preferences.c:2197
+#: ../src/preferences.c:2397
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: ../src/preferences.c:2345
+#: ../src/preferences.c:2551
 #, c-format
 msgid ""
 "%s %s\n"
@@ -4515,85 +4946,85 @@ msgstr ""
 "\n"
 "以GNU GPL许可方式发行"
 
-#: ../src/preferences.c:2364
+#: ../src/preferences.c:2570
 msgid "Credits..."
 msgstr "荣誉..."
 
-#: ../src/print.c:124
+#: ../src/print.c:134
 msgid "Selection"
 msgstr "选择项"
 
-#: ../src/print.c:125
+#: ../src/print.c:135
 msgid "All"
 msgstr "全部"
 
-#: ../src/print.c:136
+#: ../src/print.c:146
 msgid "One image per page"
 msgstr "每页一张图片"
 
-#: ../src/print.c:137
+#: ../src/print.c:147
 msgid "Proof sheet"
 msgstr "试样"
 
-#: ../src/print.c:150
+#: ../src/print.c:160
 msgid "Default printer"
 msgstr "默认打印机"
 
-#: ../src/print.c:151
+#: ../src/print.c:161
 msgid "Custom printer"
 msgstr "自定义打印机"
 
-#: ../src/print.c:152
+#: ../src/print.c:162
 msgid "PostScript file"
 msgstr "PostScript 文件"
 
-#: ../src/print.c:153
+#: ../src/print.c:163
 msgid "Image file"
 msgstr "图像文件"
 
-#: ../src/print.c:167
+#: ../src/print.c:177
 msgid "jpeg, low quality"
 msgstr "jpeg, 低质量"
 
-#: ../src/print.c:168
+#: ../src/print.c:178
 msgid "jpeg, normal quality"
 msgstr "jpeg, 标准质量"
 
-#: ../src/print.c:169
+#: ../src/print.c:179
 msgid "jpeg, high quality"
 msgstr "jpeg, 高质量"
 
-#: ../src/print.c:365 ../src/print.c:3212
+#: ../src/print.c:375 ../src/print.c:3222
 msgid "points"
 msgstr "pt"
 
-#: ../src/print.c:366
+#: ../src/print.c:376
 msgid "millimeters"
 msgstr "毫米"
 
-#: ../src/print.c:367
+#: ../src/print.c:377
 msgid "centimeters"
 msgstr "厘米"
 
-#: ../src/print.c:368
+#: ../src/print.c:378
 msgid "inches"
 msgstr "英寸"
 
-#: ../src/print.c:369
+#: ../src/print.c:379
 msgid "picas"
 msgstr "比卡"
 
-#: ../src/print.c:381
+#: ../src/print.c:391
 msgid "Letter"
 msgstr "ä¿¡"
 
 #. in 8.5 x 11
-#: ../src/print.c:382
+#: ../src/print.c:392
 msgid "Legal"
 msgstr ""
 
 #. in 8.5 x 14
-#: ../src/print.c:383
+#: ../src/print.c:393
 msgid "Executive"
 msgstr ""
 
@@ -4609,60 +5040,60 @@ msgstr ""
 #. mm 250 x 353
 #. mm 176 x 250
 #. mm 125 x 176
-#: ../src/print.c:395
+#: ../src/print.c:405
 msgid "Envelope #10"
 msgstr "信封 #10"
 
 #. in 4.125 x 9.5
-#: ../src/print.c:396
+#: ../src/print.c:406
 msgid "Envelope #9"
 msgstr "信封 #9"
 
 #. in 3.875 x 8.875
-#: ../src/print.c:397
+#: ../src/print.c:407
 msgid "Envelope C4"
 msgstr "信封 C4"
 
 #. mm 229 x 324
-#: ../src/print.c:398
+#: ../src/print.c:408
 msgid "Envelope C5"
 msgstr "信封 C5"
 
 #. mm 162 x 229
-#: ../src/print.c:399
+#: ../src/print.c:409
 msgid "Envelope C6"
 msgstr "信封 C6"
 
 #. mm 114 x 162
-#: ../src/print.c:400
+#: ../src/print.c:410
 msgid "Photo 6x4"
 msgstr "照片 6x4"
 
 #. in 6   x 4
-#: ../src/print.c:401
+#: ../src/print.c:411
 msgid "Photo 8x10"
 msgstr "照片 8x10"
 
 #. in 8   x 10
-#: ../src/print.c:402
+#: ../src/print.c:412
 msgid "Postcard"
 msgstr "明信片"
 
 #. mm 100 x 148
-#: ../src/print.c:403
+#: ../src/print.c:413
 msgid "Tabloid"
 msgstr "小报"
 
-#: ../src/print.c:559
+#: ../src/print.c:569
 #, c-format
 msgid "page %d of %d"
 msgstr "第 %d 页 共 %d 页"
 
-#: ../src/print.c:751
+#: ../src/print.c:761
 msgid "Preview"
 msgstr "预览"
 
-#: ../src/print.c:1059
+#: ../src/print.c:1069
 #, c-format
 msgid ""
 "Unable to open pipe for writing.\n"
@@ -4671,147 +5102,147 @@ msgstr ""
 "无法打开写入通道.\n"
 "\"%s\""
 
-#: ../src/print.c:1074 ../src/print.c:1466 ../src/ui_pathsel.c:423
+#: ../src/print.c:1084 ../src/print.c:1476 ../src/ui_pathsel.c:432
 #, c-format
 msgid "A file with name %s already exists."
 msgstr "文件 %s 已存在."
 
-#: ../src/print.c:1089 ../src/print.c:1521
+#: ../src/print.c:1099 ../src/print.c:1531
 #, c-format
 msgid "Failure writing to file %s"
 msgstr "写入文件 %s 失败"
 
-#: ../src/print.c:1144 ../src/print.c:1181 ../src/print.c:1217
-#: ../src/print.c:1334 ../src/print.c:1407
+#: ../src/print.c:1154 ../src/print.c:1191 ../src/print.c:1227
+#: ../src/print.c:1344 ../src/print.c:1417
 msgid "SIGPIPE error writing to printer."
 msgstr ""
 
-#: ../src/print.c:1942
+#: ../src/print.c:1952
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 页"
 
-#: ../src/print.c:1964 ../src/print.c:1969
+#: ../src/print.c:1974 ../src/print.c:1979
 msgid "Printing error"
 msgstr "打印出错"
 
-#: ../src/print.c:1968
+#: ../src/print.c:1978
 #, c-format
 msgid "An error occured printing to %s."
 msgstr "打印 %s 时发生错误."
 
-#: ../src/print.c:1972
+#: ../src/print.c:1982
 msgid "Details"
 msgstr "详情"
 
-#: ../src/print.c:2587 ../src/print.c:3341
+#: ../src/print.c:2597 ../src/print.c:3351
 msgid "Print"
 msgstr "打印"
 
-#: ../src/print.c:2591
+#: ../src/print.c:2601
 #, c-format
 msgid "Printing %d pages to %s."
 msgstr "打印第 %d 页到第 %s 页."
 
-#: ../src/print.c:2691
+#: ../src/print.c:2701
 msgid "Format:"
 msgstr "类型:"
 
-#: ../src/print.c:2766
+#: ../src/print.c:2776
 msgid "Units:"
 msgstr "单位"
 
-#: ../src/print.c:2810
+#: ../src/print.c:2820
 msgid "Orientation:"
 msgstr "方向:"
 
-#: ../src/print.c:2942
+#: ../src/print.c:2952
 msgid "Destination:"
 msgstr "目标:"
 
-#: ../src/print.c:2990
+#: ../src/print.c:3000
 msgid "<printer name>"
 msgstr "<打印机名称>"
 
-#: ../src/print.c:3079
+#: ../src/print.c:3089
 msgid "Unlimited"
 msgstr "无限的"
 
-#: ../src/print.c:3197
+#: ../src/print.c:3207
 msgid "Show"
 msgstr "显示"
 
-#: ../src/print.c:3368
+#: ../src/print.c:3378
 msgid "Source"
 msgstr "源"
 
-#: ../src/print.c:3380
+#: ../src/print.c:3390
 msgid "Image size:"
 msgstr "图像大小:"
 
-#: ../src/print.c:3384
+#: ../src/print.c:3394
 msgid "Proof size:"
 msgstr "试样大小:"
 
-#: ../src/print.c:3410
+#: ../src/print.c:3420
 msgid "Paper"
 msgstr "纸张"
 
-#: ../src/print.c:3433
+#: ../src/print.c:3443
 msgid "Margins"
 msgstr "边距"
 
-#: ../src/print.c:3435
+#: ../src/print.c:3445
 msgid "Left:"
 msgstr "å·¦:"
 
-#: ../src/print.c:3438
+#: ../src/print.c:3448
 msgid "Right:"
 msgstr "右:"
 
-#: ../src/print.c:3441
+#: ../src/print.c:3451
 msgid "Top:"
 msgstr "上:"
 
-#: ../src/print.c:3444
+#: ../src/print.c:3454
 msgid "Bottom:"
 msgstr "下:"
 
-#: ../src/print.c:3453
+#: ../src/print.c:3463
 msgid "Printer"
 msgstr "打印机"
 
-#: ../src/print.c:3459
+#: ../src/print.c:3469
 msgid "Custom printer:"
 msgstr "自定义打印机:"
 
-#: ../src/print.c:3468
+#: ../src/print.c:3478
 msgid "File:"
 msgstr "文件:"
 
-#: ../src/print.c:3477
+#: ../src/print.c:3487
 msgid "File format:"
 msgstr "文件格式:"
 
-#: ../src/print.c:3482
+#: ../src/print.c:3492
 msgid "DPI:"
 msgstr ""
 
-#: ../src/print.c:3490
+#: ../src/print.c:3500
 msgid "Remember print settings"
 msgstr "记住打印的设置"
 
-#: ../src/rcfile.c:81
+#: ../src/rcfile.c:91
 #, c-format
 msgid "Option %s ignored: %s\n"
 msgstr ""
 
-#: ../src/rcfile.c:468
+#: ../src/rcfile.c:525
 #, c-format
 msgid "error saving config file: %s\n"
 msgstr "保存设置文件出错: %s\n"
 
-#: ../src/rcfile.c:526
+#: ../src/rcfile.c:583
 #, c-format
 msgid ""
 "error saving config file: %s\n"
@@ -4821,337 +5252,456 @@ msgstr ""
 "错误: %s\n"
 
 #. short, long                  callback,               extra, prefer, parameter, description
-#: ../src/remote.c:640
+#: ../src/remote.c:719
 #, fuzzy
 msgid "next image"
 msgstr "下一图片"
 
-#: ../src/remote.c:641
+#: ../src/remote.c:720
 #, fuzzy
 msgid "previous image"
 msgstr "上一图片"
 
-#: ../src/remote.c:642
+#: ../src/remote.c:721
 #, fuzzy
 msgid "first image"
 msgstr "首个图片"
 
-#: ../src/remote.c:643
+#: ../src/remote.c:722
 #, fuzzy
 msgid "last image"
 msgstr "撤销上一图片"
 
-#: ../src/remote.c:644
+#: ../src/remote.c:723
 #, fuzzy
 msgid "toggle full screen"
 msgstr "退出全屏"
 
-#: ../src/remote.c:645
+#: ../src/remote.c:724
 #, fuzzy
 msgid "start full screen"
 msgstr "退出全屏"
 
-#: ../src/remote.c:646
+#: ../src/remote.c:725
 #, fuzzy
 msgid "stop full screen"
 msgstr "退出全屏 (_f)"
 
-#: ../src/remote.c:647
+#: ../src/remote.c:726
 #, fuzzy
 msgid "toggle slide show"
 msgstr "切换播片开启/关闭"
 
-#: ../src/remote.c:648
+#: ../src/remote.c:727
 #, fuzzy
 msgid "start slide show"
 msgstr "开始播片 (_S)"
 
-#: ../src/remote.c:649
+#: ../src/remote.c:728
 #, fuzzy
 msgid "stop slide show"
 msgstr "停止播片 (_S)"
 
-#: ../src/remote.c:650
+#: ../src/remote.c:729
 msgid "<FOLDER>"
 msgstr ""
 
-#: ../src/remote.c:650
+#: ../src/remote.c:729
 msgid "start recursive slide show in FOLDER"
 msgstr ""
 
-#: ../src/remote.c:651
+#: ../src/remote.c:730
 msgid "<[N][.M]>"
 msgstr ""
 
-#: ../src/remote.c:651
+#: ../src/remote.c:730
 msgid "set slide show delay to N.M seconds"
 msgstr ""
 
-#: ../src/remote.c:652
+#: ../src/remote.c:731
 msgid "show tools"
 msgstr ""
 
-#: ../src/remote.c:653
+#: ../src/remote.c:732
 #, fuzzy
 msgid "hide tools"
 msgstr "隐藏工具栏"
 
-#: ../src/remote.c:654
+#: ../src/remote.c:733
 msgid "quit"
 msgstr ""
 
-#: ../src/remote.c:655 ../src/remote.c:656 ../src/remote.c:657
-#: ../src/remote.c:658 ../src/remote.c:659 ../src/remote.c:661
+#: ../src/remote.c:734 ../src/remote.c:735 ../src/remote.c:736
+#: ../src/remote.c:737 ../src/remote.c:738 ../src/remote.c:740
+#: ../src/remote.c:742
 msgid "<FILE>"
 msgstr ""
 
-#: ../src/remote.c:655
+#: ../src/remote.c:734
 msgid "load configuration from FILE"
 msgstr ""
 
-#: ../src/remote.c:656
+#: ../src/remote.c:735
 msgid "get list of sidecars of FILE"
 msgstr ""
 
-#: ../src/remote.c:657
+#: ../src/remote.c:736
 msgid "get destination path of FILE"
 msgstr ""
 
-#: ../src/remote.c:658
-msgid "open FILE"
+#: ../src/remote.c:737
+#, fuzzy
+msgid "open FILE, bring Geeqie window to the top"
+msgstr "在新窗口中查看"
+
+#: ../src/remote.c:738
+msgid "open FILE, do not bring Geeqie window to the top"
+msgstr ""
+
+#: ../src/remote.c:739
+msgid "print filename of current image"
 msgstr ""
 
-#: ../src/remote.c:659
+#: ../src/remote.c:740
 #, fuzzy
 msgid "open FILE in new window"
 msgstr "在新窗口中查看"
 
-#: ../src/remote.c:660
+#: ../src/remote.c:741
 msgid "clear command line collection list"
 msgstr ""
 
-#: ../src/remote.c:661
+#: ../src/remote.c:742
 #, fuzzy
 msgid "add FILE to command line collection list"
 msgstr "添加到新图片集"
 
-#: ../src/remote.c:662
+#: ../src/remote.c:743
 msgid "bring the Geeqie window to the top"
 msgstr ""
 
-#: ../src/remote.c:727
-msgid "Remote command list:\n"
+#: ../src/remote.c:744 ../src/remote.c:745
+msgid "clear|clean"
 msgstr ""
 
+#: ../src/remote.c:744
+#, fuzzy
+msgid "clear or clean thumbnail cache"
+msgstr "共享的缩略图缓存"
+
+#: ../src/remote.c:745
+#, fuzzy
+msgid "clear or clean shared thumbnail cache"
+msgstr "使用共享的缩略图缓存"
+
 #: ../src/remote.c:746
+msgid "    clean the metadata cache"
+msgstr ""
+
+#: ../src/remote.c:747
+#, fuzzy
+msgid "<folder>  "
+msgstr "文件夹"
+
+#: ../src/remote.c:747
+#, fuzzy
+msgid " render thumbnails"
+msgstr "创建缩略图"
+
+#: ../src/remote.c:748 ../src/remote.c:749
+#, fuzzy
+msgid "<folder> "
+msgstr "文件夹"
+
+#: ../src/remote.c:748
+#, fuzzy
+msgid "render thumbnails recursively"
+msgstr "对指定文件夹生成缩略图"
+
+#: ../src/remote.c:749
+#, fuzzy
+msgid " render thumbnails (see Help)"
+msgstr "对指定文件夹生成缩略图"
+
+#: ../src/remote.c:750
+#, fuzzy
+msgid "<folder>"
+msgstr "文件夹"
+
+#: ../src/remote.c:750
+msgid " render thumbnails recursively (see Help)"
+msgstr ""
+
+#: ../src/remote.c:815
+msgid "Remote command list:\n"
+msgstr ""
+
+#: ../src/remote.c:834
 msgid ""
 "\n"
 "  All other command line parameters are used as plain files if they exists.\n"
 msgstr ""
 
-#: ../src/remote.c:796
+#: ../src/remote.c:884
 #, c-format
 msgid "Remote %s not running, starting..."
 msgstr ""
 
-#: ../src/remote.c:932
+#: ../src/remote.c:1020
 #, fuzzy
 msgid "Remote not available\n"
 msgstr "[名称不能显示]"
 
-#: ../src/search.c:212
+#: ../src/search.c:243
 msgid "folder"
 msgstr "文件夹"
 
-#: ../src/search.c:213
+#: ../src/search.c:244
 msgid "comments"
 msgstr "注释"
 
-#: ../src/search.c:214
+#: ../src/search.c:245
 msgid "results"
 msgstr "结果"
 
-#: ../src/search.c:218 ../src/search.c:243
+#: ../src/search.c:249 ../src/search.c:274
 msgid "contains"
 msgstr "包含"
 
-#: ../src/search.c:219
+#: ../src/search.c:250
 msgid "is"
 msgstr "是"
 
-#: ../src/search.c:223 ../src/search.c:230
+#: ../src/search.c:254 ../src/search.c:261 ../src/search.c:280
 msgid "equal to"
 msgstr "等于"
 
-#: ../src/search.c:224
+#: ../src/search.c:255 ../src/search.c:281 ../src/search.c:288
 msgid "less than"
 msgstr "少于"
 
-#: ../src/search.c:225
+#: ../src/search.c:256 ../src/search.c:282 ../src/search.c:289
 msgid "greater than"
 msgstr "大于"
 
-#: ../src/search.c:226 ../src/search.c:233
+#: ../src/search.c:257 ../src/search.c:264 ../src/search.c:283
 msgid "between"
 msgstr "介于"
 
-#: ../src/search.c:231
+#: ../src/search.c:262
 msgid "before"
 msgstr "早于"
 
-#: ../src/search.c:232
+#: ../src/search.c:263
 msgid "after"
 msgstr "晚于"
 
-#: ../src/search.c:237
+#: ../src/search.c:268
 msgid "match all"
 msgstr "匹配所有"
 
-#: ../src/search.c:238
+#: ../src/search.c:269
 msgid "match any"
 msgstr "匹配任一"
 
-#: ../src/search.c:239
+#: ../src/search.c:270
 msgid "exclude"
 msgstr "不包括"
 
-#: ../src/search.c:244
+#: ../src/search.c:275
 msgid "miss"
 msgstr "漏过"
 
-#: ../src/search.c:295
+#: ../src/search.c:287
+msgid "not geocoded"
+msgstr ""
+
+#: ../src/search.c:340
 #, c-format
 msgid "%s, %d files (%s, %d)"
 msgstr "%s, %d 文件 (%s, %d)"
 
-#: ../src/search.c:300
+#: ../src/search.c:345
 #, c-format
 msgid "%s, %d files"
 msgstr "%s, %d 文件"
 
-#: ../src/search.c:318
+#: ../src/search.c:363
 msgid "Searching..."
 msgstr "查找中..."
 
-#: ../src/search.c:2120
+#: ../src/search.c:2020 ../src/search.c:3016
+msgid "km"
+msgstr ""
+
+#: ../src/search.c:2025 ../src/search.c:3017
+#, fuzzy
+msgid "miles"
+msgstr "文件"
+
+#: ../src/search.c:2317
 msgid "File not found"
 msgstr "文件未找到"
 
-#: ../src/search.c:2121
+#: ../src/search.c:2318
 msgid "Please enter an existing file for image content."
 msgstr "请输入一个存在的文件作为图像内容."
 
-#: ../src/search.c:2170
+#: ../src/search.c:2343
+msgid "Entry does not contain a valid lat/long value"
+msgstr ""
+
+#: ../src/search.c:2393
 msgid "Please enter an existing folder to search."
 msgstr "请输入一个存在的文件夹来查找."
 
-#: ../src/search.c:2588
+#: ../src/search.c:2835
 msgid "Image search"
 msgstr "图像搜索"
 
-#: ../src/search.c:2618
+#: ../src/search.c:2865
 msgid "Search:"
 msgstr "搜索:"
 
-#: ../src/search.c:2632
+#: ../src/search.c:2879
 msgid "Recurse"
 msgstr "包括子目录"
 
-#: ../src/search.c:2637
+#: ../src/search.c:2884
 msgid "File name"
 msgstr "文件名"
 
-#: ../src/search.c:2643 ../src/search.c:2738
+#: ../src/search.c:2890 ../src/search.c:2987
 msgid "Match case"
 msgstr "匹配大小写"
 
-#: ../src/search.c:2648
+#: ../src/search.c:2895
 msgid "File size is"
 msgstr "文件大小为"
 
-#: ../src/search.c:2655 ../src/search.c:2671 ../src/search.c:2690
+#: ../src/search.c:2902 ../src/search.c:2918 ../src/search.c:2939
+#: ../src/search.c:2999
 msgid "and"
 msgstr "与"
 
-#: ../src/search.c:2661
+#: ../src/search.c:2908
 msgid "File date is"
 msgstr "文件日期为"
 
-#: ../src/search.c:2679
+#: ../src/search.c:2923
+#, fuzzy
+msgid "Exif date"
+msgstr "使用 Exif 日期"
+
+#: ../src/search.c:2928
 msgid "Image dimensions are"
 msgstr "图像尺寸为"
 
-#: ../src/search.c:2700
+#: ../src/search.c:2949
 msgid "Image content is"
 msgstr "图像内容为"
 
-#: ../src/search.c:2706
+#: ../src/search.c:2955
 #, no-c-format
 msgid "% similar to"
 msgstr "% 相似于"
 
-#: ../src/search.c:2788
+#: ../src/search.c:2992
+#, fuzzy
+msgid "Image rating is"
+msgstr "图像内容为"
+
+#: ../src/search.c:3006
+#, fuzzy
+msgid "Image is"
+msgstr "图片列表(_L)"
+
+#: ../src/search.c:3018
+msgid "n.m."
+msgstr ""
+
+#: ../src/search.c:3024
+msgid "from"
+msgstr ""
+
+#: ../src/search.c:3029
+msgid ""
+"Enter a coordinate in the form:\n"
+"89.123 179.456\n"
+"or drag-and-drop a geo-coded image\n"
+"or left-click on the map and paste\n"
+"or cut-and-paste or drag-and-drop\n"
+"an internet search URL\n"
+"See the Help file"
+msgstr ""
+
+#: ../src/search.c:3082
 msgid "Rank"
 msgstr "评级"
 
-#: ../src/secure_save.c:397
+#: ../src/secure_save.c:405
 msgid "Cannot read the file"
 msgstr "不能读取文件"
 
-#: ../src/secure_save.c:399
+#: ../src/secure_save.c:407
 msgid "Cannot get file status"
 msgstr "不能获取文件状态"
 
-#: ../src/secure_save.c:401
+#: ../src/secure_save.c:409
 msgid "Cannot access the file"
 msgstr "不能打开文件"
 
-#: ../src/secure_save.c:403
+#: ../src/secure_save.c:411
 msgid "Cannot create temp file"
 msgstr "不能创建临时文件"
 
-#: ../src/secure_save.c:405
+#: ../src/secure_save.c:413
 msgid "Cannot rename the file"
 msgstr "不能重命名文件"
 
-#: ../src/secure_save.c:407
+#: ../src/secure_save.c:415
 msgid "File saving disabled by option"
 msgstr "文件保存被选项禁止"
 
-#: ../src/secure_save.c:409
+#: ../src/secure_save.c:417
 msgid "Out of memory"
 msgstr "内存不够"
 
-#: ../src/secure_save.c:411
+#: ../src/secure_save.c:419
 msgid "Cannot write the file"
 msgstr "不能写入文件"
 
-#: ../src/secure_save.c:415
+#: ../src/secure_save.c:423
 msgid "Secure file saving error"
 msgstr "安全文件保存出错"
 
-#: ../src/thumb.c:392
+#: ../src/shortcuts.c:97 ../src/shortcuts.c:151
+#, fuzzy
+msgid "Add Shortcut"
+msgstr "快捷键"
+
+#: ../src/thumb.c:400
 msgid "Thumbnail image in cache failed to load, trying to recreate.\n"
 msgstr "缓存中的缩略图不能载入，正在尝试重建.\n"
 
-#: ../src/trash.c:80 ../src/utilops.c:2461 ../src/utilops.c:2472
-#: ../src/utilops.c:2529
+#: ../src/trash.c:88 ../src/utilops.c:2607 ../src/utilops.c:2618
+#: ../src/utilops.c:2675
 msgid "Delete failed"
 msgstr "删除失败"
 
-#: ../src/trash.c:81
+#: ../src/trash.c:89
 msgid "Unable to remove old file from trash folder"
 msgstr "不能移除回收部文件夹的旧文件"
 
-#: ../src/trash.c:138
+#: ../src/trash.c:146
 msgid "Could not create folder"
 msgstr "不能创建文件夹"
 
-#: ../src/trash.c:160
+#: ../src/trash.c:168
 msgid "Permission denied"
 msgstr "拒绝权限请求"
 
-#: ../src/trash.c:170
+#: ../src/trash.c:178
 #, c-format
 msgid ""
 "Unable to access or create the trash folder.\n"
@@ -5160,20 +5710,20 @@ msgstr ""
 "不能进入或创建回收部文件夹.\n"
 "\"%s\""
 
-#: ../src/trash.c:174
+#: ../src/trash.c:182
 msgid "Turn off safe delete"
 msgstr "关闭安全删除"
 
-#: ../src/trash.c:193
+#: ../src/trash.c:201
 msgid "Deletion by external command"
 msgstr "被外部命令删除"
 
-#: ../src/trash.c:201
+#: ../src/trash.c:209
 #, c-format
 msgid " (max. %d MB)"
 msgstr " (最大. %d MB)"
 
-#: ../src/trash.c:205
+#: ../src/trash.c:213
 #, c-format
 msgid ""
 "Safe delete: %s%s\n"
@@ -5182,66 +5732,66 @@ msgstr ""
 "安全删除: %s%s\n"
 "回收站: %s"
 
-#: ../src/trash.c:210
+#: ../src/trash.c:218
 #, c-format
 msgid "Safe delete: %s"
 msgstr "安全删除: %s"
 
-#: ../src/ui_bookmark.c:130 ../src/ui_bookmark.c:193
+#: ../src/ui_bookmark.c:139 ../src/ui_bookmark.c:202
 msgid "New Bookmark"
 msgstr "新书签"
 
-#: ../src/ui_bookmark.c:276 ../src/ui_bookmark.c:282
+#: ../src/ui_bookmark.c:285 ../src/ui_bookmark.c:291
 msgid "Edit Bookmark"
 msgstr "编辑书签"
 
-#: ../src/ui_bookmark.c:297
+#: ../src/ui_bookmark.c:306
 msgid "Path:"
 msgstr "路径:"
 
-#: ../src/ui_bookmark.c:306
+#: ../src/ui_bookmark.c:315
 msgid "Icon:"
 msgstr "图标:"
 
-#: ../src/ui_bookmark.c:312
+#: ../src/ui_bookmark.c:321
 msgid "Select icon"
 msgstr "选择图标"
 
-#: ../src/ui_bookmark.c:405
+#: ../src/ui_bookmark.c:414
 msgid "_Properties..."
 msgstr "属性(_P)"
 
-#: ../src/ui_bookmark.c:411
+#: ../src/ui_bookmark.c:420
 msgid "_Remove"
 msgstr "移去(_R)"
 
-#: ../src/ui_fileops.c:67
+#: ../src/ui_fileops.c:81
 msgid ""
 "One or more filenames are not encoded with the preferred locale character "
 "set.\n"
 msgstr "一个或多个文件名未以推荐的 locale 字符集进行编码.\n"
 
-#: ../src/ui_fileops.c:68
+#: ../src/ui_fileops.c:82
 #, c-format
 msgid "Operations on, and display of these files with %s may not succeed.\n"
 msgstr "操作开启, 但是这些文件和 %s 显示或许不成功.\n"
 
-#: ../src/ui_fileops.c:70
+#: ../src/ui_fileops.c:84
 msgid ""
 "If your filenames are not encoded in utf-8, try setting the environment "
 "variable G_BROKEN_FILENAMES=1\n"
 msgstr ""
 
-#: ../src/ui_fileops.c:72
+#: ../src/ui_fileops.c:86
 #, c-format
 msgid "It appears G_BROKEN_FILENAMES is set to %s\n"
 msgstr ""
 
-#: ../src/ui_fileops.c:74
+#: ../src/ui_fileops.c:88
 msgid "It appears G_BROKEN_FILENAMES is not set\n"
 msgstr ""
 
-#: ../src/ui_fileops.c:76
+#: ../src/ui_fileops.c:90
 #, c-format
 msgid ""
 "The locale appears to be set to \"%s\"\n"
@@ -5250,7 +5800,7 @@ msgstr ""
 "The locale appears to be set to \"%s\"\n"
 "(set by the LANG environment variable)\n"
 
-#: ../src/ui_fileops.c:81
+#: ../src/ui_fileops.c:95
 msgid ""
 "\n"
 "Preferred encoding appears to be UTF-8, however the file:\n"
@@ -5258,25 +5808,25 @@ msgstr ""
 "\n"
 "最佳编码应该是 UTF-8, 但这个文件:\n"
 
-#: ../src/ui_fileops.c:82 ../src/ui_fileops.c:85 ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:96 ../src/ui_fileops.c:99 ../src/ui_fileops.c:101
 msgid "[name not displayable]"
 msgstr "[名称不能显示]"
 
-#: ../src/ui_fileops.c:85
+#: ../src/ui_fileops.c:99
 #, c-format
 msgid "\"%s\" is encoded in valid UTF-8."
 msgstr "\"%s\" 被正确编码为 UTF-8 ."
 
-#: ../src/ui_fileops.c:87
+#: ../src/ui_fileops.c:101
 #, c-format
 msgid "\"%s\" is not encoded in valid UTF-8."
 msgstr "\"%s\" 不是有效的 UTF-8 编码."
 
-#: ../src/ui_fileops.c:92 ../src/ui_fileops.c:97
+#: ../src/ui_fileops.c:106 ../src/ui_fileops.c:111
 msgid "Filename encoding locale mismatch"
 msgstr "文件名 locale 编码不匹配"
 
-#: ../src/ui_help.c:110
+#: ../src/ui_help.c:119
 #, c-format
 msgid ""
 "Unable to load:\n"
@@ -5285,33 +5835,33 @@ msgstr ""
 "不能载入:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:424 ../src/ui_pathsel.c:430 ../src/utilops.c:2160
-#: ../src/utilops.c:2187 ../src/utilops.c:2653
+#: ../src/ui_pathsel.c:433 ../src/ui_pathsel.c:439 ../src/utilops.c:2306
+#: ../src/utilops.c:2333 ../src/utilops.c:2799
 msgid "Rename failed"
 msgstr "重命名失败"
 
-#: ../src/ui_pathsel.c:429
+#: ../src/ui_pathsel.c:438
 #, c-format
 msgid "Failed to rename %s to %s."
 msgstr "重命名 %s 为 %s 失败."
 
-#: ../src/ui_pathsel.c:625 ../src/ui_pathsel.c:633
+#: ../src/ui_pathsel.c:634 ../src/ui_pathsel.c:642
 msgid "_Rename"
 msgstr "重命名 (_R)"
 
-#: ../src/ui_pathsel.c:627 ../src/ui_pathsel.c:637
+#: ../src/ui_pathsel.c:636 ../src/ui_pathsel.c:646
 msgid "Add _Bookmark"
 msgstr "添加书签 (_B)"
 
-#: ../src/ui_pathsel.c:635
+#: ../src/ui_pathsel.c:644
 msgid "_Delete"
 msgstr "删除 (_D)"
 
-#: ../src/ui_pathsel.c:742 ../src/ui_pathsel.c:1047 ../src/utilops.c:2687
+#: ../src/ui_pathsel.c:751 ../src/ui_pathsel.c:1057 ../src/utilops.c:2833
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: ../src/ui_pathsel.c:752
+#: ../src/ui_pathsel.c:761
 #, c-format
 msgid ""
 "Unable to create folder:\n"
@@ -5320,36 +5870,36 @@ msgstr ""
 "不能创建文件夹:\n"
 "%s"
 
-#: ../src/ui_pathsel.c:753
+#: ../src/ui_pathsel.c:762
 msgid "Error creating folder"
 msgstr "创建文件夹出错"
 
-#: ../src/ui_pathsel.c:978
+#: ../src/ui_pathsel.c:988
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../src/ui_pathsel.c:1050
+#: ../src/ui_pathsel.c:1060
 msgid "Show hidden"
 msgstr "显示隐藏文件"
 
-#: ../src/ui_pathsel.c:1134
+#: ../src/ui_pathsel.c:1144
 msgid "Filter:"
 msgstr "过滤器:"
 
-#: ../src/ui_tabcomp.c:924
+#: ../src/ui_tabcomp.c:933
 msgid "Select path"
 msgstr "选择路径"
 
-#: ../src/ui_tabcomp.c:940
+#: ../src/ui_tabcomp.c:949
 msgid "All files"
 msgstr "所有文件"
 
-#: ../src/uri_utils.c:35
+#: ../src/uri_utils.c:43
 #, fuzzy
 msgid "Drag and Drop failed"
 msgstr "外部命令失败"
 
-#: ../src/utilops.c:547
+#: ../src/utilops.c:590
 msgid ""
 "\n"
 " Continue multiple file operation?"
@@ -5357,11 +5907,11 @@ msgstr ""
 "\n"
 " 继续对多个文件执行操作吗?"
 
-#: ../src/utilops.c:554 ../src/utilops.c:987
+#: ../src/utilops.c:597 ../src/utilops.c:1030
 msgid "Co_ntinue"
 msgstr "继续 (_n)"
 
-#: ../src/utilops.c:731
+#: ../src/utilops.c:774
 #, c-format
 msgid ""
 "Removal of folder contents failed at this file:\n"
@@ -5372,7 +5922,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/utilops.c:875
+#: ../src/utilops.c:918
 #, c-format
 msgid ""
 "%s\n"
@@ -5381,104 +5931,108 @@ msgstr ""
 "%s\n"
 "不能执行外部命令.\n"
 
-#: ../src/utilops.c:955
+#. During copy/move operations it is necessary to ensure that the
+#. * target directory exists before continuing with the next step.
+#. * If not revert to the select directory dialog
+#.
+#: ../src/utilops.c:998 ../src/utilops.c:1150
 #, c-format
 msgid "%s is not a directory"
 msgstr "%s 不是目录"
 
-#: ../src/utilops.c:985
+#: ../src/utilops.c:1028
 msgid "Really continue?"
 msgstr "真得要继续吗？"
 
-#: ../src/utilops.c:999
+#: ../src/utilops.c:1042 ../src/utilops.c:1155
 msgid "This operation can't continue:"
 msgstr "这个操作不能继续"
 
-#: ../src/utilops.c:1377 ../src/utilops.c:1490 ../src/utilops.c:1874
+#: ../src/utilops.c:1498 ../src/utilops.c:1611 ../src/utilops.c:2018
 msgid "Discard changes"
 msgstr "放弃更改"
 
-#: ../src/utilops.c:1378 ../src/utilops.c:1491 ../src/utilops.c:1824
-#: ../src/utilops.c:1840
+#: ../src/utilops.c:1499 ../src/utilops.c:1612 ../src/utilops.c:1968
+#: ../src/utilops.c:1984
 msgid "File details"
 msgstr "文件详情"
 
-#: ../src/utilops.c:1400 ../src/utilops.c:1498
+#: ../src/utilops.c:1521 ../src/utilops.c:1619
 #, fuzzy
 msgid "Sidecars"
 msgstr "允许Sidecar"
 
-#: ../src/utilops.c:1402
+#: ../src/utilops.c:1523
 msgid "Write to file"
 msgstr "写入文件"
 
-#: ../src/utilops.c:1442
+#: ../src/utilops.c:1563
 msgid "Choose the destination folder."
 msgstr "选择目标文件夹."
 
-#: ../src/utilops.c:1500
+#: ../src/utilops.c:1621
 msgid "New name"
 msgstr "新名称"
 
-#: ../src/utilops.c:1530
+#: ../src/utilops.c:1658
 msgid "Manual rename"
 msgstr "手动重命名"
 
-#: ../src/utilops.c:1535
+#: ../src/utilops.c:1663
 msgid "Original name:"
 msgstr "原名称:"
 
-#: ../src/utilops.c:1538
+#: ../src/utilops.c:1666
 msgid "New name:"
 msgstr "新名称:"
 
-#: ../src/utilops.c:1551
+#: ../src/utilops.c:1679
 msgid "Auto rename"
 msgstr "自动重命名"
 
-#: ../src/utilops.c:1557
+#: ../src/utilops.c:1685
 msgid "Begin text"
 msgstr "前缀"
 
-#: ../src/utilops.c:1565 ../src/utilops.c:1597
+#: ../src/utilops.c:1693 ../src/utilops.c:1725
 msgid "Start #"
 msgstr "开始数字"
 
-#: ../src/utilops.c:1571
+#: ../src/utilops.c:1699
 msgid "End text"
 msgstr "后缀"
 
-#: ../src/utilops.c:1579
+#: ../src/utilops.c:1707
 msgid "Padding:"
 msgstr "填充位数:"
 
-#: ../src/utilops.c:1584
+#: ../src/utilops.c:1712
 msgid "Formatted rename"
 msgstr "格式化重命名"
 
-#: ../src/utilops.c:1589
+#: ../src/utilops.c:1717
 msgid "Format (* = original name, ## = numbers)"
 msgstr "格式 (* = 原名称, ## = 数字)"
 
-#: ../src/utilops.c:1727
+#: ../src/utilops.c:1871
 msgid "Another operation in progress.\n"
 msgstr "另一个操作执行中.\n"
 
-#: ../src/utilops.c:1783
+#: ../src/utilops.c:1927
 #, c-format
 msgid "File: '%s'\n"
 msgstr "文件: '%s'\n"
 
-#: ../src/utilops.c:1788
+#: ../src/utilops.c:1932
 msgid "with sidecar files:\n"
 msgstr "与 sidecar 文件:\n"
 
-#: ../src/utilops.c:1794
+#: ../src/utilops.c:1938
 #, fuzzy, c-format
 msgid " '%s'\n"
 msgstr "文件: '%s'\n"
 
-#: ../src/utilops.c:1798
+#: ../src/utilops.c:1942
 msgid ""
 "\n"
 "Status: "
@@ -5486,19 +6040,19 @@ msgstr ""
 "\n"
 "状态: "
 
-#: ../src/utilops.c:1810
+#: ../src/utilops.c:1954
 msgid "no problem detected"
 msgstr "没有发现问题"
 
-#: ../src/utilops.c:1826 ../src/utilops.c:1873
+#: ../src/utilops.c:1970 ../src/utilops.c:2017
 msgid "Exclude file"
 msgstr "不包括此文件"
 
-#: ../src/utilops.c:1871 ../src/utilops.c:1896
+#: ../src/utilops.c:2015 ../src/utilops.c:2040
 msgid "Overview of changed metadata"
 msgstr "浏览已改动的元数据"
 
-#: ../src/utilops.c:1889
+#: ../src/utilops.c:2033
 #, c-format
 msgid ""
 "The following metadata tags will be written to\n"
@@ -5507,101 +6061,101 @@ msgstr ""
 "下列元数据标签将被写入\n"
 "'%s'."
 
-#: ../src/utilops.c:1893
+#: ../src/utilops.c:2037
 #, c-format
 msgid "The following metadata tags will be written to the image file itself."
 msgstr "下列元数据标签将被写入图像文件本身."
 
-#: ../src/utilops.c:1999
+#: ../src/utilops.c:2143
 msgid "Delete files?"
 msgstr "删除文件吗？"
 
-#: ../src/utilops.c:2000
+#: ../src/utilops.c:2144
 msgid "This will delete the following files"
 msgstr "将要删除下列文件"
 
-#: ../src/utilops.c:2019
+#: ../src/utilops.c:2163
 msgid "Can't write metadata"
 msgstr "不能写入元数据"
 
-#: ../src/utilops.c:2042
+#: ../src/utilops.c:2186
 msgid "Write metadata"
 msgstr "写入元数据"
 
-#: ../src/utilops.c:2043
+#: ../src/utilops.c:2187
 msgid "Write metadata?"
 msgstr "写入元数据吗?"
 
-#: ../src/utilops.c:2044
+#: ../src/utilops.c:2188
 msgid "This will write the changed metadata into the following files"
 msgstr "将要把已更改的元数据写入下列文件"
 
-#: ../src/utilops.c:2046
+#: ../src/utilops.c:2190
 #, fuzzy
 msgid "Metadata writing failed"
 msgstr "元数据写入失败"
 
-#: ../src/utilops.c:2065 ../src/utilops.c:2092
+#: ../src/utilops.c:2209 ../src/utilops.c:2237
 msgid "Move failed"
 msgstr "移动失败"
 
-#: ../src/utilops.c:2089
+#: ../src/utilops.c:2234
 msgid "Move files?"
 msgstr "移动文件吗？"
 
-#: ../src/utilops.c:2090
+#: ../src/utilops.c:2235
 msgid "This will move the following files"
 msgstr "将会移动下列文件"
 
-#: ../src/utilops.c:2114 ../src/utilops.c:2141
+#: ../src/utilops.c:2259 ../src/utilops.c:2287
 msgid "Copy failed"
 msgstr "复制失败"
 
-#: ../src/utilops.c:2138
+#: ../src/utilops.c:2284
 msgid "Copy files?"
 msgstr "复制文件吗？"
 
-#: ../src/utilops.c:2139 ../src/utilops.c:2273
+#: ../src/utilops.c:2285 ../src/utilops.c:2419
 msgid "This will copy the following files"
 msgstr "将会复制下列文件"
 
-#: ../src/utilops.c:2183 ../src/utilops.c:2649
+#: ../src/utilops.c:2329 ../src/utilops.c:2795
 msgid "Rename"
 msgstr "重命名"
 
-#: ../src/utilops.c:2184
+#: ../src/utilops.c:2330
 msgid "Rename files?"
 msgstr "重命名文件吗？"
 
-#: ../src/utilops.c:2185
+#: ../src/utilops.c:2331
 msgid "This will rename the following files"
 msgstr "这将会重命名以下文件"
 
-#: ../src/utilops.c:2237
+#: ../src/utilops.c:2383
 msgid "Can't run external editor"
 msgstr "不能运行外部编辑器"
 
-#: ../src/utilops.c:2271
+#: ../src/utilops.c:2417
 msgid "Editor"
 msgstr "外部编辑器"
 
-#: ../src/utilops.c:2272
+#: ../src/utilops.c:2418
 msgid "Run editor?"
 msgstr "运行编辑器吗？"
 
-#: ../src/utilops.c:2275
+#: ../src/utilops.c:2421
 msgid "External command failed"
 msgstr "外部命令失败"
 
-#: ../src/utilops.c:2444 ../src/utilops.c:2517
+#: ../src/utilops.c:2590 ../src/utilops.c:2663
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: ../src/utilops.c:2445
+#: ../src/utilops.c:2591
 msgid "Delete symbolic link?"
 msgstr "删除软链接吗?"
 
-#: ../src/utilops.c:2447
+#: ../src/utilops.c:2593
 msgid ""
 "This will delete the symbolic link.\n"
 "The folder this link points to will not be deleted."
@@ -5609,11 +6163,11 @@ msgstr ""
 "将会删除软链接.\n"
 "软链接所指向的文件夹不会被删除."
 
-#: ../src/utilops.c:2449
+#: ../src/utilops.c:2595
 msgid "Link deletion failed"
 msgstr "链接删除失败"
 
-#: ../src/utilops.c:2459
+#: ../src/utilops.c:2605
 #, c-format
 msgid ""
 "Unable to remove folder %s\n"
@@ -5622,16 +6176,16 @@ msgstr ""
 "不能移除文件夹 %s\n"
 "权限不允许写入该文件夹."
 
-#: ../src/utilops.c:2471 ../src/utilops.c:2528
+#: ../src/utilops.c:2617 ../src/utilops.c:2674
 #, c-format
 msgid "Unable to list contents of folder %s"
 msgstr "不能列出文件夹的内容"
 
-#: ../src/utilops.c:2485 ../src/utilops.c:2493
+#: ../src/utilops.c:2631 ../src/utilops.c:2639
 msgid "Folder contains subfolders"
 msgstr "文件夹包括子目录"
 
-#: ../src/utilops.c:2489
+#: ../src/utilops.c:2635
 #, c-format
 msgid ""
 "Unable to delete the folder:\n"
@@ -5646,19 +6200,19 @@ msgstr ""
 "\n"
 "此文件夹包含子目录，在删除前必需移出子目录."
 
-#: ../src/utilops.c:2497
+#: ../src/utilops.c:2643
 msgid "Subfolders:"
 msgstr "子目录:"
 
-#: ../src/utilops.c:2518
+#: ../src/utilops.c:2664
 msgid "Delete folder?"
 msgstr "删除文件夹吗？"
 
-#: ../src/utilops.c:2519
+#: ../src/utilops.c:2665
 msgid "The folder contains these files:"
 msgstr "此文件夹包含以下文件:"
 
-#: ../src/utilops.c:2520
+#: ../src/utilops.c:2666
 msgid ""
 "This will delete the folder.\n"
 "The contents of this folder will also be deleted."
@@ -5666,87 +6220,87 @@ msgstr ""
 "将会删除此文件夹.\n"
 "文件夹内的文件也将被删除."
 
-#: ../src/utilops.c:2650
+#: ../src/utilops.c:2796
 msgid "Rename folder?"
 msgstr "重命名文件夹吗?"
 
-#: ../src/utilops.c:2651
+#: ../src/utilops.c:2797
 msgid "The folder contains the following files"
 msgstr "该文件夹包含下列文件"
 
-#: ../src/utilops.c:2697
+#: ../src/utilops.c:2843
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../src/utilops.c:2698
+#: ../src/utilops.c:2844
 msgid "Create folder?"
 msgstr "创建文件夹吗?"
 
-#: ../src/utilops.c:2701
+#: ../src/utilops.c:2847
 msgid "Can't create folder"
 msgstr "不能创建文件夹"
 
-#: ../src/view_dir.c:397
+#: ../src/view_dir.c:406
 msgid "_Copy"
 msgstr "复制 (_C)"
 
-#: ../src/view_dir.c:399
+#: ../src/view_dir.c:408
 msgid "_Move"
 msgstr "移动 (_M)"
 
-#: ../src/view_dir.c:644
+#: ../src/view_dir.c:653
 msgid "_Up to parent"
 msgstr "上一级目录"
 
-#: ../src/view_dir.c:649
+#: ../src/view_dir.c:658
 msgid "_Slideshow"
 msgstr "播片 (_S)"
 
-#: ../src/view_dir.c:651
+#: ../src/view_dir.c:660
 msgid "Slideshow recursive"
 msgstr "播片 包括子目录"
 
-#: ../src/view_dir.c:655
+#: ../src/view_dir.c:664
 msgid "Find _duplicates..."
 msgstr "查找重复项"
 
-#: ../src/view_dir.c:657
+#: ../src/view_dir.c:666
 msgid "Find duplicates recursive..."
 msgstr "查找重复项 包括子目录..."
 
-#: ../src/view_dir.c:662
+#: ../src/view_dir.c:671
 msgid "_New folder..."
 msgstr "新建文件夹...(_N)"
 
-#: ../src/view_dir.c:676 ../src/view_file.c:619
+#: ../src/view_dir.c:685 ../src/view_file.c:655
 msgid "View as _List"
 msgstr "以列表形式查看"
 
-#: ../src/view_dir.c:679
+#: ../src/view_dir.c:688
 msgid "View as _Tree"
 msgstr "以树状形式查看"
 
-#: ../src/view_dir.c:684
+#: ../src/view_dir.c:693
 msgid "Show _hidden files"
 msgstr "显示隐藏文件 (_h)"
 
-#: ../src/view_dir.c:687 ../src/view_file.c:637
+#: ../src/view_dir.c:696 ../src/view_file.c:673
 msgid "Re_fresh"
 msgstr "刷新 (_f)"
 
-#: ../src/view_file.c:622
+#: ../src/view_file.c:658
 msgid "View as _Icons"
 msgstr "以图标形式查看"
 
-#: ../src/view_file.c:628
+#: ../src/view_file.c:664
 msgid "Show _thumbnails"
 msgstr "显示缩略图 (_t)"
 
-#: ../src/view_file_icon.c:2098 ../src/view_file_list.c:825
+#: ../src/view_file/view_file_icon.c:2027 ../src/view_file/view_file_list.c:834
 msgid " [NO GROUPING]"
 msgstr " [不编组]"
 
-#: ../src/view_file_list.c:451
+#: ../src/view_file/view_file_list.c:460
 #, c-format
 msgid ""
 "Invalid file name:\n"
@@ -5755,14 +6309,39 @@ msgstr ""
 "无效文件名:\n"
 "%s"
 
-#: ../src/view_file_list.c:452
+#: ../src/view_file/view_file_list.c:461
 msgid "Error renaming file"
 msgstr "重命名文件出错"
 
-#: ../src/window.c:252
+#: ../src/window.c:261
 msgid "Help"
 msgstr "帮助"
 
+#~ msgid "Add keywords"
+#~ msgstr "添加关键词"
+
+#~ msgid "Folder Li_st"
+#~ msgstr "文件夹列表(_i)"
+
+#~ msgid "View Folders as List"
+#~ msgstr "以列表查看文件夹"
+
+#~ msgid "Folder T_ree"
+#~ msgstr "文件夹树(_r)"
+
+#~ msgid "View Folders as Tree"
+#~ msgstr "以树状查看文件夹"
+
+#~ msgid "When new image is selected:"
+#~ msgstr "当新图像被选择时:"
+
+#~ msgid "Auto rotate image using Exif information"
+#~ msgstr "根据 Exif 信息自动旋转图像"
+
+#, fuzzy
+#~ msgid "Similarities"
+#~ msgstr "相似度"
+
 #~ msgid "Collection empty"
 #~ msgstr "图片集为空"
 
@@ -5772,9 +6351,6 @@ msgstr "帮助"
 #~ msgid "Stay above other windows"
 #~ msgstr "停留在其它窗口之上"
 
-#~ msgid "Use Exif date"
-#~ msgstr "使用 Exif 日期"
-
 #~ msgid "None"
 #~ msgstr "无"