Merge branch 'feature/upstream' into develop

1 files changed, 4644 insertions, 2416 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index be56e1e..d0474b5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -31,39 +31,1314 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=shotwell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-15 20:17+0000\n"
-"PO-Revision-Date: 2014-01-18 17:45+0800\n"
-"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2016-12-23 00:18+0000\n"
+"PO-Revision-Date: 2016-12-25 19:01+0800\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: ../plugins/common/RESTSupport.vala:424
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "用于发布需要的临时文件不可用"
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "流行的照片管理器"
 
-#: ../plugins/common/RESTSupport.vala:1138
+#: misc/shotwell.appdata.xml.in:11
 msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
 msgstr ""
-"在本次 Shotwell 会话中您登录 Google 服务然后退出了。\n"
-"要继续发布到 Google，请退出并重新启动 Shotwell，然后再尝试发布。"
+"Shotwell 是一个易用的、快速的照片组织软件，为 GNOME 桌面而设计。它可以帮助您"
+"从您的照相机或磁盘中导入照片、按照时间和主题内容进行组织，甚至是进行评分。它"
+"同时提供了基础的照片编辑功能，如剪裁、红眼修正、颜色调整和倾斜修正。Shotwell "
+"的非破坏性照片编辑器不会修改您的原始照片，可以更方便您的试验并对编辑错误进行"
+"修正。"
 
-#: ../plugins/common/Resources.vala:9 ../src/AppWindow.vala:683
-msgid "Visit the Yorba web site"
-msgstr "访问 Yorba 网站"
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+"一切就绪后，Shotwell 可以将您的照片上传到各个网站上，例如 Fackbook, Flickr, "
+"Picasa (Google Plus) 等等。"
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr "Shotwell 支持 JPEG, PNG, TIFF 以及许多 RAW 文件格式。"
+
+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "照片管理器"
+
+#: misc/shotwell.desktop.in.in:6
+msgid "Organize your photos"
+msgstr "组织您的照片"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in.in:8
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;相册;图像;照片;"
+"发布;脸书;照相机;编辑;录像;摄像;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+msgid "Shotwell Viewer"
+msgstr "Shotwell 查看器"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "照片查看器"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "验证凭据"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Yandex-Fotki 验证凭据，如果已登录。"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "访问 tumblr 的凭据"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:486
+msgid "default size"
+msgstr "默认大小"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "默认博客"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "Rajce URL"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+msgid "URL of the Rajce server."
+msgstr "Rajce 服务器的 URL。"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
+msgid "username"
+msgstr "用户名"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Rajce 用户名，如果已登录。"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:530
+#, fuzzy
+#| msgid "within category:"
+msgid "last category"
+msgstr "在以下分类中:"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:542
+#, fuzzy
+#| msgid "Photo size:"
+msgid "last photo size"
+msgstr "照片尺寸："
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "如果为真，则记录上次登录的信息。"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "隐藏相册"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "在网页浏览器中打开相册"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "remove sensitive info from uploads"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+#, fuzzy
+#| msgid "Display extended information for the selection"
+msgid "display extended properties"
+msgstr "显示所选项的扩展信息"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "显示侧边栏"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "显示工具栏"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "显示搜索栏"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+#, fuzzy
+#| msgid "Display each photo's tags"
+msgid "display photo titles"
+msgstr "显示每张照片的标签"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+#, fuzzy
+#| msgid "Display each photo's tags"
+msgid "display photo comments"
+msgstr "显示每张照片的标签"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+#, fuzzy
+#| msgid "Edit Event Comment"
+msgid "display event comments"
+msgstr "修改事件备注"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+#, fuzzy
+#| msgid "Display each photo's tags"
+msgid "display photo tags"
+msgstr "显示每张照片的标签"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+#, fuzzy
+#| msgid "Display each photo's rating"
+msgid "display photo ratings"
+msgstr "显示每张照片的评分"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+#, fuzzy
+#| msgid "No events found"
+msgid "sort events ascending"
+msgstr "没有找到事件"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort library photos ascending"
+msgstr "按照升序排列照片"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort event photos ascending"
+msgstr "按照升序排列照片"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+#, fuzzy
+#| msgid "Sort photos by title"
+msgid "sort event photos criteria"
+msgstr "按照标题排序"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "使用24小时制"
+
+#: misc/org.yorba.shotwell.gschema.xml:120
+msgid ""
+"True if should display times with a 24 hour clock, false if times should use "
+"AM/PM notation."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:126
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+#, fuzzy
+#| msgid "_Modify original photo files"
+msgid "modify original photo files"
+msgstr "修改原始照片文件(_M)"
+
+#: misc/org.yorba.shotwell.gschema.xml:132
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:138
+msgid ""
+"True if, when on startup, a welcome dialog should be shown. False if it "
+"should not be shown."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+#, fuzzy
+#| msgid "Library Location"
+msgid "sidebar position"
+msgstr "媒体库位置"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr "照片缩略图尺寸"
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr "照片缩略图的尺寸，范围为 72 至 360。"
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+#, fuzzy
+#| msgid "Pin the toolbar open"
+msgid "pin toolbar state"
+msgstr "将工具栏固定为打开"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:686
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+#, fuzzy
+#| msgid "_Background:"
+msgid "background color"
+msgstr "背景(_B)："
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+#, fuzzy
+#| msgid "_Delay:"
+msgid "delay"
+msgstr "延时(_D)："
+
+#: misc/org.yorba.shotwell.gschema.xml:176
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:181
+#, fuzzy
+#| msgid "Transition d_elay:"
+msgid "transition delay"
+msgstr "过渡延时(_E)："
+
+#: misc/org.yorba.shotwell.gschema.xml:182
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+#, fuzzy
+#| msgid "_Transition effect:"
+msgid "transition effect id"
+msgstr "过渡效果(_T)："
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "Show title"
+msgstr "显示标题"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:201
+msgid "maximize library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:202
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "width of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:208
+msgid "The last recorded width of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "height of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "The last recorded height of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "maximize direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "width of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "height of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "sidebar divider position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+msgid "import directory"
+msgstr "导入目录"
+
+#: misc/org.yorba.shotwell.gschema.xml:246
+msgid "Directory in which imported photo files are placed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:251
+#, fuzzy
+#| msgid "_Watch library directory for new files"
+msgid "watch library directory for new files"
+msgstr "监视媒体库文件夹中的新文件(_W)"
+
+#: misc/org.yorba.shotwell.gschema.xml:252
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "write metadata to master files"
+msgstr "写入元数据到文件..."
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "use lowercase filenames"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+#, fuzzy
+#| msgid "_Directory structure:"
+msgid "directory pattern"
+msgstr "目录结构(_D)："
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+#, fuzzy
+#| msgid "RAW Developer"
+msgid "RAW developer default"
+msgstr "RAW 开发者："
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:289
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:290
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:295
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:300
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+#, fuzzy
+#| msgid "E_xternal photo editor:"
+msgid "external photo editor"
+msgstr "外部照片编辑器(_X)："
+
+#: misc/org.yorba.shotwell.gschema.xml:308
+msgid "External application used to edit photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:313
+#, fuzzy
+#| msgid "External _RAW editor:"
+msgid "external raw editor"
+msgstr "外部 RAW 编辑器(_R)："
+
+#: misc/org.yorba.shotwell.gschema.xml:314
+msgid "External application used to edit RAW photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#, fuzzy
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "导出元数据"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: jpeg quality option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "maximal size of image"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:390
+#, fuzzy
+#| msgid "Core Publishing Services"
+msgid "last used publishing service"
+msgstr "主要上传服务"
+
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:396
+#, fuzzy
+#| msgid "Core Publishing Services"
+msgid "default publishing service"
+msgstr "主要上传服务"
+
+#: misc/org.yorba.shotwell.gschema.xml:410
+msgid "access token"
+msgstr "访问凭据"
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:416
+msgid "user i.d."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "user name"
+msgstr "用户名"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+#, fuzzy
+#| msgid "You are not currently logged into Yandex.Fotki."
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "您当前未登陆至 Yandex.Fotki。"
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "default size code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:442
+msgid "OAuth Access Phase Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:448
+msgid "OAuth Access Phase Token Secret"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:449
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:466
+msgid "default visibility"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
+msgid "refresh token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:481
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:487
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "last album"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:506
+msgid "Piwigo URL"
+msgstr "Piwigo URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:507
+msgid "URL of the Piwigo server."
+msgstr "Piwigo 服务器的 URL。"
+
+#: misc/org.yorba.shotwell.gschema.xml:513
+msgid "Piwigo username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "password"
+msgstr "密码"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "Piwigo password, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:524
+msgid "remember password"
+msgstr "记住密码"
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "If true, remember the Piwigo password."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "The last selected Piwigo category."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "last permission level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "The last chosen Piwigo permission level."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:554
+#, fuzzy
+#| msgid "_If a title is set and comment unset, use title as comment"
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr "如果有标题而没有备注，将标题作为备注(_I)"
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:560
+msgid "do not upload tags when uploading to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their tags removed on "
+"upload, such that these tags will not appear on the remote Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:569
+msgid "Gallery3 username"
+msgstr "Gallery3 用户名"
+
+#: misc/org.yorba.shotwell.gschema.xml:574
+msgid "API key"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:575
+msgid "Gallery3 API key"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 site URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:613
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:620
+#, fuzzy
+#| msgid "Core Data Import Services"
+msgid "last used import service"
+msgstr "核心数据导入服务"
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:628
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:629
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:636
+msgid "content layout mode"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:637
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:642
+#, fuzzy
+#| msgid "_Contents"
+msgid "content ppi"
+msgstr "目录(_C)"
+
+#: misc/org.yorba.shotwell.gschema.xml:643
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content width"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+#, fuzzy
+#| msgid "Rotate Right"
+msgid "content height"
+msgstr "向右旋转"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+#, fuzzy
+#| msgid "_Contents"
+msgid "content units"
+msgstr "目录(_C)"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+#, fuzzy
+#| msgid "2 images per page"
+msgid "images per page code"
+msgstr "每页 2 张"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "size selection"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+#, fuzzy
+#| msgid "_Match photo aspect ratio"
+msgid "match aspect ratio"
+msgstr "匹配照片比例(_M)"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+#, fuzzy
+#| msgid "Print image _title"
+msgid "print titles"
+msgstr "打印图像标题(_T)"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "titles font"
+msgstr "标题字体"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "enable facebook publishing plugin"
+msgstr "启用 facebook 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:708
+msgid "enable flickr publishing plugin"
+msgstr "启用 flickr 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:709
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable picasa publishing plugin"
+msgstr "启用 picasa 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+msgid "enable youtube publishing plugin"
+msgstr "启用 youtube 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable piwigo publishing plugin"
+msgstr "启用 piwigo 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable yandex publishing plugin"
+msgstr "启用 yandex 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+msgid "enable tumblr publishing plugin"
+msgstr "启用 tumblr 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+msgid "enable rajce publishing plugin"
+msgstr "启用 rajce 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+msgid "enable gallery3 publishing plugin"
+msgstr "启用 gallery3 发布插件"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable F-Spot import plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow crumble transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow fade transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow slide transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow clock transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow circle transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow squares transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow stripes transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow chess transition"
+msgstr "主要幻灯片变换"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "访问 Shotwell 主页"
+
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
 msgid "translator-credits"
 msgstr ""
 "Tommy He <tommy.he@linux.com>, 2011\n"
@@ -74,6 +1349,7 @@ msgstr ""
 "Aron Xu <happyaron.xu@gmail.com>, 2012\n"
 "Jason Lau, 刘家昌 <i@dotkrnl.com>, 2013\n"
 "甘露(Gan Lu) <rhythm.gan@gmail.com>, 2014\n"
+"Boyuan Yang <073plan@gmail.com>, 2016\n"
 "\n"
 "Launchpad Contributions:\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
@@ -90,17 +1366,78 @@ msgstr ""
 "  slgray https://launchpad.net/~chenlibinpeter-gmail\n"
 "  丁威扬 https://launchpad.net/~dingvyoung"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: ../src/Resources.vala:27
-msgid "Copyright 2009-2013 Yorba Foundation"
-msgstr "版权所有 2009-2013 Yorba Foundation, Yorba 基金会"
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr ""
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
+msgid ""
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
+msgid ""
+"⚫ This website’s identification was not issued by a trusted organization."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
+msgid ""
+"⚫ This website’s identification could not be processed. It may be corrupted."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
+msgid ""
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
+msgid ""
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
+msgid ""
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
+msgstr ""
+
+#: plugins/common/RESTSupport.vala:509
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "用于发布需要的临时文件不可用"
+
+#: plugins/common/RESTSupport.vala:1167
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"在本次 Shotwell 会话中您登录 Google 服务然后退出了。\n"
+"要继续发布到 Google，请退出并重新启动 Shotwell，然后再尝试发布。"
+
+#: plugins/shotwell-data-imports/FSpotImporter.vala:36
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "版权所有 2016 Software Freedom Conservancy Inc."
+
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -113,7 +1450,7 @@ msgstr ""
 "请选择一个要导入的媒体库，既可以是 Shotwell 找到的现存库，也可以选择其他 F-"
 "Spot 数据库文件。"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -123,35 +1460,35 @@ msgstr ""
 "\n"
 "请选择一个 F-Spot 数据库文件。"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
 msgid "Manually select an F-Spot database file to import:"
 msgstr "手工选择一个要导入的 F-Spot 数据库文件："
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
 msgstr "无法打开选定的 F-Spot 数据库文件：文件不存在或不是 F-Spot 数据库"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
 "database is not supported by Shotwell"
 msgstr ""
 "无法打开选定的 F-Spot 数据库文件：Shotwell 不支持此版本的 F-Spot 数据库"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#: plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr "无法读取选定的 F-Spot 数据库文件：读取标签列表出错"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
 msgstr "无法读取选定的 F-Spot 数据库文件：读取照片出错"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
+#: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
 msgid ""
 "Shotwell has found %d photos in the F-Spot library and is currently "
@@ -165,71 +1502,373 @@ msgstr ""
 "\n"
 "您可以关闭这个会话并开始使用 Shotwell，导入工作将在后台继续进行。"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: plugins/shotwell-data-imports/FSpotImporter.vala:86
 #, c-format
 msgid "F-Spot library: %s"
 msgstr "F-Spot 媒体库：%s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: plugins/shotwell-data-imports/FSpotImporter.vala:424
 msgid "Preparing to import"
 msgstr "正在准备导入"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr "核心数据导入服务"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
-msgid "Copyright 2012 BJA Electronics"
-msgstr "版权所有 2012 BJA Electronics"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr ""
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 像素"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "用户名称(_U)："
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 像素"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "密码(_P)："
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 像素"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+#, fuzzy
+#| msgid "Back"
+msgid "Go _Back"
+msgstr "后退"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "登录(_L)"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+#, fuzzy
+#| msgid "hour"
+#| msgid_plural "hours"
+msgid "or"
+msgstr "小时"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "一个已有的相册(_E)"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "一个新相册(_N)"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+#, fuzzy
+#| msgid ""
+#| "_Remove location, camera, and other identifying information before "
+#| "uploading"
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "上传前去除照片的地理位置、相机型号和其他可供辨认的信息(_R)"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+#, fuzzy
+#| msgid "_Scaling constraint:"
+msgid "Scaling constraint:"
+msgstr "缩放限制(_S)："
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr " 像素"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "原始尺寸"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "宽度或者高度"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:208
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "注销(_L)"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
+msgid "_Publish"
+msgstr "发布(_P)"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+msgid "Gallery3 publishing module"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into YouTube.\n"
+#| "\n"
+#| "You must have already signed up for a Google account and set it up for "
+#| "use with YouTube to continue. You can set up most accounts by using your "
+#| "browser to log into the YouTube site at least once."
+msgid ""
+"You are not currently logged into your Gallery.\n"
+"\n"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"您尚未登录 YouTube。\n"
+"\n"
+"您必须已经注册了一个 Google 帐号并设置为使用 YouTube 才能继续。您可以通过浏览"
+"器设置绝大多数帐号并至少登录 YouTube 一次。"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+msgid "Shotwell default directory"
+msgstr "Shotwell 默认目录"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgid ""
+"\n"
+"\n"
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
+#, fuzzy, c-format
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can’t "
+"continue."
+msgstr "一个发布所需要的文件不存在。无法继续发布至 Picasa。"
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#, fuzzy, c-format
+#| msgid "Publish Photos and Videos"
+msgid "Publishing to %s as %s."
+msgstr "发布照片和视频"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#, fuzzy
+#| msgid ""
+#| "Enter the URL of your Piwigo photo library as well as the username and "
+#| "password associated with your Piwigo account for that library."
+msgid ""
+"Enter the URL for your Gallery3 site and the username and password (or API "
+"key) for your Gallery3 account."
+msgstr "输入您 Piwigo 照片库的 URL 以及对应 Piwigo 照片库相关的用户名和密码。"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+msgid ""
+"The username and password or API key were incorrect. To try again, re-enter "
+"your username and password below."
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+msgid ""
+"The URL entered does not appear to be the main directory of a Gallery3 "
+"instance. Please make sure you typed it correctly and it does not have any "
+"trailing components (e.g., index.php)."
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
+msgid "Unrecognized User"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
+msgid " Site Not Found"
+msgstr "站点未找到"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
+msgid "_Email address"
+msgstr "邮箱地址(_E)"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "密码(_)"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
+#, fuzzy
+#| msgid "_Remember Password"
+msgid "_Remember"
+msgstr "记住密码(_R)"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+#, fuzzy
+#| msgid "Logging in..."
+msgid "Log in"
+msgstr "正在登录……"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:70
+msgid "An _existing album:"
+msgstr "一个已有的相册(_E)："
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
+msgid "A _new album named:"
+msgstr "一个新相册(_N)："
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+msgid "_Hide album"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+msgid "Open target _album in browser"
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+msgid "Copyright © 2013 rajce.net"
+msgstr "版权所有 © 2013 rajce.net"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+#, fuzzy
+#| msgid ""
+#| "An error message occurred when publishing to Piwigo. Please try again."
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "在发布至 Piwigo 时发生了错误，请重试。"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+#, fuzzy
+#| msgid "Enter the username and password associated with your Tumblr account."
+msgid "Enter email and password associated with your Rajce account."
+msgstr "输入和您 Tumblr 账户关联的用户名和密码。"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+#, fuzzy
+#| msgid "Username and/or password invalid. Please try again"
+msgid "Invalid email and/or password. Please try again"
+msgstr "用户名或密码无效。请重试"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+#, fuzzy
+#| msgid "Invalid User Name or Password"
+msgid "Invalid User Email or Password"
+msgstr "无效的用户名或密码"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#, fuzzy, c-format
+#| msgid ""
+#| "You are logged into Facebook as %s.\n"
+#| "\n"
+msgid "You are logged into Rajce as %s."
+msgstr ""
+"您已经作为 %s 登录 Facebook。\n"
+"\n"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
+msgid "Photos will appear in:"
+msgstr "照片将出现在："
+
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Shotwell 额外发布服务"
+
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "博客："
+
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+msgid "Photo _size:"
+msgstr "照片尺寸(_S)："
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
+msgid "Copyright 2012 BJA Electronics"
+msgstr "版权所有 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1205
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+msgid "500 × 375 pixels"
+msgstr "500 × 375 像素"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1206
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 像素"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 像素"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
+#, fuzzy, c-format
+#| msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
 msgstr "'%s' 不是一个有效的 OAuth 授权请求响应"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
