summaryrefslogtreecommitdiff
path: root/po/ja.po
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <gp@n-dimensional.de>2005-04-14 21:30:58 +0000
committerHans Ulrich Niedermann <gp@n-dimensional.de>2005-04-14 21:30:58 +0000
commit2a807adf5a70f4a1a7d341dac3692025610a9a65 (patch)
tree2f995b10f3f23ac771a49a53ef6c412cbb5b3a52 /po/ja.po
parentcda224bf0482cb0eca5e281d1c59fe8fd019abea (diff)
downloadlibgphoto2-2a807adf5a70f4a1a7d341dac3692025610a9a65.tar.gz
more new build system
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7835 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po1188
1 files changed, 679 insertions, 509 deletions
diff --git a/po/ja.po b/po/ja.po
index ab7c909ac..d5752711f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: libgphoto2 2.1.5head\n"
-"Report-Msgid-Bugs-To: <gphoto-translation@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2005-03-19 16:35+0100\n"
+"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2005-04-10 10:46+0200\n"
"PO-Revision-Date: 2004-12-21 00:59+0900\n"
"Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,6 +16,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: camlibs/adc65/adc65.c:83
+msgid ""
+"Adc65\n"
+"Benjamin Moos <benjamin@psnw.com>"
+msgstr ""
+
#: camlibs/agfa-cl20/agfa_cl20.c:555
msgid ""
"agfa_cl20\n"
@@ -82,26 +88,26 @@ msgstr ""
"WEB 上に実装済みの使用方法のドキュメント\n"
"があります。Vision の承諾済み。"
-#: camlibs/canon/canon.c:528
+#: camlibs/canon/canon.c:549
#, c-format
msgid "Could not create directory %s."
msgstr "ディレクトリ %s を生成できませんでした。"
-#: camlibs/canon/canon.c:531
+#: camlibs/canon/canon.c:552
#, c-format
msgid "Could not remove directory %s."
msgstr "ディレクトリ %s を削除できませんでした。"
-#: camlibs/canon/canon.c:883 camlibs/canon/canon.c:1152
-#: camlibs/canon/usb.c:370
+#: camlibs/canon/canon.c:916 camlibs/canon/canon.c:1207
+#: camlibs/canon/usb.c:481
msgid "lock keys failed."
msgstr "キーのロックに失敗しました。"
-#: camlibs/canon/canon.c:947 camlibs/canon/canon.c:948
+#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:981
msgid "*UNKNOWN*"
msgstr "*不明*"
-#: camlibs/canon/canon.c:1096
+#: camlibs/canon/canon.c:1151
#, c-format
msgid ""
"canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -110,7 +116,7 @@ msgstr ""
"canon_int_capture_image: 関数 canon_usb_list_all_dirs() の初期化に失敗しまし"
"た (ステータス %i)"
-#: camlibs/canon/canon.c:1183
+#: camlibs/canon/canon.c:1238
#, c-format
msgid ""
"canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -119,52 +125,56 @@ msgstr ""
"canon_int_capture_image: 関数 canon_usb_list_all_dirs() の終了処理に失敗しま"
"した (ステータス %i)"
-#: camlibs/canon/canon.c:1302
+#: camlibs/canon/canon.c:1344
#, c-format
msgid "Name '%s' (%i characters) too long, maximum 30 characters are allowed."
msgstr "名前 '%s' (%i 個の文字) は長すぎます 最大 30 文字まで有効です。"
-#: camlibs/canon/canon.c:1702
+#: camlibs/canon/canon.c:1753
#, c-format
msgid "Lower case letters in %s not allowed."
msgstr "%s に小文字があります。"
-#: camlibs/canon/canon.c:1859
-#, c-format
-msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
+#: camlibs/canon/canon.c:1928
+#, fuzzy, c-format
+msgid ""
+"canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
msgstr "canon_int_list_dir: ERROR: 初期メッセージが短すぎます (%i < 最小値 %i)"
-#: camlibs/canon/canon.c:1881
+#: camlibs/canon/canon.c:1950
+#, fuzzy
msgid ""
-"canon_int_list_dir: Reached end of packet while examining the first dirent"
+"canon_int_list_directory: Reached end of packet while examining the first "
+"dirent"
msgstr ""
"canon_int_list_dir: 最初の dirent を調査する際にパケットの終端に到達しました"
-#: camlibs/canon/canon.c:1966
-msgid "canon_int_list_dir: truncated directory entry encountered"
+#: camlibs/canon/canon.c:2035
+#, fuzzy
+msgid "canon_int_list_directory: truncated directory entry encountered"
msgstr "canon_int_list_dir: 切りつめられたディレクトリに遭遇しました"
-#: camlibs/canon/canon.c:2283
+#: camlibs/canon/canon.c:2377
msgid "File protected."
msgstr "ファイルが保護されています。"
-#: camlibs/canon/canon.c:2354
+#: camlibs/canon/canon.c:2448
msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
msgstr ""
"データから JPEG サムネイルへ展開できませんでした: データは JFIF ではありませ"
"ん"
-#: camlibs/canon/canon.c:2379
+#: camlibs/canon/canon.c:2473
msgid "Could not extract JPEG thumbnail from data: No beginning/end"
msgstr ""
"データから JPEG サムネイルへ展開できませんでした: 開始/終端がありません"
-#: camlibs/canon/canon.h:144 camlibs/canon/canon.h:158
+#: camlibs/canon/canon.h:146 camlibs/canon/canon.h:160
#, c-format
msgid "NULL parameter \"%s\" in %s line %i"
msgstr "%3$i 行の %2$s にあるパラメータ \"%1$s\" が NULL です"
-#: camlibs/canon/canon.h:342
+#: camlibs/canon/canon.h:350
#, c-format
msgid ""
"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -177,6 +187,7 @@ msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
msgstr "致命的なエラー: CRC の初期値 (サイズ %d) が不明です\n"
#: camlibs/canon/crc.c:250
+#, c-format
msgid "unable to guess initial CRC value\n"
msgstr "CRC の初期値を推測できません\n"
@@ -189,65 +200,66 @@ msgstr ""
"警告: CRC がチェックされていません (サイズ %d, 値 0x%04x の追加) "
"#########################\n"
-#: camlibs/canon/library.c:134
+#: camlibs/canon/library.c:125
msgid ""
"This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
" and EOS Digital cameras in their native (sometimes called \"normal\")\n"
" mode. It also supports a small number of Canon digital camcorders\n"
" with still image capability.\n"
"It includes code for communicating over a serial port or USB connection,\n"
-" but not (yet) over IEEE 1394 (Firewire().\n"
+" but not (yet) over IEEE 1394 (Firewire).\n"
"It is designed to work with over 70 models as old as the PowerShot A5\n"
-" and Pro70 of 1998 and as new as the PowerShot SD20 of 2004.\n"
+" and Pro70 of 1998 and as new as the PowerShot A510 and EOS 350D of\n"
+" 2005.\n"
"It has not been verified against the EOS 1D or EOS 1Ds.\n"
"For the A50, using 115200 bps may effectively be slower than using 57600\n"
"If you experience a lot of serial transmission errors, try to have your\n"
" computer as idle as possible (i.e. no disk activity)\n"
msgstr ""
-#: camlibs/canon/library.c:262
+#: camlibs/canon/library.c:254
#, fuzzy, c-format
msgid "Camera unavailable: %s"
msgstr "カメラが無効です"
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:274
msgid "Switching Camera Off"
msgstr "カメラを OFF にします"
-#: camlibs/canon/library.c:340 camlibs/canon/library.c:374
+#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
msgid "Error capturing image"
msgstr "画像のキャプチャ中にエラー"
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:422
#, c-format
msgid "Could not get disk name: %s"
msgstr "ディスク名を取得できませんでした: %s"
-#: camlibs/canon/library.c:431
+#: camlibs/canon/library.c:423
msgid "No reason available"
msgstr "使用不可の理由"
-#: camlibs/canon/library.c:438
+#: camlibs/canon/library.c:430
#, c-format
msgid "Could not get disk info: %s"
msgstr "ディスク情報を取得できませんでした: %s"
-#: camlibs/canon/library.c:502
+#: camlibs/canon/library.c:494
#, c-format
msgid "Internal error #1 in get_file_func() (%s line %i)"
msgstr "関数 get_file_func() で内部エラー #1 (%2$i 行の %1$s)"
-#: camlibs/canon/library.c:525
+#: camlibs/canon/library.c:517
#, c-format
msgid "No audio file could be found for %s"
msgstr "%s のオーディオ・ファイルが見つかりませんでした"
-#: camlibs/canon/library.c:573 camlibs/canon/library.c:611
+#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
#, c-format
msgid "%s is a file type for which no thumbnail is provided"
msgstr "サムネイルではないファイル %s が指定されました"
-#: camlibs/canon/library.c:781
+#: camlibs/canon/library.c:773
#, c-format
msgid ""
" Drive %s\n"
@@ -258,35 +270,35 @@ msgstr ""
" 合計 %11s バイト\n"
" %11s バイト有効"
-#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
-#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
+#: camlibs/canon/library.c:781 camlibs/canon/library.c:787
+#: camlibs/canon/library.c:1305 camlibs/canon/library.c:1311
msgid "AC adapter"
msgstr "AC アダプタ"
-#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
-#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
+#: camlibs/canon/library.c:781 camlibs/canon/library.c:787
+#: camlibs/canon/library.c:1305 camlibs/canon/library.c:1311
msgid "on battery"
msgstr "バッテリ容量"
-#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:783 camlibs/canon/library.c:1307
msgid "power OK"
msgstr "電源 ○"
-#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:783 camlibs/canon/library.c:1307
msgid "power bad"
msgstr "電源 ×"
-#: camlibs/canon/library.c:799
+#: camlibs/canon/library.c:791
#, c-format
msgid "not available: %s"
msgstr "使用不可: %s"
-#: camlibs/canon/library.c:825
+#: camlibs/canon/library.c:817
#, c-format
msgid "%s (host time %s%i seconds)"
msgstr "%s (host 時間 %s%i 秒)"
-#: camlibs/canon/library.c:835
+#: camlibs/canon/library.c:827
#, c-format
msgid ""
"\n"
@@ -313,17 +325,18 @@ msgstr ""
"\n"
"時刻: %s\n"
-#: camlibs/canon/library.c:852
+#: camlibs/canon/library.c:844
#, fuzzy
msgid ""
"Canon PowerShot series driver by\n"
-"Wolfgang G. Reissnegger,\n"
-"Werner Almesberger,\n"
-"Edouard Lafargue,\n"
-"Philippe Marzouk,\n"
+" Wolfgang G. Reissnegger,\n"
+" Werner Almesberger,\n"
+" Edouard Lafargue,\n"
+" Philippe Marzouk,\n"
"A5 additions by Ole W. Saastad\n"
-"Holger Klemm\n"
-"Stephen H. Westin"
+"Additional enhancements by\n"
+" Holger Klemm\n"
+" Stephen H. Westin"
msgstr ""
"Cannon PowerShot シリーズのドライバ。\n"
"Wolfgang G.Reissnegger 氏、\n"
@@ -333,24 +346,24 @@ msgstr ""
"A5 追加は Ole W. Saastad\n"
"Holger Klemm\n"
-#: camlibs/canon/library.c:894
+#: camlibs/canon/library.c:887
msgid "Error deleting file"
msgstr "ファイルの削除中にエラー"
-#: camlibs/canon/library.c:910
+#: camlibs/canon/library.c:903
msgid "Error deleting associated thumbnail file"
msgstr "共有サムネイルの削除中にエラー"
-#: camlibs/canon/library.c:1040 camlibs/canon/library.c:1169
+#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1162
msgid ""
"Speeds greater than 57600 are not supported for uploading to this camera"
msgstr "このカメラにスピード 57600 以上でアップロードすることはできません"
-#: camlibs/canon/library.c:1057 camlibs/canon/library.c:1186
+#: camlibs/canon/library.c:1050 camlibs/canon/library.c:1179
msgid "Could not get flash drive letter"
msgstr "フラッシュドライブを取得できませんでした"
-#: camlibs/canon/library.c:1101 camlibs/canon/library.c:1209
+#: camlibs/canon/library.c:1094 camlibs/canon/library.c:1202
msgid ""
"Could not upload, no free folder name available!\n"
"999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -358,90 +371,90 @@ msgstr ""
"アップロードできませんでした。使われていないフォルダ名がありません!\n"
"フォルダ 999CANON は既に存在しており、画像 AUT_9999.JPG がその中にあります。"
-#: camlibs/canon/library.c:1123 camlibs/canon/library.c:1229
+#: camlibs/canon/library.c:1116 camlibs/canon/library.c:1222
msgid "Could not create \\DCIM directory."
msgstr "\\DCIM ディレクトリを作成できませんでした"
-#: camlibs/canon/library.c:1129 camlibs/canon/library.c:1235
+#: camlibs/canon/library.c:1122 camlibs/canon/library.c:1228
msgid "Could not create destination directory."
msgstr "対象となるディレクトリを作成できませんでした"
-#: camlibs/canon/library.c:1267 camlibs/ptp2/library.c:1706
-#: camlibs/ptp2/library.c:1794
+#: camlibs/canon/library.c:1260 camlibs/ptp2/library.c:2508
+#: camlibs/ptp2/library.c:2599
msgid "Camera and Driver Configuration"
msgstr "カメラとドライバの設定"
-#: camlibs/canon/library.c:1269 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1262 camlibs/polaroid/pdc700.c:982
msgid "Camera"
msgstr "カメラ"
-#: camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:1265
msgid "Camera Model (readonly)"
msgstr "カメラの型式 (読み取りのみ)"
-#: camlibs/canon/library.c:1276 camlibs/canon/library.c:1353
+#: camlibs/canon/library.c:1269 camlibs/canon/library.c:1346
msgid "Owner name"
msgstr "所有者の名前"
-#: camlibs/canon/library.c:1283 camlibs/canon/library.c:1287
-#: camlibs/canon/library.c:1292
+#: camlibs/canon/library.c:1276 camlibs/canon/library.c:1280
+#: camlibs/canon/library.c:1285
msgid "Date and Time (readonly)"
msgstr "日付と時刻 (読み取りのみ)"
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1281
msgid "Error"
msgstr "エラー"
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1286 camlibs/canon/library.c:1313
msgid "Unavailable"
msgstr "使用不可"
-#: camlibs/canon/library.c:1297 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1359
msgid "Set camera date to PC date"
msgstr "カメラの日付を PC の日付にセットします"
-#: camlibs/canon/library.c:1300
+#: camlibs/canon/library.c:1293
msgid "Firmware revision (readonly)"
msgstr "ファームウェアのリビジョン (読み取りのみ)"
-#: camlibs/canon/library.c:1324 camlibs/ptp2/library.c:1740
-#: camlibs/ptp2/library.c:1770
+#: camlibs/canon/library.c:1317 camlibs/ptp2/library.c:2546
+#: camlibs/ptp2/library.c:2575
msgid "Power (readonly)"
msgstr "電源 (読み取りのみ)"
-#: camlibs/canon/library.c:1328
+#: camlibs/canon/library.c:1321
msgid "Driver"
msgstr "ドライバ"
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1380
+#: camlibs/canon/library.c:1324 camlibs/canon/library.c:1373
msgid "List all files"
msgstr "全ファイルの一覧"
-#: camlibs/canon/library.c:1336 camlibs/canon/library.c:1388
+#: camlibs/canon/library.c:1329 camlibs/canon/library.c:1382
msgid "Keep filename on upload"
msgstr "アップロード時にファイル名を保持する"
-#: camlibs/canon/library.c:1357 camlibs/canon/library.c:1370
+#: camlibs/canon/library.c:1350 camlibs/canon/library.c:1363
msgid "Camera unavailable"
msgstr "カメラが無効です"
-#: camlibs/canon/library.c:1360
+#: camlibs/canon/library.c:1353
msgid "Owner name changed"
msgstr "所有者が変更されました"
-#: camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1355
msgid "could not change owner name"
msgstr "所有者の名前を変更できませんでした"
-#: camlibs/canon/library.c:1373
+#: camlibs/canon/library.c:1366
msgid "time set"
msgstr "時刻のセット"
-#: camlibs/canon/library.c:1375
+#: camlibs/canon/library.c:1368
msgid "could not set time"
msgstr "時刻をセットできませんでした"
-#: camlibs/canon/library.c:1591
+#: camlibs/canon/library.c:1586
#, c-format
msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
msgstr ""
@@ -611,51 +624,42 @@ msgstr "エラー: %d は大きすぎます"
msgid "Getting thumbnail..."
msgstr "サムネイルの取得中..."
-#: camlibs/canon/usb.c:82
+#: camlibs/canon/usb.c:193
msgid "NOT RECOGNIZED"
msgstr "認識されていません"
-#: camlibs/canon/usb.c:97
+#: camlibs/canon/usb.c:208
msgid "Could not establish initial contact with camera"
msgstr "カメラと初期接続を確立できませんでした"
-#: camlibs/canon/usb.c:103
+#: camlibs/canon/usb.c:214
msgid "Camera was already active"
msgstr "カメラは既にアクティブです"
-#: camlibs/canon/usb.c:106
+#: camlibs/canon/usb.c:217
msgid "Camera was woken up"
msgstr "カメラが起動されました"
-#: camlibs/canon/usb.c:111
+#: camlibs/canon/usb.c:222
#, fuzzy
msgid "Unknown (some kind of error)"
msgstr "不明なエラー (詳細不明)"
-#: camlibs/canon/usb.c:112
+#: camlibs/canon/usb.c:223
#, fuzzy, c-format
msgid "Initial camera response '%c' unrecognized"
msgstr "カメラの初期応答 %c/'%s' を認識できません"
-#: camlibs/canon/usb.c:126
-#, c-format
-msgid ""
-"Step #2 of initialization failed for PowerShot camera! (returned %i, "
-"expected %i) Camera not operational"
-msgstr ""
-"ステップ #2 で PowerShot カメラの初期化に失敗しました (返り値 %i, 期待値 %"
-"i)。カメラを操作できません!"
-
-#: camlibs/canon/usb.c:147
-#, c-format
+#: camlibs/canon/usb.c:237
+#, fuzzy, c-format
msgid ""
-"EOS Step #3 of initialization failed! (returned %i, expected %i) Camera not "
+"Step #2 of initialization failed! (returned %i, expected %i) Camera not "
"operational"
msgstr ""
-"ステップ #3 で EOS の初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操"
-"作できません!"
+"ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
+"せん!"
-#: camlibs/canon/usb.c:167
+#: camlibs/canon/usb.c:257 camlibs/canon/usb.c:278
#, c-format
msgid ""
"Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -664,24 +668,24 @@ msgstr ""
"ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
"せん!"
-#: camlibs/canon/usb.c:197
-#, c-format
-msgid "Step #4.1 failed! (returned %i, expected %i) Camera not operational"
+#: camlibs/canon/usb.c:309 camlibs/canon/usb.c:336
+#, fuzzy, c-format
+msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
msgstr ""
"ステップ #4.1 で失敗しました (返り値 %i, 期待値 %i)。カメラを操作できません!"
-#: camlibs/canon/usb.c:258 camlibs/sipix/blink.c:1068
+#: camlibs/canon/usb.c:408 camlibs/sipix/blink.c:1068
#: camlibs/stv0674/stv0674.c:250
msgid "Could not apply USB settings"
msgstr "USB 設定を適用できませんでした"
-#: camlibs/canon/usb.c:283
+#: camlibs/canon/usb.c:433
#, c-format
msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
msgstr ""
"カメラの準備ができていません。複数回 \"カメラ情報\" 要求が失敗しました: %s"
-#: camlibs/canon/usb.c:316
+#: camlibs/canon/usb.c:466
#, fuzzy, c-format
msgid ""
"canon_usb_init: Unexpected return of %i bytes (expected %i) from \"get "
@@ -690,13 +694,13 @@ msgstr ""
"canon_usb_lock_keys: 期待していない返り値 %i バイト (期待値 %i) を \"get "
"picture abilities\" から受け取りました"
-#: camlibs/canon/usb.c:322 camlibs/canon/usb.c:377
+#: camlibs/canon/usb.c:472 camlibs/canon/usb.c:488
#, c-format
msgid "Camera not ready, get_battery failed: %s"
msgstr "カメラの準備ができていません (get_battery に失敗): %s"
-#: camlibs/canon/usb.c:441 camlibs/canon/usb.c:463 camlibs/canon/usb.c:489
-#: camlibs/canon/usb.c:530
+#: camlibs/canon/usb.c:552 camlibs/canon/usb.c:574 camlibs/canon/usb.c:600
+#: camlibs/canon/usb.c:641
#, c-format
msgid ""
"canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
@@ -705,7 +709,7 @@ msgstr ""
"canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
"ト, 期待値 %i)"
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/usb.c:625
#, fuzzy, c-format
msgid ""
"canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
@@ -714,7 +718,7 @@ msgstr ""
"canon_usb_lock_keys: 期待していない返り値 %i バイト (期待値 %i) を \"get "
"picture abilities\" から受け取りました"
-#: camlibs/canon/usb.c:573 camlibs/canon/usb.c:589
+#: camlibs/canon/usb.c:684 camlibs/canon/usb.c:700
#, c-format
msgid ""
"canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
@@ -723,7 +727,7 @@ msgstr ""
"canon_usb_unlock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
"ト, 期待値 %i)"
-#: camlibs/canon/usb.c:644 camlibs/canon/usb.c:662
+#: camlibs/canon/usb.c:755 camlibs/canon/usb.c:773
#, fuzzy, c-format
msgid ""
"canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -732,15 +736,16 @@ msgstr ""
"canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
"ト, 期待値 %i)"
-#: camlibs/canon/usb.c:710
-#, c-format
+#: camlibs/canon/usb.c:827
+#, fuzzy, c-format
msgid ""
-"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
+"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
+"sec \"%s\""
msgstr ""
"canon_usb_poll_interrupt_pipe: %i 回試行しましたが割り込みに失敗しました (\"%"
"s\")"
-#: camlibs/canon/usb.c:763
+#: camlibs/canon/usb.c:881
#, c-format
msgid ""
"canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -749,7 +754,7 @@ msgstr ""
"canon_usb_poll_interrupt_multiple: %i 回試行しましたが割り込みに失敗しました "
"(\"%s\")"
-#: camlibs/canon/usb.c:861
+#: camlibs/canon/usb.c:986
#, c-format
msgid ""
"canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -757,24 +762,24 @@ msgstr ""
"canon_usb_capture_dialogue: サムネイルのパケット・サイズがおかしいです (0x%"
"04x)"
-#: camlibs/canon/usb.c:872
+#: camlibs/canon/usb.c:1002
#, c-format
msgid ""
"canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
msgstr ""
"canon_usb_capture_dialogue: 画像パケットの合計サイズがおかしいです (0x%04x)"
-#: camlibs/canon/usb.c:892
+#: camlibs/canon/usb.c:1027
msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
msgstr ""
"canon_usb_capture_dialogue: シーケンスの外で一回目の割り込みが発生しました"
-#: camlibs/canon/usb.c:900
+#: camlibs/canon/usb.c:1035
msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
msgstr ""
"canon_usb_capture_dialogue: シーケンスの外で二回目の割り込みが発生しました"
-#: camlibs/canon/usb.c:910
+#: camlibs/canon/usb.c:1045
#, c-format
msgid ""
"canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -782,67 +787,67 @@ msgstr ""
"canon_usb_capture_dialogue: 写真のシグナル受信に失敗しました (コード = 0x%"
"08x)"
-#: camlibs/canon/usb.c:928
+#: camlibs/canon/usb.c:1063
msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
msgstr ""
"canon_usb_capture_dialogue: シーケンスの外で三回目の割り込みが発生しました "
"(EOS)"
-#: camlibs/canon/usb.c:962
+#: camlibs/canon/usb.c:1098
msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
msgstr ""
"canon_usb_capture_dialogue: シーケンスとの外で四回目の割り込みが発生しました "
"(EOS)"
-#: camlibs/canon/usb.c:1117
+#: camlibs/canon/usb.c:1284
#, c-format
msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
msgstr ""
"canon_usb_dialogue: サイズが大きすぎます。バッファに取り込めません (%i > %i)"
-#: camlibs/canon/usb.c:1220
+#: camlibs/canon/usb.c:1390
#, c-format
msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
msgstr ""
-#: camlibs/canon/usb.c:1324
+#: camlibs/canon/usb.c:1511
msgid "Receiving data..."
msgstr "データの受信中..."
-#: camlibs/canon/usb.c:1622 camlibs/canon/usb.c:1758
+#: camlibs/canon/usb.c:1837 camlibs/canon/usb.c:1973
#, c-format
msgid "Out of memory: %d bytes needed."
msgstr "メモリが足りません: %d バイト必要です。"
-#: camlibs/canon/usb.c:1685
+#: camlibs/canon/usb.c:1902
msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
msgstr "canon_usb_set_file_attributes: canon_usb_dialogue に失敗しました"
-#: camlibs/canon/usb.c:1692
-#, c-format
+#: camlibs/canon/usb.c:1909
+#, fuzzy, c-format
msgid ""
-"canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
-"08x from camera"
+"Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
+"status 0x%08x from camera"
msgstr ""
"canon_usb_set_file_attributes: canon_usb_dialogue がエラー・ステータス 0x%"
"08x を受け取りました"
-#: camlibs/canon/usb.c:1769
+#: camlibs/canon/usb.c:1984
#, c-format
msgid "Couldn't read from file \"%s\""
msgstr "ファイル \"%s\" を読み込めませんでした"
-#: camlibs/canon/usb.c:1779
+#: camlibs/canon/usb.c:1994
#, c-format
msgid "Out of memory: %ld bytes needed."
msgstr "メモリが足りません: %ld バイト必要です"
-#: camlibs/canon/usb.c:1812 camlibs/canon/usb.c:1823 camlibs/canon/usb.c:1859
-#: camlibs/canon/usb.c:1873 camlibs/canon/usb.c:1887
+#: camlibs/canon/usb.c:2027 camlibs/canon/usb.c:2038 camlibs/canon/usb.c:2074
+#: camlibs/canon/usb.c:2088 camlibs/canon/usb.c:2102
msgid "File upload failed."
msgstr "ファイルのアップロードに失敗しました"
-#: camlibs/canon/usb.c:1911
+#: camlibs/canon/usb.c:2128
msgid ""
"File was too big. You may have to turn your camera off and back on before "
"uploading more files."
@@ -850,7 +855,7 @@ msgstr ""
"ファイルが大きすぎます。お使いのカメラの電源を OFF にして、ファイルをアップ"
"ロードする前に戻して下さい。"
-#: camlibs/canon/usb.c:1957
+#: camlibs/canon/usb.c:2174
#, c-format
msgid ""
"canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -859,7 +864,7 @@ msgstr ""
"canon_usb_get_dirents: バッファに読み込めません。切りつめたサイズ '%.96s' が"
"大きすぎます。"
-#: camlibs/canon/usb.c:1974
+#: camlibs/canon/usb.c:2191
#, c-format
msgid ""
"canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -868,7 +873,7 @@ msgstr ""
"canon_usb_get_dirents: canon_usb_long_dialogue でディレクトリの取得に失敗しま"
"した (返り値 %i)"
-#: camlibs/canon/usb.c:2025
+#: camlibs/canon/usb.c:2242
#, c-format
msgid ""
"canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -877,7 +882,7 @@ msgstr ""
"canon_usb_list_all_dirs: バッファに読み込めません。切りつめたサイズ '%.96s' "
"が大きすぎます。"
-#: camlibs/canon/usb.c:2044
+#: camlibs/canon/usb.c:2261
#, c-format
msgid ""
"canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -886,12 +891,12 @@ msgstr ""
"canon_usb_list_all_dirs: canon_usb_long_dialogue でディレクトリの取得に失敗し"
"ました (返り値 %i)"
-#: camlibs/canon/usb.c:2113
+#: camlibs/canon/usb.c:2330
#, c-format
msgid "Detected a '%s'."
msgstr "'%s' を検出しました。"
-#: camlibs/canon/usb.c:2119
+#: camlibs/canon/usb.c:2336
#, c-format
msgid "Name \"%s\" from camera does not match any known camera"
msgstr "カメラの名前 \"%s\" が既存のカメラ名に一致しません"
@@ -923,12 +928,13 @@ msgstr ""
#: camlibs/casio/casio-qv.c:261 camlibs/dimera/dimera3500.c:771
#: camlibs/kodak/dc210/dc210.c:168 camlibs/polaroid/pdc700.c:980
-#: camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1433
+#: camlibs/sierra/sierra.c:856 camlibs/sierra/sierra.c:1434
#: camlibs/sierra/sierra-desc.c:203
msgid "Camera Configuration"
msgstr "カメラの設定"
#: camlibs/casio/casio-qv.c:264 camlibs/konica/qm150.c:1140
+#, c-format
msgid "Battery"
msgstr "バッテリ"
@@ -1018,8 +1024,8 @@ msgstr ""
#: camlibs/dimera/dimera3500.c:399 camlibs/dimera/dimera3500.c:785
#: camlibs/kodak/dc210/dc210.c:253 camlibs/kodak/dc210/dc210.c:421
#: camlibs/konica/library.c:778 camlibs/konica/library.c:1019
-#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1255
-#: camlibs/ptp2/library.c:1688 camlibs/ptp2/ptp.c:1928
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1521
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/ptp.c:1928
#: camlibs/ricoh/library.c:500 camlibs/sierra/nikon-desc.c:286
msgid "Flash"
msgstr "フラッシュあり"
@@ -1146,7 +1152,7 @@ msgstr "メモリが足りません"
#: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
#: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
-#: camlibs/ricoh/g3.c:316 camlibs/samsung/samsung.c:214
+#: camlibs/ricoh/g3.c:321 camlibs/samsung/samsung.c:214
#: camlibs/sipix/web2.c:175 camlibs/smal/ultrapocket.c:127
#: camlibs/smal/ultrapocket.c:173
msgid "Downloading image..."
@@ -1325,7 +1331,7 @@ msgid "Camera sent unexpected byte 0x%02x."
msgstr "カメラが予期しないバイト 0x%02x を送信してきました。"
#: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:310
+#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:315
msgid "Downloading..."
msgstr "ダウンロード中..."
@@ -1379,7 +1385,7 @@ msgstr "FUJI カメラの設定"
#: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
#: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1661 camlibs/sierra/sierra.c:1834
+#: camlibs/sierra/sierra.c:1662 camlibs/sierra/sierra.c:1835
msgid "Date & Time"
msgstr "日付と時間"
@@ -1643,23 +1649,25 @@ msgid "High (good quality)"
msgstr "高 (普通の品質)"
#: camlibs/kodak/dc210/dc210.c:217 camlibs/konica/qm150.c:1053
+#: camlibs/ptp2/library.c:2464
msgid "Capture"
msgstr "キャプチャ"
#: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:1685
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:2487
#: camlibs/ptp2/ptp.c:1603 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1363
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1364
msgid "Zoom"
msgstr "ズーム"
#: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/ptp.c:1956
-#: camlibs/ricoh/library.c:498 camlibs/sierra/epson-desc.c:218
-#: camlibs/sierra/nikon-desc.c:324 camlibs/sierra/olympus-desc.c:488
-#: camlibs/sierra/sierra.c:1058 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1334 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1533 camlibs/sierra/sierra.c:1746
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2109
+#: camlibs/ptp2/ptp.c:1956 camlibs/ricoh/library.c:498
+#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
+#: camlibs/sierra/olympus-desc.c:488 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1064 camlibs/sierra/sierra.c:1335
+#: camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1534
+#: camlibs/sierra/sierra.c:1747
msgid "Macro"
msgstr "マクロ"
@@ -1696,6 +1704,7 @@ msgstr "露出度"
#: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
#: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
#: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
+#: camlibs/ptp2/library.c:2069 camlibs/ptp2/library.c:2149
#: camlibs/ptp2/ptp.c:1924 camlibs/ptp2/ptp.c:1953 camlibs/ptp2/ptp.c:1969
#: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:151
@@ -1708,25 +1717,25 @@ msgstr "露出度"
#: camlibs/sierra/olympus-desc.c:411 camlibs/sierra/olympus-desc.c:430
#: camlibs/sierra/olympus-desc.c:449 camlibs/sierra/olympus-desc.c:468
#: camlibs/sierra/olympus-desc.c:489 camlibs/sierra/olympus-desc.c:690
-#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:866
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:906
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1027
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1201
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1270
-#: camlibs/sierra/sierra.c:1313 camlibs/sierra/sierra.c:1476
-#: camlibs/sierra/sierra.c:1482 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1729
+#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:867
+#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:967
+#: camlibs/sierra/sierra.c:974 camlibs/sierra/sierra.c:1028
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1231 camlibs/sierra/sierra.c:1271
+#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1710
+#: camlibs/sierra/sierra.c:1730
msgid "Auto"
msgstr "自動"
#: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
#: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
#: camlibs/sierra/olympus-desc.c:395 camlibs/sierra/olympus-desc.c:412
-#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:975
-#: camlibs/sierra/sierra.c:1272 camlibs/sierra/sierra.c:1477
-#: camlibs/sierra/sierra.c:1484 camlibs/sierra/sierra.c:1711
+#: camlibs/sierra/sierra.c:968 camlibs/sierra/sierra.c:976
+#: camlibs/sierra/sierra.c:1273 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1712
msgid "Force"
msgstr "強制発光"
@@ -1747,17 +1756,15 @@ msgstr "赤目軽減フラッシュ"
#: camlibs/konica/qm150.c:815 camlibs/konica/qm150.c:857
#: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:1027
#: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
-#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:1208
-#: camlibs/ptp2/library.c:1210 camlibs/ptp2/library.c:1222
-#: camlibs/ptp2/library.c:1415 camlibs/ptp2/library.c:1417
-#: camlibs/ptp2/library.c:1429 camlibs/ptp2/library.c:1446
-#: camlibs/ptp2/library.c:1448 camlibs/ptp2/library.c:1460
-#: camlibs/ptp2/library.c:1522 camlibs/ptp2/library.c:1524
-#: camlibs/ptp2/library.c:1536 camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874
-#: camlibs/ptp2/ptp.c:1971 camlibs/ricoh/library.c:338
-#: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:305
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1089
-#: camlibs/sierra/sierra.c:1352
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:1474
+#: camlibs/ptp2/library.c:1476 camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1681 camlibs/ptp2/library.c:1683
+#: camlibs/ptp2/library.c:1695 camlibs/ptp2/library.c:1714
+#: camlibs/ptp2/library.c:1716 camlibs/ptp2/library.c:1728
+#: camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874 camlibs/ptp2/ptp.c:1971
+#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
+#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1090 camlibs/sierra/sierra.c:1353
msgid "On"
msgstr "ON"
@@ -1770,24 +1777,24 @@ msgstr "ON"
#: camlibs/konica/qm150.c:818 camlibs/konica/qm150.c:856
#: camlibs/konica/qm150.c:863 camlibs/konica/qm150.c:1028
#: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
-#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:1209
-#: camlibs/ptp2/library.c:1210 camlibs/ptp2/library.c:1226
-#: camlibs/ptp2/library.c:1416 camlibs/ptp2/library.c:1417
-#: camlibs/ptp2/library.c:1433 camlibs/ptp2/library.c:1447
-#: camlibs/ptp2/library.c:1448 camlibs/ptp2/library.c:1464
-#: camlibs/ptp2/library.c:1523 camlibs/ptp2/library.c:1524
-#: camlibs/ptp2/library.c:1540 camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874
-#: camlibs/ptp2/ptp.c:1970 camlibs/ricoh/library.c:339
-#: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:153 camlibs/sierra/nikon-desc.c:236
-#: camlibs/sierra/nikon-desc.c:304 camlibs/sierra/nikon-desc.c:359
-#: camlibs/sierra/olympus-desc.c:396 camlibs/sierra/olympus-desc.c:413
-#: camlibs/sierra/olympus-desc.c:509 camlibs/sierra/olympus-desc.c:673
-#: camlibs/sierra/olympus-desc.c:757 camlibs/sierra/sierra.c:968
-#: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1084
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1274
-#: camlibs/sierra/sierra.c:1354 camlibs/sierra/sierra.c:1478
-#: camlibs/sierra/sierra.c:1486 camlibs/sierra/sierra.c:1713
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:1475
+#: camlibs/ptp2/library.c:1476 camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1683
+#: camlibs/ptp2/library.c:1699 camlibs/ptp2/library.c:1715
+#: camlibs/ptp2/library.c:1716 camlibs/ptp2/library.c:1732
+#: camlibs/ptp2/library.c:2108 camlibs/ptp2/library.c:2246
+#: camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874 camlibs/ptp2/ptp.c:1970
+#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
+#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
+#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
+#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:396
+#: camlibs/sierra/olympus-desc.c:413 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:673 camlibs/sierra/olympus-desc.c:757
+#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1088
+#: camlibs/sierra/sierra.c:1275 camlibs/sierra/sierra.c:1355
+#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1487
+#: camlibs/sierra/sierra.c:1714
msgid "Off"
msgstr "OFF"
@@ -1961,6 +1968,7 @@ msgstr ""
"在の操作が終了するまでお待ち下さい。"
#: camlibs/kodak/dc3200/dc3200.c:142
+#, c-format
msgid "camera inactive for > 9 seconds, re-initing.\n"
msgstr "カメラが 9 秒以上動作していません。再初期化します。\n"
@@ -2215,8 +2223,8 @@ msgstr "スライドショーの表示間隔"
#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:865 camlibs/sierra/sierra.c:1197
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1758
msgid "Resolution"
msgstr "解像度"
@@ -2241,7 +2249,7 @@ msgstr "日本語化"
#: camlibs/konica/library.c:744 camlibs/konica/library.c:951
#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1624 camlibs/sierra/sierra.c:1808
+#: camlibs/sierra/sierra.c:1625 camlibs/sierra/sierra.c:1809
msgid "Language"
msgstr "言語"
@@ -2309,8 +2317,8 @@ msgid "Focus"
msgstr "フォーカス"
#: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1505
-#: camlibs/sierra/sierra.c:1511 camlibs/sierra/sierra.c:1731
+#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1512 camlibs/sierra/sierra.c:1732
msgid "Fixed"
msgstr "固定"
@@ -2334,13 +2342,14 @@ msgstr "セルフタイマ (次の写真のみ)"
#: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
#: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
#: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:376
-#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:997
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1059
-#: camlibs/sierra/sierra.c:1065 camlibs/sierra/sierra.c:1249
-#: camlibs/sierra/sierra.c:1292 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1535
-#: camlibs/sierra/sierra.c:1748
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:944 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1005 camlibs/sierra/sierra.c:1060
+#: camlibs/sierra/sierra.c:1066 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1293 camlibs/sierra/sierra.c:1337
+#: camlibs/sierra/sierra.c:1532 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1749
+#, c-format
msgid "Normal"
msgstr "標準"
@@ -2405,21 +2414,21 @@ msgid "No answer from the camera."
msgstr "カメラから応答がありません"
#: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:907
-#: camlibs/sierra/sierra.c:914 camlibs/sierra/sierra.c:1232
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1233
msgid "Low"
msgstr "低"
#: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:908
-#: camlibs/sierra/sierra.c:916 camlibs/sierra/sierra.c:1234
+#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:909
+#: camlibs/sierra/sierra.c:917 camlibs/sierra/sierra.c:1235
msgid "Medium"
msgstr "中"
#: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:868 camlibs/sierra/sierra.c:876
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:918
-#: camlibs/sierra/sierra.c:1205 camlibs/sierra/sierra.c:1236
+#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:877
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1237
msgid "High"
msgstr "高い"
@@ -2485,9 +2494,9 @@ msgid "Black and White"
msgstr "モノクロ"
#: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:378
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
-#: camlibs/sierra/sierra.c:1253
+#: camlibs/ptp2/library.c:2250 camlibs/ricoh/library.c:331
+#: camlibs/sierra/olympus-desc.c:378 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:1254
msgid "Sepia"
msgstr "セピア"
@@ -2520,29 +2529,34 @@ msgid "Everywhere"
msgstr "場所を問わず"
#: camlibs/konica/qm150.c:1142
+#, c-format
msgid "AC"
msgstr "電源"
#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
#: camlibs/sierra/nikon-desc.c:361
+#, c-format
msgid "Play"
msgstr "再生"
#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
#: camlibs/sierra/nikon-desc.c:360
+#, c-format
msgid "Record"
msgstr "記録"
#: camlibs/konica/qm150.c:1157
+#, c-format
msgid "DD/MM/YYYY"
msgstr "DD/MM/YYYY"
#: camlibs/konica/qm150.c:1162
-#, fuzzy
+#, fuzzy, c-format
msgid "YYYY/MM/DD"
msgstr "YYYY/MM/AA"
#: camlibs/konica/qm150.c:1166
+#, c-format
msgid "MM/DD/YYYY"
msgstr "MM/DD/YYYY"
@@ -2568,6 +2582,7 @@ msgstr ""
"日付と時刻: %s\n"
#: camlibs/konica/qm150.c:1193
+#, c-format
msgid ""
"Konica Q-M150 Library\n"
"Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2582,6 +2597,7 @@ msgstr ""
"フランス製 Konica Q-M150 のサポート。"
#: camlibs/konica/qm150.c:1208
+#, c-format
msgid ""
"About Konica Q-M150:\n"
"This camera does not support to do any changes\n"
@@ -2734,27 +2750,30 @@ msgid "No"
msgstr "いいえ"
#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1557
-#: camlibs/sierra/sierra.c:1762
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1558
+#: camlibs/sierra/sierra.c:1763
msgid "Fine"
msgstr "ファイン"
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:867
-#: camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:1203
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1760
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:868
+#: camlibs/sierra/sierra.c:875 camlibs/sierra/sierra.c:1204
+#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/sierra.c:1761
msgid "Standard"
msgstr "標準"
#: camlibs/minolta/dimagev/dimagev.c:321
+#, c-format
msgid "Automatic\n"
msgstr "自動\n"
#: camlibs/minolta/dimagev/dimagev.c:329
+#, c-format
msgid "Force Flash\n"
msgstr "強制発光\n"
#: camlibs/minolta/dimagev/dimagev.c:337
+#, c-format
msgid "Prohibit Flash\n"
msgstr "発光禁止\n"
@@ -2786,6 +2805,7 @@ msgstr "使用中"
#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
#: camlibs/ptp2/ptp.c:1977
+#, c-format
msgid "Full"
msgstr "フル充電"
@@ -2806,14 +2826,17 @@ msgid "Ready"
msgstr "準備 OK"
#: camlibs/minolta/dimagev/dimagev.c:380
+#, c-format
msgid "Normal\n"
msgstr "標準\n"
#: camlibs/minolta/dimagev/dimagev.c:383
+#, c-format
msgid "Lens direction does not match flash light\n"
msgstr "レンズの向きがフラッシュの方向と同じではありません\n"
#: camlibs/minolta/dimagev/dimagev.c:386
+#, c-format
msgid "Lens is not connected\n"
msgstr "レンズがついていません\n"
@@ -2823,14 +2846,17 @@ msgid "Bad value for lens status %d\n"
msgstr "レンズの状態がおかしいです %d\n"
#: camlibs/minolta/dimagev/dimagev.c:398
+#, c-format
msgid "Card Status:\t\t"
msgstr "カードの状態:\t"
#: camlibs/minolta/dimagev/dimagev.c:411
+#, c-format
msgid "Write-protected"
msgstr "書き込み保護つき"
#: camlibs/minolta/dimagev/dimagev.c:414
+#, c-format
msgid "Unsuitable card"
msgstr "サポートしないカード"
@@ -3159,13 +3185,13 @@ msgstr ""
"Michael Trawny <trawny99@users.sourceforge.net> が担当しました。バグ修正は "
"Marcus Meissner <marcus@jet.franken.de> が担当しました。"
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:1678
-#: camlibs/ptp2/ptp.c:1590
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:2470
+#: camlibs/ptp2/library.c:2471 camlibs/ptp2/ptp.c:1590
msgid "Image Quality"
msgstr "画像の品質"
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:1679
-#: camlibs/ptp2/ptp.c:1537 camlibs/ptp2/ptp.c:1591
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:2472
+#: camlibs/ptp2/library.c:2473 camlibs/ptp2/ptp.c:1537 camlibs/ptp2/ptp.c:1591
msgid "Image Size"
msgstr "画像サイズ"
@@ -3181,11 +3207,11 @@ msgstr "自動パワーオフ (分後)"
msgid "Information"
msgstr "情報"
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1770
msgid "normal"
msgstr "標準"
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1771
msgid "fine"
msgstr "ファイン"
@@ -3193,19 +3219,22 @@ msgstr "ファイン"
msgid "superfine"
msgstr "スーパーファイン"
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1462
-#: camlibs/sierra/sierra.c:1697
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:1813
+#: camlibs/ptp2/library.c:1982 camlibs/ptp2/library.c:2290
+#: camlibs/sierra/epson-desc.c:116 camlibs/sierra/sierra.c:1449
+#: camlibs/sierra/sierra.c:1463 camlibs/sierra/sierra.c:1698
msgid "auto"
msgstr "自動"
#: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/sierra/nikon-desc.c:565 camlibs/sierra/nikon-desc.c:570
+#: camlibs/ptp2/library.c:1814 camlibs/sierra/nikon-desc.c:565
+#: camlibs/sierra/nikon-desc.c:570
msgid "on"
msgstr "ON"
#: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/ptp2/library.c:1812 camlibs/sierra/nikon-desc.c:564
+#: camlibs/sierra/nikon-desc.c:569
msgid "off"
msgstr "OFF"
@@ -3323,168 +3352,168 @@ msgstr ""
msgid "The requested port type (%i) is not supported by this driver."
msgstr "このドライバでは要求したポート型式 (%i) をサポートしていません。"
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:122
msgid "PTP Undefined Error"
msgstr "PTP の不明なエラー"
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:123
msgid "PTP OK!"
msgstr "PTP OK!"
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:124
msgid "PTP General Error"
msgstr "PTP の一般的なエラー"
-#: camlibs/ptp2/library.c:122
+#: camlibs/ptp2/library.c:125
msgid "PTP Session Not Open"
msgstr "PTP のセッションが開かれていません"
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:126
msgid "PTP Invalid Transaction ID"
msgstr "PTP の不正なトランザクション ID"
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:127
msgid "PTP Operation Not Supported"
msgstr "サポートされていない PTP 操作"
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:128
msgid "PTP Parameter Not Supported"
msgstr "サポートされていない PTP パラメータ"
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:129
msgid "PTP Incomplete Transfer"
msgstr "PTP の転送が完了していません"
-#: camlibs/ptp2/library.c:127
+#: camlibs/ptp2/library.c:130
msgid "PTP Invalid Storage ID"
msgstr "PTP の不正なストレージ ID"
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:131
msgid "PTP Invalid Object Handle"
msgstr "PTP 不正なオブジェクト操作"
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:132
msgid "PTP Device Prop Not Supported"
msgstr "サポートされていない PTP デバイス Prop"
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:133
msgid "PTP Invalid Object Format Code"
msgstr "PTP の不正なオブジェクト書式コード"
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:134
msgid "PTP Store Full"
msgstr "PTP の空き容量がありません"
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:135
msgid "PTP Object Write Protected"
msgstr "PTP オブジェクトへの書き込み保護が有効です"
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:136
msgid "PTP Store Read Only"
msgstr "PTP は読み込み専用です"
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:137
msgid "PTP Access Denied"
msgstr "PTP へのアクセスが拒否されました"
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:138
msgid "PTP No Thumbnail Present"
msgstr "PTP にはサムネイルがありません"
-#: camlibs/ptp2/library.c:136
+#: camlibs/ptp2/library.c:139
msgid "PTP Self Test Failed"
msgstr "PTP の自己診断に失敗しました"
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:140
msgid "PTP Partial Deletion"
msgstr "PTP の部分的な削除"
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:141
msgid "PTP Store Not Available"
msgstr "PTP に格納できません"
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:143
msgid "PTP Specification By Format Unsupported"
msgstr "サポートしていない PTP 書式の指定"
-#: camlibs/ptp2/library.c:141
+#: camlibs/ptp2/library.c:144
msgid "PTP No Valid Object Info"
msgstr "PTP の不正なオブジェクト情報"
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:145
msgid "PTP Invalid Code Format"
msgstr "PTP の不正なコード書式"
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:146
msgid "PTP Unknown Vendor Code"
msgstr "PTP の不明なベンダーコードです"
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:148
msgid "PTP Capture Already Terminated"
msgstr "PTP のキャプチャは中断しました"
-#: camlibs/ptp2/library.c:146
+#: camlibs/ptp2/library.c:149
#, fuzzy
msgid "PTP Device Busy"
msgstr "PTP のデバイス・バス"
-#: camlibs/ptp2/library.c:147
+#: camlibs/ptp2/library.c:150
msgid "PTP Invalid Parent Object"
msgstr "PTP 不正なオブジェクト"
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:151
msgid "PTP Invalid Device Prop Format"
msgstr "PTP の不正なデバイス Prop 書式"
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:152
msgid "PTP Invalid Device Prop Value"
msgstr "PTP の不正なデバイス Prop 値"
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:153
msgid "PTP Invalid Parameter"
msgstr "PTP の不正なパラメータ"
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:154
msgid "PTP Session Already Opened"
msgstr "PTP のセッションはオープンしています"
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:155
msgid "PTP Transaction Canceled"
msgstr "PTP トランザクションがキャンセルされました"
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:157
msgid "PTP Specification Of Destination Unsupported"
msgstr "サポートしていない PTP 転送先の指定"
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:158
msgid "PTP EK Filename Required"
msgstr "PTP EK ファイル名が必要です"
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:159
msgid "PTP EK Filename Conflicts"
msgstr "PTP EK ファイル名が重複しています"
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:160
msgid "PTP EK Filename Invalid"
msgstr "PTP EK 不正なファイル名です"
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:162
msgid "PTP I/O error"
msgstr "PTP I/O エラーです"
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:163
msgid "PTP Error: bad parameter"
msgstr "PTP エラー: パラメータが正しくありません"
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:164
msgid "PTP Protocol error, data expected"
msgstr "PTP プロトコル・エラー (期待値: データ)"
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:165
msgid "PTP Protocol error, response expected"
msgstr "PTP プロトコル・エラー (期待値: 応答)"
-#: camlibs/ptp2/library.c:710
+#: camlibs/ptp2/library.c:719
msgid ""
"PTP2 driver\n"
"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3494,35 +3523,73 @@ msgstr ""
"Mariusz Woloszyn 氏 <emsi@ipartners.pl> が担当しました。\n"
"Enjoy! して下さい。"
-#: camlibs/ptp2/library.c:800
+#: camlibs/ptp2/library.c:790 camlibs/ptp2/library.c:879
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon capture"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:915
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:920
+#, c-format
+msgid "Canon enable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:925
+#, c-format
+msgid "Canon get viewfinder image failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:935
+#, c-format
+msgid "Canon disable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:990
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:1004
+#, c-format
+msgid "Canon Capture failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1063
msgid "Sorry, your camera does not support generic capture"
msgstr ""
"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
-#: camlibs/ptp2/library.c:848
+#: camlibs/ptp2/library.c:1111
msgid "Capture command completed, but no confirmation received"
msgstr ""
"キャプチャ・コマンドが完了しましたが、確認イベントは受け取りませんでした"
-#: camlibs/ptp2/library.c:855
+#: camlibs/ptp2/library.c:1118
#, c-format
msgid "Received event 0x%04x"
msgstr "受信したイベント 0x%04x"
-#: camlibs/ptp2/library.c:947
+#: camlibs/ptp2/library.c:1210
msgid "read only"
msgstr "読み込みのみ"
-#: camlibs/ptp2/library.c:948
+#: camlibs/ptp2/library.c:1211
msgid "readwrite"
msgstr "読み書き"
-#: camlibs/ptp2/library.c:949 camlibs/ptp2/library.c:951
+#: camlibs/ptp2/library.c:1212 camlibs/ptp2/library.c:1214
#: camlibs/ptp2/ptp.c:2000
msgid "Unknown"
msgstr "不明"
-#: camlibs/ptp2/library.c:963
+#: camlibs/ptp2/library.c:1226
#, c-format
msgid ""
"Model: %s\n"
@@ -3537,166 +3604,282 @@ msgstr ""
"ベンダの拡張 ID: 0x%08x\n"
"ベンダの拡張情報: %s\n"
-#: camlibs/ptp2/library.c:1116 camlibs/ptp2/library.c:1133
-#: camlibs/ptp2/library.c:1240
+#: camlibs/ptp2/library.c:1383 camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1506
#, c-format
msgid "unexpected datatype %i"
msgstr "予期しないデータ種 %i"
-#: camlibs/ptp2/library.c:1249 camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/library.c:1515 camlibs/ptp2/ptp.c:1975
#: camlibs/sierra/olympus-desc.c:490
msgid "Manual"
msgstr "取り扱い説明書"
-#: camlibs/ptp2/library.c:1250
+#: camlibs/ptp2/library.c:1516
#, fuzzy
msgid "Automatic"
msgstr "自動\n"
-#: camlibs/ptp2/library.c:1251
+#: camlibs/ptp2/library.c:1517
#, fuzzy
msgid "One-push Automatic"
msgstr "自動\n"
-#: camlibs/ptp2/library.c:1252 camlibs/ptp2/ptp.c:1927
-#: camlibs/sierra/olympus-desc.c:431 camlibs/sierra/olympus-desc.c:450
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/ptp2/library.c:1518 camlibs/ptp2/library.c:2150
+#: camlibs/ptp2/ptp.c:1927 camlibs/sierra/olympus-desc.c:431
+#: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
msgid "Daylight"
msgstr "晴天"
-#: camlibs/ptp2/library.c:1253 camlibs/ptp2/ptp.c:1926
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:432 camlibs/sierra/olympus-desc.c:451
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1317
+#: camlibs/ptp2/library.c:1519 camlibs/ptp2/library.c:2153
+#: camlibs/ptp2/ptp.c:1926 camlibs/ricoh/library.c:328
+#: camlibs/sierra/nikon-desc.c:285 camlibs/sierra/olympus-desc.c:432
+#: camlibs/sierra/olympus-desc.c:451 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1318
msgid "Fluorescent"
msgstr "蛍光灯"
-#: camlibs/ptp2/library.c:1254 camlibs/sierra/olympus-desc.c:433
-#: camlibs/sierra/olympus-desc.c:452 camlibs/sierra/olympus-desc.c:470
-#: camlibs/sierra/sierra.c:1030 camlibs/sierra/sierra.c:1040
-#: camlibs/sierra/sierra.c:1319
+#: camlibs/ptp2/library.c:1520 camlibs/ptp2/library.c:2152
+#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1320
msgid "Tungsten"
msgstr "電球"
-#: camlibs/ptp2/library.c:1256 camlibs/ptp2/ptp.c:1929
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:434
-#: camlibs/sierra/olympus-desc.c:453 camlibs/sierra/olympus-desc.c:474
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1043
-#: camlibs/sierra/sierra.c:1321
+#: camlibs/ptp2/library.c:1522 camlibs/ptp2/library.c:2151
+#: camlibs/ptp2/ptp.c:1929 camlibs/sierra/nikon-desc.c:288
+#: camlibs/sierra/olympus-desc.c:434 camlibs/sierra/olympus-desc.c:453
+#: camlibs/sierra/olympus-desc.c:474 camlibs/sierra/sierra.c:1032
+#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1322
msgid "Cloudy"
msgstr "曇天"
-#: camlibs/ptp2/library.c:1257 camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/library.c:1523 camlibs/ptp2/ptp.c:1930
#, fuzzy
msgid "Shade"
msgstr "シャープ"
-#: camlibs/ptp2/library.c:1258 camlibs/ptp2/ptp.c:1931
+#: camlibs/ptp2/library.c:1524 camlibs/ptp2/ptp.c:1931
#: camlibs/sierra/nikon-desc.c:287
msgid "Preset"
msgstr "プリセット"
-#: camlibs/ptp2/library.c:1317 camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/library.c:1583 camlibs/ptp2/ptp.c:1919
msgid "JPEG Basic"
msgstr ""
-#: camlibs/ptp2/library.c:1318
+#: camlibs/ptp2/library.c:1584
#, fuzzy
msgid "JPEG Normal"
msgstr "標準"
-#: camlibs/ptp2/library.c:1319 camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/library.c:1585 camlibs/ptp2/ptp.c:1921
#, fuzzy
msgid "JPEG Fine"
msgstr "JPEG"
-#: camlibs/ptp2/library.c:1320
+#: camlibs/ptp2/library.c:1586
msgid "NEF (Raw)"
msgstr ""
-#: camlibs/ptp2/library.c:1321
+#: camlibs/ptp2/library.c:1587
msgid "NEF+BASIC"
msgstr ""
-#: camlibs/ptp2/library.c:1666 camlibs/ptp2/ptp.c:1607
+#: camlibs/ptp2/library.c:1772
+#, fuzzy
+msgid "super fine"
+msgstr "スーパーファイン"
+
+#: camlibs/ptp2/library.c:1815
+#, fuzzy
+msgid "auto red eye"
+msgstr "赤目対策"
+
+#: camlibs/ptp2/library.c:1816
+#, fuzzy
+msgid "on red eye"
+msgstr "赤目対策"
+
+#: camlibs/ptp2/library.c:1856
+#, fuzzy
+msgid "spot"
+msgstr "スポット"
+
+#: camlibs/ptp2/library.c:1981
+#, fuzzy
+msgid "center"
+msgstr "キャプチャ"
+
+#: camlibs/ptp2/library.c:2021
+#, fuzzy
+msgid "large"
+msgstr "画像"
+
+#: camlibs/ptp2/library.c:2022
+#, fuzzy
+msgid "medium 1"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:2023
+#, fuzzy
+msgid "medium 2"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:2024
+msgid "small"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2064 camlibs/ptp2/library.c:2194
+#, fuzzy
+msgid "Factory Default"
+msgstr "屋外"
+
+#: camlibs/ptp2/library.c:2110
+#, fuzzy
+msgid "Long distance"
+msgstr "フォーカスの距離"
+
+#: camlibs/ptp2/library.c:2154
+#, fuzzy
+msgid "Fluorescent H"
+msgstr "蛍光灯"
+
+#: camlibs/ptp2/library.c:2155 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1507 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1734
+msgid "Custom"
+msgstr "カスタム"
+
+#: camlibs/ptp2/library.c:2247
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2248
+#, fuzzy
+msgid "Neutral"
+msgstr "標準"
+
+#: camlibs/ptp2/library.c:2249
+#, fuzzy
+msgid "Low sharpening"
+msgstr "充電中"
+
+#: camlibs/ptp2/library.c:2251
+#, fuzzy
+msgid "Black & white"
+msgstr "モノクロ"
+
+#: camlibs/ptp2/library.c:2455 camlibs/ptp2/ptp.c:1607
msgid "Camera Owner"
msgstr "カメラの所有者"
-#: camlibs/ptp2/library.c:1667 camlibs/ptp2/ptp.c:1606
+#: camlibs/ptp2/library.c:2456 camlibs/ptp2/ptp.c:1606
msgid "Camera Model"
msgstr "カメラの型式"
-#: camlibs/ptp2/library.c:1668 camlibs/ptp2/ptp.c:1605
+#: camlibs/ptp2/library.c:2457 camlibs/ptp2/ptp.c:1605
msgid "Flash Memory"
msgstr "フラッシュ・メモリ"
-#: camlibs/ptp2/library.c:1669 camlibs/ptp2/library.c:1670
+#: camlibs/ptp2/library.c:2458 camlibs/ptp2/library.c:2459
msgid "Camera Time"
msgstr "カメラの時刻"
-#: camlibs/ptp2/library.c:1671 camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1588
+#: camlibs/ptp2/library.c:2460 camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1588
msgid "Beep Mode"
msgstr "ビープ・モード"
-#: camlibs/ptp2/library.c:1672
+#: camlibs/ptp2/library.c:2461
#, fuzzy
msgid "Image Comment"
msgstr "画像の調整"
-#: camlibs/ptp2/library.c:1677
+#: camlibs/ptp2/library.c:2469
msgid "Long Exp Noise Reduction"
msgstr ""
-#: camlibs/ptp2/library.c:1680
+#: camlibs/ptp2/library.c:2474 camlibs/ptp2/ptp.c:1599
+#: camlibs/sierra/olympus-desc.c:698 camlibs/sierra/olympus-desc.c:716
+msgid "ISO Speed"
+msgstr "ISO スピード"
+
+#: camlibs/ptp2/library.c:2475 camlibs/ptp2/ptp.c:1596
+msgid "Macro Mode"
+msgstr "マクロモード"
+
+#: camlibs/ptp2/library.c:2476 camlibs/ptp2/library.c:2478
#, fuzzy
msgid "WhiteBalance"
msgstr "ホワイトバランス"
-#: camlibs/ptp2/library.c:1686 camlibs/ptp2/ptp.c:1611
+#: camlibs/ptp2/library.c:2477 camlibs/ptp2/ptp.c:1595
+msgid "Metering Mode"
+msgstr "測光モード"
+
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/ptp.c:1610
+msgid "Photo Effect"
+msgstr "写真の効果"
+
+#: camlibs/ptp2/library.c:2480 camlibs/ptp2/ptp.c:1600
+#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:1227
+#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1683
+msgid "Aperture"
+msgstr "絞り"
+
+#: camlibs/ptp2/library.c:2481 camlibs/ptp2/ptp.c:1597
+msgid "Focusing Point"
+msgstr "フォーカスの焦点"
+
+#: camlibs/ptp2/library.c:2482
+#, fuzzy
+msgid "Shutter Speed"
+msgstr "シャッター速度"
+
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/ptp.c:1611
msgid "Assist Light"
msgstr "補助光"
-#: camlibs/ptp2/library.c:1687 camlibs/ptp2/ptp.c:1602 camlibs/ptp2/ptp.c:1684
+#: camlibs/ptp2/library.c:2489 camlibs/ptp2/ptp.c:1602 camlibs/ptp2/ptp.c:1684
#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
#: camlibs/sierra/olympus-desc.c:617
msgid "Exposure Compensation"
msgstr "露出度"
-#: camlibs/ptp2/library.c:1694 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:2496 camlibs/sierra/epson-desc.c:282
#: camlibs/sierra/nikon-desc.c:662 camlibs/sierra/nikon-desc.c:673
#: camlibs/sierra/olympus-desc.c:834 camlibs/sierra/olympus-desc.c:889
-#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1128
-#: camlibs/sierra/sierra.c:1590
+#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1129
+#: camlibs/sierra/sierra.c:1591
msgid "Camera Settings"
msgstr "カメラの設定"
-#: camlibs/ptp2/library.c:1695
+#: camlibs/ptp2/library.c:2497
#, fuzzy
msgid "Image Settings"
msgstr "カメラの設定"
-#: camlibs/ptp2/library.c:1696
+#: camlibs/ptp2/library.c:2498
msgid "Capture Settings"
msgstr "キャプチャの設定"
-#: camlibs/ptp2/library.c:1749
+#: camlibs/ptp2/library.c:2555
msgid "Number of values"
msgstr "値の数"
-#: camlibs/ptp2/library.c:1753
+#: camlibs/ptp2/library.c:2559
msgid "Supported values"
msgstr "サポートしている値"
-#: camlibs/ptp2/library.c:1761
+#: camlibs/ptp2/library.c:2567
msgid "Current value"
msgstr "現在の値"
-#: camlibs/ptp2/library.c:2340
+#: camlibs/ptp2/library.c:3165
msgid "Initializing Camera"
msgstr "カメラの初期化中..."
-#: camlibs/ptp2/library.c:2443
+#: camlibs/ptp2/library.c:3268
msgid "PTP is implemented for USB cameras only."
msgstr "PTP は USB カメラのみサポートしています。"
@@ -3881,9 +4064,9 @@ msgstr "圧縮の設定"
#: camlibs/ptp2/ptp.c:1539 camlibs/ptp2/ptp.c:1598
#: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
#: camlibs/sierra/olympus-desc.c:439 camlibs/sierra/olympus-desc.c:458
-#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1309 camlibs/sierra/sierra.c:1503
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1027
+#: camlibs/sierra/sierra.c:1310 camlibs/sierra/sierra.c:1504
+#: camlibs/sierra/sierra.c:1727
msgid "White Balance"
msgstr "ホワイトバランス"
@@ -3913,9 +4096,9 @@ msgid "Exposure Metering Mode"
msgstr "露出補正モード"
#: camlibs/ptp2/ptp.c:1546 camlibs/ptp2/ptp.c:1592 camlibs/ptp2/ptp.c:1718
-#: camlibs/ptp2/ptp.c:1784 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:1266 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1706
+#: camlibs/ptp2/ptp.c:1784 camlibs/sierra/sierra.c:966
+#: camlibs/sierra/sierra.c:1267 camlibs/sierra/sierra.c:1476
+#: camlibs/sierra/sierra.c:1707
msgid "Flash Mode"
msgstr "フラッシュモード"
@@ -4020,29 +4203,6 @@ msgstr "ビューファインダーモード"
msgid "TV A/V Setting"
msgstr "TV A/V 設定"
-#: camlibs/ptp2/ptp.c:1595
-msgid "Metering Mode"
-msgstr "測光モード"
-
-#: camlibs/ptp2/ptp.c:1596
-msgid "Macro Mode"
-msgstr "マクロモード"
-
-#: camlibs/ptp2/ptp.c:1597
-msgid "Focusing Point"
-msgstr "フォーカスの焦点"
-
-#: camlibs/ptp2/ptp.c:1599 camlibs/sierra/olympus-desc.c:698
-#: camlibs/sierra/olympus-desc.c:716
-msgid "ISO Speed"
-msgstr "ISO スピード"
-
-#: camlibs/ptp2/ptp.c:1600 camlibs/sierra/sierra.c:905
-#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1682
-msgid "Aperture"
-msgstr "絞り"
-
#: camlibs/ptp2/ptp.c:1601
msgid "ShutterSpeed"
msgstr "シャッター速度"
@@ -4059,10 +4219,6 @@ msgstr "UNIX 時刻"
msgid "Real Image Width"
msgstr "実画像の幅"
-#: camlibs/ptp2/ptp.c:1610
-msgid "Photo Effect"
-msgstr "写真の効果"
-
#: camlibs/ptp2/ptp.c:1620
#, fuzzy
msgid "Auto White Balance Bias"
@@ -4523,9 +4679,9 @@ msgid "Default"
msgstr "屋外"
#: camlibs/ptp2/ptp.c:1933 camlibs/sierra/epson-desc.c:154
-#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:979
-#: camlibs/sierra/sierra.c:1276 camlibs/sierra/sierra.c:1479
-#: camlibs/sierra/sierra.c:1488 camlibs/sierra/sierra.c:1715
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1277 camlibs/sierra/sierra.c:1480
+#: camlibs/sierra/sierra.c:1489 camlibs/sierra/sierra.c:1716
msgid "Red-eye Reduction"
msgstr "赤目軽減発光"
@@ -4535,9 +4691,9 @@ msgid "Red-eye Reduction + Slow Sync"
msgstr "赤目軽減発光"
#: camlibs/ptp2/ptp.c:1935 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:981
-#: camlibs/sierra/sierra.c:1278 camlibs/sierra/sierra.c:1480
-#: camlibs/sierra/sierra.c:1490 camlibs/sierra/sierra.c:1717
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:982
+#: camlibs/sierra/sierra.c:1279 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1491 camlibs/sierra/sierra.c:1718
msgid "Slow Sync"
msgstr "スローシンクロ"
@@ -4665,80 +4821,81 @@ msgstr ""
msgid "Right"
msgstr "光源"
-#: camlibs/ricoh/g3.c:312
+#: camlibs/ricoh/g3.c:317
msgid "Downloading movie..."
msgstr "動画のダウンロード中..."
-#: camlibs/ricoh/g3.c:318
+#: camlibs/ricoh/g3.c:323
msgid "Downloading audio..."
msgstr "音声のダウンロード中..."
-#: camlibs/ricoh/g3.c:333
+#: camlibs/ricoh/g3.c:338
msgid "Downloading EXIF data..."
msgstr "EXIF データのダウンロード中..."
-#: camlibs/ricoh/g3.c:335 camlibs/ricoh/g3.c:354
+#: camlibs/ricoh/g3.c:340 camlibs/ricoh/g3.c:359
#, c-format
msgid "No EXIF data available for %s."
msgstr "%s で利用可能な EXIF データではありません。"
-#: camlibs/ricoh/g3.c:440
+#: camlibs/ricoh/g3.c:445
msgid "Could not delete file."
msgstr "ファイルを削除できませんでした。"
-#: camlibs/ricoh/g3.c:467
+#: camlibs/ricoh/g3.c:472
msgid "Could not remove directory."
msgstr "フォルダを削除できませんでした。"
-#: camlibs/ricoh/g3.c:494
+#: camlibs/ricoh/g3.c:499
msgid "Could not create directory."
msgstr "フォルダを生成できませんでした。"
-#: camlibs/ricoh/g3.c:513
+#: camlibs/ricoh/g3.c:518
#, c-format
msgid "Version: %s\n"
msgstr "バージョン: %s\n"
-#: camlibs/ricoh/g3.c:518
+#: camlibs/ricoh/g3.c:523
#, c-format
msgid "RTC Status: %d\n"
msgstr "RTC の状態: %d\n"
-#: camlibs/ricoh/g3.c:524
+#: camlibs/ricoh/g3.c:529
#, c-format
msgid "Camera time: %s %s\n"
msgstr "カメラの時刻: %s %s\n"
-#: camlibs/ricoh/g3.c:530
+#: camlibs/ricoh/g3.c:535
#, c-format
msgid "Camera ID: %s\n"
msgstr "カメラの ID: %s\n"
-#: camlibs/ricoh/g3.c:536
+#: camlibs/ricoh/g3.c:541
+#, c-format
msgid "No SD Card inserted.\n"
msgstr "SD カードが装着されていません。\n"
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
#, c-format
msgid "SD Card ID: %s\n"
msgstr "SD カードの ID: %s\n"
-#: camlibs/ricoh/g3.c:547
+#: camlibs/ricoh/g3.c:552
#, c-format
msgid "Photos on camera: %d\n"
msgstr "写真の合計: %d\n"
-#: camlibs/ricoh/g3.c:553
+#: camlibs/ricoh/g3.c:558
#, c-format
msgid "SD memory: %d MB total, %d MB free.\n"
msgstr "SD メモリ: 合計 %d MB, 空き %d MB\n"
-#: camlibs/ricoh/g3.c:560
+#: camlibs/ricoh/g3.c:565
#, c-format
msgid "Internal memory: %d MB total, %d MB free.\n"
msgstr "内部メモリ: 合計 %d MB, 空き %d MB\n"
-#: camlibs/ricoh/g3.c:570
+#: camlibs/ricoh/g3.c:575
msgid ""
"Ricoh Caplio G3.\n"
"Marcus Meissner <marcus@jet.franken.de>\n"
@@ -4852,8 +5009,8 @@ msgstr "画像とサウンド"
msgid "Character & Sound"
msgstr "文字とサウンド"
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1106
-#: camlibs/sierra/sierra.c:1112
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1107
+#: camlibs/sierra/sierra.c:1113
msgid "2x"
msgstr "2x"
@@ -5010,8 +5167,8 @@ msgid "Aperature Settings"
msgstr "外観の設定"
#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:1245
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1775
+#: camlibs/sierra/sierra.c:936 camlibs/sierra/sierra.c:1246
+#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1776
msgid "Color Mode"
msgstr "カラーモード"
@@ -5020,11 +5177,6 @@ msgstr "カラーモード"
msgid "Flash Settings"
msgstr "フラッシュの設定"
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1506
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1733
-msgid "Custom"
-msgstr "カスタム"
-
#: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:560
msgid "Host power save (seconds)"
msgstr "ホストのパワーセーブ (秒)"
@@ -5033,59 +5185,59 @@ msgstr "ホストのパワーセーブ (秒)"
msgid "Camera power save (seconds)"
msgstr "カメラのパワーセーブ (秒)"
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1330 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1742
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1058
+#: camlibs/sierra/sierra.c:1331 camlibs/sierra/sierra.c:1530
+#: camlibs/sierra/sierra.c:1743
msgid "Lens Mode"
msgstr "レンズモード"
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1625
-#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1811
+#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1626
+#: camlibs/sierra/sierra.c:1635 camlibs/sierra/sierra.c:1812
msgid "Korean"
msgstr "韓国語"
#: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1626 camlibs/sierra/sierra.c:1636
-#: camlibs/sierra/sierra.c:1813
+#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1637
+#: camlibs/sierra/sierra.c:1814
msgid "English"
msgstr "英語"
#: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1638
-#: camlibs/sierra/sierra.c:1815
+#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1639
+#: camlibs/sierra/sierra.c:1816
msgid "French"
msgstr "フランス語"
#: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1640
-#: camlibs/sierra/sierra.c:1817
+#: camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1641
+#: camlibs/sierra/sierra.c:1818
msgid "German"
msgstr "ドイツ語"
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1629
-#: camlibs/sierra/sierra.c:1642 camlibs/sierra/sierra.c:1819
+#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1630
+#: camlibs/sierra/sierra.c:1643 camlibs/sierra/sierra.c:1820
msgid "Italian"
msgstr "イタリア語"
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1644 camlibs/sierra/sierra.c:1821
+#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1631
+#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1822
msgid "Japanese"
msgstr "日本語"
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1631
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1823
+#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1632
+#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1824
msgid "Spanish"
msgstr "スペイン語"
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1648 camlibs/sierra/sierra.c:1825
+#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1633
+#: camlibs/sierra/sierra.c:1649 camlibs/sierra/sierra.c:1826
msgid "Portugese"
msgstr "ポルトガル語"
#: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:658
#: camlibs/sierra/nikon-desc.c:669 camlibs/sierra/olympus-desc.c:830
#: camlibs/sierra/olympus-desc.c:885 camlibs/sierra/olympus-desc.c:896
-#: camlibs/sierra/sierra.c:856 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:857 camlibs/sierra/sierra.c:1524
msgid "Picture Settings"
msgstr "写真の設定"
@@ -5225,13 +5377,13 @@ msgstr "赤目対策"
msgid "Slow-sync"
msgstr "スローシンクロ"
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1298
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1001
+#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1299
msgid "Contrast+"
msgstr "コントラスト(+)"
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1001
-#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1300
+#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1002
+#: camlibs/sierra/sierra.c:1013 camlibs/sierra/sierra.c:1301
msgid "Contrast-"
msgstr "コントラスト(-)"
@@ -5276,7 +5428,7 @@ msgid "Operation Mode"
msgstr "操作モード"
#: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:531
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1402
+#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1403
msgid "LCD Brightness"
msgstr "液晶モニタの明るさ"
@@ -5519,239 +5671,239 @@ msgstr ""
" 設定機能を完全にするために開発に協力してくれるのならば\n"
" 開発者のメーリング・リストまで連絡して下さい。\n"
-#: camlibs/sierra/sierra.c:713 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:714 camlibs/soundvision/soundvision.c:411
msgid "The file to be uploaded has a null length"
msgstr "アップロードしたファイルのサイズが NULL です"
-#: camlibs/sierra/sierra.c:727
+#: camlibs/sierra/sierra.c:728
msgid "Not enough memory available on the memory card"
msgstr "メモリカードに空き容量がありません"
-#: camlibs/sierra/sierra.c:734
+#: camlibs/sierra/sierra.c:735
msgid "Cannot retrieve the name of the folder containing the pictures"
msgstr "写真を格納するフォルダ名が取得できません"
-#: camlibs/sierra/sierra.c:741
+#: camlibs/sierra/sierra.c:742
#, c-format
msgid "Upload is supported into the '%s' folder only"
msgstr "フォルダ '%s' へのアップロードのみサポートしています"
-#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:878
-#: camlibs/sierra/sierra.c:1207
+#: camlibs/sierra/sierra.c:870 camlibs/sierra/sierra.c:879
+#: camlibs/sierra/sierra.c:1208
msgid "Best"
msgstr "ベスト"
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:921
-#: camlibs/sierra/sierra.c:954 camlibs/sierra/sierra.c:984
-#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1046
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1092
-#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1465
-#: camlibs/sierra/sierra.c:1493 camlibs/sierra/sierra.c:1516
-#: camlibs/sierra/sierra.c:1538 camlibs/sierra/sierra.c:1564
-#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:955 camlibs/sierra/sierra.c:985
+#: camlibs/sierra/sierra.c:1016 camlibs/sierra/sierra.c:1047
+#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1093
+#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1466
+#: camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1517
+#: camlibs/sierra/sierra.c:1539 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1652
#, c-format
msgid "%i (unknown)"
msgstr "%i (不明)"
-#: camlibs/sierra/sierra.c:893 camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1218
msgid "Shutter Speed (microseconds, 0 auto)"
msgstr "シャッター速度 (マイクロ秒, 0:自動)"
-#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:945
-#: camlibs/sierra/sierra.c:1251
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:946
+#: camlibs/sierra/sierra.c:1252
msgid "Black/White"
msgstr "モノクロ"
-#: camlibs/sierra/sierra.c:939 camlibs/sierra/sierra.c:949
-#: camlibs/sierra/sierra.c:1255
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:950
+#: camlibs/sierra/sierra.c:1256
msgid "White Board"
msgstr "白板"
-#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:951
-#: camlibs/sierra/sierra.c:1257
+#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:952
+#: camlibs/sierra/sierra.c:1258
msgid "Black Board"
msgstr "黒板"
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1288
+#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1289
msgid "Brightness/Contrast"
msgstr "明るさ/コントラスト"
-#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1294
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1007
+#: camlibs/sierra/sierra.c:1295
msgid "Bright+"
msgstr "明るさ(+)"
-#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1009
+#: camlibs/sierra/sierra.c:1297
msgid "Bright-"
msgstr "明るさ(-)"
-#: camlibs/sierra/sierra.c:1028 camlibs/sierra/sierra.c:1036
-#: camlibs/sierra/sierra.c:1315
+#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1037
+#: camlibs/sierra/sierra.c:1316
msgid "Skylight"
msgstr "晴天"
-#: camlibs/sierra/sierra.c:1060 camlibs/sierra/sierra.c:1067
-#: camlibs/sierra/sierra.c:1338
+#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1068
+#: camlibs/sierra/sierra.c:1339
msgid "Infinity/Fish-eye"
msgstr "∞/フラッシュアイ"
-#: camlibs/sierra/sierra.c:1081 camlibs/sierra/sierra.c:1348
+#: camlibs/sierra/sierra.c:1082 camlibs/sierra/sierra.c:1349
msgid "Spot Metering Mode"
msgstr "スポット測光モード"
-#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1110
+#: camlibs/sierra/sierra.c:1105 camlibs/sierra/sierra.c:1111
msgid "1x"
msgstr "x1"
-#: camlibs/sierra/sierra.c:1105 camlibs/sierra/sierra.c:1115
+#: camlibs/sierra/sierra.c:1106 camlibs/sierra/sierra.c:1116
msgid "1.6x"
msgstr "x1.6"
-#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1118
+#: camlibs/sierra/sierra.c:1108 camlibs/sierra/sierra.c:1119
msgid "2.5x"
msgstr "x2.5"
-#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1382
-#: camlibs/sierra/sierra.c:1597 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/sierra.c:1136 camlibs/sierra/sierra.c:1383
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1790
msgid "Auto Off (host) (in seconds)"
msgstr "自動パワーオフ (host) (秒後)"
-#: camlibs/sierra/sierra.c:1137 camlibs/sierra/sierra.c:1599
+#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1600
msgid ""
"How long will it take until the camera powers off when connected to the "
"computer?"
msgstr "コンピュータに接続した時に自動的にパワーオフするまでの時間です"
-#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1392
-#: camlibs/sierra/sierra.c:1611 camlibs/sierra/sierra.c:1799
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1393
+#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1800
msgid "Auto Off (field) (in seconds)"
msgstr "自動パワーオフ (屋外) (秒後)"
-#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1152 camlibs/sierra/sierra.c:1614
msgid ""
"How long will it take until the camera powers off when not connected to the "
"computer?"
msgstr "屋外で自動的にパワーオフするまでの時間です"
-#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1411
+#: camlibs/sierra/sierra.c:1174 camlibs/sierra/sierra.c:1412
msgid "LCD Auto Off (in seconds)"
msgstr "液晶モニタの自動オフ (秒後)"
-#: camlibs/sierra/sierra.c:1435
+#: camlibs/sierra/sierra.c:1436
msgid "Shot Settings"
msgstr "ショットの設定"
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1685
+#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1451
+#: camlibs/sierra/sierra.c:1686
msgid "F2"
msgstr "F2"
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1453
+#: camlibs/sierra/sierra.c:1688
msgid "F2.3"
msgstr "F2.3"
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1455
+#: camlibs/sierra/sierra.c:1690
msgid "F2.8"
msgstr "F2.8"
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1691
+#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1457
+#: camlibs/sierra/sierra.c:1692
msgid "F4"
msgstr "F4"
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1458
-#: camlibs/sierra/sierra.c:1693
+#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1459
+#: camlibs/sierra/sierra.c:1694
msgid "F5.6"
msgstr "F5.6"
-#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1461
+#: camlibs/sierra/sierra.c:1696
msgid "F8"
msgstr "F8"
-#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1764
+#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1560
+#: camlibs/sierra/sierra.c:1765
msgid "SuperFine"
msgstr "スーパーファイン"
-#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1561
-#: camlibs/sierra/sierra.c:1766
+#: camlibs/sierra/sierra.c:1553 camlibs/sierra/sierra.c:1562
+#: camlibs/sierra/sierra.c:1767
msgid "HyPict"
msgstr "高解像度"
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1578
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/sierra/sierra.c:1576 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1779
msgid "color"
msgstr "色彩"
-#: camlibs/sierra/sierra.c:1576 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1780
+#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1581
+#: camlibs/sierra/sierra.c:1781
msgid "black & white"
msgstr "モノクロ"
-#: camlibs/sierra/sierra.c:1882
+#: camlibs/sierra/sierra.c:1883
msgid "Note: no memory card present, some values may be invalid\n"
msgstr ""
"注意: メモリ・カードがありません。いくつかの値が不正になるかもしれません。\n"
-#: camlibs/sierra/sierra.c:1890
+#: camlibs/sierra/sierra.c:1891
#, c-format
msgid "%sCamera Model: %s\n"
msgstr "%sカメラの型式: %s\n"
-#: camlibs/sierra/sierra.c:1892
+#: camlibs/sierra/sierra.c:1893
#, c-format
msgid "%sManufacturer: %s\n"
msgstr "%s製造: %s\n"
-#: camlibs/sierra/sierra.c:1894
+#: camlibs/sierra/sierra.c:1895
#, c-format
msgid "%sCamera ID: %s\n"
msgstr "%sカメラID: %s\n"
-#: camlibs/sierra/sierra.c:1896
+#: camlibs/sierra/sierra.c:1897
#, c-format
msgid "%sSerial Number: %s\n"
msgstr "%sシリアル番号: %s\n"
-#: camlibs/sierra/sierra.c:1898
+#: camlibs/sierra/sierra.c:1899
#, c-format
msgid "%sSoftware Rev.: %s\n"
msgstr "%sソフトウェア・リビジョン: %s\n"
-#: camlibs/sierra/sierra.c:1903 camlibs/sierra/sierra.c:1906
+#: camlibs/sierra/sierra.c:1904 camlibs/sierra/sierra.c:1907
#, c-format
msgid "%sFrames Taken: %i\n"
msgstr "%sフレーム数: %i\n"
-#: camlibs/sierra/sierra.c:1909
+#: camlibs/sierra/sierra.c:1910
#, c-format
msgid "%sFrames Left: %i\n"
msgstr "%s残りフレーム数: %i\n"
-#: camlibs/sierra/sierra.c:1911
+#: camlibs/sierra/sierra.c:1912
#, c-format
msgid "%sBattery Life: %i\n"
msgstr "%sバッテリーの寿命: %i\n"
-#: camlibs/sierra/sierra.c:1913
+#: camlibs/sierra/sierra.c:1914
#, c-format
msgid "%sMemory Left: %i bytes\n"
msgstr "%sメモリの空き容量: %i バイト\n"
-#: camlibs/sierra/sierra.c:1918
+#: camlibs/sierra/sierra.c:1919
#, c-format
msgid "%sDate: %s"
msgstr "%s日付: %s"
-#: camlibs/sierra/sierra.c:1934
+#: camlibs/sierra/sierra.c:1935
msgid "No camera manual available.\n"
msgstr "取り扱い説明書は利用できません。\n"
-#: camlibs/sierra/sierra.c:1941
+#: camlibs/sierra/sierra.c:1942
#, c-format
msgid ""
"Some notes about Epson cameras:\n"
@@ -5772,7 +5924,7 @@ msgstr ""
" お使いのカメラがおかしな動きをした場合は\n"
" %s まで (英語で) 連絡して下さい。\n"
-#: camlibs/sierra/sierra.c:1953
+#: camlibs/sierra/sierra.c:1954
msgid ""
"Some notes about Olympus cameras (and others?):\n"
"(1) Camera Configuration:\n"
@@ -5808,7 +5960,7 @@ msgstr ""
" もしこのような状態になったら、PC から取り外しして再び接続し\n"
" 液晶を \"OFF\" に切り替えて下さい。"
-#: camlibs/sierra/sierra.c:1982
+#: camlibs/sierra/sierra.c:1983
#, fuzzy
msgid ""
"sierra SPARClite library\n"
@@ -5877,14 +6029,17 @@ msgid "Sorry, taking pictures is not implemented..."
msgstr "すみません、写真の撮影は実装されていません..."
#: camlibs/sonydscf1/dsc_f1.c:152
+#, c-format
msgid "Couldn't open camera.\n"
msgstr "カメラをオープンできませんでした。\n"
#: camlibs/sonydscf1/dsc_f1.c:166
+#, c-format
msgid "Error opening camera\n"
msgstr "カメラをオープンする際にエラーが発生しました。\n"
#: camlibs/sonydscf1/dsc_f1.c:171
+#, c-format
msgid "Picture number is too large.\n"
msgstr "写真の番号が大きすぎます。\n"
@@ -5907,6 +6062,7 @@ msgstr ""
"このライブラリは旨く動作しないかも。YMMV\n"
#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
+#, c-format
msgid "Error opening camera.\n"
msgstr "カメラをオープンする際にエラーが発生しました。\n"
@@ -6238,18 +6394,18 @@ msgstr ""
"David Hogue <david@jawa.gotdns.org>\n"
"Toshiba pdr-m11 向けのドライバ。\n"
-#: libgphoto2/gphoto2-abilities-list.c:181
-#: libgphoto2/gphoto2-abilities-list.c:278
+#: libgphoto2/gphoto2-abilities-list.c:176
+#: libgphoto2/gphoto2-abilities-list.c:277
#, c-format
msgid "Loading camera drivers from '%s'..."
msgstr "'%s' からカメラのドライバを読み込み中..."
-#: libgphoto2/gphoto2-abilities-list.c:266
+#: libgphoto2/gphoto2-abilities-list.c:265
#, c-format
msgid "Could not open '%s'"
msgstr "'%s' を開けませんでした"
-#: libgphoto2/gphoto2-abilities-list.c:698
+#: libgphoto2/gphoto2-abilities-list.c:697
#, c-format
msgid "Could not find any driver for '%s'"
msgstr "'%s' 用のドライバが見つかりませんでした"
@@ -6491,6 +6647,20 @@ msgid "Unknown error"
msgstr "不明なエラー"
#~ msgid ""
+#~ "Step #2 of initialization failed for PowerShot camera! (returned %i, "
+#~ "expected %i) Camera not operational"
+#~ msgstr ""
+#~ "ステップ #2 で PowerShot カメラの初期化に失敗しました (返り値 %i, 期待値 %"
+#~ "i)。カメラを操作できません!"
+
+#~ msgid ""
+#~ "EOS Step #3 of initialization failed! (returned %i, expected %i) Camera "
+#~ "not operational"
+#~ msgstr ""
+#~ "ステップ #3 で EOS の初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを"
+#~ "操作できません!"
+
+#~ msgid ""
#~ "For the A50, using 115200 may effectively be slower than using 57600\n"
#~ "If you experience a lot of serial transmission errors, try to have your "
#~ "computer as idle as possible\n"