Merge commit 'upstream/2.31.5.bzr424'

1 files changed, 105 insertions, 78 deletions

diff --git a/po/ja.po b/po/ja.po
index 696a66f..1e6ed16 100644
--- a/po/ja.po
+++ b/po/ja.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-03-20 04:07+0000\n"
-"Last-Translator: Kentaro Kazuhama <kazken3@gmail.com>\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
+"PO-Revision-Date: 2010-06-17 01:01+0000\n"
+"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
 "Language-Team: Japanese <ja@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
@@ -268,7 +268,7 @@ msgstr "ドキュメントをスキャンします"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr ""
+msgstr "スキャンするデバイス"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
@@ -276,7 +276,7 @@ msgstr "スキャン方向"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
-msgstr ""
+msgstr "ファイルを保存するディレクトリ"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
@@ -288,27 +288,27 @@ 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"
-msgstr ""
+msgstr "写真スキャンの解像度"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "テキストスキャンの解像度"
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "最後にスキャンした画像の解像度"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "画像を取得する SANE デバイスです。"
 
 #: ../data/simple-scan.schemas.in.h:11
 msgid "TRUE if the application window is maximized"
-msgstr ""
+msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
@@ -319,36 +319,36 @@ msgstr ""
 #: ../data/simple-scan.schemas.in.h:13
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
+msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
 
 #: ../data/simple-scan.schemas.in.h:14
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
-msgstr ""
+msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr ""
+msgstr "10mm単位の紙の高さ (または 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 "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "前にスキャンした画像の解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "写真をスキャンするときの解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "テキストをスキャンするときの解像度(DPI)です。"
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid ""
@@ -364,7 +364,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
-msgstr ""
+msgstr "スキャンするドキュメントの種類"
 
 #: ../data/simple-scan.schemas.in.h:23
 msgid ""
@@ -375,24 +375,24 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "10mm単位での紙の幅"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
-msgstr ""
+msgstr "スキャン画像の幅(ピクセル)"
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
-msgstr ""
+msgstr "ウィンドウの高さ(ピクセル)"
 
 #: ../data/simple-scan.schemas.in.h:27
 msgid "Window width in pixels"
-msgstr ""
+msgstr "ウィンドウの幅(ピクセル)"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:916
@@ -405,35 +405,32 @@ 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"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
+"使い方:\n"
+"  %s [DEVICE...] - スキャンニング装置"
 
 #. 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"
@@ -445,7 +442,7 @@ msgid ""
 msgstr ""
 
 #. 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"
@@ -460,68 +457,88 @@ msgid ""
 msgstr ""
 
 #. 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 ""
+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 ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. 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 ""
 
+#. 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"
@@ -538,16 +555,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,50 +572,60 @@ msgstr ""
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
 "  Shushi Kurose https://launchpad.net/~kurokuro"
 
+#. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. 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 "インストールされているか確認してください"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "スキャナを変更(_S)"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr ""
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
-msgstr "スキャンされたドキュメントpdf"
+msgstr "スキャンされたドキュメント.pdf"