+#, fuzzy
+#| msgid ""
+#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr "TumblrPublisher: start( ): 无法启动；无法重启该发布器。"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr "输入和您 Tumblr 账户关联的用户名和密码。"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "用户名或密码无效。请重试"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "无效的用户名或密码"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "无法载入 UI：%s"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -238,122 +1877,92 @@ msgstr ""
 "您登录的 Tumblr 账户为 %s。\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "版权所有 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
 msgstr "访问 Yandex.Fotki 网站"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "您当前未登陆至 Yandex.Fotki。"
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:18
-msgid "Shotwell Extra Publishing Services"
-msgstr "Shotwell 额外发布服务"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
-msgid "label"
-msgstr "标签"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "邮箱地址(_E)"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "密码(_)"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "登录"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid ""
-"You are logged into Tumblr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"您正在以 (name) 身份登录 Tumblr.\n"
-"\n"
-"(该标签字符串在源码内产生并设定，\n"
-"因此此处的更改将不会显示)"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:5
-msgid "Blogs:"
-msgstr "博客："
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:6
-msgid "Photo _size:"
-msgstr "照片尺寸(_S)："
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "公开"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:10
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "注销(_L)"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
+msgstr "朋友"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:11
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "发布(_P)"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
+msgstr "私人"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "已有或新相册(_A)："
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "访问类型(_T)："
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "禁用评论(_C)"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "禁止下载原始照片(_F)"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "公开"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "发布到已有相册(_X)："
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "朋友"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "创建一个新相册名为(_N)："
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "私人"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+msgid "Upload _size:"
+msgstr "上传大小(_S)："
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
+msgid "Videos and new photo albums _visible to:"
+msgstr "视频和新照片相册可见于(_V)："
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr "上传前去除照片的地理位置、相机型号和其他可供辨认的信息(_R)"
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:62
+#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Shotwell 连接"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: plugins/shotwell-publishing/FacebookPublishing.vala:64
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Facebook.\n"
+#| "\n"
+#| "If you don't yet have a Facebook account, you can create one during the "
+#| "login process. During login, Shotwell Connect may ask you for permission "
+#| "to upload photos and publish to your feed. These permissions are required "
+#| "for Shotwell Connect to function."
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the "
+"If you don’t yet have a Facebook account, you can create one during the "
 "login process. During login, Shotwell Connect may ask you for permission to "
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
@@ -364,7 +1973,7 @@ msgstr ""
 "Connect 将请求您上传照片和发布到订阅列表的权限。这些权限对于 Shotwell "
 "Connect 的工作是必须的。"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+#: plugins/shotwell-publishing/FacebookPublishing.vala:66
 msgid ""
 "You have already logged in and out of Facebook during this Shotwell "
 "session.\n"
@@ -374,30 +1983,34 @@ msgstr ""
 "您已经登录了 Facebook 但并不在当前 Shotwell 进程中。\n"
 "继续在 Facebook 上发布，退出并重新启动，然后再次尝试发布。"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:87
 msgid "Standard (720 pixels)"
 msgstr "标准 (720 像素)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:90
 msgid "Large (2048 pixels)"
 msgstr "大型 (2048 像素)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:255
+msgid "Testing connection to Facebook…"
 msgstr "正在测试连接到 Facebook..."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:348
+#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album…"
 msgstr "创建相册..."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Facebook "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
+"A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr "一个发布所需要的文件不存在。无法继续发布至 Facebook。"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#: plugins/shotwell-publishing/FacebookPublishing.vala:982
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -406,39 +2019,54 @@ msgstr ""
 "您已经作为 %s 登录 Facebook。\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+#: plugins/shotwell-publishing/FacebookPublishing.vala:983
 msgid "Where would you like to publish the selected photos?"
 msgstr "想在哪里发布选中的照片？"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
-msgid "Upload _size:"
-msgstr "上传大小(_S)："
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
 msgid "Just me"
 msgstr "仅有我"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "所有人"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:61
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:17
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr "输入您使用网页浏览器登录 Flickr 后出现的确认码。"
+
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
+msgid "Authorization _Number:"
+msgstr "认证码(_N)："
+
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "继续(_T)"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:60
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Flickr.\n"
+#| "\n"
+#| "Click Login to log into Flickr in your Web browser.  You will have to "
+#| "authorize Shotwell Connect to link to your Flickr account."
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
+"Click Log in to log into Flickr in your Web browser. You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 "您目前尚未登录到 Flickr。\n"
 "\n"
-"在您的浏览器中点击“登录”以登录到 Flickr。您必须授权 Shotwell 连接到您"
-"的 Flickr 帐号。"
+"在您的浏览器中点击“登录”以登录到 Flickr。您必须授权 Shotwell 连接到您的 "
+"Flickr 帐号。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
+#: plugins/shotwell-publishing/FlickrPublishing.vala:62
 msgid ""
 "You have already logged in and out of Flickr during this Shotwell session.\n"
 "To continue publishing to Flickr, quit and restart Shotwell, then try "
@@ -447,22 +2075,30 @@ msgstr ""
 "在本次 Shotwell 会话中您登录了 Flickr 服务然后退出了。\n"
 "要继续发布到 Flickr，请退出并重新启动 Shotwell，然后再尝试发布。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:374
+#, fuzzy
+#| msgid "Preparing for login..."
+msgid "Preparing for login…"
 msgstr "准备登录..."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+#: plugins/shotwell-publishing/FlickrPublishing.vala:434
+#: plugins/shotwell-publishing/FlickrPublishing.vala:571
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr "一个发布所需要的文件不存在。无法继续发布至 Flickr。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:447
+#, fuzzy
+#| msgid "Verifying authorization..."
+msgid "Verifying authorization…"
 msgstr "校验认证信息..."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -471,155 +2107,269 @@ msgstr ""
 "您已经作为 %s 登录到 Flickr。\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, c-format
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#, fuzzy, c-format
+#| msgid ""
+#| "Your free Flickr account limits how much data you can upload per month.\n"
+#| "This month, you have %d megabytes remaining in your upload quota."
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
-"This month, you have %d megabytes remaining in your upload quota."
+"This month you have %s remaining in your upload quota."
 msgstr ""
 "您的 Flickr 免费帐号限制您每月可以上传的数据。\n"
 "本月您的流量限额还剩 %d MB。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "您的 Flickr Pro 帐号让您可以无限上传。"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1162
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
 msgid "Photos _visible to:"
 msgstr "照片公开给(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
 msgid "Videos _visible to:"
 msgstr "视频公开给(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
 msgid "Photos and videos _visible to:"
 msgstr "照片和视频公开给(_V)："
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
 msgid "Friends & family only"
 msgstr "仅朋友和家人"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
 msgid "Family only"
 msgstr "仅限家人"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
 msgid "Friends only"
 msgstr "仅限朋友"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 像素"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 像素"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 像素"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 像素"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "原始尺寸"
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
+msgid "L_ist album in public gallery"
+msgstr "显示公开相片库里的相册(_I)"
+
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
+msgid "Photo _size preset:"
+msgstr "预置照片尺寸(_S)："
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PicasaPublishing.vala:59
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Picasa Web Albums.\n"
+#| "\n"
+#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
+#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
+#| "account."
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 "您当前尚未登录 Picasa 网络相册。\n"
 "\n"
 "在您的浏览器中点击登录来完成 Picasa 网络相册等各路。您必须授权 Shotwell "
 "Connect 来连接至您的 Picasa 网络相册。"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/shotwell-publishing/PicasaPublishing.vala:361
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
+"A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr "一个发布所需要的文件不存在。无法继续发布至 Picasa。"
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "您已经作为 %s 登录 Picasa 网络相册。"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:665
 msgid "Videos will appear in:"
 msgstr "视频将出现在："
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "照片将出现在："
-
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "小 (640 x 480 像素)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 × 480 pixels)"
+msgstr "小 (640 × 480 像素)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "中 (1024 x 768 像素)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 × 768 pixels)"
+msgstr "中 (1024 × 768 像素)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "推荐 (1600 x 1200 像素)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "推荐 (1600 × 1200 像素)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 像素)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 像素)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "原始尺寸"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
-#, c-format
-msgid "Creating album %s..."
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "您的 Piwigo 照片库 _URL(_)"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+msgid "User _name"
+msgstr "用户名(_)"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+#, fuzzy
+#| msgid "_Remember Password"
+msgid "Remember Password"
+msgstr "记住密码(_R)"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+#, fuzzy
+#| msgid "An _existing category:"
+msgid "An _existing category"
+msgstr "一个已有的分类(_)："
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+#, fuzzy
+#| msgid "A _new album named:"
+msgid "A _new album named"
+msgstr "一个新相册(_N)："
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#, fuzzy
+#| msgid "within category:"
+msgid "within category"
+msgstr "在以下分类中:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "相册备注"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+#, fuzzy
+#| msgid "Photos will be _visible by:"
+msgid "Photos will be _visible by"
+msgstr "照片可见(_V)："
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "照片尺寸"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr "如果有标题而没有备注，将标题作为备注(_I)"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "不上传标签(_D)"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "登出"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
+msgid "Publish"
+msgstr "发布"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
+#, fuzzy, c-format
+#| msgid "Creating album %s..."
+msgid "Creating album %s…"
 msgstr "正在创建相册 %s…"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "在发布至 Piwigo 时发生了错误，请重试。"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#. %s is the host name that we tried to connect to
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
+#, c-format
+msgid ""
+"This does not look like the real <b>%s</b>. Attackers might be trying to "
+"steal or alter information going to or from this site (for example, private "
+"messages, credit card information, or passwords)."
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "%s 的证书"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr "输入您 Piwigo 照片库的 URL 以及对应 Piwigo 照片库相关的用户名和密码。"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
 msgstr "Shotwell 无法连接至您的 Piwigo 照片库。请检查您输入的 URL。"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "无效的 URL"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "管理员，家人，朋友，联系人"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "管理员，家人，朋友"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "管理员，家人"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "管理员"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "这个连接不安全"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "显示证书…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "我已经了解，请继续。(_P)"
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "主要上传服务"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "视频隐私设置(_S)："
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:58
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -632,306 +2382,155 @@ msgstr ""
 "您必须已经注册了一个 Google 帐号并设置为使用 YouTube 才能继续。您可以通过浏览"
 "器设置绝大多数帐号并至少登录 YouTube 一次。"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/shotwell-publishing/YouTubePublishing.vala:363
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Youtube "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr "一个发布所需要的文件不存在。无法继续发布至 YouTube。"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: plugins/shotwell-publishing/YouTubePublishing.vala:462
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "您已经作为 %s 登录 YouTube。"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:464
+#, fuzzy, c-format
+#| msgid "Videos will appear in '%s'"
+msgid "Videos will appear in “%s”"
 msgstr "视频将出现在“%s”"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+#: plugins/shotwell-publishing/YouTubePublishing.vala:496
 msgid "Public listed"
 msgstr "公开列出"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:497
 msgid "Public unlisted"
 msgstr "公开未列出"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid ""
-" (text depends on fb username and is modified in the app - \n"
-"anything put into this field won't display)"
-msgstr ""
-"(文本依赖于 FB 用户名，已在程序中修改 -\n"
-"在此输入此框内的一切均不会显示)"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Publish to an e_xisting album:"
-msgstr "发布到已有相册(_X)："
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Create a _new album named:"
-msgstr "创建一个新相册名为(_N)："
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-msgid "Videos and new photo albums _visible to:"
-msgstr "视频和新照片相册可见于(_V)："
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "上传前去除照片的地理位置、相机型号和其他可供辨认的信息(_R)"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr "输入您使用网页浏览器登录 Flickr 后出现的确认码。"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "认证码(_N)："
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "继续(_T)"
-
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
-msgid ""
-"You are logged into Flickr as (name).\n"
-"\n"
-"(this label's string is populated and set inside the code, \n"
-"so changes made here will not display)"
-msgstr ""
-"您已登录到 Flickr 的 (name) 用户。\n"
-"\n"
-"(这个标签串设定于代码中\n"
-"在此的改变不会被显示)"
-
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:5
-msgid "_visibility label (populated in the code)"
-msgstr "可见度标签 (代码中)(_V)"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid ""
-"'you are logged in as $name'\n"
-"(populated in the application code)"
-msgstr ""
-"'您已登录为 $name'\n"
-"(程序代码中)"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "An _existing album:"
-msgstr "一个已有的相册(_E)："
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "一个新相册(_N)："
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
-msgid "L_ist album in public gallery"
-msgstr "显示公开相片库里的相册(_I)"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-msgid ""
-"$mediatype will appear in\n"
-"(populated in code)"
-msgstr ""
-"$mediatype 会被显示于\n"
-"(代码中)"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:8
-msgid "Photo _size preset:"
-msgstr "预置照片尺寸(_S)："
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "您的 Piwigo 照片库 _URL(_)"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "用户名(_)"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "记住密码(_R)"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "一个已有的分类(_)："
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "照片可见(_V)："
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "照片尺寸："
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "在以下分类中:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "相册备注:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr "如果有标题而没有备注，将标题作为备注(_I)"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "不上传标签(_D)"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "登出"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:270
-msgid "Publish"
-msgstr "发布"
-
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "主要上传服务"
-
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "视频隐私设置(_S)："
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "百叶窗"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "茄子"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "圈子"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "圆圈"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "时钟"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "碎片"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "渐出"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "主要幻灯片变换"
+
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
+#, fuzzy
+#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
+msgid ""
+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
+"Inc."
+msgstr ""
+"Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation, Yorba "
+"基金会版权所有"
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "幻灯片演示"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "方格"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "条纹"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "主要幻灯片变换"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation"
-msgstr ""
-"Copyright 2010 Maxim Kartashev, Copyright 2011-2013 Yorba Foundation, Yorba "
-"基金会版权所有"
-
-#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "无法创建缓存目录 %s：%s"
 
-#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "无法创建数据文件夹 %s：%s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "图片"
 
-#: ../src/AppDirs.vala:190
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "无法创建临时文件夹 %s：%s"
 
-#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "无法创建数据子文件夹 %s：%s"
 
-#: ../src/AppWindow.vala:49
+#: src/AppDirs.vala:236
+#, c-format
+msgid "Could not make directory %s writable"
+msgstr "无法将 %s 目录设为可写状态"
+
+#: src/AppDirs.vala:239
+#, fuzzy, c-format
+#| msgid "Unable to create cache directory %s: %s"
+msgid "Could not make directory %s writable: %s"
+msgstr "无法创建缓存目录 %s：%s"
+
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "固定工具栏"
 
-#: ../src/AppWindow.vala:50
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "将工具栏固定为打开"
 
-#: ../src/AppWindow.vala:53 ../src/AppWindow.vala:131
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "退出全屏"
 
-#: ../src/AppWindow.vala:130
-msgid "Leave _Fullscreen"
-msgstr "退出全屏(_F)"
-
-#: ../src/AppWindow.vala:491
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../src/AppWindow.vala:496
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../src/AppWindow.vala:501
-msgid "Fulls_creen"
-msgstr "全屏(_C)"
-
-#: ../src/AppWindow.vala:506
-msgid "_Contents"
-msgstr "目录(_C)"
-
-#: ../src/AppWindow.vala:511
-msgid "_Frequently Asked Questions"
-msgstr "常见问题(_F)"
-
-#: ../src/AppWindow.vala:516
-msgid "_Report a Problem..."
-msgstr "汇报问题(_R)…"
-
-#: ../src/AppWindow.vala:615 ../src/AppWindow.vala:636
-#: ../src/AppWindow.vala:653 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1361 ../src/Dialogs.vala:1384
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/AppWindow.vala:663
-#, c-format
+#: src/AppWindow.vala:580
+#, fuzzy, c-format
+#| msgid ""
+#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
+#| "cannot continue.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -940,338 +2539,687 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:695
+#: src/AppWindow.vala:600
+#, fuzzy
+#| msgid "Visit the Yorba web site"
+msgid "Visit the Shotwell web site"
+msgstr "访问 Yorba 网站"
+
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "无法显示帮助 %s"
 
