Merge commit 'upstream/2.31.5.bzr424'

1 files changed, 85 insertions, 60 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd39392..9c7254a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-04-19 07:56+0000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-13 05:56+0000\n"
 "Last-Translator: Xhacker Liu <liu.dongyuan@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "传送来的所有页面(_F)"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "背面"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "裁剪选中的页面"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "正面"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "正面和背面"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "新建"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "页面大小："
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "保存"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "将文档保存为文件"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "扫描来源(_O)："
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "扫描页面："
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "保存文件的文件夹："
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "纸张的高度 (以 0.1mm 计)"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "所扫描图像的的高度 (以像素计)"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "扫描纸张的哪面"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -331,12 +331,12 @@ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
+msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -360,7 +360,7 @@ msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -375,7 +375,7 @@ msgstr "扫描文档的类型。“文本”适用于文本文档，“照片”
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "纸张的宽度 (以 0.1mm 计)"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -405,27 +405,22 @@ msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "扫描失败"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr "扫描的文档"
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "保存文件错误"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -435,7 +430,7 @@ msgstr ""
 "  %s [设备...] - 扫描工具"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -453,7 +448,7 @@ msgstr ""
 "  --help-gtk 显示 GTK+ 选项"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -475,68 +470,88 @@ msgstr ""
 "  --g-fatal-warnings  将所有警告置为致命"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "无法打开图像预览软件"
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "保存为..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "所有文件"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "保存文件错误"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "无法打开图像预览软件"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -562,16 +577,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -583,50 +598,60 @@ msgstr ""
 "  YunQiang Su https://launchpad.net/~wzssyqa\n"
 "  ZhangCheng https://launchpad.net/~xxzc"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "文件丢失"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "请检查您的安装"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.c:1352
-msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#: ../src/ui.c:1651
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1587
+msgid "Automatic"
+msgstr "自动"
+
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"