-#: ../src/AppWindow.vala:703
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "无法转向 Bug 数据库：%s"
 
-#: ../src/AppWindow.vala:711
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "无法显示常见问题 %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "成功"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "文件错误"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "无法解码文件"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "数据库错误"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "用户中止导入"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "不是一个文件"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "文件已存在于数据库中"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "不支持的文件格式"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "不是照片文件"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "磁盘错误"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "磁盘已满"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "相机错误"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "文件写入错误"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "损坏的图片"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "导入失败(%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2627
+#: src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "相机"
+
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
+#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
+msgid "Camera"
+msgstr "相机"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
+
+#: src/camera/ImportPage.vala:458
+#, fuzzy
+#| msgid ""
+#| "Unable to unmount camera.  Try unmounting the camera from the file "
+#| "manager."
+msgid ""
+"Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr "不能卸载相机。请尝试从文件管理器中卸载相机。"
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:775
+msgid "Hide photos already imported"
+msgstr "隐藏已经导入的照片"
+
+#: src/camera/ImportPage.vala:776
+msgid "Only display photos that have not been imported"
+msgstr "只显示尚未导入的照片"
+
+#: src/camera/ImportPage.vala:815 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "导入全部(_A)"
+
+#: src/camera/ImportPage.vala:825 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "导入选中项目(_S)"
+
+#: src/camera/ImportPage.vala:849
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr "照相机好像是空的。没有找到可以导入的照片或视频"
+
+#: src/camera/ImportPage.vala:853
+#, fuzzy
+#| msgid "No photos/videos found"
+msgid "No new photos/videos found on camera"
+msgstr "没有找到照片或视频"
+
+#. it's mounted, offer to unmount for the user
+#: src/camera/ImportPage.vala:1006
+#, fuzzy
+#| msgid ""
+#| "Shotwell needs to unmount the camera from the filesystem in order to "
+#| "access it.  Continue?"
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+msgstr "Shotwell 需要从文件系统卸载相机来访问它。是否继续？"
+
+#: src/camera/ImportPage.vala:1012
+msgid "_Unmount"
+msgstr "卸载(_U)"
+
+#: src/camera/ImportPage.vala:1017
+msgid "Please unmount the camera."
+msgstr "请卸载相机。"
+
+#: src/camera/ImportPage.vala:1022
+#, fuzzy
+#| msgid ""
+#| "The camera is locked by another application.  Shotwell can only access "
+#| "the camera when it's unlocked.  Please close any other application using "
+#| "the camera and try again."
+msgid ""
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
+"camera and try again."
+msgstr ""
+"该相机被其他程序锁定，仅在解锁后 Shotwell 才能访问。请关闭其他使用该相机的程"
+"序后重试。"
+
+#: src/camera/ImportPage.vala:1032
+msgid "Please close any other application using the camera."
+msgstr "请关闭其他使用该相机的程序。"
+
+#: src/camera/ImportPage.vala:1037
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"无法从相机获取预览：\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1054
+#, fuzzy
+#| msgid "Unmounting..."
+msgid "Unmounting…"
+msgstr "卸载..."
+
+#: src/camera/ImportPage.vala:1145
+#, fuzzy
+#| msgid "Starting import, please wait..."
+msgid "Starting import, please wait…"
+msgstr "正在开始导入，请稍候..."
+
+#: src/camera/ImportPage.vala:1162
+msgid "Fetching photo information"
+msgstr "获取照片信息"
+
+#: src/camera/ImportPage.vala:1520
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "获取 %s 的预览"
+
+#: src/camera/ImportPage.vala:1636
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "无法锁定相机：%s"
+
+#: src/camera/ImportPage.vala:1721
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "从相机删除 %d 张照片？"
+
+#: src/camera/ImportPage.vala:1724
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "从相机删除这 %d 个视频？"
+
+#: src/camera/ImportPage.vala:1727
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "从相机删除 %d 个照片/视频？"
+
+#: src/camera/ImportPage.vala:1730
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "从相机删除 %d 个文件？"
+
+#: src/camera/ImportPage.vala:1738 src/Dialogs.vala:1387
+msgid "_Keep"
+msgstr "保留(_K)"
+
+#: src/camera/ImportPage.vala:1757
+msgid "Removing photos/videos from camera"
+msgstr "正在从相机移除照片/视频"
+
+#: src/camera/ImportPage.vala:1761
+#, c-format
+msgid "Unable to delete %d photo/video from the camera due to errors."
+msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
+msgstr[0] "由于错误无法从相机中删除 %d 个照片/视频。"
+
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
+#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#, fuzzy
+#| msgid "_Print..."
+msgid "_Print"
+msgstr "打印(_P)..."
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+#, fuzzy
+#| msgid "Send To"
+msgid "Send _To…"
+msgstr "发送至"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
+#: src/PhotoPage.vala:2461 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "设置为桌面背景(_D)"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "副本(_D)"
+
+#: src/CollectionPage.vala:94
+#, fuzzy
+#| msgid "Fulls_creen"
+msgid "Fullscreen"
+msgstr "全屏(_C)"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "幻灯片演示(_L)"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2628
-msgid "Play a slideshow"
-msgstr "开始幻灯片播放"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "向右旋转(_R)"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "向左旋转(_L)"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "水平翻转(_Z)"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "竖直翻转(_C)"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "增强(_E)"
+
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "恢复到原始(_V)"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "复制颜色调整(_C)"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "粘贴颜色调整(_P)"
+
+#: src/CollectionPage.vala:129
+#, fuzzy
+#| msgid "Adjust Date and Time"
+msgid "Adjust Date and Time…"
+msgstr "修改日期和时间"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "用外部编辑器打开(_X)"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "用 RA_W 编辑器打开"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "播放(_P)"
+
+#: src/CollectionPage.vala:402
 msgid "Export Photo/Video"
 msgstr "导出照片/视频"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:402
 msgid "Export Photos/Videos"
 msgstr "导出照片/视频"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3200
+#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
 msgid "Export Photo"
 msgstr "导出照片"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:404 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "导出照片"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Rotating"
 msgstr "正在旋转"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
 msgid "Undoing Rotate"
 msgstr "正在取消旋转"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:516
 msgid "Flipping Horizontally"
 msgstr "正在水平翻转"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:517
 msgid "Undoing Flip Horizontally"
 msgstr "正在取消水平翻转"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:526
 msgid "Flipping Vertically"
 msgstr "正在垂直翻转"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:527
 msgid "Undoing Flip Vertically"
 msgstr "正在取消垂直翻转"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "正在还原"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "正在取消还原"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "正在增强"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "正在取消增强"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "应用颜色变换"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "撤销颜色变换"
 
-#: ../src/Commands.vala:995
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "正在创建新的事件"
 
-#: ../src/Commands.vala:996
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "正在移除事件"
 
-#: ../src/Commands.vala:1005
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "正在移动照片到新事件"
 
-#: ../src/Commands.vala:1006
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "正在设置照片至先前的事件"
 
-#: ../src/Commands.vala:1063
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "正在合并"
 
-#: ../src/Commands.vala:1064
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "正在取消合并"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "正在创建照片副本"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "正在移除照片副本"
 
-#: ../src/Commands.vala:1096
+#: src/Commands.vala:1108
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "由于文件错误无法创建 %d 照片副本"
 
-#: ../src/Commands.vala:1183
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "恢复先前评分"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "提高评分"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "降低评分"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "设置 RAW 开发者"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "恢复原先的 RAW 开发者"
 
-#: ../src/Commands.vala:1245
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "设置开发人员"
 
-#: ../src/Commands.vala:1335
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "无法修改原始照片。"
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "正在调整日期和时间"
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "正在取消日期和时间调整"
 
-#: ../src/Commands.vala:1387
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "无法修改下列原始照片。"
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "时间调整出错"
 
-#: ../src/Commands.vala:1411
+#: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
 msgstr[0] "时间修改无法在以下照片上取消。"
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "创建标签"
 
-#: ../src/Commands.vala:1683
-#, c-format
-msgid "Move Tag \"%s\""
+#: src/Commands.vala:1695
+#, fuzzy, c-format
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "移动标签 %s"
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "移动照片至回收站"
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "从回收站还原照片"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "将照片移至 Shotwell 回收站"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "恢复这些照片到 Shotwell 媒体库"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "正在将照片移动到回收站"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "正在从回收站还原照片"
 
-#: ../src/Commands.vala:2441
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "标注选定照片"
 
-#: ../src/Commands.vala:2442
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "取消标注选定照片"
 
-#: ../src/Commands.vala:2443
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
 msgstr "正在标注选定照片"
 
-#: ../src/Commands.vala:2444
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
 msgstr "正在取消标注选定照片"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "标注"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "取消标注"
 
-#: ../src/DesktopIntegration.vala:118
+#. Send an empty job to the queue to mark the end of the import
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s 数据库"
+
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
+#, fuzzy, c-format
+#| msgid "Importing from %s can't continue because an error occurred:"
+msgid "Importing from %s can’t continue because an error occurred:"
+msgstr "发生错误，无法继续导入 %s："
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr "要尝试从其他服务导入，请从上面的菜单中选择一个。"
+
+#: src/data_imports/DataImportsUI.vala:10
+msgid ""
+"You do not have any data imports plugins enabled.\n"
+"\n"
+"In order to use the Import From Application functionality, you need to have "
+"at least one data imports plugin enabled. Plugins can be enabled in the "
+"Preferences dialog."
+msgstr ""
+"您没有启用任何数据导入插件。\n"
+"\n"
+"要使用从应用程序导入数据的功能，您需要至少启用一个数据导入插件。您可在首选想"
+"对话框中启用插件。"
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "数据库文件："
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
+msgid "_Import"
+msgstr "导入(_I)"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "从应用程序导入"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "从以下位置导入媒体(_F)："
+
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "数据导入"
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "无法打开/创建照片数据库 %s：错误代码 %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"无法写入照片数据库文件：\n"
+"%s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"访问数据库文件错误：\n"
+"%s\n"
+"\n"
+"错误是：\n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to write to photo database file:\n"
+#| " %s"
+msgid "Unable to restore photo database %s"
+msgstr ""
+"无法写入照片数据库文件：\n"
+"%s"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "无法启动 Nautilus 文件管理器的发送至：%s"
 
-#: ../src/DesktopIntegration.vala:126
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "发送至"
 
-#: ../src/DesktopIntegration.vala:171
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "不能输出为背景到 %s：%s"
 
-#: ../src/DesktopIntegration.vala:299
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "无法准备桌面幻灯片：%s"
 
-#: ../src/Dialogs.vala:16
-#, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#: src/Dialogs.vala:16
+#, fuzzy, c-format
+#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "这将移除标签 \"%s\" 从 %d 张照片中。继续么？"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1329
-#: ../src/Resources.vala:330 ../src/Resources.vala:378
-#: ../src/Resources.vala:643
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/Dialogs.vala:25
-#, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#: src/Dialogs.vala:25
+#, fuzzy, c-format
+#| msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr "这将移除已保存搜索 %s。是否继续？"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1280,11 +3228,11 @@ msgid_plural ""
 "Shotwell"
 msgstr[0] "切换开发者将撤销您对于此照片所作的全部更改"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "切换开发者(_S)"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "导出视频"
 
@@ -1293,14 +3241,17 @@ msgstr "导出视频"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:115
-#, c-format
+#: src/Dialogs.vala:112
+#, fuzzy, c-format
+#| msgid ""
+#| "Shotwell couldn't create a file for editing this photo because you do not "
+#| "have permission to write to %s."
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr "Shotwell 无法为编辑此照片创建必需的文件，因为您没有写入 %s 的权限。"
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1308,7 +3259,7 @@ msgstr ""
 "由于文件错误无法导出以下照片。\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1321,59 +3272,63 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:147
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "未修改的"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "当前"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "格式(_F)："
 
-#: ../src/Dialogs.vala:215
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "质量(_Q)："
 
-#: ../src/Dialogs.vala:218
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "缩放限制(_S)："
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " 像素(_P)"
+#: src/Dialogs.vala:230
+msgid "_Pixels:"
+msgstr " 像素(_P)："
 
-#: ../src/Dialogs.vala:229
-msgid "Export metadata"
+#: src/Dialogs.vala:234
+#, fuzzy
+#| msgid "Export metadata"
+msgid "Export _metadata:"
 msgstr "导出元数据"
 
-#: ../src/Dialogs.vala:465
-msgid "Save Details..."
+#: src/Dialogs.vala:478
+#, fuzzy
+#| msgid "Save Details"
+msgid "Save Details…"
 msgstr "保存详细信息..."
 
-#: ../src/Dialogs.vala:466
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "保存详细信息..."
 
-#: ../src/Dialogs.vala:481
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(和另外 %d 个)\n"
 
-#: ../src/Dialogs.vala:534
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "导入结果报告"
 
-#: ../src/Dialogs.vala:538
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "尝试导入 %d 个文件。"
 
-#: ../src/Dialogs.vala:541
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1382,116 +3337,130 @@ msgstr[0] "其中，%d 个文件被成功导入。"
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "以下重复的照片/视频没有被导入:"
 
-#: ../src/Dialogs.vala:557
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "创建现有媒体文件的副本"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "照片/视频因为相机错误而未被导入:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "错误信息:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+#, fuzzy
+#| msgid ""
+#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "以下文件因为它们不被识别为照片或视频而未被导入:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: src/Dialogs.vala:610
+#, fuzzy
+#| msgid ""
+#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+#| "Understands:"
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr "以下照片/视频因为它们不是 Shotwell 识别的格式而未被导入:"
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: src/Dialogs.vala:625
+#, fuzzy
+#| msgid ""
+#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+#| "Library:"
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr "以下照片/视频因为 Shotwell 无法拷贝它们而未被导入:"
 
-#: ../src/Dialogs.vala:616
-#, c-format
+#: src/Dialogs.vala:629
+#, fuzzy, c-format
+#| msgid ""
+#| "couldn't copy %s\n"
+#| "\tto %s"
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr "无法将 %s⏎ »拷贝到 %s"
 
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "以下照片/视频因为文件损坏而未被导入:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "因为其他原因而未被导入的照片/视频:"
 
-#: ../src/Dialogs.vala:663
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d 个重复的照片没有导入：\n"
 
-#: ../src/Dialogs.vala:666
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d 个重复的视频没有导入：\n"
 
-#: ../src/Dialogs.vala:669
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d 个重复的照片/视频没有导入：\n"
 
-#: ../src/Dialogs.vala:683
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d 个照片由于文件或硬件错误导入失败：\n"
 
-#: ../src/Dialogs.vala:686
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d 个视频由于文件或硬件错误导入失败：\n"
 
-#: ../src/Dialogs.vala:689
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
 "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d 个照片/视频由于文件或硬件错误导入失败：\n"
 
-#: ../src/Dialogs.vala:692
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "%d 文件导入失败由于文件或硬件错误：\n"
 
-#: ../src/Dialogs.vala:706
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1500,7 +3469,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d 个照片由于无法写入媒体库导入失败：\n"
 
-#: ../src/Dialogs.vala:709
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1509,7 +3478,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d 个视频由于无法写入媒体库导入失败：\n"
 
-#: ../src/Dialogs.vala:712
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1519,7 +3488,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d 个照片/视频由于无法写入媒体库导入失败：\n"
 
-#: ../src/Dialogs.vala:715
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1528,49 +3497,49 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d 文件导入失败因为照片库文件夹不可写入：\n"
 
-#: ../src/Dialogs.vala:729
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "%d 个照片由于相机错误导入失败：\n"
 
-#: ../src/Dialogs.vala:732
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "%d 个视频由于相机错误导入失败：\n"
 
-#: ../src/Dialogs.vala:735
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "%d 个照片/视频由于相机错误导入失败：\n"
 
-#: ../src/Dialogs.vala:738
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "%d 文件导入失败由于相机错误：\n"
 
-#: ../src/Dialogs.vala:752
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d 个照片由于文件损坏导入失败：\n"
 
-#: ../src/Dialogs.vala:755
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 个视频由于文件损坏导入失败：\n"
 
-#: ../src/Dialogs.vala:758
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 个照片/视频由于文件损坏导入失败：\n"
 
-#: ../src/Dialogs.vala:761
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1580,7 +3549,7 @@ msgstr[0] "%d 文件由于损坏导入失败：\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:778
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1588,49 +3557,49 @@ msgstr[0] "跳过 %d 个不支持的照片：\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:793
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "跳过 %d 个非照片文件。\n"
 
-#: ../src/Dialogs.vala:804
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "由于用户取消跳过 %d 个照片：\n"
 
-#: ../src/Dialogs.vala:807
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "由于用户取消跳过 %d 个视频：\n"
 
-#: ../src/Dialogs.vala:810
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "由于用户取消跳过 %d 个照片/视频：\n"
 
-#: ../src/Dialogs.vala:813
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d 文件被跳过由于用户取消：\n"
 
-#: ../src/Dialogs.vala:827
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d 个照片成功导入。\n"
 
-#: ../src/Dialogs.vala:830
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "%d 个视频成功导入。\n"
 
-#: ../src/Dialogs.vala:833
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1638,172 +3607,175 @@ msgstr[0] "%d 个照片/视频成功导入。\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:849
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "没有导入照片或视频。\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "导入完成"
 
-#: ../src/Dialogs.vala:1103
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../src/Dialogs.vala:1106
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
-#: ../src/Dialogs.vala:1110
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../src/Dialogs.vala:1113
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 天"
 
-#: ../src/Dialogs.vala:1263 ../src/Resources.vala:205
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "重命名事件"
 
-#: ../src/Dialogs.vala:1263
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "名称："
 
-#: ../src/Dialogs.vala:1273 ../src/Resources.vala:274
+#. Dialog title
+#: src/Dialogs.vala:1328
+#, fuzzy
+#| msgid "Edit Title"
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "编辑标题"
 
-#: ../src/Dialogs.vala:1273 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "标题："
 
-#: ../src/Dialogs.vala:1287 ../src/Resources.vala:280
+#. Dialog title
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "修改事件备注"
 
-#: ../src/Dialogs.vala:1287
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "修改照片/视频备注"
 
-#: ../src/Dialogs.vala:1288 ../src/Properties.vala:630
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "备注:"
 
-#: ../src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
+#: src/Dialogs.vala:1363
+#, fuzzy
+#| msgid "_Trash File"
+#| msgid_plural "_Trash Files"
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
 msgstr[0] "移至垃圾箱(_T)"
 
-#: ../src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "只移除(_R)"
-
-#: ../src/Dialogs.vala:1328 ../src/camera/ImportPage.vala:1739
-msgid "_Keep"
-msgstr "保留(_K)"
+#: src/Dialogs.vala:1367
+#, fuzzy
+#| msgid "Remove From Library"
+msgid "_Remove From Library"
+msgstr "从媒体库移除"
 
-#: ../src/Dialogs.vala:1351
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "恢复额外修改?"
 
-#: ../src/Dialogs.vala:1351
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "恢复额外修改?"
 
-#: ../src/Dialogs.vala:1353
-#, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+#: src/Dialogs.vala:1412
+#, fuzzy, c-format
+#| msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid_plural ""
+#| "This will destroy all changes made to %d external files.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] "这将毁掉对于 %d 个外部文件所做的全部修改。继续？"
 
-#: ../src/Dialogs.vala:1357
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "恢复额外修改(_V)"
 
-#: ../src/Dialogs.vala:1357
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "恢复额外修改(_V)"
 
-#: ../src/Dialogs.vala:1378
+#: src/Dialogs.vala:1437
 #, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
-msgstr[0] "这将从媒体库中移除 %d 张照片中。继续么？"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
+msgstr[0] "这将从媒体库中移除 %d 张照片。继续么？"
 
-#: ../src/Dialogs.vala:1385
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/Dialogs.vala:1386
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "从照片库移除照片"
 
-#: ../src/Dialogs.vala:1386
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "从照片库移除照片"
 
-#: ../src/Dialogs.vala:1479
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1626
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "上午"
 
-#: ../src/Dialogs.vala:1627
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "下午"
 
-#: ../src/Dialogs.vala:1628
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 小时"
 
-#: ../src/Dialogs.vala:1643
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "按照同样大小调整照片/视频(_S)"
 
-#: ../src/Dialogs.vala:1648
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "设置所有照片/视频到这个时间(_A)"
 
-#: ../src/Dialogs.vala:1655
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "修改原始照片文件(_M)"
-
-#: ../src/Dialogs.vala:1655
-msgid "_Modify original photo files"
-msgstr "修改原始照片文件(_M)"
+msgid_plural "_Modify original photo files"
+msgstr[0] "修改原始照片文件(_M)"
 
-#: ../src/Dialogs.vala:1658
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "修改原始文件(_M)"
+msgid_plural "_Modify original files"
+msgstr[0] "修改原始文件(_M)"
 
-#: ../src/Dialogs.vala:1658
-msgid "_Modify original files"
-msgstr "修改原始文件(_M)"
-
-#: ../src/Dialogs.vala:1744
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "原始："
 
-#: ../src/Dialogs.vala:1745
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y/%m/%d %H:%M:%S"
 
-#: ../src/Dialogs.vala:1746
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y/%m/%d %p%I:%M:%S"
 
-#: ../src/Dialogs.vala:1835
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1812,7 +3784,7 @@ msgstr ""
 "曝光时间将会向较早时改变 \n"
 "%d %s、%d %s、%d %s 和 %d %s。"
 
-#: ../src/Dialogs.vala:1836
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1821,27 +3793,27 @@ msgstr ""
 "曝光时间将会向较晚时改变 \n"
 "%d %s、%d %s、%d %s 和 %d %s。"
 
-#: ../src/Dialogs.vala:1838
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: ../src/Dialogs.vala:1839
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../src/Dialogs.vala:1840
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../src/Dialogs.vala:1841
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: ../src/Dialogs.vala:1885
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -1856,130 +3828,140 @@ msgstr[0] ""
 "\n"
 "和另外 %d 个。"
 
-#: ../src/Dialogs.vala:1907 ../src/Dialogs.vala:1934
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "标签(由逗号分割)："
 
-#: ../src/Dialogs.vala:2014
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "欢迎！"
 
-#: ../src/Dialogs.vala:2021
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "欢迎使用 Shotwell ！"
 
-#: ../src/Dialogs.vala:2025
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "要开始使用，请用以下任意一种方式导入照片："
 
-#: ../src/Dialogs.vala:2044
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "选择 <span weight=\"bold\">文件 %s 从文件夹导入</span>"
 
-#: ../src/Dialogs.vala:2045
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "拖放照片到 Shotwell 窗口中"
 
-#: ../src/Dialogs.vala:2046
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "链接相机到电脑上并导入"
 
-#: ../src/Dialogs.vala:2056
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "从您的 %s 文件夹导入照片(_I)"
 
-#: ../src/Dialogs.vala:2063
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "您可以使用以下任意方式导入照片："
 
-#: ../src/Dialogs.vala:2073
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "不再显示该消息(_D)"
 
-#: ../src/Dialogs.vala:2108
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "从您的 %s 照片库导入照片"
 
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2252 ../src/Dialogs.vala:2256
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(帮助)"
 
-#: ../src/Dialogs.vala:2265
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "年%s月%s日"
 
-#: ../src/Dialogs.vala:2267
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "年%s月"
 
-#: ../src/Dialogs.vala:2269
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "年%s月-日"
 
-#: ../src/Dialogs.vala:2271
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "年-月-日"
 
-#: ../src/Dialogs.vala:2272 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "自定义"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2509
+#: src/Dialogs.vala:2590
 msgid "Invalid pattern"
 msgstr "无效的样式"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2612
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr "Shotwell 可以复制照片到您的媒体库，或者可以导入但并不复制。"
 
-#: ../src/Dialogs.vala:2617
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "复制照片(_P)"
 
-#: ../src/Dialogs.vala:2618
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "保留原位置导入(_I)"
 
-#: ../src/Dialogs.vala:2619
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "导入到媒体库"
 
-#: ../src/Dialogs.vala:2629 ../src/PhotoPage.vala:3079
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
 msgid "Remove From Library"
 msgstr "从媒体库移除"
 
-#: ../src/Dialogs.vala:2630 ../src/PhotoPage.vala:3079
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
 msgid "Removing Photo From Library"
 msgstr "正在从媒体库移除照片"
 
-#: ../src/Dialogs.vala:2630
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "从照片库移除照片"
 
-#: ../src/Dialogs.vala:2644
-#, c-format
+#: src/Dialogs.vala:2724
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo/video from your Shotwell library.  Would you "
+#| "also like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos/videos from your Shotwell library.  Would you "
+#| "also like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -1988,15 +3970,25 @@ msgstr[0] ""
 "\n"
 "该操作将不可撤销。"
 
-#: ../src/Dialogs.vala:2648
-#, c-format
+#: src/Dialogs.vala:2728
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the video from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d videos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2005,15 +3997,25 @@ msgstr[0] ""
 "\n"
 "该操作将不可撤销。"
 
-#: ../src/Dialogs.vala:2652
-#, c-format
+#: src/Dialogs.vala:2732
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2022,193 +4024,624 @@ msgstr[0] ""
 "\n"
 "该操作将不可撤销。"
 
-#: ../src/Dialogs.vala:2684
-#, c-format
+#: src/Dialogs.vala:2764
+#, fuzzy, c-format
+#| msgid ""
+#| "The photo or video cannot be moved to your desktop trash.  Delete this "
+#| "file?"
+#| msgid_plural ""
+#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
+#| "files?"
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] "%d 个照片/视频无法移动到您的桌面回收站。删除这些文件？"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2701
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "%d 照片/视频无法被删除。"
 
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "宽度或者高度"
-
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "宽度"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "高度"
 
+#: src/direct/DirectPhotoPage.vala:92
+#, c-format
+msgid "%s does not exist."
+msgstr "%s 不存在。"
+
+#: src/direct/DirectPhotoPage.vala:94
+#, c-format
+msgid "%s is not a file."
+msgstr "%s 不是一个文件。"
+
+#: src/direct/DirectPhotoPage.vala:96
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr "%s 不支持 %s 类型的文件。"
+
+#: src/direct/DirectPhotoPage.vala:113
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to print photo:\n"
+#| "\n"
+#| "%s"
+msgid "Unable open photo %s. Sorry."
+msgstr ""
+"无法打印照片：\n"
+"\n"
+"%s"
+
+#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/direct/DirectPhotoPage.vala:297
+msgid "_Save a Copy"
+msgstr "保存副本(_S)"
+
+#: src/direct/DirectPhotoPage.vala:300
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "放弃对 %s 的更改？"
+
+#: src/direct/DirectPhotoPage.vala:301
+msgid "Close _without Saving"
+msgstr "关闭但不保存(_W)"
+
+#: src/direct/DirectPhotoPage.vala:334
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "保存 %s 时出错：%s"
+
+#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+msgid "Save As"
+msgstr "另存为"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "无法监视 %s：不是一个目录(%s)"
 
+#: src/editing_tools/EditingTools.vala:666
+msgid "Return to current photo dimensions"
+msgstr "回到当前照片尺寸"
+
+#: src/editing_tools/EditingTools.vala:669
+msgid "Set the crop for this photo"
+msgstr "对这张照片进行剪裁"
+
+#: src/editing_tools/EditingTools.vala:681
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr "在肖像和风景方向上旋转剪裁矩形"
+
+#: src/editing_tools/EditingTools.vala:754
+msgid "Unconstrained"
+msgstr "不限制"
+
+#: src/editing_tools/EditingTools.vala:755
+msgid "Square"
+msgstr "方形"
+
+#: src/editing_tools/EditingTools.vala:756
+msgid "Screen"
+msgstr "屏幕"
+
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:759
+msgid "SD Video (4 ∶ 3)"
+msgstr "标清视频 (4 ∶ 3)"
+
+#: src/editing_tools/EditingTools.vala:760
+msgid "HD Video (16 ∶ 9)"
+msgstr "高清视频 (16 ∶ 9)"
+
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+msgid "Wallet (2 × 3 in.)"
+msgstr "用于皮夹(2 × 3 英寸)"
+
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+msgid "Notecard (3 × 5 in.)"
+msgstr "留言卡(3 × 5 英寸)"
+
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+msgid "4 × 6 in."
+msgstr "4 × 6 英寸"
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+msgid "5 × 7 in."
+msgstr "5 × 7 英寸"
+
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+msgid "8 × 10 in."
+msgstr "8 × 10 英寸"
+
+#: src/editing_tools/EditingTools.vala:767
+msgid "Letter (8.5 × 11 in.)"
+msgstr "书信 (8.5 × 11 英寸)"
+
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+msgid "11 × 14 in."
+msgstr "11 × 14 英寸"
+
+#: src/editing_tools/EditingTools.vala:769
+msgid "Tabloid (11 × 17 in.)"
+msgstr "小型海报 (11 × 17 英寸)"
+
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+msgid "16 × 20 in."
+msgstr "16 × 20 英寸"
+
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "用于皮夹(9 × 13 厘米)"
+
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+msgid "Postcard (10 × 15 cm)"
+msgstr "明信片(10 × 15 厘米)"
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+msgid "13 × 18 cm"
+msgstr "13 × 18 厘米"
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+msgid "18 × 24 cm"
+msgstr "18 × 24 厘米"
+
+#: src/editing_tools/EditingTools.vala:776
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 毫米)"
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+msgid "20 × 30 cm"
+msgstr "20 × 30 厘米"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+msgid "24 × 40 cm"
+msgstr "24 × 40 厘米"
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+msgid "30 × 40 cm"
+msgstr "30 × 40 厘米"
+
+#: src/editing_tools/EditingTools.vala:780
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 毫米)"
+
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+msgid "Size:"
+msgstr "大小："
+
+#: src/editing_tools/EditingTools.vala:1895
+msgid "Close the red-eye tool"
+msgstr "关闭红眼工具"
+
+#: src/editing_tools/EditingTools.vala:1898
+msgid "Remove any red-eye effects in the selected region"
+msgstr "移除在选定区域内的所有红眼效果"
+
+#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "重置(_R)"
+
+#. fit both on the top line, emit and move on
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
+msgid "Exposure:"
+msgstr "曝光："
+
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:2270
+msgid "Saturation:"
+msgstr "饱和度："
+
+#: src/editing_tools/EditingTools.vala:2279
+msgid "Tint:"
+msgstr "色彩："
+
+#: src/editing_tools/EditingTools.vala:2289
+msgid "Temperature:"
+msgstr "色温："
+
+#: src/editing_tools/EditingTools.vala:2298
+msgid "Shadows:"
+msgstr "阴影："
+
+#: src/editing_tools/EditingTools.vala:2307
+msgid "Highlights:"
+msgstr "高亮:"
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset Colors"
+msgstr "重置颜色"
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset all color adjustments to original"
+msgstr "将所有颜色修正重置至原始值"
+
+#: src/editing_tools/EditingTools.vala:2722
+msgid "Temperature"
+msgstr "色温"
+
+#: src/editing_tools/EditingTools.vala:2734
+msgid "Tint"
+msgstr "色彩"
+
+#: src/editing_tools/EditingTools.vala:2746
+#, fuzzy
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "对比度扩展"
+
+#: src/editing_tools/EditingTools.vala:2760
+msgid "Saturation"
+msgstr "饱和度"
+
+#: src/editing_tools/EditingTools.vala:2773
+msgid "Exposure"
+msgstr "曝光"
+
+#: src/editing_tools/EditingTools.vala:2786
+msgid "Shadows"
+msgstr "阴影"
+
+#: src/editing_tools/EditingTools.vala:2799
+msgid "Highlights"
+msgstr "高亮"
+
+#: src/editing_tools/EditingTools.vala:2809
+msgid "Contrast Expansion"
+msgstr "对比度扩展"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "角度："
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
+msgid "_Straighten"
+msgstr "校正(_S)"
+
+#: src/events/Branch.vala:25
+msgid "Events"
+msgstr "事件"
+
+#: src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d 个照片/视频"
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d 个视频"
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d 个照片"
+
+#: src/events/EventPage.vala:121
+msgid "No Event"
+msgstr "没有事件"
+
+#: src/events/EventsDirectoryPage.vala:143
+msgid "No events"
+msgstr "没有事件"
+
+#: src/events/EventsDirectoryPage.vala:147
+msgid "No events found"
+msgstr "没有找到事件"
+
+#: src/events/EventsDirectoryPage.vala:220
+#, fuzzy
+#| msgid "Events"
+msgid "All Events"
+msgstr "事件"
+
+#: src/events/EventsDirectoryPage.vala:234
+msgid "Undated"
+msgstr "取消隐藏"
+
+#: src/events/EventsDirectoryPage.vala:235
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:236
+msgid "%B"
+msgstr "%m"
+
 #. if no name, pretty up the start time
-#: ../src/Event.vala:737
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "事件 %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "无法为 %s 生成临时文件：%s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "正在导出"
 
-#: ../src/Exporter.vala:317
-#, c-format
-msgid "File %s already exists.  Replace?"
+#: src/Exporter.vala:317
+#, fuzzy, c-format
+#| msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
 msgstr "文件 %s 已存在。是否替换？"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "跳过(_S)"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "导出"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.vala:144
+msgid "Folders"
+msgstr "文件夹"
+
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
+msgid "Library"
+msgstr "媒体库"
+
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
+msgid "Photos"
+msgstr "照片"
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
+msgid "Flagged"
+msgstr "已标注"
+
+#: src/library/ImportQueuePage.vala:8
+#, fuzzy
+#| msgid "Importing"
+msgid "Importing…"
+msgstr "导入中"
+
+#: src/library/ImportQueuePage.vala:122
+#, fuzzy
+#| msgid "Preparing to import"
+msgid "Preparing to import…"
+msgstr "正在准备导入"
+
+#: src/library/ImportQueuePage.vala:149
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "无法进行监控更新：%s"
+msgid "Imported %s"
+msgstr "已导入 %s"
 
-#: ../src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "改变缩略图大小"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "最近导入"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2583
-#: ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "放大(_I)"
+#: src/library/LibraryWindow.vala:505
+msgid "Import From Folder"
+msgstr "从文件夹导入"
 
-#: ../src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "放大缩略图"
+#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
+msgid "Empty Trash"
+msgstr "清空回收站"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2589
-#: ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "缩小(_O)"
+#: src/library/LibraryWindow.vala:574
+#, fuzzy
+#| msgid "Emptying Trash..."
+msgid "Emptying Trash…"
+msgstr "正在清空回收站..."
 
-#: ../src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "缩小缩略图"
+#: src/library/LibraryWindow.vala:770
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Shotwell 配置为将照片导入到您的主文件夹。\n"
+"我们推荐您在 <span weight=\"bold\">编辑 %s 首选项</span>中更改此设置。\n"
+"您想继续导入照片吗？"
 
-#: ../src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "照片排序(_P)"
+#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
+msgid "Library Location"
+msgstr "媒体库位置"
 
-#: ../src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "播放视频(_P)"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:786
+msgid "Photos cannot be imported from this directory."
+msgstr "无法从此文件夹导入照片。"
 
-#: ../src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "在系统视频播放器中打开选定视频"
+#: src/library/LibraryWindow.vala:1066
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2632
-msgid "_Developer"
-msgstr "开发人员(_D)"
+#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
+#, fuzzy
+#| msgid "Updating library..."
+msgid "Updating library…"
+msgstr "更新媒体库..."
 
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
-msgid "Shotwell"
-msgstr "Shotwell"
+#: src/library/LibraryWindow.vala:1127
+#, fuzzy
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
+msgstr "准备自动导入照片..."
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
-msgid "Camera"
-msgstr "相机"
+#: src/library/LibraryWindow.vala:1132
+#, fuzzy
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
+msgstr "自动导入照片..."
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
-msgid "_Titles"
-msgstr "标题(_T)"
+#: src/library/LibraryWindow.vala:1140
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
+msgstr "写入元数据到文件..."
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
-msgid "Display the title of each photo"
-msgstr "显示每张照片的标题"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "丢失文件"
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "备注(_C)"
+#: src/library/OfflinePage.vala:103
+#, fuzzy
+#| msgid "Deleting..."
+msgid "Deleting…"
+msgstr "删除..."
 
-#: ../src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "显示每张照片的备注"
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "回收站"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
-msgid "Ta_gs"
-msgstr "标签(_G)"
+#: src/library/TrashPage.vala:101
+msgid "Trash is empty"
+msgstr "回收站为空"
 
-#: ../src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "显示每张照片的标签"
+#: src/library/TrashPage.vala:105
+msgid "Delete"
+msgstr "刪除"
 
-#: ../src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "按照标题(_T)"
+#: src/library/TrashPage.vala:106
+msgid "Deleting Photos"
+msgstr "删除照片"
 
-#: ../src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "按照标题排序"
+#: src/main.vala:54
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please use the latest version of Shotwell."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
+msgstr ""
+"您的媒体库和当前版本的 Shotwell 不兼容。它似乎是由 Shotwell %s (schema %d)创"
+"建的，而当前版本是 %s (schema %d) 。请使用最新版本的 Shotwell。"
 
-#: ../src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "按照曝光日期(_D)"
+#: src/main.vala:59
+#, fuzzy, c-format
+#| msgid ""
+#| "Shotwell was unable to upgrade your photo library from version %s (schema "
+#| "%d) to %s (schema %d).  For more information please check the Shotwell "
+#| "Wiki at %s"
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
+"at %s"
+msgstr ""
+"Shotwell 无法将您的媒体库从 %s (schema %d)版本升级到 %s (schema %d)版本。更多"
+"的信息请查询 Shotwell 维基 %s"
 
-#: ../src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "按照曝光日期排序"
+#: src/main.vala:65
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please clear your library by deleting %s and re-import your "
+#| "photos."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
+"photos."
+msgstr ""
+"您的媒体库和当前版本的 Shotwell 不兼容。它似乎是由 Shotwell %s (schema %d)创"
+"建的。当前版本是 %s (schema %d)。请删除 %s 来释放您的照片库然后重新导入照片。"
 
-#: ../src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "按照评分(_R)"
+#: src/main.vala:71
+#, fuzzy, c-format
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr "验证 Shotwell 数据库时发生未知错误：%s"
 
-#: ../src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "按照评分排序"
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "正在载入 Shotwell"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
-msgid "_Ascending"
-msgstr "升序(_A)"
+#: src/main.vala:294
+#, fuzzy
+#| msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
+msgstr "Shotwell 程序数据目录"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
-msgid "Sort photos in an ascending order"
-msgstr "按照升序排列照片"
+#: src/main.vala:294
+msgid "DIRECTORY"
+msgstr "文件夹"
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
-msgid "D_escending"
-msgstr "降序(_D)"
+#: src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "请勿在程序运行时监视文件夹变化"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
-msgid "Sort photos in a descending order"
-msgstr "按照降序排列照片"
+#: src/main.vala:302
+#, fuzzy
+#| msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
+msgstr "不显示启动进程条"
+
+#: src/main.vala:306
+#, fuzzy
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
+msgstr "显示程序版本"
+
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:338
+msgid "[FILE]"
+msgstr "[文件]"
+
+#: src/main.vala:342
+#, fuzzy, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr "运行 '%s --help' 来查看可用命令行选项的完整列表。\n"
+
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "无法进行监控更新：%s"
+
+#: src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "改变缩略图大小"
 
-#: ../src/MediaPage.vala:702
+#: src/MediaPage.vala:493
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2217,204 +4650,129 @@ msgstr ""
 "Shotwell 无法播放选中视频：\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: src/Page.vala:1300
 msgid "No photos/videos"
 msgstr "没有照片/视频"
 
-#: ../src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "没有找到照片或视频"
+#: src/Page.vala:1304
+msgid "No photos/videos found which match the current filter"
+msgstr ""
 
-#: ../src/Page.vala:2569
+#: src/Page.vala:2610
 msgid "Photos cannot be exported to this directory."
 msgstr "照片不可以被导出到该文件夹。"
 
-#: ../src/Photo.vala:3656
-msgid "modified"
-msgstr "修改"
-
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "上一张照片"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "下一张照片"
 
-#: ../src/PhotoPage.vala:1844
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "照片源文件丢失：%s"
 
-#: ../src/PhotoPage.vala:2404 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../src/PhotoPage.vala:2408 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "工具(_O)"
-
-#: ../src/PhotoPage.vala:2413 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "前一张照片(_P)"
-
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "前一张照片"
-
-#: ../src/PhotoPage.vala:2419 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "下一张照片(_N)"
+#: src/PhotoPage.vala:2997
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "无法导出 %s：%s"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "下一张照片"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2584 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "放大缩略图"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2590 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "缩小缩略图"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "低(%d%%)"
 
-#: ../src/PhotoPage.vala:2595 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "适合页面(_P)"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "中(%d%%)"
 
-#: ../src/PhotoPage.vala:2596 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "缩放照片以适合屏幕"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "高(%d%%)"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "缩放 _100%"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "最大(%d%%)"
 
-#: ../src/PhotoPage.vala:2604 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "缩放照片至 100% 比例"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2610 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "缩放 _200%"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "缩放照片至 200% 比例"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3220
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "无法导出 %s：%s"
+#: src/Photo.vala:3753
+msgid "modified"
+msgstr "修改"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "填充整个页面"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "每页 2 张"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "每页 4 张"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "每页 6 张"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "每页 8 张"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "每页 16 张"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "每页 32 张"
 
-#: ../src/Printing.vala:348
+#: src/Printing.vala:348
 msgid "in."
 msgstr "英寸"
 
-#: ../src/Printing.vala:349
+#: src/Printing.vala:349
 msgid "cm"
 msgstr "厘米"
 
-#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
-msgid "Wallet (2 x 3 in.)"
-msgstr "用于皮夹(2 x 3 英寸)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "留言卡(3 x 5 英寸)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 英寸"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 英寸"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 英寸"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 英寸"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 英寸"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "用于皮夹(9 x 13 厘米)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "明信片(10 x 15 厘米)"
-
-#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
-msgid "13 x 18 cm"
-msgstr "13 x 18 厘米"
-
-#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
-msgid "18 x 24 cm"
-msgstr "18 x 24 厘米"
-
-#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
-msgid "20 x 30 cm"
-msgstr "20 x 30 厘米"
-
-#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
-msgid "24 x 40 cm"
-msgstr "24 x 40 厘米"
-
-#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
-msgid "30 x 40 cm"
-msgstr "30 x 40 厘米"
-
-#: ../src/Printing.vala:875
+#: src/Printing.vala:876
 msgid "Image Settings"
 msgstr "图像设置"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
+#: src/Printing.vala:889
+#, fuzzy
+#| msgid "Printing..."
+msgid "Printing…"
 msgstr "打印中..."
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2425,805 +4783,1017 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "今天"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "项目："
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d 个事件"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d 个照片"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d 个视频"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "日期："
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "时间："
 
 #. display time range
 #. display date range
-#: ../src/Properties.vala:384 ../src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
 msgid "From:"
 msgstr "从："
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "到："
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1861
-msgid "Size:"
-msgstr "大小："
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "持续时长："
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "开发者："
 
-#. fit both on the top line, emit and move on
-#: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2229
-msgid "Exposure:"
-msgstr "曝光："
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "地点："
 
-#: ../src/Properties.vala:588
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "文件大小："
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "当前开发:"
 
-#: ../src/Properties.vala:594
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "原始尺寸："
 
-#: ../src/Properties.vala:597
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "相机厂商："
 
-#: ../src/Properties.vala:600
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "相机型号："
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "闪光灯："
 
-#: ../src/Properties.vala:605
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "焦距："
 
-#: ../src/Properties.vala:608
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "曝光日期:"
 
-#: ../src/Properties.vala:611
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "曝光时间:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "曝光偏差："
 
-#: ../src/Properties.vala:616
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS 纬度："
 
-#: ../src/Properties.vala:619
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS 经度："
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "艺术家："
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "版权："
 
-#: ../src/Properties.vala:626
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "软件："
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "扩展信息"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "照片管理器"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "准备上传"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "照片查看器"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "正在上传 %d/%d"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "向右旋转(_R)"
+#: src/publishing/PublishingPluginHost.vala:81
+#, fuzzy, c-format
+#| msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr "无法继续发布到 %s 因为发生了一个错误："
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr "尝试发布到其他的服务，从上面的菜单中选择一个。"
+
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104
+#, fuzzy
+#| msgid "The selected video was successfully published."
+msgid "The selected video was successfully published."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "选中的视频已经成功发布。"
+
+#: src/publishing/PublishingUI.vala:109
+#, fuzzy
+#| msgid "The selected photo was successfully published."
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "选中的照片已经成功发布。"
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "选中的照片/视频已经成功发布。"
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#: src/publishing/PublishingUI.vala:127
+#, fuzzy
+#| msgid "Fetching account information..."
+msgid "Fetching account information…"
+msgstr "获取帐号信息..."
+
+#: src/publishing/PublishingUI.vala:133
+#, fuzzy
+#| msgid "Logging in..."
+msgid "Logging in…"
+msgstr "正在登录……"
+
+#: src/publishing/PublishingUI.vala:193
+msgid "Publish Photos"
+msgstr "发布照片"
+
+#: src/publishing/PublishingUI.vala:194
+msgid "Publish photos _to:"
+msgstr "发布照片到(_T)："
+
+#: src/publishing/PublishingUI.vala:196
+msgid "Publish Videos"
+msgstr "发布视频"
+
+#: src/publishing/PublishingUI.vala:197
+msgid "Publish videos _to"
+msgstr "发布视频到(_T)"
+
+#: src/publishing/PublishingUI.vala:199
+msgid "Publish Photos and Videos"
+msgstr "发布照片和视频"
+
+#: src/publishing/PublishingUI.vala:200
+msgid "Publish photos and videos _to"
+msgstr "发布照片和视频到(_T)"
+
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: src/publishing/PublishingUI.vala:410
+msgid "Unable to publish"
+msgstr "无法发布"
+
+#: src/publishing/PublishingUI.vala:411
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
+msgstr ""
+"Shotwell 无法发布选定项目，因为您尚未启用兼容的发布插件。要修复此问题，请选择"
+"<b>编辑 %s 首选项</b>，并且在<b>插件</b>标签页中启用一个或多个发布插件。"
+
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "发布"
+
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "旋转"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:141
 msgid "Rotate Right"
 msgstr "向右旋转"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "向右旋转照片(按住 Ctrl 向左旋转)"
 
-#: ../src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "向左旋转(_L)"
-
-#: ../src/Resources.vala:151
+#: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "向左旋转"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:147
 msgid "Rotate the photos left"
 msgstr "向左旋转照片"
 
-#: ../src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "水平翻转(_Z)"
-
-#: ../src/Resources.vala:155
+#: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "水平翻转"
 
-#: ../src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "竖直翻转(_C)"
-
-#: ../src/Resources.vala:158
+#: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "竖直翻转"
 
-#: ../src/Resources.vala:160
-msgid "_Enhance"
-msgstr "增强(_E)"
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
+msgid "_About"
+msgstr "关于(_A)"
+
+#: src/Resources.vala:156
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: src/Resources.vala:160
+#, fuzzy
+#| msgid "_Format:"
+msgid "_Forward"
+msgstr "格式(_F)："
+
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
+msgid "Fulls_creen"
+msgstr "全屏(_C)"
+
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: src/Resources.vala:163
+msgid "Leave _Fullscreen"
+msgstr "退出全屏(_F)"
+
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
+msgid "_New"
+msgstr "新建(_N)"
+
+#: src/Resources.vala:165
+#, fuzzy
+#| msgid "Next"
+msgid "_Next"
+msgstr "前进"
+
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
+#: src/Resources.vala:169
+#, fuzzy
+#| msgid "_Previous Photo"
+msgid "_Previous"
+msgstr "前一张照片(_P)"
+
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/Resources.vala:172
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
+#: src/Resources.vala:174
+#, fuzzy
+#| msgid "Reverting"
+msgid "_Revert"
+msgstr "正在还原"
+
+#: src/Resources.vala:176
+msgid "Save _As"
+msgstr "另存为(_A)"
+
+#: src/Resources.vala:177
+#, fuzzy
+#| msgid "_Ascending"
+msgid "Sort _Ascending"
+msgstr "升序(_A)"
+
+#: src/Resources.vala:178
+#, fuzzy
+#| msgid "D_escending"
+msgid "Sort _Descending"
+msgstr "降序(_D)"
+
+#: src/Resources.vala:179
+msgid "_Stop"
+msgstr "停止(_S)"
+
+#: src/Resources.vala:180
+msgid "_Undelete"
+msgstr "取消删除(_U)"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:181
+#, fuzzy
+#| msgid "Original Size"
+msgid "_Normal Size"
+msgstr "原始尺寸"
+
+#: src/Resources.vala:182
+msgid "Best _Fit"
+msgstr ""
+
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "放大(_I)"
+
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "缩小(_O)"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "增强"
 
-#: ../src/Resources.vala:162
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
+#, fuzzy
+#| msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
 msgstr "自动增强照片的观感"
 
-#: ../src/Resources.vala:164
-msgid "_Copy Color Adjustments"
-msgstr "复制颜色调整(_C)"
-
-#: ../src/Resources.vala:165
+#: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "复制颜色调整"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:192
 msgid "Copy the color adjustments applied to the photo"
 msgstr "复制应用于照片的颜色调整"
 
-#: ../src/Resources.vala:168
-msgid "_Paste Color Adjustments"
-msgstr "粘贴颜色调整(_P)"
-
-#: ../src/Resources.vala:169
+#: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "粘贴颜色调整"
 
-#: ../src/Resources.vala:170
+#: src/Resources.vala:196
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "将复制的颜色调整应用于选定的照片"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
-#: ../src/Resources.vala:173
+#: src/Resources.vala:199
 msgid "Crop"
 msgstr "剪裁"
 
-#: ../src/Resources.vala:174
-msgid "Crop the photo's size"
+#: src/Resources.vala:200
+#, fuzzy
+#| msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "剪裁照片尺寸"
 
-#: ../src/Resources.vala:176 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "校正(_S)"
-
-#: ../src/Resources.vala:177
+#: src/Resources.vala:203
 msgid "Straighten"
 msgstr "校正"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:204
 msgid "Straighten the photo"
 msgstr "校正照片"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "红眼(_R)"
 
-#: ../src/Resources.vala:181
+#: src/Resources.vala:207
 msgid "Red-eye"
 msgstr "红眼"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:208
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "降低或去除照片上的红眼效果"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "调整(_A)"
 
-#: ../src/Resources.vala:185
+#: src/Resources.vala:211
 msgid "Adjust"
 msgstr "调整"
 
-#: ../src/Resources.vala:186
-msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:212
+#, fuzzy
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "调整照片的色彩和色调"
 
-#: ../src/Resources.vala:188
-msgid "Re_vert to Original"
-msgstr "恢复到原始(_V)"
-
-#: ../src/Resources.vala:189
+#: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "恢复到原始"
 
-#: ../src/Resources.vala:191
+#: src/Resources.vala:217
 msgid "Revert External E_dits"
 msgstr "恢复额外修改(_D)"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:218
 msgid "Revert to the master photo"
 msgstr "恢复到主照片"
 
-#: ../src/Resources.vala:194
-msgid "Set as _Desktop Background"
-msgstr "设置为桌面背景(_D)"
-
-#: ../src/Resources.vala:195
+#: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "设置选定照片为新的桌面背景"
 
-#: ../src/Resources.vala:196
-msgid "Set as _Desktop Slideshow..."
-msgstr "设置为桌面幻灯片(_D)..."
+#: src/Resources.vala:222
+#, fuzzy
+#| msgid "Set as Desktop Slideshow"
+msgid "Set as _Desktop Slideshow…"
+msgstr "设置为桌面幻灯片"
 
-#: ../src/Resources.vala:198
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "取消(_U)"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:225
 msgid "Undo"
 msgstr "取消"
 
-#: ../src/Resources.vala:201
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: ../src/Resources.vala:202
+#: src/Resources.vala:228
 msgid "Redo"
 msgstr "重做"
 
-#: ../src/Resources.vala:204
-msgid "Re_name Event..."
-msgstr "重新命名事件(_N)..."
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
+#, fuzzy
+#| msgid "Rename Event"
+msgid "Re_name Event…"
+msgstr "重命名事件"
 
-#: ../src/Resources.vala:207
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "为事件创建关键照片(_K)"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:234
 msgid "Make Key Photo for Event"
 msgstr "创建事件关键照片"
 
-#: ../src/Resources.vala:210
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "新建事件(_N)"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:237
 msgid "New Event"
 msgstr "新建事件"
 
-#: ../src/Resources.vala:213
+#: src/Resources.vala:239
 msgid "Move Photos"
 msgstr "移动照片"
 
-#: ../src/Resources.vala:214
+#: src/Resources.vala:240
 msgid "Move photos to an event"
 msgstr "将照片移动到一个事件"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "合并事件(_M)"
 
-#: ../src/Resources.vala:217
+#: src/Resources.vala:243
 msgid "Merge"
 msgstr "合并"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:244
 msgid "Combine events into a single event"
 msgstr "将多个事件合并为一个"
 
-#: ../src/Resources.vala:220
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "设置评分(_S)"
 
-#: ../src/Resources.vala:221
+#: src/Resources.vala:247
 msgid "Set Rating"
 msgstr "设置评分"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:248
 msgid "Change the rating of your photo"
 msgstr "改变您照片的评分"
 
-#: ../src/Resources.vala:224
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "提高(_I)"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:251
 msgid "Increase Rating"
 msgstr "提高评分"
 
-#: ../src/Resources.vala:227
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "降低(_D)"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:254
 msgid "Decrease Rating"
 msgstr "降低评分"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "未评分(_U)"
 
-#: ../src/Resources.vala:231
+#: src/Resources.vala:257
 msgid "Unrated"
 msgstr "未评分"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:258
 msgid "Rate Unrated"
 msgstr "未评分"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:259
 msgid "Setting as unrated"
 msgstr "设置为未评分"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:260
 msgid "Remove any ratings"
 msgstr "移除任何评分"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "次品(_R)"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:263
 msgid "Rejected"
 msgstr "次品"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:264
 msgid "Rate Rejected"
 msgstr "评为次品"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:265
 msgid "Setting as rejected"
 msgstr "设置为次品"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:266
 msgid "Set rating to rejected"
 msgstr "设置评分为次品"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "仅次品(_R)"
 
-#: ../src/Resources.vala:243
+#: src/Resources.vala:269
 msgid "Rejected Only"
 msgstr "仅次品(_R)"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:270
 msgid "Show only rejected photos"
 msgstr "只显示次要的照片"
 
-#: ../src/Resources.vala:246
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "全部为次品(_R)"
 
-#: ../src/Resources.vala:247 ../src/Resources.vala:248
+#: src/Resources.vala:273
+#, fuzzy
+#| msgid "Show all photos, including rejected"
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "显示所有照片，包括次品"
 
-#: ../src/Resources.vala:250
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "所有照片(_A)"
 
-#: ../src/Resources.vala:251 ../src/Resources.vala:252
+#. Button tooltip
+#: src/Resources.vala:277
 msgid "Show all photos"
 msgstr "显示所有照片"
 
-#: ../src/Resources.vala:254
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "评分(_R)"
 
-#: ../src/Resources.vala:255
-msgid "Display each photo's rating"
+#: src/Resources.vala:280
+#, fuzzy
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "显示每张照片的评分"
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "过滤照片(_F)"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:283
 msgid "Filter Photos"
 msgstr "过滤照片"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:284
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "限制在过滤条件下显示的照片数量"
 
-#: ../src/Resources.vala:261
-msgid "_Duplicate"
-msgstr "副本(_D)"
-
-#: ../src/Resources.vala:262
+#: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "副本"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:288
 msgid "Make a duplicate of the photo"
 msgstr "创建照片副本"
 
-#: ../src/Resources.vala:265
-msgid "_Export..."
-msgstr "导出(_E)..."
+#: src/Resources.vala:290
+#, fuzzy
+#| msgid "Export"
+msgid "_Export…"
+msgstr "导出"
 
-#: ../src/Resources.vala:267
-msgid "_Print..."
+#: src/Resources.vala:292
+msgid "_Print…"
 msgstr "打印(_P)..."
 
-#: ../src/Resources.vala:269
-msgid "Pu_blish..."
-msgstr "发布(_B)..."
+#: src/Resources.vala:294
+#, fuzzy
+#| msgid "Publish"
+msgid "Pu_blish…"
+msgstr "发布"
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "将所选照片发布到各种网站上"
 
-#: ../src/Resources.vala:273
-msgid "Edit _Title..."
-msgstr "编辑标题(_T)..."
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+#, fuzzy
+#| msgid "Edit Title"
+msgid "Edit _Title…"
+msgstr "编辑标题"
+
+#. Button label
+#: src/Resources.vala:300
+#, fuzzy
+#| msgid "Edit Title"
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "编辑标题"
 
-#: ../src/Resources.vala:276
-msgid "Edit _Comment..."
-msgstr "编辑备注(_C)..."
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
+#, fuzzy
+#| msgid "Edit Comment"
+msgid "Edit _Comment…"
+msgstr "修改备注"
 
-#: ../src/Resources.vala:277
+#. Button label
+#: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "修改备注"
 
-#: ../src/Resources.vala:279
-msgid "Edit Event _Comment..."
-msgstr "修改事件备注(_C)"
+#: src/Resources.vala:306 ui/event.ui:588
+#, fuzzy
+#| msgid "Edit Event Comment"
+msgid "Edit Event _Comment…"
+msgstr "修改事件备注"
 
-#: ../src/Resources.vala:282
-msgid "_Adjust Date and Time..."
-msgstr "修改日期和时间(_A)..."
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+#, fuzzy
+#| msgid "Adjust Date and Time"
+msgid "_Adjust Date and Time…"
+msgstr "修改日期和时间"
 
-#: ../src/Resources.vala:283
+#: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "修改日期和时间"
 
-#: ../src/Resources.vala:285
-msgid "Add _Tags..."
-msgstr "添加标签(_T)..."
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
+#, fuzzy
+#| msgid "Add Tags"
+msgid "Add _Tags…"
+msgstr "添加标签"
 
-#: ../src/Resources.vala:286
-msgid "_Add Tags..."
-msgstr "添加标注(A)…"
+#: src/Resources.vala:313 ui/photo_context.ui:17
+#, fuzzy
+#| msgid "Add Tags"
+msgid "_Add Tags…"
+msgstr "添加标签"
 
-#: ../src/Resources.vala:287 ../src/Resources.vala:318
+#. Dialog title
+#: src/Resources.vala:315
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "添加标签"
 
-#: ../src/Resources.vala:289
-msgid "_Preferences"
-msgstr "首选项(_P)"
-
-#: ../src/Resources.vala:291
-msgid "Open With E_xternal Editor"
-msgstr "用外部编辑器打开(_X)"
-
-#: ../src/Resources.vala:293
-msgid "Open With RA_W Editor"
-msgstr "用 RA_W 编辑器打开"
-
-#: ../src/Resources.vala:295
-msgid "Send _To..."
-msgstr "发送至(_T)..."
-
-#: ../src/Resources.vala:296
-msgid "Send T_o..."
-msgstr "发送至(_O)…"
+#: src/Resources.vala:324 ui/photo_context.ui:133
+#, fuzzy
+#| msgid "Send To"
+msgid "Send T_o…"
+msgstr "发送至"
 
-#: ../src/Resources.vala:298
-msgid "_Find..."
-msgstr "查找(_F)..."
+#: src/Resources.vala:326
+#, fuzzy
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "查找(_F)"
 
-#: ../src/Resources.vala:299
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "查找"
 
-#: ../src/Resources.vala:300
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "依据名称或者标签查找图片"
 
-#: ../src/Resources.vala:302
+#: src/Resources.vala:330
 msgid "_Flag"
 msgstr "标注(_F)"
 
-#: ../src/Resources.vala:304
+#: src/Resources.vala:332
 msgid "Un_flag"
 msgstr "取消标注(_F)"
 
-#: ../src/Resources.vala:307
+#: src/Resources.vala:335
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "无法启动编辑器：%s"
 
-#: ../src/Resources.vala:312
-#, c-format
-msgid "Add Tag \"%s\""
+#: src/Resources.vala:340
+#, fuzzy, c-format
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "添加标签 %s"
 
-#: ../src/Resources.vala:314
-#, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+#. Used when adding two tags to photo(s)
+#: src/Resources.vala:343
+#, fuzzy, c-format
+#| msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "添加标签 %s 和 %s"
 
-#: ../src/Resources.vala:322
-#, c-format
-msgid "_Delete Tag \"%s\""
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:348
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "添加标签"
+
+#: src/Resources.vala:353
+#, fuzzy, c-format
+#| msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "删除标签 %s (_D)"
 
-#: ../src/Resources.vala:326
-#, c-format
-msgid "Delete Tag \"%s\""
+#: src/Resources.vala:357
+#, fuzzy, c-format
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "删除标签 %s"
 
-#: ../src/Resources.vala:329
+#: src/Resources.vala:360
 msgid "Delete Tag"
 msgstr "删除标签"
 
-#: ../src/Resources.vala:332
-msgid "_New"
-msgstr "新建(_N)"
-
-#: ../src/Resources.vala:335
-#, c-format
-msgid "Re_name Tag \"%s\"..."
+#: src/Resources.vala:366
+#, fuzzy, c-format
+#| msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
 msgstr "重命名标签 %s (_N)..."
 
-#: ../src/Resources.vala:339
-#, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+#: src/Resources.vala:370
+#, fuzzy, c-format
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "重命名标签 %s 为 %s"
 
-#: ../src/Resources.vala:342
-msgid "_Rename..."
+#: src/Resources.vala:373 ui/tags.ui:454
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Rename…"
 msgstr "重命名(_R)..."
 
-#: ../src/Resources.vala:344
-msgid "Modif_y Tags..."
-msgstr "修改标签(_Y)..."
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
+#, fuzzy
+#| msgid "Modify Tags"
+msgid "Modif_y Tags…"
+msgstr "修改标签"
 
-#: ../src/Resources.vala:345
+#: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "修改标签"
 
-#: ../src/Resources.vala:348
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "为照片添加标签 %s"
-
-#: ../src/Resources.vala:348
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "为照片添加标签 %s"
-
-#: ../src/Resources.vala:352
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "为选中的照片添加标签 %s"
-
-#: ../src/Resources.vala:353
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "为选中的照片添加标签 %s"
-
-#: ../src/Resources.vala:357
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "从照片移除标签 %s (_P)"
-
-#: ../src/Resources.vala:358
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "从照片移除标签 %s (_P)"
-
-#: ../src/Resources.vala:362
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "从照片移除标签 %s"
-
-#: ../src/Resources.vala:363
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "从照片移除标签 %s"
-
-#: ../src/Resources.vala:367
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#: src/Resources.vala:379
+#, fuzzy, c-format
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "为照片添加标签 %s"
+
+#: src/Resources.vala:385
+#, fuzzy, c-format
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "为选中的照片添加标签 %s"
+
+#: src/Resources.vala:391
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "从照片移除标签 %s (_P)"
+
+#: src/Resources.vala:397
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "从照片移除标签 %s"
+
+#: src/Resources.vala:403
+#, fuzzy, c-format
+#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "无法重命名标签为 %s，同名标签已存在。"
 
-#: ../src/Resources.vala:371
-#, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#: src/Resources.vala:407
+#, fuzzy, c-format
+#| msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "无法重命名搜索为 %s，同名搜索已存在。"
 
-#: ../src/Resources.vala:374
+#. Saved search button
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "保存搜索"
 
-#: ../src/Resources.vala:376
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "删除搜索"
 
-#: ../src/Resources.vala:379
-msgid "_Edit..."
-msgstr "编辑(_E)..."
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr "编辑(_E)…"
 
-#: ../src/Resources.vala:380
-msgid "Re_name..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+#, fuzzy
+#| msgid "Re_name..."
+msgid "Re_name…"
 msgstr "重命名(_N)..."
 
-#: ../src/Resources.vala:383
-#, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+#: src/Resources.vala:419
+#, fuzzy, c-format
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "重命名搜索 %s 为 %s"
 
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Delete Search \"%s\""
+#: src/Resources.vala:423
+#, fuzzy, c-format
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "删除搜索 %s"
 
-#: ../src/Resources.vala:545
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "评分 %s"
 
-#: ../src/Resources.vala:546
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "设置评分为 %s"
 
-#: ../src/Resources.vala:547
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "设置评分为 %s"
 
-#: ../src/Resources.vala:549
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "显示 %s"
 
-#: ../src/Resources.vala:550
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "只显示评分为 %s 的照片"
 
-#: ../src/Resources.vala:551
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s 或更高"
 
-#: ../src/Resources.vala:552
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "显示 %s 或更高"
 
-#: ../src/Resources.vala:553
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "只显示评分为 %s 或更高的照片"
 
-#: ../src/Resources.vala:644
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "从回收站中移除选中照片"
 
-#: ../src/Resources.vala:645
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "从媒体库移除选定照片"
 
-#: ../src/Resources.vala:647
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "还原(_R)"
 
-#: ../src/Resources.vala:648
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "将选定照片移回至媒体库"
 
-#: ../src/Resources.vala:650
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "在文件管理器显示(_G)"
 
-#: ../src/Resources.vala:651
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
+#, fuzzy
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "在文件管理器中打开选定照片目录"
 
-#: ../src/Resources.vala:654
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "无法在文件管理器中打开：%s"
 
-#: ../src/Resources.vala:657
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "从媒体库移除(_E)"
 
-#: ../src/Resources.vala:659
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "移至回收站(_M)"
 
-#: ../src/Resources.vala:661
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "选择全部(_A)"
 
-#: ../src/Resources.vala:662
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "选择全部项目"
 
@@ -3231,1359 +5801,1017 @@ msgstr "选择全部项目"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:743
-msgid "%-I:%M %p"
-msgstr "%-I:%M %p"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:748
-msgid "%-I:%M:%S %p"
-msgstr "%-I:%M:%S %p"
-
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:752
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:757 ../src/Resources.vala:767
+#: src/Resources.vala:744
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%m月%d日%A"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:762
+#: src/Resources.vala:749
+#, fuzzy
+#| msgid "%d, %Y"
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "幻灯片放映"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "已标注"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "照片"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:754
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%m月%d日%A"
 
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "视频"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:759
+#, fuzzy
+#| msgid "%a %b %d, %Y"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%Y年%m月%d日%A"
 
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW 照片"
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "幻灯片放映"
 
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW 照片"
+#: src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "已保存搜索"
 
-#: ../src/SearchFilter.vala:952
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "载入 UI 文件 %s 时出错：%s"
+#. Ordering must correspond with SearchConditionText.Context
+#: src/searches/SavedSearchDialog.vala:162
+msgid "contains"
+msgstr "包含"
 
-#. Type label and toggles
-#: ../src/SearchFilter.vala:969
-msgid "Type"
-msgstr "类型"
+#. Ordering must correspond with Context
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
+msgid "is exactly"
+msgstr "必须有"
 
-#. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "评分"
+#: src/searches/SavedSearchDialog.vala:164
+msgid "starts with"
+msgstr "以开始"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "设置"
+#: src/searches/SavedSearchDialog.vala:165
+msgid "ends with"
+msgstr "结束以"
 
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "后退"
+#: src/searches/SavedSearchDialog.vala:166
+msgid "does not contain"
+msgstr "不包含"
 
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "跳到上一张照片"
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
+msgid "is not set"
+msgstr "未设为"
 
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "暂停"
+#: src/searches/SavedSearchDialog.vala:168
+#, fuzzy
+#| msgid "is not set"
+msgid "is set"
+msgstr "未设为"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "暂停幻灯片演示"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
+msgid "is"
+msgstr "是"
 
-#: ../src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "前进"
+#: src/searches/SavedSearchDialog.vala:243
+msgid "is not"
+msgstr "不是"
 
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "跳到下一张照片"
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: src/searches/SavedSearchDialog.vala:249
+msgid "any photo"
+msgstr "任意照片"
 
-#: ../src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "改变幻灯片演示设置"
+#: src/searches/SavedSearchDialog.vala:250
+msgid "a raw photo"
+msgstr "一个 RAW 照片"
 
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "所有的照片源文件丢失。"
+#: src/searches/SavedSearchDialog.vala:251
+msgid "a video"
+msgstr "一个视频"
 
-#: ../src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "播放"
+#: src/searches/SavedSearchDialog.vala:305
+msgid "has"
+msgstr "有"
 
-#: ../src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "继续幻灯片演示"
+#: src/searches/SavedSearchDialog.vala:306
+msgid "has no"
+msgstr "没有"
 
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "未命名"
+#: src/searches/SavedSearchDialog.vala:311
+msgid "modifications"
+msgstr "修改"
 
-#. multiple videos
-#: ../src/VideoSupport.vala:492
-msgid "Export Videos"
-msgstr "导出视频"
+#: src/searches/SavedSearchDialog.vala:312
+msgid "internal modifications"
+msgstr "内部修改"
 
-#: ../src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "相机"
+#: src/searches/SavedSearchDialog.vala:313
+msgid "external modifications"
+msgstr "外部修改"
 
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr "不能卸载相机。请尝试从文件管理器中卸载相机。"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: src/searches/SavedSearchDialog.vala:367
+msgid "flagged"
+msgstr "已标注"
 
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "隐藏已经导入的照片"
+#: src/searches/SavedSearchDialog.vala:368
+msgid "not flagged"
+msgstr "未标注"
 
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "只显示尚未导入的照片"
+#: src/searches/SavedSearchDialog.vala:431
+msgid "and higher"
+msgstr "及更高"
 
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:845
-msgid "Starting import, please wait..."
-msgstr "正在开始导入，请稍候..."
+#: src/searches/SavedSearchDialog.vala:432
+msgid "only"
+msgstr "仅"
 
-#: ../src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "导入选中项目(_S)"
+#: src/searches/SavedSearchDialog.vala:433
+msgid "and lower"
+msgstr "及更低"
 
-#: ../src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "导入选定的照片到您的媒体库"
+#: src/searches/SavedSearchDialog.vala:495
+msgid "is after"
+msgstr "晚于"
 
-#: ../src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "导入全部(_A)"
+#: src/searches/SavedSearchDialog.vala:496
+msgid "is before"
+msgstr "先于"
 
-#: ../src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "导入所有照片到您的媒体库"
+#: src/searches/SavedSearchDialog.vala:497
+msgid "is between"
+msgstr "介于"
 
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr "Shotwell 需要从文件系统卸载相机来访问它。是否继续？"
+#: src/searches/SavedSearchDialog.vala:510
+msgid "and"
+msgstr "和"
 
-#: ../src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "卸载(_U)"
+#: src/searches/SavedSearchDialog.vala:691
+msgid "Search"
+msgstr "搜索"
 
-#: ../src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "请卸载相机。"
+#: src/searches/SavedSearchDialog.vala:696
+msgid "Cancel"
+msgstr "取消"
 
-#: ../src/camera/ImportPage.vala:1028
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
+#: src/searches/SavedSearchDialog.vala:697
+msgid "OK"
 msgstr ""
-"该相机被其他程序锁定，仅在解锁后 Shotwell 才能访问。请关闭其他使用该相机的程"
-"序后重试。"
 
-#: ../src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "请关闭其他使用该相机的程序。"
+#: src/searches/SavedSearchDialog.vala:716
+msgid "any"
+msgstr "任何"
 
-#: ../src/camera/ImportPage.vala:1043
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"无法从相机获取预览：\n"
-"%s"
+#: src/searches/SavedSearchDialog.vala:717
+msgid "all"
+msgstr "全部"
 
-#: ../src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "卸载..."
+#: src/searches/SavedSearchDialog.vala:718
+msgid "none"
+msgstr "无"
 
-#: ../src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "获取照片信息"
+#: src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "任意文字"
 
-#: ../src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "获取 %s 的预览"
+#: src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "标题"
 
-#: ../src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "无法锁定相机：%s"
+#: src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "标签"
 
-#: ../src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "从相机删除 %d 张照片？"
+#: src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "备注"
 
-#: ../src/camera/ImportPage.vala:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "从相机删除这 %d 个视频？"
+#: src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "事件名称"
 
-#: ../src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "从相机删除 %d 个照片/视频？"
+#: src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "文件名"
 
-#: ../src/camera/ImportPage.vala:1731
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "从相机删除 %d 个文件？"
+#: src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "媒体类型"
 
-#: ../src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "正在从相机移除照片/视频"
+#: src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "标注状态"
 
-#: ../src/camera/ImportPage.vala:1762
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "由于错误无法从相机中删除 %d 个照片/视频。"
+#: src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "照片状态"
 
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "数据导入"
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+msgid "Rating"
+msgstr "评分"
 
-#. Send an empty job to the queue to mark the end of the import
-#: ../src/data_imports/DataImportsPluginHost.vala:65
-#: ../src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "%s 数据库"
+#: src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "日期"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:148
-#: ../src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-msgid "Importing from %s can't continue because an error occurred:"
-msgstr "发生错误，无法继续导入 %s："
+#: src/SearchFilter.vala:815
+#, fuzzy
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "评分"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr "要尝试从其他服务导入，请从上面的菜单中选择一个。"
+#: src/SearchFilter.vala:818
+#, fuzzy
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "评分"
 
-#: ../src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
 msgstr ""
-"您没有启用任何数据导入插件。\n"
-"\n"
-"要使用从应用程序导入数据的功能，您需要至少启用一个数据导入插件。您可在首选想"
-"对话框中启用插件。"
-
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "数据库文件："
-
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "导入(_I)"
 
-#: ../src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "从应用程序导入"
-
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "从以下位置导入媒体(_F)："
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "无法打开/创建照片数据库 %s：错误代码 %d"
-
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
 msgstr ""
-"无法写入照片数据库文件：\n"
-"%s"
 
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
 msgstr ""
-"访问数据库文件错误：\n"
-"%s\n"
-"\n"
-"错误是：\n"
-"%s"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "保存(_S)"
-
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "保存照片"
-
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "另存为(_A)..."
-
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "以其他名字保存照片"
-
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "使用连接到此电脑的打印机打印照片"
-
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
-msgid "_Photo"
-msgstr "照片(_P)"
-
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s 不存在。"
-
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s 不是一个文件。"
-
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr "%s 不支持 %s 类型的文件。"
-
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save a Copy"
-msgstr "保存副本(_S)"
-
-#: ../src/direct/DirectPhotoPage.vala:420
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "放弃对 %s 的更改？"
-
-#: ../src/direct/DirectPhotoPage.vala:421
-msgid "Close _without Saving"
-msgstr "关闭但不保存(_W)"
-
-#: ../src/direct/DirectPhotoPage.vala:454
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "保存 %s 时出错：%s"
-
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
-msgid "Save As"
-msgstr "另存为"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "回到当前照片尺寸"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "对这张照片进行剪裁"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "在肖像和风景方向上旋转剪裁矩形"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "不限制"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "方形"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "屏幕"
-
-#: ../src/editing_tools/EditingTools.vala:757
-#: ../src/editing_tools/EditingTools.vala:760
-#: ../src/editing_tools/EditingTools.vala:770
-#: ../src/editing_tools/EditingTools.vala:780
-msgid "-"
-msgstr "-"
-
-#: ../src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
-msgstr "标清视频(4 : 3)"
-
-#: ../src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "高清视频(16 : 9)"
-
-#: ../src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "书信 (8.5 x 11 英寸)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "小型海报 (11 x 17 英寸)"
+#: src/SearchFilter.vala:1064
+#, fuzzy, c-format
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "载入 UI 文件 %s 时出错：%s"
 
-#: ../src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 毫米)"
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: src/SearchFilter.vala:1073
+msgid "Close"
+msgstr "关闭"
 
-#: ../src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 毫米)"
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+msgid "Type"
+msgstr "类型"
 
-#: ../src/editing_tools/EditingTools.vala:1876
-msgid "Close the red-eye tool"
-msgstr "关闭红眼工具"
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "视频"
 
-#: ../src/editing_tools/EditingTools.vala:1879
-msgid "Remove any red-eye effects in the selected region"
-msgstr "移除在选定区域内的所有红眼效果"
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW 照片"
 
-#: ../src/editing_tools/EditingTools.vala:2215
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "重置(_R)"
+#: src/SearchFilter.vala:1125
+msgid "Use a saved search to filter items in the current view"
+msgstr ""
 
-#: ../src/editing_tools/EditingTools.vala:2237
-msgid "Saturation:"
-msgstr "饱和度："
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "设置"
 
-#: ../src/editing_tools/EditingTools.vala:2245
-msgid "Tint:"
-msgstr "色彩："
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "后退"
 
-#: ../src/editing_tools/EditingTools.vala:2254
-msgid "Temperature:"
-msgstr "色温："
+#: src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "跳到上一张照片"
 
-#: ../src/editing_tools/EditingTools.vala:2262
-msgid "Shadows:"
-msgstr "阴影："
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "暂停"
 
-#: ../src/editing_tools/EditingTools.vala:2270
-msgid "Highlights:"
-msgstr "高亮:"
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "暂停幻灯片演示"
 
-#: ../src/editing_tools/EditingTools.vala:2324
-msgid "Reset Colors"
-msgstr "重置颜色"
+#: src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "前进"
 
-#: ../src/editing_tools/EditingTools.vala:2324
-msgid "Reset all color adjustments to original"
-msgstr "将所有颜色修正重置至原始值"
+#: src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "跳到下一张照片"
 
-#: ../src/editing_tools/EditingTools.vala:2676
-msgid "Temperature"
-msgstr "色温"
+#: src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "改变幻灯片演示设置"
 
-#: ../src/editing_tools/EditingTools.vala:2689
-msgid "Tint"
-msgstr "色彩"
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "所有的照片源文件丢失。"
 
-#: ../src/editing_tools/EditingTools.vala:2702
-msgid "Saturation"
-msgstr "饱和度"
+#: src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "播放"
 
-#: ../src/editing_tools/EditingTools.vala:2715
-msgid "Exposure"
-msgstr "曝光"
+#: src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "继续幻灯片演示"
 
-#: ../src/editing_tools/EditingTools.vala:2728
-msgid "Shadows"
-msgstr "阴影"
+#: src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "幻灯片过渡"
 
-#: ../src/editing_tools/EditingTools.vala:2741
-msgid "Highlights"
-msgstr "高亮"
+#: src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(无)"
 
-#: ../src/editing_tools/EditingTools.vala:2751
-msgid "Contrast Expansion"
-msgstr "对比度扩展"
+#: src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "无"
 
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "角度："
+#: src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "随机"
 
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d 个照片/视频"
+#: src/tags/Branch.vala:131
+msgid "Tags"
+msgstr "标签"
 
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "没有事件"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "未命名"
 
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "显示每个事件的备注"
+#. multiple videos
+#: src/VideoSupport.vala:507
+msgid "Export Videos"
+msgstr "导出视频"
 
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "没有事件"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr ""
 
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "没有找到事件"
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "开发人员(_D)"
 
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "事件"
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "用外部编辑器打开(_X)"
 
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "取消隐藏"
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "查看照片所属活动(_N)"
 
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "文件(_F)"
 
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%m"
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+msgid "Save _As…"
+msgstr "另存为(_A)…"
 
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "文件夹"
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "查看(_V)"
 
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
-msgid "Library"
-msgstr "媒体库"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "适合页面(_P)"
 
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "导入..."
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "缩放 _100%"
 
-#: ../src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "停止导入(_S)"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "缩放 _200%"
 
-#: ../src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "停止导入照片"
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "照片(_P)"
 
-#: ../src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "准备导入..."
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "前一张照片(_P)"
 
-#: ../src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "已导入 %s"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "下一张照片(_N)"
 
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "最近导入"
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "工具(_O)"
 
-#: ../src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "从文件夹导入(_I)..."
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "常见问题(_F)"
 
-#: ../src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "从磁盘导入照片到媒体库"
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "汇报问题(_R)…"
 
-#: ../src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "从应用程序导入(_A)..."
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+#, fuzzy
+#| msgid "Import From Folder"
+msgid "_Import from Folder…"
+msgstr "从文件夹导入"
 
-#: ../src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "排列事件(_E)"
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+#, fuzzy
+#| msgid "Import From Application"
+msgid "Import From _Application…"
+msgstr "从应用程序导入"
 
-#: ../src/library/LibraryWindow.vala:323
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
 msgid "Empty T_rash"
 msgstr "清空回收站(_R)"
 
-#: ../src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "删除在回收站中的全部照片"
-
-#: ../src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "查看照片所属活动(_N)"
-
-#: ../src/library/LibraryWindow.vala:334
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
 msgid "_Find"
 msgstr "查找(_F)"
 
-#: ../src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "按照规则查找照片和视频"
-
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+#, fuzzy
+#| msgid "Ne_w Saved Search..."
+msgid "Ne_w Saved Search…"
 msgstr "新建保存搜索(_W)..."
 
-#: ../src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "照片(_P)"
-
-#: ../src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "活动(_T)"
-
-#: ../src/library/LibraryWindow.vala:391
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
 msgid "_Basic Information"
 msgstr "基本信息(_B)"
 
-#: ../src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "显示所选项的基本信息"
-
-#: ../src/library/LibraryWindow.vala:397
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
 msgid "E_xtended Information"
 msgstr "扩展信息(_X)"
 
-#: ../src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "显示所选项的扩展信息"
-
-#: ../src/library/LibraryWindow.vala:403
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
 msgid "_Search Bar"
 msgstr "搜索栏(_S)"
 
-#: ../src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "显示搜索栏"
-
-#: ../src/library/LibraryWindow.vala:409
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
 msgid "S_idebar"
 msgstr "侧边栏(_S)"
 
-#: ../src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "显示侧边栏"
-
-#: ../src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "从文件夹导入"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "清空回收站"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "正在清空回收站..."
-
-#: ../src/library/LibraryWindow.vala:896
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell 配置为将照片导入到您的主文件夹。\n"
-"我们推荐您在 <span weight=\"bold\">编辑 %s 首选项</span>中更改此设置。\n"
-"您想继续导入照片吗？"
-
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
-msgid "Library Location"
-msgstr "媒体库位置"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "无法从此文件夹导入照片。"
-
-#: ../src/library/LibraryWindow.vala:1200
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "更新媒体库..."
-
-#: ../src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "准备自动导入照片..."
-
-#: ../src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "自动导入照片..."
-
-#: ../src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "写入元数据到文件..."
-
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "丢失文件"
-
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "删除..."
-
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "回收站"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "回收站为空"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "刪除"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "删除照片"
-
-#: ../src/main.vala:54
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
-msgstr ""
-"您的媒体库和当前版本的 Shotwell 不兼容。它似乎是由 Shotwell %s (schema %d)创"
-"建的，而当前版本是 %s (schema %d) 。请使用最新版本的 Shotwell。"
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+#, fuzzy
+#| msgid "Pin Toolbar"
+msgid "T_oolbar"
+msgstr "固定工具栏"
 
-#: ../src/main.vala:59
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
-msgstr ""
-"Shotwell 无法将您的媒体库从 %s (schema %d)版本升级到 %s (schema %d)版本。更多"
-"的信息请查询 Shotwell 维基 %s"
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "备注(_C)"
 
-#: ../src/main.vala:65
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"您的媒体库和当前版本的 Shotwell 不兼容。它似乎是由 Shotwell %s (schema %d)创"
-"建的。当前版本是 %s (schema %d)。请删除 %s 来释放您的照片库然后重新导入照片。"
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "排列事件(_E)"
 
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "验证 Shotwell 数据库时发生未知错误：%s"
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "升序(_A)"
 
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "正在载入 Shotwell"
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "降序(_D)"
 
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Shotwell 程序数据目录"
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "活动(_T)"
 
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "文件夹"
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+#, fuzzy
+#| msgid "R_emove From Library"
+msgid "R_emove from Library"
+msgstr "从媒体库移除(_E)"
 
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "请勿在程序运行时监视文件夹变化"
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "标题(_T)"
 
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "不显示启动进程条"
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "标签(_G)"
 
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "显示程序版本"
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "照片排序(_P)"
 
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[文件]"
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "按照标题(_T)"
 
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "运行 '%s --help' 来查看可用命令行选项的完整列表。\n"
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+#, fuzzy
+#| msgid "File name"
+msgid "By _Filename"
+msgstr "文件名"
 
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "按照曝光日期(_D)"
 
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "按照评分(_R)"
 
-#: ../src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "低(%d%%)"
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+#, fuzzy
+#| msgid "D_escending"
+msgid "_Descending"
+msgstr "降序(_D)"
 
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "中(%d%%)"
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "照片(_P)"
 
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "高(%d%%)"
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "停止导入(_S)"
 
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "最大(%d%%)"
+#: ui/set_background_dialog.ui:9
+#, fuzzy
+#| msgid "Set as _Desktop Background"
+msgid "Set as Desktop Background"
+msgstr "设置为桌面背景(_D)"
 
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+msgid "Use for Desktop"
+msgstr "用作桌面"
 
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+msgid "Use for Lock Screen"
+msgstr "用作锁屏背景"
 
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "设置为桌面幻灯片"
 
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "发布"
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "生成桌面背景幻灯片"
 
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "准备上传"
+#: ui/set_background_slideshow_dialog.ui:82
+msgid "Show each photo for"
+msgstr "显示每张照片为"
 
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "正在上传 %d/%d"
+#: ui/set_background_slideshow_dialog.ui:94
+msgid "period of time"
+msgstr "时间段"
 
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "无法继续发布到 %s 因为发生了一个错误："
+#: ui/set_background_slideshow_dialog.ui:116
+msgid "How long each photo is shown on the desktop background"
+msgstr "每张照片在桌面背景上出现多长时间"
 
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "尝试发布到其他的服务，从上面的菜单中选择一个。"
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "白"
 
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "选中的照片/视频已经成功发布。"
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "黑"
 
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "选中的视频已经成功发布。"
+#: ui/shotwell.ui:123
+msgid "Display"
+msgstr "显示"
 
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "选中照片已经成功发布。"
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "背景(_B)："
 
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "选中的视频已经成功发布。"
+#: ui/shotwell.ui:175
+msgid "_Import photos to:"
+msgstr "导入照片到(_I)："
 
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "选中的照片已经成功发布。"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "监视媒体库文件夹中的新文件(_W)"
 
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "获取帐号信息..."
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "导入中"
 
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "正在登录……"
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "目录结构(_D)："
 
-#: ../src/publishing/PublishingUI.vala:183
-msgid "Publish Photos"
-msgstr "发布照片"
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "例如："
 
-#: ../src/publishing/PublishingUI.vala:184
-msgid "Publish photos _to:"
-msgstr "发布照片到(_T)："
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "将导入文件以小写重命名(_E)"
 
-#: ../src/publishing/PublishingUI.vala:186
-msgid "Publish Videos"
-msgstr "发布视频"
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "元数据"
 
-#: ../src/publishing/PublishingUI.vala:187
-msgid "Publish videos _to"
-msgstr "发布视频到(_T)"
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "写入标签、标题和其他元数据到照片文件(_M)"
 
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish Photos and Videos"
-msgstr "发布照片和视频"
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "RAW 开发者："
 
-#: ../src/publishing/PublishingUI.vala:190
-msgid "Publish photos and videos _to"
-msgstr "发布照片和视频到(_T)"
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "默认(_F)："
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
-msgid "Unable to publish"
-msgstr "无法发布"
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "范例(_P)："
 
-#: ../src/publishing/PublishingUI.vala:384
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell 无法发布选定项目，因为您尚未启用兼容的发布插件。要修复此问题，请选择"
-"<b>编辑 %s 首选项</b>，并且在<b>插件</b>标签页中启用一个或多个发布插件。"
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "外部照片编辑器(_X)："
 
-#: ../src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "已保存搜索"
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "外部 RAW 编辑器(_R)："
 
-#. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
-msgid "contains"
-msgstr "包含"
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "外部编辑器"
 
-#. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
-msgid "is exactly"
-msgstr "必须有"
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "插件"
 
-#: ../src/searches/SavedSearchDialog.vala:171
-msgid "starts with"
-msgstr "以开始"
+#: ui/shotwell.ui:583
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>印刷尺寸</b>"
 
-#: ../src/searches/SavedSearchDialog.vala:172
-msgid "ends with"
-msgstr "结束以"
+#: ui/shotwell.ui:600
+msgid "Use a _standard size:"
+msgstr "使用标准尺寸(_S)："
 
-#: ../src/searches/SavedSearchDialog.vala:173
-msgid "does not contain"
-msgstr "不包含"
+#: ui/shotwell.ui:643
+msgid "Use a c_ustom size:"
+msgstr "使用自定义尺寸(_U)："
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
-msgid "is not set"
-msgstr "未设为"
+#: ui/shotwell.ui:731
+msgid "_Match photo aspect ratio"
+msgstr "匹配照片比例(_M)"
 
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
-msgid "is"
-msgstr "是"
+#: ui/shotwell.ui:755
+msgid "_Autosize:"
+msgstr "自动(_A)："
 
-#: ../src/searches/SavedSearchDialog.vala:246
-msgid "is not"
-msgstr "不是"
+#: ui/shotwell.ui:795
+msgid "<b>Titles</b>"
+msgstr "<b>标题</b>"
 
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
-msgid "any photo"
-msgstr "任意照片"
+#: ui/shotwell.ui:812
+msgid "Print image _title"
+msgstr "打印图像标题(_T)"
 
-#: ../src/searches/SavedSearchDialog.vala:253
-msgid "a raw photo"
-msgstr "一个 RAW 照片"
+#: ui/shotwell.ui:855
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>像素分辨率</b>"
 
-#: ../src/searches/SavedSearchDialog.vala:254
-msgid "a video"
-msgstr "一个视频"
+#: ui/shotwell.ui:875
+msgid "_Output photo at:"
+msgstr "输出照片为(_O)："
 
-#: ../src/searches/SavedSearchDialog.vala:308
-msgid "has"
-msgstr "有"
+#: ui/shotwell.ui:909
+msgid "pixels per inch"
+msgstr "每英寸像素数"
 
-#: ../src/searches/SavedSearchDialog.vala:309
-msgid "has no"
-msgstr "没有"
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "搜索名称(_N)："
 
-#: ../src/searches/SavedSearchDialog.vala:314
-msgid "modifications"
-msgstr "修改"
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "匹配(_M)"
 
-#: ../src/searches/SavedSearchDialog.vala:315
-msgid "internal modifications"
-msgstr "内部修改"
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "以下这些："
 
-#: ../src/searches/SavedSearchDialog.vala:316
-msgid "external modifications"
-msgstr "外部修改"
+#: ui/shotwell.ui:1111
+msgid "label"
+msgstr "标签"
 
-#. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
-msgid "flagged"
-msgstr "已标注"
+#: ui/shotwell.ui:1262
+msgid "_Delay:"
+msgstr "延时(_D)："
 
-#: ../src/searches/SavedSearchDialog.vala:371
-msgid "not flagged"
-msgstr "未标注"
+#: ui/shotwell.ui:1276
+msgid "_Transition effect:"
+msgstr "过渡效果(_T)："
 
-#: ../src/searches/SavedSearchDialog.vala:434
-msgid "and higher"
-msgstr "及更高"
+#: ui/shotwell.ui:1290
+msgid "Transition d_elay:"
+msgstr "过渡延时(_E)："
 
-#: ../src/searches/SavedSearchDialog.vala:435
-msgid "only"
-msgstr "仅"
+#: ui/shotwell.ui:1300
+msgid "Show t_itle"
+msgstr "显示标题(_I)"
 
-#: ../src/searches/SavedSearchDialog.vala:436
-msgid "and lower"
-msgstr "及更低"
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+msgid "seconds"
+msgstr "秒"
 
-#: ../src/searches/SavedSearchDialog.vala:498
-msgid "is after"
-msgstr "晚于"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+#, fuzzy
+#| msgid "New _Tag..."
+msgid "New _Tag…"
+msgstr "新建标签(_T)..."
 
-#: ../src/searches/SavedSearchDialog.vala:499
-msgid "is before"
-msgstr "先于"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "删除在回收站中的全部照片"
 
-#: ../src/searches/SavedSearchDialog.vala:500
-msgid "is between"
-msgstr "介于"
+#~ msgid "Login"
+#~ msgstr "登录"
 
-#: ../src/searches/SavedSearchDialog.vala:513
-msgid "and"
-msgstr "和"
+#~ msgid ""
+#~ "You are logged into Tumblr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "您正在以 (name) 身份登录 Tumblr.\n"
+#~ "\n"
+#~ "(该标签字符串在源码内产生并设定，\n"
+#~ "因此此处的更改将不会显示)"
 
-#: ../src/searches/SavedSearchDialog.vala:720
-msgid "any"
-msgstr "任何"
+#~ msgid ""
+#~ " (text depends on fb username and is modified in the app - \n"
+#~ "anything put into this field won't display)"
+#~ msgstr ""
+#~ "(文本依赖于 FB 用户名，已在程序中修改 -\n"
+#~ "在此输入此框内的一切均不会显示)"
 
-#: ../src/searches/SavedSearchDialog.vala:721
-msgid "all"
-msgstr "全部"
+#~ msgid ""
+#~ "You are logged into Flickr as (name).\n"
+#~ "\n"
+#~ "(this label's string is populated and set inside the code, \n"
+#~ "so changes made here will not display)"
+#~ msgstr ""
+#~ "您已登录到 Flickr 的 (name) 用户。\n"
+#~ "\n"
+#~ "(这个标签串设定于代码中\n"
+#~ "在此的改变不会被显示)"
 
-#: ../src/searches/SavedSearchDialog.vala:722
-msgid "none"
-msgstr "无"
+#~ msgid "_visibility label (populated in the code)"
+#~ msgstr "可见度标签 (代码中)(_V)"
 
-#: ../src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "任意文字"
+#~ msgid ""
+#~ "'you are logged in as $name'\n"
+#~ "(populated in the application code)"
+#~ msgstr ""
+#~ "'您已登录为 $name'\n"
+#~ "(程序代码中)"
 
-#: ../src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "标题"
+#~ msgid ""
+#~ "$mediatype will appear in\n"
+#~ "(populated in code)"
+#~ msgstr ""
+#~ "$mediatype 会被显示于\n"
+#~ "(代码中)"
 
-#: ../src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "标签"
+#~ msgid "Play a slideshow"
+#~ msgstr "开始幻灯片播放"
 
-#: ../src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "备注"
+#~ msgid "Save Details..."
+#~ msgstr "保存详细信息..."
 
-#: ../src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "事件名称"
+#~ msgid "Only _Remove"
+#~ msgstr "只移除(_R)"
 
-#: ../src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "文件名"
+#~ msgid "_Modify original files"
+#~ msgstr "修改原始文件(_M)"
 
-#: ../src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "媒体类型"
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "放大缩略图"
 
-#: ../src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "标注状态"
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "缩小缩略图"
 
-#: ../src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "照片状态"
+#~ msgid "_Play Video"
+#~ msgstr "播放视频(_P)"
 
-#: ../src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "日期"
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "在系统视频播放器中打开选定视频"
 
-#: ../src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "新建标签(_T)..."
+#~ msgid "Display the title of each photo"
+#~ msgstr "显示每张照片的标题"
 
-#: ../src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "幻灯片过渡"
+#~ msgid "Display the comment of each photo"
+#~ msgstr "显示每张照片的备注"
 
-#: ../src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(无)"
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "按照曝光日期排序"
 
-#: ../src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "无"
+#~ msgid "Sort photos by rating"
+#~ msgstr "按照评分排序"
 
-#: ../src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "随机"
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "按照降序排列照片"
 
-#: ../src/tags/Branch.vala:127
-msgid "Tags"
-msgstr "标签"
+#~ msgid "Previous Photo"
+#~ msgstr "前一张照片"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "设置为桌面幻灯片"
+#~ msgid "Next Photo"
+#~ msgstr "下一张照片"
 
-#: ../ui/set_background_dialog.glade.h:2
-msgid "Generate desktop background slideshow"
-msgstr "生成桌面背景幻灯片"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "放大缩略图"
 
-#: ../ui/set_background_dialog.glade.h:3
-msgid "Show each photo for"
-msgstr "显示每张照片为"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "缩小缩略图"
 
-#: ../ui/set_background_dialog.glade.h:4
-msgid "period of time"
-msgstr "时间段"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "缩放照片以适合屏幕"
 
-#: ../ui/set_background_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "每张照片在桌面背景上出现多长时间"
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "缩放照片至 100% 比例"
 
-#: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "搜索"
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "缩放照片至 200% 比例"
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Name of search:"
-msgstr "搜索名称(_N)："
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "设置为桌面幻灯片(_D)..."
 
-#: ../ui/shotwell.glade.h:3
-msgid "_Match"
-msgstr "匹配(_M)"
+#~ msgid "Re_name Event..."
+#~ msgstr "重新命名事件(_N)..."
 
-#: ../ui/shotwell.glade.h:4
-msgid "of the following:"
-msgstr "以下这些："
+#~ msgid "_Export..."
+#~ msgstr "导出(_E)..."
 
-#: ../ui/shotwell.glade.h:5
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>印刷尺寸</b>"
+#~ msgid "Pu_blish..."
+#~ msgstr "发布(_B)..."
 
-#: ../ui/shotwell.glade.h:6
-msgid "Use a _standard size:"
-msgstr "使用标准尺寸(_S)："
+#~ msgid "Edit _Title..."
+#~ msgstr "编辑标题(_T)..."
 
-#: ../ui/shotwell.glade.h:7
-msgid "Use a c_ustom size:"
-msgstr "使用自定义尺寸(_U)："
+#~ msgid "Edit _Comment..."
+#~ msgstr "编辑备注(_C)..."
 
-#: ../ui/shotwell.glade.h:8
-msgid "_Match photo aspect ratio"
-msgstr "匹配照片比例(_M)"
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "修改事件备注(_C)"
 
-#: ../ui/shotwell.glade.h:9
-msgid "_Autosize:"
-msgstr "自动(_A)："
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "修改日期和时间(_A)..."
 
-#: ../ui/shotwell.glade.h:10
-msgid "<b>Titles</b>"
-msgstr "<b>标题</b>"
+#~ msgid "Add _Tags..."
+#~ msgstr "添加标签(_T)..."
 
-#: ../ui/shotwell.glade.h:11
-msgid "Print image _title"
-msgstr "打印图像标题(_T)"
+#~ msgid "_Add Tags..."
+#~ msgstr "添加标注(A)…"
 
-#: ../ui/shotwell.glade.h:12
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>像素分辨率</b>"
+#~ msgid "Send _To..."
+#~ msgstr "发送至(_T)..."
 
-#: ../ui/shotwell.glade.h:13
-msgid "_Output photo at:"
-msgstr "输出照片为(_O)："
+#~ msgid "Send T_o..."
+#~ msgstr "发送至(_O)…"
 
-#: ../ui/shotwell.glade.h:14
-msgid "pixels per inch"
-msgstr "每英寸像素数"
+#~ msgid "_Find..."
+#~ msgstr "查找(_F)..."
 
-#: ../ui/shotwell.glade.h:16
-msgid "Shotwell Preferences"
-msgstr "Shotwell 首选项"
+#~ msgid "Modif_y Tags..."
+#~ msgstr "修改标签(_Y)..."
 
-#: ../ui/shotwell.glade.h:17
-msgid "white"
-msgstr "白"
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "为照片添加标签 %s"
 
-#: ../ui/shotwell.glade.h:18
-msgid "black"
-msgstr "黑"
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "为选中的照片添加标签 %s"
 
-#: ../ui/shotwell.glade.h:20
-msgid "_Watch library directory for new files"
-msgstr "监视媒体库文件夹中的新文件(_W)"
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "从照片移除标签 %s (_P)"
 
-#: ../ui/shotwell.glade.h:21
-msgid "Metadata"
-msgstr "元数据"
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "从照片移除标签 %s"
 
-#: ../ui/shotwell.glade.h:22
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "写入标签、标题和其他元数据到照片文件(_M)"
+#~ msgid "_Edit..."
+#~ msgstr "编辑(_E)..."
 
-#: ../ui/shotwell.glade.h:23
-msgid "Display"
-msgstr "显示"
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-I:%M %p"
 
-#: ../ui/shotwell.glade.h:24
-msgid "_Import photos to:"
-msgstr "导入照片到(_I)："
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-I:%M:%S %p"
 
-#: ../ui/shotwell.glade.h:25
-msgid "_Background:"
-msgstr "背景(_B)："
+#~ msgid "RAW photos"
+#~ msgstr "RAW 照片"
 
-#: ../ui/shotwell.glade.h:26
-msgid "Importing"
-msgstr "导入中"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "导入选定的照片到您的媒体库"
 
-#: ../ui/shotwell.glade.h:27
-msgid "_Directory structure:"
-msgstr "目录结构(_D)："
+#~ msgid "Import all the photos into your library"
+#~ msgstr "导入所有照片到您的媒体库"
 
-#: ../ui/shotwell.glade.h:28
-msgid "_Pattern:"
-msgstr "范例(_P)："
+#~ msgid "Save photo"
+#~ msgstr "保存照片"
 
-#: ../ui/shotwell.glade.h:29
-msgid "Example:"
-msgstr "例如："
+#~ msgid "Save _As..."
+#~ msgstr "另存为(_A)..."
 
-#: ../ui/shotwell.glade.h:30
-msgid "R_ename imported files to lowercase"
-msgstr "将导入文件以小写重命名(_E)"
+#~ msgid "Save photo with a different name"
+#~ msgstr "以其他名字保存照片"
 
-#: ../ui/shotwell.glade.h:31
-msgid "RAW Developer"
-msgstr "RAW 开发者："
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "使用连接到此电脑的打印机打印照片"
 
-#: ../ui/shotwell.glade.h:32
-msgid "De_fault:"
-msgstr "默认(_F)："
+#~ msgid "Display the comment of each event"
+#~ msgstr "显示每个事件的备注"
 
-#: ../ui/shotwell.glade.h:34
-msgid "E_xternal photo editor:"
-msgstr "外部照片编辑器(_X)："
+#~ msgid "Importing..."
+#~ msgstr "导入..."
 
-#: ../ui/shotwell.glade.h:35
-msgid "External _RAW editor:"
-msgstr "外部 RAW 编辑器(_R)："
+#~ msgid "Stop importing photos"
+#~ msgstr "停止导入照片"
 
-#: ../ui/shotwell.glade.h:36
-msgid "External Editors"
-msgstr "外部编辑器"
+#~ msgid "Preparing to import..."
+#~ msgstr "准备导入..."
 
-#: ../ui/shotwell.glade.h:37
-msgid "Plugins"
-msgstr "插件"
+#~ msgid "_Import From Folder..."
+#~ msgstr "从文件夹导入(_I)..."
 
-#: ../ui/shotwell.glade.h:38
-msgid "_Delay:"
-msgstr "延时(_D)："
+#~ msgid "Import photos from disk to library"
+#~ msgstr "从磁盘导入照片到媒体库"
 
-#: ../ui/shotwell.glade.h:39
-msgid "_Transition effect:"
-msgstr "过渡效果(_T)："
+#~ msgid "Import From _Application..."
+#~ msgstr "从应用程序导入(_A)..."
 
-#: ../ui/shotwell.glade.h:40
-msgid "Transition d_elay:"
-msgstr "过渡延时(_E)："
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "按照规则查找照片和视频"
 
-#: ../ui/shotwell.glade.h:41
-msgid "Show t_itle"
-msgstr "显示标题(_I)"
+#~ msgid "Display basic information for the selection"
+#~ msgstr "显示所选项的基本信息"
 
-#: ../ui/shotwell.glade.h:42
-msgid "seconds"
-msgstr "秒"
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "选中的视频已经成功发布。"
 
-#: ../ui/shotwell.glade.h:43
-msgid "_Login"
-msgstr "登录(_L)"
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "选中照片已经成功发布。"
 
 #~ msgid "Shotwell is configured to import photos to your home directory.\n"
 #~ msgstr "Shotwell 被配置为从您的主目录导入照片。\n"