update PO for localization purpose

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9197 67ed7778-7388-44ab-90cf-0a291f65f57c
author: Hubert Figuiere <hub@figuiere.net> 2006-09-20 00:48:20 +0000
committer: Hubert Figuiere <hub@figuiere.net> 2006-09-20 00:48:20 +0000
commit: ea2fe43c3edfb43429e2b29a775dc720e6cc2950 (patch)
tree: a9c258972935cdfcd78ee201ad80200af68161b3 /po/ja.po
parent: 73949bf4de11d2942e71a0b31d73b28dc70fc4d2 (diff)
download: libgphoto2-ea2fe43c3edfb43429e2b29a775dc720e6cc2950.tar.gz
1 files changed, 1476 insertions, 1355 deletions
diff --git a/po/ja.po b/po/ja.po
index be9c55d39..e269e62c3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.5head\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-06-19 21:32+0200\n"
+"POT-Creation-Date: 2006-08-24 13:39-0400\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"
@@ -88,26 +88,26 @@ msgstr ""
 "WEB 上に実装済みの使用方法のドキュメント\n"
 "があります。Vision の承諾済み。"
 
-#: camlibs/canon/canon.c:612
+#: camlibs/canon/canon.c:637
 #, c-format
 msgid "Could not create directory %s."
 msgstr "ディレクトリ %s を生成できませんでした。"
 
-#: camlibs/canon/canon.c:615
+#: camlibs/canon/canon.c:640
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "ディレクトリ %s を削除できませんでした。"
 
-#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
-#: camlibs/canon/usb.c:538
+#: camlibs/canon/canon.c:1200 camlibs/canon/canon.c:1581
+#: camlibs/canon/usb.c:544
 msgid "lock keys failed."
 msgstr "キーのロックに失敗しました。"
 
-#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
+#: camlibs/canon/canon.c:1303 camlibs/canon/canon.c:1304
 msgid "*UNKNOWN*"
 msgstr "*不明*"
 
-#: camlibs/canon/canon.c:1457
+#: camlibs/canon/canon.c:1484
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -116,7 +116,7 @@ msgstr ""
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() の初期化に失敗しまし"
 "た (ステータス %i)"
 
-#: camlibs/canon/canon.c:1592
+#: camlibs/canon/canon.c:1619
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -125,23 +125,23 @@ msgstr ""
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() の終了処理に失敗しま"
 "した (ステータス %i)"
 
-#: camlibs/canon/canon.c:2211
+#: camlibs/canon/canon.c:2238
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "名前 '%s' (%i 個の文字) は長すぎます 最大 30 文字まで有効です。"
 
-#: camlibs/canon/canon.c:2629
+#: camlibs/canon/canon.c:2656
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "%s に小文字があります。"
 
-#: camlibs/canon/canon.c:2809
+#: camlibs/canon/canon.c:2836
 #, 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:2831
+#: camlibs/canon/canon.c:2858
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -149,32 +149,32 @@ msgid ""
 msgstr ""
 "canon_int_list_dir: 最初の dirent を調査する際にパケットの終端に到達しました"
 
-#: camlibs/canon/canon.c:2916
+#: camlibs/canon/canon.c:2943
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: 切りつめられたディレクトリに遭遇しました"
 
-#: camlibs/canon/canon.c:3277
+#: camlibs/canon/canon.c:3304
 msgid "File protected."
 msgstr "ファイルが保護されています。"
 
-#: camlibs/canon/canon.c:3369
+#: camlibs/canon/canon.c:3396
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "データから JPEG サムネイルへ展開できませんでした: 開始/終端がありません"
 
-#: camlibs/canon/canon.c:3456
+#: camlibs/canon/canon.c:3483
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "データから JPEG サムネイルへ展開できませんでした: データは JFIF ではありませ"
 "ん"
 
-#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
+#: camlibs/canon/canon.h:158 camlibs/canon/canon.h:172
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "%3$i 行の %2$s にあるパラメータ \"%1$s\" が NULL です"
 
-#: camlibs/canon/canon.h:546
+#: camlibs/canon/canon.h:577
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -200,93 +200,93 @@ msgstr ""
 "警告: CRC がチェックされていません (サイズ %d, 値 0x%04x の追加) "
 "#########################\n"
 
-#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+#: camlibs/canon/library.c:98 camlibs/canon/library.c:1478
 msgid "Compatibility mode"
 msgstr ""
 
-#: camlibs/canon/library.c:91
+#: camlibs/canon/library.c:99
 #, fuzzy
 msgid "Thumbnail"
 msgstr "サムネイルのプレビュー"
 
-#: camlibs/canon/library.c:92
+#: camlibs/canon/library.c:100
 #, fuzzy
 msgid "Full Image"
 msgstr "画像"
 
-#: camlibs/canon/library.c:165
+#: camlibs/canon/library.c:204
 #, fuzzy
 msgid "Auto focus: one-shot"
 msgstr "フォーカス・モード"
 
-#: camlibs/canon/library.c:166
+#: camlibs/canon/library.c:205
 #, fuzzy
 msgid "Auto focus: AI servo"
 msgstr "自動フォーカスのエラーです。"
 
-#: camlibs/canon/library.c:167
+#: camlibs/canon/library.c:206
 #, fuzzy
 msgid "Auto focus: AI focus"
 msgstr "フォーカス・モード"
 
-#: camlibs/canon/library.c:168
+#: camlibs/canon/library.c:207
 #, fuzzy
 msgid "Manual focus"
 msgstr "取り扱い説明書"
 
-#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+#: camlibs/canon/library.c:212 camlibs/ptp2/ptp.c:2843
 msgid "RAW"
 msgstr ""
 
-#: camlibs/canon/library.c:175
+#: camlibs/canon/library.c:214
 msgid "Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:177
+#: camlibs/canon/library.c:216
 msgid "Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:179
+#: camlibs/canon/library.c:218
 msgid "Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:181
+#: camlibs/canon/library.c:220
 msgid "Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:183
+#: camlibs/canon/library.c:222
 msgid "Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:185
+#: camlibs/canon/library.c:224
 msgid "Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:187
+#: camlibs/canon/library.c:226
 msgid "RAW + Small Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:189
+#: camlibs/canon/library.c:228
 msgid "RAW + Small Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:191
+#: camlibs/canon/library.c:230
 msgid "RAW + Medium Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:193
+#: camlibs/canon/library.c:232
 msgid "RAW + Medium Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:195
+#: camlibs/canon/library.c:234
 msgid "RAW + Large Normal JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:197
+#: camlibs/canon/library.c:236
 msgid "RAW + Large Fine JPEG"
 msgstr ""
 
-#: camlibs/canon/library.c:240
+#: camlibs/canon/library.c:280
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -303,49 +303,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:369
+#: camlibs/canon/library.c:409
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "カメラが無効です"
 
-#: camlibs/canon/library.c:389
+#: camlibs/canon/library.c:429
 msgid "Switching Camera Off"
 msgstr "カメラを OFF にします"
 
-#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
+#: camlibs/canon/library.c:488 camlibs/canon/library.c:525
 msgid "Error capturing image"
 msgstr "画像のキャプチャ中にエラー"
 
-#: camlibs/canon/library.c:541
+#: camlibs/canon/library.c:581
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "ディスク名を取得できませんでした: %s"
 
-#: camlibs/canon/library.c:542
+#: camlibs/canon/library.c:582
 msgid "No reason available"
 msgstr "使用不可の理由"
 
-#: camlibs/canon/library.c:549
+#: camlibs/canon/library.c:589
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "ディスク情報を取得できませんでした: %s"
 
-#: camlibs/canon/library.c:613
+#: camlibs/canon/library.c:658
 #, 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:636
+#: camlibs/canon/library.c:681
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "%s のオーディオ・ファイルが見つかりませんでした"
 
-#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
+#: camlibs/canon/library.c:729 camlibs/canon/library.c:767
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "サムネイルではないファイル %s が指定されました"
 
-#: camlibs/canon/library.c:895
+#: camlibs/canon/library.c:940
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -356,35 +356,35 @@ msgstr ""
 "  合計 %11s バイト\n"
 "  %11s バイト有効"
 
-#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
+#: camlibs/canon/library.c:948 camlibs/canon/library.c:954
+#: camlibs/canon/library.c:1704 camlibs/canon/library.c:1710
 msgid "AC adapter"
 msgstr "AC アダプタ"
 
-#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
-#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
+#: camlibs/canon/library.c:948 camlibs/canon/library.c:954
+#: camlibs/canon/library.c:1704 camlibs/canon/library.c:1710
 msgid "on battery"
 msgstr "バッテリ容量"
 
-#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
+#: camlibs/canon/library.c:950 camlibs/canon/library.c:1706
 msgid "power OK"
 msgstr "電源 ○"
 
-#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
+#: camlibs/canon/library.c:950 camlibs/canon/library.c:1706
 msgid "power bad"
 msgstr "電源 ×"
 
-#: camlibs/canon/library.c:913
+#: camlibs/canon/library.c:958
 #, c-format
 msgid "not available: %s"
 msgstr "使用不可: %s"
 
-#: camlibs/canon/library.c:939
+#: camlibs/canon/library.c:984
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (host 時間 %s%i 秒)"
 
-#: camlibs/canon/library.c:949
+#: camlibs/canon/library.c:994
 #, c-format
 msgid ""
 "\n"
@@ -411,7 +411,7 @@ msgstr ""
 "\n"
 "時刻: %s\n"
 
-#: camlibs/canon/library.c:966
+#: camlibs/canon/library.c:1012
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -432,24 +432,24 @@ msgstr ""
 "A5 追加は Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:1009
+#: camlibs/canon/library.c:1056
 msgid "Error deleting file"
 msgstr "ファイルの削除中にエラー"
 
-#: camlibs/canon/library.c:1025
+#: camlibs/canon/library.c:1072
 msgid "Error deleting associated thumbnail file"
 msgstr "共有サムネイルの削除中にエラー"
 
-#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
+#: camlibs/canon/library.c:1202 camlibs/canon/library.c:1335
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "このカメラにスピード 57600 以上でアップロードすることはできません"
 
-#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
+#: camlibs/canon/library.c:1219 camlibs/canon/library.c:1353
 msgid "Could not get flash drive letter"
 msgstr "フラッシュドライブを取得できませんでした"
 
-#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
+#: camlibs/canon/library.c:1263 camlibs/canon/library.c:1376
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -457,263 +457,263 @@ msgstr ""
 "アップロードできませんでした。使われていないフォルダ名がありません！\n"
 "フォルダ 999CANON は既に存在しており、画像 AUT_9999.JPG がその中にあります。"
 
-#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
+#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1396
 msgid "Could not create \\DCIM directory."
 msgstr "\\DCIM ディレクトリを作成できませんでした"
 
-#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
+#: camlibs/canon/library.c:1291 camlibs/canon/library.c:1402
 msgid "Could not create destination directory."
 msgstr "対象となるディレクトリを作成できませんでした"
 
-#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
-#: camlibs/ptp2/library.c:3816
+#: camlibs/canon/library.c:1443 camlibs/ptp2/config.c:2292
+#: camlibs/ptp2/config.c:2394
 msgid "Camera and Driver Configuration"
 msgstr "カメラとドライバの設定"
 
-#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1446 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "カメラ"
 
-#: camlibs/canon/library.c:1395
+#: camlibs/canon/library.c:1450
 msgid "Camera Model (readonly)"
 msgstr "カメラの型式 (読み取りのみ)"
 
-#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
+#: camlibs/canon/library.c:1455 camlibs/canon/library.c:1765
 msgid "Owner name"
 msgstr "所有者の名前"
 
-#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#: camlibs/canon/library.c:1461 camlibs/canon/library.c:1778
 #, fuzzy
 msgid "Capture size class"
 msgstr "キャプチャの遅れ"
 
-#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
-#: camlibs/canon/library.c:1759
+#: camlibs/canon/library.c:1495 camlibs/canon/library.c:1805
+#: camlibs/canon/library.c:1820
 #, fuzzy
 msgid "ISO speed"
 msgstr "ISO スピード"
 
-#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
-#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
-#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
-#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
-#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
-#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
-#: camlibs/ptp2/ptp.c:2679
+#: camlibs/canon/library.c:1521 camlibs/canon/library.c:1522
+#: camlibs/canon/library.c:1555 camlibs/canon/library.c:1556
+#: camlibs/canon/library.c:1589 camlibs/canon/library.c:1590
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1629
+#: camlibs/canon/library.c:1662 camlibs/canon/library.c:1663
+#: camlibs/ptp2/library.c:1641 camlibs/ptp2/library.c:1643
+#: camlibs/ptp2/ptp.c:2957
 msgid "Unknown"
 msgstr "不明"
 
-#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
-#: camlibs/canon/library.c:1799
+#: camlibs/canon/library.c:1529 camlibs/canon/library.c:1802
+#: camlibs/canon/library.c:1860
 #, fuzzy
 msgid "Shutter speed"
 msgstr "シャッター速度"
 
-#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
-#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
-#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
-#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
-#: camlibs/sierra/sierra.c:1711
+#: camlibs/canon/library.c:1563 camlibs/canon/library.c:1808
+#: camlibs/canon/library.c:1900 camlibs/ptp2/config.c:2238
+#: camlibs/ptp2/ptp.c:2489 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:1262 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1718
 msgid "Aperture"
 msgstr "絞り"
 
-#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
-#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/canon/library.c:1597 camlibs/canon/library.c:1811
+#: camlibs/canon/library.c:1940 camlibs/konica/library.c:718
 #: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
-#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
-#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
-#: camlibs/sierra/sierra.c:1786
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:901
+#: camlibs/sierra/sierra.c:1233 camlibs/sierra/sierra.c:1584
+#: camlibs/sierra/sierra.c:1793
 msgid "Resolution"
 msgstr "解像度"
 
-#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
-#: camlibs/canon/library.c:1919
+#: camlibs/canon/library.c:1636 camlibs/canon/library.c:1814
+#: camlibs/canon/library.c:1980
 #, fuzzy
 msgid "Focus mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/canon/library.c:1618
+#: camlibs/canon/library.c:1673
 msgid "Date and Time (readonly)"
 msgstr "日付と時刻 (読み取りのみ)"
 
-#: camlibs/canon/library.c:1625
+#: camlibs/canon/library.c:1680
 msgid "Error"
 msgstr "エラー"
 
-#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
+#: camlibs/canon/library.c:1683 camlibs/canon/library.c:1712
 msgid "Unavailable"
 msgstr "使用不可"
 
-#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
+#: camlibs/canon/library.c:1687 camlibs/canon/library.c:2023
 msgid "Set camera date to PC date"
 msgstr "カメラの日付を PC の日付にセットします"
 
-#: camlibs/canon/library.c:1636
+#: camlibs/canon/library.c:1691
 msgid "Firmware revision (readonly)"
 msgstr "ファームウェアのリビジョン (読み取りのみ)"
 
-#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
-#: camlibs/ptp2/library.c:3792
+#: camlibs/canon/library.c:1716 camlibs/ptp2/config.c:2341
+#: camlibs/ptp2/config.c:2370
 msgid "Power (readonly)"
 msgstr "電源 (読み取りのみ)"
 
-#: camlibs/canon/library.c:1666
+#: camlibs/canon/library.c:1721
 msgid "Driver"
 msgstr "ドライバ"
 
-#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
+#: camlibs/canon/library.c:1725 camlibs/canon/library.c:2037
 msgid "List all files"
 msgstr "全ファイルの一覧"
 
-#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
+#: camlibs/canon/library.c:1731 camlibs/canon/library.c:2050
 msgid "Keep filename on upload"
 msgstr "アップロード時にファイル名を保持する"
 
-#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
-#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
-#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
-#: camlibs/canon/library.c:1966
+#: camlibs/canon/library.c:1769 camlibs/canon/library.c:1824
+#: camlibs/canon/library.c:1864 camlibs/canon/library.c:1904
+#: camlibs/canon/library.c:1944 camlibs/canon/library.c:1984
+#: camlibs/canon/library.c:2027
 msgid "Camera unavailable"
 msgstr "カメラが無効です"
 
-#: camlibs/canon/library.c:1711
+#: camlibs/canon/library.c:1772
 msgid "Owner name changed"
 msgstr "所有者が変更されました"
 
-#: camlibs/canon/library.c:1713
+#: camlibs/canon/library.c:1774
 msgid "could not change owner name"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:1725
+#: camlibs/canon/library.c:1786
 msgid "Capture size class changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1732
+#: camlibs/canon/library.c:1793
 msgid "Invalid capture size class setting"
 msgstr ""
 
-#: camlibs/canon/library.c:1783
+#: camlibs/canon/library.c:1844
 msgid "Invalid ISO speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:1786
+#: camlibs/canon/library.c:1847
 #, fuzzy
 msgid "ISO speed changed"
 msgstr "所有者が変更されました"
 
-#: camlibs/canon/library.c:1788
+#: camlibs/canon/library.c:1849
 #, fuzzy
 msgid "Could not change ISO speed"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:1823
+#: camlibs/canon/library.c:1884
 msgid "Invalid shutter speed setting"
 msgstr ""
 
-#: camlibs/canon/library.c:1826
+#: camlibs/canon/library.c:1887
 #, fuzzy
 msgid "Shutter speed changed"
 msgstr "シャッター速度"
 
-#: camlibs/canon/library.c:1828
+#: camlibs/canon/library.c:1889
 #, fuzzy
 msgid "Could not change shutter speed"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:1863
+#: camlibs/canon/library.c:1924
 #, fuzzy
 msgid "Invalid aperture setting"
 msgstr "外観の設定"
 
-#: camlibs/canon/library.c:1866
+#: camlibs/canon/library.c:1927
 #, fuzzy
 msgid "Aperture changed"
 msgstr "外観の設定"
 
-#: camlibs/canon/library.c:1868
+#: camlibs/canon/library.c:1929
 #, fuzzy
 msgid "Could not change aperture"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:1902
+#: camlibs/canon/library.c:1963
 msgid "Invalid resolution setting"
 msgstr ""
 
-#: camlibs/canon/library.c:1906
+#: camlibs/canon/library.c:1967
 #, fuzzy
 msgid "Resolution changed"
 msgstr "解像度切替えあり"
 
-#: camlibs/canon/library.c:1908
+#: camlibs/canon/library.c:1969
 #, fuzzy
 msgid "Could not change resolution"
 msgstr "フォルダを生成できませんでした。"
 
-#: camlibs/canon/library.c:1943
+#: camlibs/canon/library.c:2004
 msgid "Invalid focus mode setting"
 msgstr ""
 
-#: camlibs/canon/library.c:1946
+#: camlibs/canon/library.c:2007
 #, fuzzy
 msgid "Focus mode changed"
 msgstr "フォーカス・モード"
 
-#: camlibs/canon/library.c:1948
+#: camlibs/canon/library.c:2009
 #, fuzzy
 msgid "Could not change focus mode"
 msgstr "所有者の名前を変更できませんでした"
 
-#: camlibs/canon/library.c:1969
+#: camlibs/canon/library.c:2030
 msgid "time set"
 msgstr "時刻のセット"
 
-#: camlibs/canon/library.c:1971
+#: camlibs/canon/library.c:2032
 msgid "could not set time"
 msgstr "時刻をセットできませんでした"
 
-#: camlibs/canon/library.c:2189
+#: camlibs/canon/library.c:2264
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "未サポートのポートの種類 %i = 0x%x が指定されました。初期化できません。"
 
-#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
+#: camlibs/canon/serial.c:709 camlibs/canon/serial.c:774
 msgid "Battery exhausted, camera off."
 msgstr "バッテリが消耗しました。カメラを OFF にします。"
 
-#: camlibs/canon/serial.c:704
+#: camlibs/canon/serial.c:712
 msgid "ERROR: unexpected message"
 msgstr "エラー: 予期しないメッセージ"
 
-#: camlibs/canon/serial.c:714
+#: camlibs/canon/serial.c:722
 msgid "ERROR: message overrun"
 msgstr "エラー: メッセージのオーバーラン"
 
-#: camlibs/canon/serial.c:743
+#: camlibs/canon/serial.c:751
 msgid "ERROR: out of sequence."
 msgstr "エラー: シーケンスを越えました。"
 
-#: camlibs/canon/serial.c:748
+#: camlibs/canon/serial.c:756
 msgid "ERROR: unexpected packet type."
 msgstr "エラー: 予期しないパケットの種類です。"
 
-#: camlibs/canon/serial.c:758
+#: camlibs/canon/serial.c:766
 msgid "ERROR: message format error."
 msgstr "エラー: メッセージ書式のエラーです。"
 
-#: camlibs/canon/serial.c:770
+#: camlibs/canon/serial.c:778
 msgid "ERROR: unexpected message2."
 msgstr "エラー: 予期しないメッセージ 2 です。"
 
-#: camlibs/canon/serial.c:985
+#: camlibs/canon/serial.c:993
 msgid "Uploading file..."
 msgstr "ファイルのアップロード中..."
 
-#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1064 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "ファイルの取得中..."
 
-#: camlibs/canon/serial.c:1126
+#: camlibs/canon/serial.c:1134
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -721,153 +721,153 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue でディレクトリを取得できませ"
 "んでした"
 
-#: camlibs/canon/serial.c:1134
+#: camlibs/canon/serial.c:1142
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 "canon_serial_get_dirents: dirent の初期パケットが短すぎます (%i バイトだけ)"
 
-#: camlibs/canon/serial.c:1154
+#: camlibs/canon/serial.c:1162
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: %i バイトのメモリを確保できませんでした"
 
-#: camlibs/canon/serial.c:1174
+#: camlibs/canon/serial.c:1182
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: 別のディレクトリを読み込めませんでした"
 
-#: camlibs/canon/serial.c:1192
+#: camlibs/canon/serial.c:1200
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: 切りつめられたディレクトリを受け取りました"
 
-#: camlibs/canon/serial.c:1220
+#: camlibs/canon/serial.c:1228
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: dirent が多すぎます (ループせざるを得ないです)"
 
-#: camlibs/canon/serial.c:1230
+#: camlibs/canon/serial.c:1238
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: dirent のバッファ・サイズを %i バイトに変更できませ"
 "んでした"
 
-#: camlibs/canon/serial.c:1299
+#: camlibs/canon/serial.c:1307
 msgid "Error changing speed."
 msgstr "スピード変更でエラーが発生しました。"
 
-#: camlibs/canon/serial.c:1308
+#: camlibs/canon/serial.c:1316
 msgid "Resetting protocol..."
 msgstr "プロトコルの再設定..."
 
-#: camlibs/canon/serial.c:1317
+#: camlibs/canon/serial.c:1325
 msgid "Camera OK.\n"
 msgstr "カメラは OK です。\n"
 
-#: camlibs/canon/serial.c:1330
+#: camlibs/canon/serial.c:1338
 msgid "Looking for camera ..."
 msgstr "カメラの検出中..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1348
 msgid "Trying to contact camera..."
 msgstr "カメラと通信中..."
 
-#: camlibs/canon/serial.c:1344
+#: camlibs/canon/serial.c:1352
 msgid "Communication error 1"
 msgstr "通信エラー 1"
 
-#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362 camlibs/canon/serial.c:1366
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "カメラから反応がありません"
 
-#: camlibs/canon/serial.c:1362
+#: camlibs/canon/serial.c:1370
 msgid "Unrecognized response"
 msgstr "認識できない反応です"
 
-#: camlibs/canon/serial.c:1382
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "\"%s\" (\"%s\") を検出しました。"
 
-#: camlibs/canon/serial.c:1390
+#: camlibs/canon/serial.c:1398
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "不明な型式 \"%s\""
 
-#: camlibs/canon/serial.c:1411
+#: camlibs/canon/serial.c:1419
 msgid "Bad EOT"
 msgstr "おかしな EOT"
 
-#: camlibs/canon/serial.c:1417
+#: camlibs/canon/serial.c:1425
 msgid "Communication error 2"
 msgstr "通信エラー 2"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1448
 msgid "Communication error 3"
 msgstr "通信エラー 3"
 
-#: camlibs/canon/serial.c:1444
+#: camlibs/canon/serial.c:1452
 msgid "Changing speed... wait..."
 msgstr "スピードの変更中... 少々お待ち下さい..."
 
-#: camlibs/canon/serial.c:1449
+#: camlibs/canon/serial.c:1457
 msgid "Error changing speed"
 msgstr "スピード変更でエラー"
 
-#: camlibs/canon/serial.c:1460
+#: camlibs/canon/serial.c:1468
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "再初期化中の ACK 待ちでエラー"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1474
 msgid "Error waiting ACK during initialization"
 msgstr "初期化中の ACK 待ちでエラー"
 
-#: camlibs/canon/serial.c:1470
+#: camlibs/canon/serial.c:1478
 msgid "Connected to camera"
 msgstr "カメラに接続済み"
 
-#: camlibs/canon/serial.c:1508
+#: camlibs/canon/serial.c:1516
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "エラー: 致命的なエラーを検出しました。続行できません。"
 
-#: camlibs/canon/serial.c:1524
+#: camlibs/canon/serial.c:1532
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "エラー: %d は大きすぎます"
 
-#: camlibs/canon/serial.c:1534
+#: camlibs/canon/serial.c:1542
 msgid "Getting thumbnail..."
 msgstr "サムネイルの取得中..."
 
-#: camlibs/canon/usb.c:211
+#: camlibs/canon/usb.c:217
 msgid "NOT RECOGNIZED"
 msgstr "認識されていません"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:232
 msgid "Could not establish initial contact with camera"
 msgstr "カメラと初期接続を確立できませんでした"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:238
 msgid "Camera was already active"
 msgstr "カメラは既にアクティブです"
 
-#: camlibs/canon/usb.c:235
+#: camlibs/canon/usb.c:241
 msgid "Camera was woken up"
 msgstr "カメラが起動されました"
 
-#: camlibs/canon/usb.c:240
+#: camlibs/canon/usb.c:246
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "不明なエラー (詳細不明)"
 
-#: camlibs/canon/usb.c:241
+#: camlibs/canon/usb.c:247
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "カメラの初期応答 %c/'%s' を認識できません"
 
-#: camlibs/canon/usb.c:256
+#: camlibs/canon/usb.c:262
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -876,7 +876,7 @@ msgstr ""
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:262
+#: camlibs/canon/usb.c:268
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -885,7 +885,7 @@ msgstr ""
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:281
+#: camlibs/canon/usb.c:287
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -893,7 +893,7 @@ msgstr ""
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
+#: camlibs/canon/usb.c:294 camlibs/canon/usb.c:321
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -902,7 +902,7 @@ msgstr ""
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:308
+#: camlibs/canon/usb.c:314
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -911,30 +911,30 @@ msgstr ""
 "ステップ #3 で初期化に失敗しました (返り値 %i, 期待値 %i)。カメラを操作できま"
 "せん！"
 
-#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
+#: camlibs/canon/usb.c:352 camlibs/canon/usb.c:393
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "ステップ #4.1 で失敗しました (返り値 %i, 期待値 %i)。カメラを操作できません！"
 
-#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
+#: camlibs/canon/usb.c:359 camlibs/canon/usb.c:400
 #, fuzzy, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "ステップ #4.1 で失敗しました (返り値 %i, 期待値 %i)。カメラを操作できません！"
 
-#: camlibs/canon/usb.c:491
+#: camlibs/canon/usb.c:497
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "カメラの準備ができていません。複数回 \"カメラ情報\" 要求が失敗しました: %s"
 
-#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
+#: camlibs/canon/usb.c:535 camlibs/canon/usb.c:551
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "カメラの準備ができていません (get_battery に失敗): %s"
 
-#: camlibs/canon/usb.c:609
+#: camlibs/canon/usb.c:616
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -943,14 +943,14 @@ msgstr ""
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
+#: camlibs/canon/usb.c:638 camlibs/canon/usb.c:664 camlibs/canon/usb.c:704
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
+#: camlibs/canon/usb.c:747 camlibs/canon/usb.c:763
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -958,7 +958,7 @@ msgstr ""
 "canon_usb_unlock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
+#: camlibs/canon/usb.c:818 camlibs/canon/usb.c:836
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -967,7 +967,7 @@ msgstr ""
 "canon_usb_lock_keys: 期待していないサイズのデータを受け取りました (%i バイ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:883
+#: camlibs/canon/usb.c:890
 #, fuzzy, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -976,7 +976,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: %i 回試行しましたが割り込みに失敗しました (\"%"
 "s\")"
 
-#: camlibs/canon/usb.c:938
+#: camlibs/canon/usb.c:945
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -985,7 +985,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: %i 回試行しましたが割り込みに失敗しました "
 "(\"%s\")"
 
-#: camlibs/canon/usb.c:1067
+#: camlibs/canon/usb.c:1074
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -993,30 +993,30 @@ msgstr ""
 "canon_usb_capture_dialogue: サムネイルのパケット・サイズがおかしいです (0x%"
 "04x)"
 
-#: camlibs/canon/usb.c:1083
+#: camlibs/canon/usb.c:1090
 #, 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:1101
+#: camlibs/canon/usb.c:1108
 #, fuzzy
 msgid "canon_usb_capture_dialogue:secondary image descriptor received"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンスの外で二回目の割り込みが発生しました"
 
-#: camlibs/canon/usb.c:1127
+#: camlibs/canon/usb.c:1134
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンスの外で一回目の割り込みが発生しました"
 
-#: camlibs/canon/usb.c:1135
+#: camlibs/canon/usb.c:1142
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンスの外で二回目の割り込みが発生しました"
 
-#: camlibs/canon/usb.c:1145
+#: camlibs/canon/usb.c:1152
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -1024,43 +1024,43 @@ msgstr ""
 "canon_usb_capture_dialogue: 写真のシグナル受信に失敗しました (コード = 0x%"
 "08x)"
 
-#: camlibs/canon/usb.c:1164
+#: camlibs/canon/usb.c:1171
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンスの外で三回目の割り込みが発生しました "
 "(EOS)"
 
-#: camlibs/canon/usb.c:1199
+#: camlibs/canon/usb.c:1206
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンスとの外で四回目の割り込みが発生しました "
 "(EOS)"
 
-#: camlibs/canon/usb.c:1387
+#: camlibs/canon/usb.c:1394
 #, 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:1493
+#: camlibs/canon/usb.c:1500
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1659
+#: camlibs/canon/usb.c:1666
 msgid "Receiving data..."
 msgstr "データの受信中..."
 
-#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
+#: camlibs/canon/usb.c:2054 camlibs/canon/usb.c:2201
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "メモリが足りません: %d バイト必要です。"
 
-#: camlibs/canon/usb.c:2112
+#: camlibs/canon/usb.c:2119
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue に失敗しました"
 
-#: camlibs/canon/usb.c:2119
+#: camlibs/canon/usb.c:2126
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -1069,22 +1069,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue がエラー・ステータス 0x%"
 "08x を受け取りました"
 
-#: camlibs/canon/usb.c:2194
+#: camlibs/canon/usb.c:2212
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "ファイル \"%s\" を読み込めませんでした"
 
-#: camlibs/canon/usb.c:2204
+#: camlibs/canon/usb.c:2222
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "メモリが足りません: %ld バイト必要です"
 
-#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
-#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
+#: camlibs/canon/usb.c:2255 camlibs/canon/usb.c:2266 camlibs/canon/usb.c:2302
+#: camlibs/canon/usb.c:2316 camlibs/canon/usb.c:2330
 msgid "File upload failed."
 msgstr "ファイルのアップロードに失敗しました"
 
-#: camlibs/canon/usb.c:2338
+#: camlibs/canon/usb.c:2356
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "ファイルが大きすぎます。お使いのカメラの電源を OFF にして、ファイルをアップ"
 "ロードする前に戻して下さい。"
 
-#: camlibs/canon/usb.c:2384
+#: camlibs/canon/usb.c:2403
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -1101,7 +1101,7 @@ msgstr ""
 "canon_usb_get_dirents: バッファに読み込めません。切りつめたサイズ '%.96s' が"
 "大きすぎます。"
 
-#: camlibs/canon/usb.c:2401
+#: camlibs/canon/usb.c:2420
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1110,7 +1110,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue でディレクトリの取得に失敗しま"
 "した (返り値 %i)"
 
-#: camlibs/canon/usb.c:2452
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -1119,7 +1119,7 @@ msgstr ""
 "canon_usb_list_all_dirs: バッファに読み込めません。切りつめたサイズ '%.96s' "
 "が大きすぎます。"
 
-#: camlibs/canon/usb.c:2471
+#: camlibs/canon/usb.c:2490
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -1128,12 +1128,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue でディレクトリの取得に失敗し"
 "ました (返り値 %i)"
 
-#: camlibs/canon/usb.c:2547
+#: camlibs/canon/usb.c:2567
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' を検出しました。"
 
-#: camlibs/canon/usb.c:2553
+#: camlibs/canon/usb.c:2573
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "カメラの名前 \"%s\" が既存のカメラ名に一致しません"
@@ -1163,7 +1163,7 @@ msgstr ""
 
 #: camlibs/casio/casio-qv.c:266 camlibs/dimera/dimera3500.c:771
 #: camlibs/kodak/dc210/dc210.c:172 camlibs/polaroid/pdc700.c:980
-#: camlibs/sierra/sierra.c:884 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:891 camlibs/sierra/sierra.c:1469
 #: camlibs/sierra/sierra-desc.c:205
 msgid "Camera Configuration"
 msgstr "カメラの設定"
@@ -1232,7 +1232,7 @@ msgstr ""
 "Aox 汎用ドライバ\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:106
+#: camlibs/digigr8/library.c:107
 #, fuzzy, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -1241,7 +1241,7 @@ msgstr ""
 "お使いの USB カメラは Kodak EZ200 です。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/digigr8/library.c:119
+#: camlibs/digigr8/library.c:120
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1254,7 +1254,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:137
+#: camlibs/digigr8/library.c:138
 #, fuzzy
 msgid ""
 "sq905C generic driver\n"
@@ -1329,8 +1329,8 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:399 camlibs/dimera/dimera3500.c:785
 #: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:425
 #: camlibs/konica/library.c:778 camlibs/konica/library.c:1019
-#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
-#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/config.c:577
+#: camlibs/ptp2/ptp.c:2849 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "フラッシュあり"
@@ -1618,7 +1618,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/ptp2/library.c:762
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:783
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "ダウンロード中..."
@@ -1673,11 +1673,12 @@ 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:1690 camlibs/sierra/sierra.c:1863
+#: camlibs/sierra/sierra.c:1697 camlibs/sierra/sierra.c:1870
 msgid "Date & Time"
 msgstr "日付と時間"
 
 #: camlibs/fuji/library.c:385 camlibs/fuji/library.c:418
+#: camlibs/ptp2/config.c:1767
 msgid "ID"
 msgstr "ID"
 
@@ -1956,25 +1957,25 @@ msgid "High (good quality)"
 msgstr "高 (普通の品質)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3631
+#: camlibs/ptp2/config.c:2197
 msgid "Capture"
 msgstr "キャプチャ"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
-#: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/config.c:2219
+#: camlibs/ptp2/ptp.c:2492 camlibs/ricoh/library.c:499
+#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1399
 msgid "Zoom"
 msgstr "ズーム"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
-#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/config.c:1075
+#: camlibs/ptp2/config.c:1363 camlibs/ptp2/ptp.c:2883
 #: 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:1087 camlibs/sierra/sierra.c:1092
-#: camlibs/sierra/sierra.c:1363 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1775
+#: camlibs/sierra/sierra.c:1094 camlibs/sierra/sierra.c:1099
+#: camlibs/sierra/sierra.c:1370 camlibs/sierra/sierra.c:1566
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1782
 msgid "Macro"
 msgstr "マクロ"
 
@@ -2011,11 +2012,11 @@ 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:2833 camlibs/ptp2/library.c:2854
-#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
-#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
-#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
-#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
+#: camlibs/ptp2/config.c:919 camlibs/ptp2/config.c:940
+#: camlibs/ptp2/config.c:1072 camlibs/ptp2/config.c:1252
+#: camlibs/ptp2/config.c:1340 camlibs/ptp2/config.c:1351
+#: camlibs/ptp2/config.c:1382 camlibs/ptp2/ptp.c:2845 camlibs/ptp2/ptp.c:2880
+#: camlibs/ptp2/ptp.c:2896 camlibs/ptp2/ptp.c:2937 camlibs/ptp2/ptp.c:2945
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
 #: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:151
 #: camlibs/sierra/epson-desc.c:169 camlibs/sierra/nikon-desc.c:168
@@ -2027,32 +2028,32 @@ 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:895
-#: camlibs/sierra/sierra.c:901 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1056
-#: camlibs/sierra/sierra.c:1063 camlibs/sierra/sierra.c:1230
-#: camlibs/sierra/sierra.c:1259 camlibs/sierra/sierra.c:1299
-#: camlibs/sierra/sierra.c:1342 camlibs/sierra/sierra.c:1505
-#: camlibs/sierra/sierra.c:1511 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1538 camlibs/sierra/sierra.c:1738
-#: camlibs/sierra/sierra.c:1758
+#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:902
+#: camlibs/sierra/sierra.c:908 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:1002
+#: camlibs/sierra/sierra.c:1009 camlibs/sierra/sierra.c:1063
+#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1237
+#: camlibs/sierra/sierra.c:1266 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1349 camlibs/sierra/sierra.c:1512
+#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1540
+#: camlibs/sierra/sierra.c:1545 camlibs/sierra/sierra.c:1745
+#: camlibs/sierra/sierra.c:1765
 msgid "Auto"
 msgstr "自動"
 
 #: camlibs/kodak/dc210/dc210.c:260 camlibs/kodak/dc210/dc210.c:267
 #: 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:996 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1301 camlibs/sierra/sierra.c:1506
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1740
+#: camlibs/sierra/sierra.c:1003 camlibs/sierra/sierra.c:1011
+#: camlibs/sierra/sierra.c:1308 camlibs/sierra/sierra.c:1513
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1747
 msgid "Force"
 msgstr "強制発光"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
-#: camlibs/ricoh/library.c:346
+#: camlibs/ptp2/config.c:1346 camlibs/ptp2/config.c:1861
+#: camlibs/ptp2/library.c:1926 camlibs/ptp2/library.c:1930
+#: camlibs/ptp2/ptp.c:2943 camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "なし"
 
@@ -2068,16 +2069,16 @@ 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:2477
-#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
-#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
-#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
-#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
-#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/config.c:529
+#: camlibs/ptp2/config.c:531 camlibs/ptp2/config.c:543
+#: camlibs/ptp2/config.c:636 camlibs/ptp2/config.c:638
+#: camlibs/ptp2/config.c:650 camlibs/ptp2/config.c:669
+#: camlibs/ptp2/config.c:671 camlibs/ptp2/config.c:683
+#: camlibs/ptp2/config.c:1254 camlibs/ptp2/ptp.c:2794 camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2898 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:305
-#: camlibs/sierra/sierra.c:1112 camlibs/sierra/sierra.c:1118
-#: camlibs/sierra/sierra.c:1381
+#: camlibs/sierra/sierra.c:1119 camlibs/sierra/sierra.c:1125
+#: camlibs/sierra/sierra.c:1388
 msgid "On"
 msgstr "ON"
 
@@ -2090,24 +2091,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:2478
-#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
-#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
-#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
-#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
-#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
-#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/config.c:530
+#: camlibs/ptp2/config.c:531 camlibs/ptp2/config.c:547
+#: camlibs/ptp2/config.c:637 camlibs/ptp2/config.c:638
+#: camlibs/ptp2/config.c:654 camlibs/ptp2/config.c:670
+#: camlibs/ptp2/config.c:671 camlibs/ptp2/config.c:687
+#: camlibs/ptp2/config.c:1253 camlibs/ptp2/config.c:1362
+#: camlibs/ptp2/config.c:1413 camlibs/ptp2/ptp.c:2794 camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2897 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:997
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1113
-#: camlibs/sierra/sierra.c:1116 camlibs/sierra/sierra.c:1303
-#: camlibs/sierra/sierra.c:1383 camlibs/sierra/sierra.c:1507
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1742
+#: camlibs/sierra/olympus-desc.c:757 camlibs/sierra/sierra.c:1004
+#: camlibs/sierra/sierra.c:1013 camlibs/sierra/sierra.c:1120
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1310
+#: camlibs/sierra/sierra.c:1390 camlibs/sierra/sierra.c:1514
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1749
 msgid "Off"
 msgstr "OFF"
 
@@ -2352,42 +2353,42 @@ msgstr "引数 2"
 msgid "Parameter 3"
 msgstr "引数 3"
 
-#: camlibs/kodak/dc240/dc240.c:180
+#: camlibs/kodak/dc240/dc240.c:181
 #, c-format
 msgid "Model: Kodak %s\n"
 msgstr "型式: Kodak %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:181
+#: camlibs/kodak/dc240/dc240.c:182
 #, c-format
 msgid "Firmware version: %d.%02d\n"
 msgstr "ファームウェアのリビジョン: %d.%02d\n"
 
-#: camlibs/kodak/dc240/dc240.c:183
+#: camlibs/kodak/dc240/dc240.c:184
 #, c-format
 msgid "Battery status: %s, AC Adapter: %s\n"
 msgstr "電源: %s  AC アダプタ: %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:187
+#: camlibs/kodak/dc240/dc240.c:188
 #, c-format
 msgid "Number of pictures: %d\n"
 msgstr "写真の数: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:189
+#: camlibs/kodak/dc240/dc240.c:190
 #, c-format
 msgid "Space remaining: High: %d, Medium: %d, Low: %d\n"
 msgstr "残り空き容量: 高: %d 中: %d, 低: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:193
+#: camlibs/kodak/dc240/dc240.c:194
 #, c-format
 msgid "Memory card status (%d): %s\n"
 msgstr "メモリカードの状態 (%d): %s\n"
 
-#: camlibs/kodak/dc240/dc240.c:197
+#: camlibs/kodak/dc240/dc240.c:198
 #, c-format
 msgid "Total pictures captured: %d, Flashes fired: %d\n"
 msgstr "キャプチャした写真の合計: %d フラッシュの発光数: %d\n"
 
-#: camlibs/kodak/dc240/dc240.c:211
+#: camlibs/kodak/dc240/dc240.c:212
 msgid ""
 "Kodak DC240 Camera Library\n"
 "Scott Fritzinger <scottf@gphoto.net> and Hubert Figuiere <hfiguiere@teaser."
@@ -2720,7 +2721,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:1653 camlibs/sierra/sierra.c:1837
+#: camlibs/sierra/sierra.c:1660 camlibs/sierra/sierra.c:1844
 msgid "Language"
 msgstr "言語"
 
@@ -2788,8 +2789,8 @@ msgid "Focus"
 msgstr "フォーカス"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1534
-#: camlibs/sierra/sierra.c:1540 camlibs/sierra/sierra.c:1760
+#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1541
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1767
 msgid "Fixed"
 msgstr "固定"
 
@@ -2810,19 +2811,19 @@ msgstr "セルフタイマ (次の写真のみ)"
 
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
-#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
-#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
-#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
-#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/config.c:1328
+#: camlibs/ptp2/config.c:1341 camlibs/ptp2/config.c:1352
+#: camlibs/ptp2/config.c:1448 camlibs/ptp2/ptp.c:2928 camlibs/ptp2/ptp.c:2938
+#: camlibs/ptp2/ptp.c:2946 camlibs/ptp2/ptp.c:2953 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:965
-#: camlibs/sierra/sierra.c:972 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1033 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1094 camlibs/sierra/sierra.c:1278
-#: camlibs/sierra/sierra.c:1321 camlibs/sierra/sierra.c:1365
-#: camlibs/sierra/sierra.c:1560 camlibs/sierra/sierra.c:1564
-#: camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:979 camlibs/sierra/sierra.c:1033
+#: camlibs/sierra/sierra.c:1040 camlibs/sierra/sierra.c:1095
+#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1328 camlibs/sierra/sierra.c:1372
+#: camlibs/sierra/sierra.c:1567 camlibs/sierra/sierra.c:1571
+#: camlibs/sierra/sierra.c:1784
 #, c-format
 msgid "Normal"
 msgstr "標準"
@@ -2888,23 +2889,23 @@ msgid "No answer from the camera."
 msgstr "カメラから応答がありません"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
+#: camlibs/ptp2/config.c:1342 camlibs/ptp2/ptp.c:2939
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:943
+#: camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:1268
 msgid "Low"
 msgstr "低"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:937
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1263
+#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:944
+#: camlibs/sierra/sierra.c:952 camlibs/sierra/sierra.c:1270
 msgid "Medium"
 msgstr "中"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
-#: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
-#: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
+#: camlibs/ptp2/config.c:1345 camlibs/ptp2/ptp.c:2942
+#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:954
+#: camlibs/sierra/sierra.c:1241 camlibs/sierra/sierra.c:1272
 msgid "High"
 msgstr "高い"
 
@@ -2940,7 +2941,7 @@ msgstr "オフィス"
 msgid "Day-lt"
 msgstr "屋外"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2169
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2447
 msgid "Sharpness"
 msgstr "鮮明度"
 
@@ -2970,10 +2971,10 @@ msgid "Black and White"
 msgstr "モノクロ"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
+#: camlibs/ptp2/config.c:1146 camlibs/ptp2/config.c:1417
 #: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:378
-#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:976
-#: camlibs/sierra/sierra.c:1282
+#: camlibs/sierra/sierra.c:974 camlibs/sierra/sierra.c:983
+#: camlibs/sierra/sierra.c:1289
 msgid "Sepia"
 msgstr "セピア"
 
@@ -3213,8 +3214,8 @@ msgstr ""
 "カードID:\t\t%d\n"
 "フラッシュモード:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/config.c:1088
+#: camlibs/ptp2/ptp.c:2890
 msgid "Remote"
 msgstr "リモート"
 
@@ -3224,26 +3225,26 @@ msgstr "ローカル"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2796
 msgid "Yes"
 msgstr "はい"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2796
 msgid "No"
 msgstr "いいえ"
 
 #: camlibs/minolta/dimagev/dimagev.c:300 camlibs/sierra/nikon-desc.c:283
-#: camlibs/sierra/sierra.c:1579 camlibs/sierra/sierra.c:1586
-#: camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/sierra.c:1586 camlibs/sierra/sierra.c:1593
+#: camlibs/sierra/sierra.c:1798
 msgid "Fine"
 msgstr "ファイン"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
-#: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/config.c:1144
+#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:910
+#: camlibs/sierra/sierra.c:1239 camlibs/sierra/sierra.c:1585
+#: camlibs/sierra/sierra.c:1591 camlibs/sierra/sierra.c:1796
 msgid "Standard"
 msgstr "標準"
 
@@ -3289,7 +3290,7 @@ msgid "Not Full"
 msgstr "使用中"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/config.c:849 camlibs/ptp2/ptp.c:2905
 #, c-format
 msgid "Full"
 msgstr "フル充電"
@@ -3472,7 +3473,7 @@ msgstr ""
 "ファイルサイズは %ld バイトです。アップロード可能なサイズは %i バイトです。"
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:826 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -3670,13 +3671,13 @@ msgstr ""
 "Michael Trawny <trawny99@users.sourceforge.net> が担当しました。バグ修正は "
 "Marcus Meissner <marcus@jet.franken.de> が担当しました。"
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/config.c:2203
+#: camlibs/ptp2/config.c:2204 camlibs/ptp2/ptp.c:2480
 msgid "Image Quality"
 msgstr "画像の品質"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
-#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/config.c:2205
+#: camlibs/ptp2/config.c:2206 camlibs/ptp2/ptp.c:2427 camlibs/ptp2/ptp.c:2481
 msgid "Image Size"
 msgstr "画像サイズ"
 
@@ -3692,11 +3693,11 @@ msgstr "自動パワーオフ (分後)"
 msgid "Information"
 msgstr "情報"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:824
 msgid "normal"
 msgstr "標準"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:825
 msgid "fine"
 msgstr "ファイン"
 
@@ -3704,21 +3705,21 @@ msgstr "ファイン"
 msgid "superfine"
 msgstr "スーパーファイン"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
-#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:834
+#: camlibs/ptp2/config.c:1424 camlibs/sierra/epson-desc.c:116
+#: camlibs/sierra/sierra.c:1484 camlibs/sierra/sierra.c:1498
+#: camlibs/sierra/sierra.c:1733
 msgid "auto"
 msgstr "自動"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2749 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/config.c:835 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/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/config.c:833 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "OFF"
@@ -3837,2273 +3838,2381 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "このドライバでは要求したポート型式 (%i) をサポートしていません。"
 
-#: camlibs/ptp2/library.c:109
-msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
-msgstr ""
-
-#: camlibs/ptp2/library.c:148
-msgid "PTP Undefined Error"
-msgstr "PTP の不明なエラー"
-
-#: camlibs/ptp2/library.c:149
-msgid "PTP OK!"
-msgstr "PTP OK!"
-
-#: camlibs/ptp2/library.c:150
-msgid "PTP General Error"
-msgstr "PTP の一般的なエラー"
-
-#: camlibs/ptp2/library.c:151
-msgid "PTP Session Not Open"
-msgstr "PTP のセッションが開かれていません"
-
-#: camlibs/ptp2/library.c:152
-msgid "PTP Invalid Transaction ID"
-msgstr "PTP の不正なトランザクション ID"
-
-#: camlibs/ptp2/library.c:153
-msgid "PTP Operation Not Supported"
-msgstr "サポートされていない PTP 操作"
-
-#: camlibs/ptp2/library.c:154
-msgid "PTP Parameter Not Supported"
-msgstr "サポートされていない PTP パラメータ"
-
-#: camlibs/ptp2/library.c:155
-msgid "PTP Incomplete Transfer"
-msgstr "PTP の転送が完了していません"
-
-#: camlibs/ptp2/library.c:156
-msgid "PTP Invalid Storage ID"
-msgstr "PTP の不正なストレージ ID"
-
-#: camlibs/ptp2/library.c:157
-msgid "PTP Invalid Object Handle"
-msgstr "PTP 不正なオブジェクト操作"
-
-#: camlibs/ptp2/library.c:158
-msgid "PTP Device Prop Not Supported"
-msgstr "サポートされていない PTP デバイス Prop"
-
-#: camlibs/ptp2/library.c:159
-msgid "PTP Invalid Object Format Code"
-msgstr "PTP の不正なオブジェクト書式コード"
-
-#: camlibs/ptp2/library.c:160
-msgid "PTP Store Full"
-msgstr "PTP の空き容量がありません"
-
-#: camlibs/ptp2/library.c:161
-msgid "PTP Object Write Protected"
-msgstr "PTP オブジェクトへの書き込み保護が有効です"
-
-#: camlibs/ptp2/library.c:162
-msgid "PTP Store Read Only"
-msgstr "PTP は読み込み専用です"
-
-#: camlibs/ptp2/library.c:163
-msgid "PTP Access Denied"
-msgstr "PTP へのアクセスが拒否されました"
-
-#: camlibs/ptp2/library.c:164
-msgid "PTP No Thumbnail Present"
-msgstr "PTP にはサムネイルがありません"
-
-#: camlibs/ptp2/library.c:165
-msgid "PTP Self Test Failed"
-msgstr "PTP の自己診断に失敗しました"
-
-#: camlibs/ptp2/library.c:166
-msgid "PTP Partial Deletion"
-msgstr "PTP の部分的な削除"
-
-#: camlibs/ptp2/library.c:167
-msgid "PTP Store Not Available"
-msgstr "PTP に格納できません"
-
-#: camlibs/ptp2/library.c:169
-msgid "PTP Specification By Format Unsupported"
-msgstr "サポートしていない PTP 書式の指定"
-
-#: camlibs/ptp2/library.c:170
-msgid "PTP No Valid Object Info"
-msgstr "PTP の不正なオブジェクト情報"
-
-#: camlibs/ptp2/library.c:171
-msgid "PTP Invalid Code Format"
-msgstr "PTP の不正なコード書式"
-
-#: camlibs/ptp2/library.c:172
-msgid "PTP Unknown Vendor Code"
-msgstr "PTP の不明なベンダーコードです"
-
-#: camlibs/ptp2/library.c:174
-msgid "PTP Capture Already Terminated"
-msgstr "PTP のキャプチャは中断しました"
-
-#: camlibs/ptp2/library.c:175
-#, fuzzy
-msgid "PTP Device Busy"
-msgstr "PTP のデバイス・バス"
-
-#: camlibs/ptp2/library.c:176
-msgid "PTP Invalid Parent Object"
-msgstr "PTP 不正なオブジェクト"
-
-#: camlibs/ptp2/library.c:177
-msgid "PTP Invalid Device Prop Format"
-msgstr "PTP の不正なデバイス Prop 書式"
-
-#: camlibs/ptp2/library.c:178
-msgid "PTP Invalid Device Prop Value"
-msgstr "PTP の不正なデバイス Prop 値"
-
-#: camlibs/ptp2/library.c:179
-msgid "PTP Invalid Parameter"
-msgstr "PTP の不正なパラメータ"
-
-#: camlibs/ptp2/library.c:180
-msgid "PTP Session Already Opened"
-msgstr "PTP のセッションはオープンしています"
-
-#: camlibs/ptp2/library.c:181
-msgid "PTP Transaction Canceled"
-msgstr "PTP トランザクションがキャンセルされました"
-
-#: camlibs/ptp2/library.c:183
-msgid "PTP Specification Of Destination Unsupported"
-msgstr "サポートしていない PTP 転送先の指定"
-
-#: camlibs/ptp2/library.c:184
-msgid "PTP EK Filename Required"
-msgstr "PTP EK ファイル名が必要です"
-
-#: camlibs/ptp2/library.c:185
-msgid "PTP EK Filename Conflicts"
-msgstr "PTP EK ファイル名が重複しています"
-
-#: camlibs/ptp2/library.c:186
-msgid "PTP EK Filename Invalid"
-msgstr "PTP EK 不正なファイル名です"
-
-#: camlibs/ptp2/library.c:188
-msgid "PTP I/O error"
-msgstr "PTP I/O エラーです"
-
-#: camlibs/ptp2/library.c:189
-msgid "PTP Error: bad parameter"
-msgstr "PTP エラー: パラメータが正しくありません"
-
-#: camlibs/ptp2/library.c:190
-msgid "PTP Protocol error, data expected"
-msgstr "PTP プロトコル・エラー (期待値: データ)"
-
-#: camlibs/ptp2/library.c:191
-msgid "PTP Protocol error, response expected"
-msgstr "PTP プロトコル・エラー (期待値: 応答)"
-
-#: camlibs/ptp2/library.c:989
-msgid ""
-"PTP2 driver\n"
-"(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"(c)2003-2006 by Marcus Meissner <marcus@jet.franken.de>.\n"
-"This driver supports cameras that support PTP or PictBridge(tm), and\n"
-"Media Players that support the Media Transfer Protocol (MTP).\n"
-"\n"
-"This driver is not a 'Licensed Implementation' of the Media Transfer "
-"Protocol.\n"
-"\n"
-"Enjoy!"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/config.c:73 camlibs/ptp2/config.c:162
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1188
-#, fuzzy
-msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
-msgstr ""
-"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
-
-#: camlibs/ptp2/library.c:1193
-#, c-format
-msgid "Canon enable viewfinder failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1198
-#, c-format
-msgid "Canon get viewfinder image failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1208
-#, c-format
-msgid "Canon disable viewfinder failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1310
-#, fuzzy
-msgid "Sorry, your camera does not support Nikon capture"
-msgstr ""
-"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
-
-#: camlibs/ptp2/library.c:1391
-#, fuzzy
-msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
-msgstr ""
-"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
-
-#: camlibs/ptp2/library.c:1405
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1499
-msgid "Sorry, your camera does not support generic capture"
-msgstr ""
-"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
-
-#: camlibs/ptp2/library.c:1547
-msgid "Capture command completed, but no confirmation received"
-msgstr ""
-"キャプチャ・コマンドが完了しましたが、確認イベントは受け取りませんでした"
-
-#: camlibs/ptp2/library.c:1554
-#, c-format
-msgid "Received event 0x%04x"
-msgstr "受信したイベント 0x%04x"
-
-#: camlibs/ptp2/library.c:1716
-msgid "read only"
-msgstr "読み込みのみ"
-
-#: camlibs/ptp2/library.c:1717
-msgid "readwrite"
-msgstr "読み書き"
-
-#: camlibs/ptp2/library.c:1848
-#, c-format
-msgid ""
-"Model: %s\n"
-"  device version: %s\n"
-"  serial number:  %s\n"
-"Vendor extension ID: 0x%08x\n"
-"Vendor extension description: %s\n"
-msgstr ""
-"型式: %s\n"
-"  デバイスのバージョン: %s\n"
-"  シリアル番号:  %s\n"
-"ベンダの拡張 ID: 0x%08x\n"
-"ベンダの拡張情報: %s\n"
-
-#: camlibs/ptp2/library.c:1866
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Capture Formats: "
-msgstr "データ形式"
-
-#: camlibs/ptp2/library.c:1880
-#, fuzzy, c-format
-msgid "Display Formats: "
-msgstr "データ形式"
-
-#: camlibs/ptp2/library.c:1896
-#, c-format
-msgid "Supported MTP Object Properties:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1912
-#, c-format
-msgid " PTP error %04x on query"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1929
-#, c-format
-msgid ""
-"\n"
-"Device Capabilities:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1933
-#, c-format
-msgid "\tFile Download, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:1936
-#, fuzzy, c-format
-msgid "File Deletion, "
-msgstr "ファイルの解像度"
-
-#: camlibs/ptp2/library.c:1938
-#, fuzzy, c-format
-msgid "No File Deletion, "
-msgstr "ファイルの解像度"
-
-#: camlibs/ptp2/library.c:1942
-#, fuzzy, c-format
-msgid "File Upload\n"
-msgstr "ファイルのアップロードに失敗しました"
-
-#: camlibs/ptp2/library.c:1944
-#, c-format
-msgid "No File Upload\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1949
-#, c-format
-msgid "\tGeneric Image Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:1951
-#, c-format
-msgid "\tNo Image Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:1954
-#, fuzzy, c-format
-msgid "Open Capture, "
-msgstr "キャプチャ"
-
-#: camlibs/ptp2/library.c:1956
-#, c-format
-msgid "No Open Capture, "
-msgstr ""
-
-#: camlibs/ptp2/library.c:1962
-#, fuzzy, c-format
-msgid "Canon Capture\n"
-msgstr "キャプチャ"
-
-#: camlibs/ptp2/library.c:1966
-#, fuzzy, c-format
-msgid "Nikon Capture\n"
-msgstr "キャプチャ"
-
-#: camlibs/ptp2/library.c:1968
-#, c-format
-msgid "No vendor specific capture\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1980
-#, c-format
-msgid ""
-"\n"
-"Storage Devices Summary:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1995
-#, c-format
-msgid "\tStorageDescription: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1999
-#, c-format
-msgid "\tVolumeLabel: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
-#: camlibs/ptp2/library.c:3285
-#, fuzzy
-msgid "Undefined"
-msgstr "PTP の不明なエラー"
-
-#: camlibs/ptp2/library.c:2006
-msgid "Builtin ROM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2007
-msgid "Removable ROM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2008
-msgid "Builtin RAM"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2009
-msgid "Removable RAM (memory card)"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
-#: camlibs/ptp2/library.c:2036
-#, fuzzy, c-format
-msgid "Unknown: 0x%04x\n"
-msgstr "不明 (0x%02x)"
-
-#: camlibs/ptp2/library.c:2015
-#, c-format
-msgid "\tStorage Type: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2020
-#, fuzzy
-msgid "Generic Flat"
-msgstr "全般"
-
-#: camlibs/ptp2/library.c:2021
-msgid "Generic Hierarchical"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2022
-msgid "Digital Camera Layout (DCIM)"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2028
-#, c-format
-msgid "\tFilesystemtype: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2032
-#, fuzzy
-msgid "Read-Write"
-msgstr "読み書き"
-
-#: camlibs/ptp2/library.c:2033
-#, fuzzy
-msgid "Read-Only"
-msgstr "準備 OK"
-
-#: camlibs/ptp2/library.c:2034
-msgid "Read Only with Object deletion"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2040
-#, c-format
-msgid "\tAccess Capability: %s\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2042
-#, c-format
-msgid "\tMaximum Capability: %llu (%lu MB)\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2047
-#, c-format
-msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2052
-#, fuzzy, c-format
-msgid "\tFree Space (Images): %d\n"
-msgstr "写真の数: %d\n"
-
-#: camlibs/ptp2/library.c:2057
-#, c-format
-msgid ""
-"\n"
-"Device Property Summary:\n"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
-#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
-#: camlibs/ptp2/library.c:2357
+#: camlibs/ptp2/config.c:277 camlibs/ptp2/config.c:303
+#: camlibs/ptp2/config.c:350 camlibs/ptp2/config.c:381
+#: camlibs/ptp2/config.c:409
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "不明なファイル形式 %i です。"
 
-#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
-#: camlibs/ptp2/library.c:2509
+#: camlibs/ptp2/config.c:438 camlibs/ptp2/config.c:455
+#: camlibs/ptp2/config.c:561
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "予期しないデータ種 %i"
 
-#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
-#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/config.c:571 camlibs/ptp2/config.c:843
+#: camlibs/ptp2/config.c:1372 camlibs/ptp2/ptp.c:2903
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "取り扱い説明書"
 
-#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
+#: camlibs/ptp2/config.c:572 camlibs/ptp2/config.c:1373
 #, fuzzy
 msgid "Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2521
+#: camlibs/ptp2/config.c:573
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
-#: camlibs/ptp2/ptp.c:2570 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/config.c:574 camlibs/ptp2/config.c:1383
+#: camlibs/ptp2/ptp.c:2848 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:2523 camlibs/ptp2/library.c:3300
-#: camlibs/ptp2/ptp.c:2569 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/config.c:575 camlibs/ptp2/config.c:1386
+#: camlibs/ptp2/ptp.c:2847 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:1058
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1346
+#: camlibs/sierra/olympus-desc.c:451 camlibs/sierra/sierra.c:1065
+#: camlibs/sierra/sierra.c:1074 camlibs/sierra/sierra.c:1353
 msgid "Fluorescent"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
+#: camlibs/ptp2/config.c:576 camlibs/ptp2/config.c:1385
 #: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:452
-#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1059
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1348
+#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1066
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1355
 msgid "Tungsten"
 msgstr "電球"
 
-#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/config.c:578 camlibs/ptp2/config.c:1384
+#: camlibs/ptp2/ptp.c:2850 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:1060
-#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1350
+#: camlibs/sierra/olympus-desc.c:474 camlibs/sierra/sierra.c:1067
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1357
 msgid "Cloudy"
 msgstr "曇天"
 
-#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
+#: camlibs/ptp2/config.c:579 camlibs/ptp2/ptp.c:2851
 #, fuzzy
 msgid "Shade"
 msgstr "シャープ"
 
-#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
+#: camlibs/ptp2/config.c:580 camlibs/ptp2/ptp.c:2852
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "プリセット"
 
-#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
+#: camlibs/ptp2/config.c:588 camlibs/ptp2/ptp.c:2840
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2537
+#: camlibs/ptp2/config.c:589
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
+#: camlibs/ptp2/config.c:590 camlibs/ptp2/ptp.c:2842
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2539
+#: camlibs/ptp2/config.c:591
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2540
+#: camlibs/ptp2/config.c:592
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2740
+#: camlibs/ptp2/config.c:826
 #, fuzzy
 msgid "super fine"
 msgstr "スーパーファイン"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/config.c:836
 #, fuzzy
 msgid "auto red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2751
+#: camlibs/ptp2/config.c:837
 #, fuzzy
 msgid "on red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2756
+#: camlibs/ptp2/config.c:842
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
+#: camlibs/ptp2/config.c:844 camlibs/ptp2/ptp.c:2904
 #, fuzzy
 msgid "Commander"
 msgstr "コマンドの実行順でエラーです。"
 
-#: camlibs/ptp2/library.c:2773
+#: camlibs/ptp2/config.c:859
 #, fuzzy
 msgid "spot"
 msgstr "スポット"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/config.c:918
 #, fuzzy
 msgid "Center"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:2839
+#: camlibs/ptp2/config.c:925
 #, fuzzy
 msgid "large"
 msgstr "画像"
 
-#: camlibs/ptp2/library.c:2840
+#: camlibs/ptp2/config.c:926
 #, fuzzy
 msgid "medium 1"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2841
+#: camlibs/ptp2/config.c:927
 #, fuzzy
 msgid "medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2842
+#: camlibs/ptp2/config.c:928
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
+#: camlibs/ptp2/config.c:935 camlibs/ptp2/config.c:1394
 #, fuzzy
 msgid "Factory Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:2983
+#: camlibs/ptp2/config.c:1069
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984
+#: camlibs/ptp2/config.c:1070
 #, fuzzy
 msgid "Action"
 msgstr "自動"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
+#: camlibs/ptp2/config.c:1071 camlibs/ptp2/config.c:1073
+#: camlibs/ptp2/config.c:1333 camlibs/ptp2/ptp.c:2881 camlibs/ptp2/ptp.c:2933
 #, fuzzy
 msgid "Portrait"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
-#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
+#: camlibs/ptp2/config.c:1074 camlibs/ptp2/config.c:1334
+#: camlibs/ptp2/ptp.c:2882 camlibs/ptp2/ptp.c:2934
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
+#: camlibs/ptp2/config.c:1076 camlibs/ptp2/ptp.c:2884
 #, fuzzy
 msgid "Sports"
 msgstr "スポット"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
+#: camlibs/ptp2/config.c:1077 camlibs/ptp2/ptp.c:2886
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
+#: camlibs/ptp2/config.c:1078 camlibs/ptp2/ptp.c:2885
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/config.c:1084 camlibs/ptp2/ptp.c:2887
 #, fuzzy
 msgid "Single Shot"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:2999
+#: camlibs/ptp2/config.c:1085
 #, fuzzy
 msgid "Burst"
 msgstr "ベスト"
 
-#: camlibs/ptp2/library.c:3000
+#: camlibs/ptp2/config.c:1086
 #, fuzzy
 msgid "Timelapse"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/config.c:1087 camlibs/ptp2/ptp.c:2889
 #, fuzzy
 msgid "Timer"
 msgstr "セルフタイマ"
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
+#: camlibs/ptp2/config.c:1089 camlibs/ptp2/ptp.c:2891
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "リモート"
 
-#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
+#: camlibs/ptp2/config.c:1095 camlibs/ptp2/ptp.c:2858
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
+#: camlibs/ptp2/config.c:1096 camlibs/ptp2/ptp.c:2859
 #, fuzzy
 msgid "Single Area"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/config.c:1097 camlibs/ptp2/ptp.c:2860
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3017
+#: camlibs/ptp2/config.c:1103
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:3018
+#: camlibs/ptp2/config.c:1104
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3019
+#: camlibs/ptp2/config.c:1105
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/config.c:1111 camlibs/ptp2/ptp.c:2923
 #, fuzzy
 msgid "Centre"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/config.c:1112 camlibs/ptp2/ptp.c:2924
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/config.c:1113 camlibs/ptp2/ptp.c:2925
 #, fuzzy
 msgid "Bottom"
 msgstr "ズーム"
 
-#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/config.c:1114 camlibs/ptp2/ptp.c:2926
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/config.c:1115 camlibs/ptp2/ptp.c:2927
 #, fuzzy
 msgid "Right"
 msgstr "光源"
 
-#: camlibs/ptp2/library.c:3035
+#: camlibs/ptp2/config.c:1121
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
+#: camlibs/ptp2/config.c:1122 camlibs/ptp2/ptp.c:2873
 #, fuzzy
 msgid "Center Weighted"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/config.c:1123
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/config.c:1124
 #, fuzzy
 msgid "Center Spot"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/library.c:3044
+#: camlibs/ptp2/config.c:1130
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:3045
+#: camlibs/ptp2/config.c:1131
 #, fuzzy
 msgid "Flash off"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3046
+#: camlibs/ptp2/config.c:1132
 #, fuzzy
 msgid "Fill flash"
 msgstr "フラッシュあり"
 
-#: camlibs/ptp2/library.c:3047
+#: camlibs/ptp2/config.c:1133
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:3048
+#: camlibs/ptp2/config.c:1134
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "赤目軽減フラッシュ"
 
-#: camlibs/ptp2/library.c:3049
+#: camlibs/ptp2/config.c:1135
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
 
-#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
+#: camlibs/ptp2/config.c:1136 camlibs/ptp2/ptp.c:2853
 #, fuzzy
 msgid "Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
-#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
-#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
-#: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/ptp2/config.c:1137 camlibs/ptp2/ptp.c:2856
+#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1017 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1526
+#: camlibs/sierra/sierra.c:1753
 msgid "Slow Sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
+#: camlibs/ptp2/config.c:1138 camlibs/ptp2/ptp.c:2857
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
+#: camlibs/ptp2/config.c:1139 camlibs/ptp2/ptp.c:2855
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/config.c:1145 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/config.c:1260 camlibs/ptp2/ptp.c:2867
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/config.c:1261 camlibs/ptp2/ptp.c:2869
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3176
+#: camlibs/ptp2/config.c:1262
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
+#: camlibs/ptp2/config.c:1263 camlibs/ptp2/ptp.c:2870
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
+#: camlibs/ptp2/config.c:1264 camlibs/ptp2/ptp.c:2871
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179
+#: camlibs/ptp2/config.c:1265
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/config.c:1270 camlibs/ptp2/config.c:1290
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/config.c:1271 camlibs/ptp2/config.c:1291
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
+#: camlibs/ptp2/config.c:1272 camlibs/ptp2/config.c:1320
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/config.c:1273 camlibs/ptp2/config.c:1321
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
+#: camlibs/ptp2/config.c:1274 camlibs/ptp2/config.c:1322
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3193
+#: camlibs/ptp2/config.c:1279
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194
+#: camlibs/ptp2/config.c:1280
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/config.c:1281
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/config.c:1282
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/config.c:1283
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3202
+#: camlibs/ptp2/config.c:1288
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/config.c:1289
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3210
+#: camlibs/ptp2/config.c:1296
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/config.c:1297
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/config.c:1298
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/config.c:1299
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/config.c:1304
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/config.c:1305
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/config.c:1306
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/config.c:1307
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/config.c:1308
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3223
+#: camlibs/ptp2/config.c:1309
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/config.c:1310
 #, fuzzy
 msgid "1"
 msgstr "x1"
 
-#: camlibs/ptp2/library.c:3225
+#: camlibs/ptp2/config.c:1311
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3226
+#: camlibs/ptp2/config.c:1312
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/config.c:1313
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/config.c:1314
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/config.c:1315
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237
+#: camlibs/ptp2/config.c:1323
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
-#: camlibs/ptp2/ptp.c:2651
+#: camlibs/ptp2/config.c:1329 camlibs/ptp2/config.c:1414
+#: camlibs/ptp2/ptp.c:2929
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/config.c:1330 camlibs/ptp2/ptp.c:2930
 #, fuzzy
 msgid "Sharper"
 msgstr "シャープ"
 
-#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/config.c:1331 camlibs/ptp2/ptp.c:2931
 #, fuzzy
 msgid "Softer"
 msgstr "ソフト"
 
-#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
+#: camlibs/ptp2/config.c:1332 camlibs/ptp2/ptp.c:2932
 #, fuzzy
 msgid "Direct Print"
 msgstr "ディレクトリが存在します"
 
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
-#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+#: camlibs/ptp2/config.c:1335 camlibs/ptp2/config.c:1357
+#: camlibs/ptp2/config.c:1388 camlibs/ptp2/ptp.c:2935 camlibs/ptp2/ptp.c:2951
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1769
 msgid "Custom"
 msgstr "カスタム"
 
-#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
+#: camlibs/ptp2/config.c:1343 camlibs/ptp2/ptp.c:2940
 #, fuzzy
 msgid "Medium Low"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
+#: camlibs/ptp2/config.c:1344 camlibs/ptp2/config.c:1355
+#: camlibs/ptp2/ptp.c:2941 camlibs/ptp2/ptp.c:2949
 #, fuzzy
 msgid "Medium high"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
+#: camlibs/ptp2/config.c:1353 camlibs/ptp2/ptp.c:2947
 #, fuzzy
 msgid "Low contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
+#: camlibs/ptp2/config.c:1354 camlibs/ptp2/ptp.c:2948
 #, fuzzy
 msgid "Medium low"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
+#: camlibs/ptp2/config.c:1356 camlibs/ptp2/ptp.c:2950
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/config.c:1364
 #, fuzzy
 msgid "Long distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/library.c:3288
+#: camlibs/ptp2/config.c:1371 camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1949
+#, fuzzy
+msgid "Undefined"
+msgstr "PTP の不明なエラー"
+
+#: camlibs/ptp2/config.c:1374
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:3289
+#: camlibs/ptp2/config.c:1375
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/config.c:1376
 #, fuzzy
 msgid "AF-C"
 msgstr "電源"
 
-#: camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/config.c:1387
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/library.c:3329
+#: camlibs/ptp2/config.c:1415
 #, fuzzy
 msgid "Neutral"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:3330
+#: camlibs/ptp2/config.c:1416
 #, fuzzy
 msgid "Low sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/library.c:3332
+#: camlibs/ptp2/config.c:1418
 #, fuzzy
 msgid "Black & white"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:3354
+#: camlibs/ptp2/config.c:1440
 #, fuzzy
 msgid "AE & Flash"
 msgstr "フラッシュなし"
 
-#: camlibs/ptp2/library.c:3355
+#: camlibs/ptp2/config.c:1441
 #, fuzzy
 msgid "AE only"
 msgstr "読み込みのみ"
 
-#: camlibs/ptp2/library.c:3356
+#: camlibs/ptp2/config.c:1442
 #, fuzzy
 msgid "Flash only"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3357
+#: camlibs/ptp2/config.c:1443
 #, fuzzy
 msgid "WB bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
+#: camlibs/ptp2/config.c:1449 camlibs/ptp2/ptp.c:2954
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
+#: camlibs/ptp2/config.c:1450 camlibs/ptp2/ptp.c:2955
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3370
+#: camlibs/ptp2/config.c:1456
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3371
+#: camlibs/ptp2/config.c:1457
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3577
+#: camlibs/ptp2/config.c:1663
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
-#: camlibs/ptp2/library.c:3578
+#: camlibs/ptp2/config.c:1664
 #, fuzzy
 msgid "Memory card"
 msgstr "カードがありません"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/config.c:1755
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1772
+msgid "essid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1777
+#, fuzzy
+msgid "Display"
+msgstr "日付の表示"
+
+#: camlibs/ptp2/config.c:1787
+#, c-format
+msgid "Creation date: %s, Last usage date: %s"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1793
+#, fuzzy
+msgid "Delete"
+msgstr "屋外"
+
+#: camlibs/ptp2/config.c:1862
+msgid "WEP 64-bit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1863
+msgid "WEP 128-bit"
+msgstr ""
+
+#: camlibs/ptp2/config.c:1910
+#, fuzzy
+msgid "Managed"
+msgstr "言語"
+
+#: camlibs/ptp2/config.c:1911
+#, fuzzy
+msgid "Ad-hoc"
+msgstr "AE-ロック"
+
+#: camlibs/ptp2/config.c:2080
+msgid "Profile name"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2081
+msgid "Wifi essid"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2082
+msgid "IP address (empty for DHCP)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2083
+msgid "Network mask"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2084
+#, fuzzy
+msgid "Default gateway"
+msgstr "屋外"
+
+#: camlibs/ptp2/config.c:2085
+#, fuzzy
+msgid "Access mode"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/config.c:2086
+msgid "Wifi channel"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2087
+#, fuzzy
+msgid "Encryption"
+msgstr "自動"
+
+#: camlibs/ptp2/config.c:2088
+msgid "Encryption key (hex)"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2089
+#, fuzzy
+msgid "Write"
+msgstr "ワイド"
+
+#: camlibs/ptp2/config.c:2136
+#, fuzzy
+msgid "List Wifi profiles"
+msgstr "全ファイルの一覧"
+
+#: camlibs/ptp2/config.c:2137
+msgid "Create Wifi profile"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2182 camlibs/ptp2/ptp.c:2496
 msgid "Camera Owner"
 msgstr "カメラの所有者"
 
-#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/config.c:2183 camlibs/ptp2/ptp.c:2495
 msgid "Camera Model"
 msgstr "カメラの型式"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/config.c:2184 camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "Firmware Version"
 msgstr "ファームウェアのリビジョン: %8s"
 
-#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
+#: camlibs/ptp2/config.c:2185 camlibs/ptp2/config.c:2186
 msgid "Camera Time"
 msgstr "カメラの時刻"
 
-#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/config.c:2187 camlibs/ptp2/ptp.c:2467 camlibs/ptp2/ptp.c:2478
 msgid "Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/config.c:2188
 #, fuzzy
 msgid "Image Comment"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/config.c:2189 camlibs/ptp2/ptp.c:2585
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/config.c:2190
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/config.c:2191 camlibs/ptp2/ptp.c:2663
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/config.c:2194
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
+#: camlibs/ptp2/config.c:2195 camlibs/ptp2/config.c:2196
 #, fuzzy
 msgid "Capture Target"
 msgstr "キャプチャの設定"
 
-#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
-#: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/config.c:2207 camlibs/ptp2/config.c:2230
+#: camlibs/ptp2/ptp.c:2488 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
+#: camlibs/ptp2/config.c:2208 camlibs/ptp2/config.c:2209
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/config.c:2210 camlibs/ptp2/ptp.c:2499
 msgid "Photo Effect"
 msgstr "写真の効果"
 
-#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/config.c:2211 camlibs/ptp2/ptp.c:2529
 #, fuzzy
 msgid "Color Model"
 msgstr "カラーモード"
 
-#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/config.c:2212 camlibs/ptp2/ptp.c:2565
 #, fuzzy
 msgid "Auto ISO"
 msgstr "自動"
 
-#: camlibs/ptp2/library.c:3651
+#: camlibs/ptp2/config.c:2217
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3652
+#: camlibs/ptp2/config.c:2218
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/config.c:2220 camlibs/ptp2/config.c:2221
+#: camlibs/ptp2/ptp.c:2500
 msgid "Assist Light"
 msgstr "補助光"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/config.c:2222 camlibs/ptp2/ptp.c:2491 camlibs/ptp2/ptp.c:2573
 #: 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:3657 camlibs/ptp2/library.c:3658
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
-#: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
-#: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra.c:1735
+#: camlibs/ptp2/config.c:2223 camlibs/ptp2/config.c:2224
+#: camlibs/ptp2/config.c:2237 camlibs/ptp2/ptp.c:2436 camlibs/ptp2/ptp.c:2482
+#: camlibs/ptp2/ptp.c:2607 camlibs/ptp2/ptp.c:2679
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1302
+#: camlibs/sierra/sierra.c:1511 camlibs/sierra/sierra.c:1742
 msgid "Flash Mode"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/config.c:2225 camlibs/ptp2/ptp.c:2677
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/config.c:2226 camlibs/ptp2/ptp.c:2665
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3661
+#: camlibs/ptp2/config.c:2227
 #, fuzzy
 msgid "F Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/config.c:2228 camlibs/ptp2/ptp.c:2432
 msgid "Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/config.c:2229 camlibs/ptp2/ptp.c:2434
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/config.c:2231 camlibs/ptp2/ptp.c:2437
 msgid "Exposure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/config.c:2232 camlibs/ptp2/ptp.c:2449
 msgid "Effect Mode"
 msgstr "効果モード"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/config.c:2233
 #, fuzzy
 msgid "Exposure Program"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/config.c:2234 camlibs/ptp2/ptp.c:2445
 msgid "Still Capture Mode"
 msgstr "キャプチャ・モード"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/config.c:2235 camlibs/ptp2/ptp.c:2454
 msgid "Focus Metering Mode"
 msgstr "フォーカス測光モード"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/config.c:2236 camlibs/ptp2/ptp.c:2435
 msgid "Exposure Metering Mode"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/config.c:2239 camlibs/ptp2/ptp.c:2486
 msgid "Focusing Point"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/library.c:3674
+#: camlibs/ptp2/config.c:2240
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/config.c:2241 camlibs/ptp2/ptp.c:2484
 msgid "Metering Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/config.c:2242 camlibs/ptp2/ptp.c:2485
 #, fuzzy
 msgid "AF Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/config.c:2243 camlibs/ptp2/ptp.c:2561
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/config.c:2244 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "露出"
 
-#: camlibs/ptp2/library.c:3679
+#: camlibs/ptp2/config.c:2245
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/config.c:2246 camlibs/ptp2/ptp.c:2595
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/config.c:2247 camlibs/ptp2/ptp.c:2683
 #, fuzzy
 msgid "Flash Sign"
 msgstr "フラッシュの設定"
 
-#: camlibs/ptp2/library.c:3682
+#: camlibs/ptp2/config.c:2248
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/config.c:2249 camlibs/ptp2/ptp.c:2673
 #, fuzzy
 msgid "Image Review"
 msgstr "画像サイズ"
 
-#: camlibs/ptp2/library.c:3684
+#: camlibs/ptp2/config.c:2250
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/config.c:2251
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/config.c:2252 camlibs/ptp2/ptp.c:2681
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/config.c:2253
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/config.c:2254 camlibs/ptp2/ptp.c:2685
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/config.c:2255 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Bracket Set"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/config.c:2256 camlibs/ptp2/ptp.c:2615
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/config.c:2257 camlibs/ptp2/ptp.c:2450
 msgid "Burst Number"
 msgstr "バースト数"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/config.c:2258
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/config.c:2259
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3694
+#: camlibs/ptp2/config.c:2260
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3695
+#: camlibs/ptp2/config.c:2261
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3696
+#: camlibs/ptp2/config.c:2262
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3697
+#: camlibs/ptp2/config.c:2263
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3698
+#: camlibs/ptp2/config.c:2264
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3699
+#: camlibs/ptp2/config.c:2265
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/library.c:3700
+#: camlibs/ptp2/config.c:2266
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/config.c:2267 camlibs/ptp2/ptp.c:2605
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/config.c:2268 camlibs/ptp2/ptp.c:2687
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/config.c:2269 camlibs/ptp2/ptp.c:2659
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/config.c:2270 camlibs/ptp2/ptp.c:2525
 #, fuzzy
 msgid "Sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/config.c:2271 camlibs/ptp2/ptp.c:2527
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/config.c:2272 camlibs/ptp2/ptp.c:2661
 #, fuzzy
 msgid "Saturation"
 msgstr "設定"
 
-#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/config.c:2273 camlibs/ptp2/ptp.c:2531
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/library.c:3713 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/config.c:2279 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:1157
-#: camlibs/sierra/sierra.c:1619
+#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1164
+#: camlibs/sierra/sierra.c:1626
 msgid "Camera Settings"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/library.c:3714
+#: camlibs/ptp2/config.c:2280
 #, fuzzy
 msgid "Image Settings"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/library.c:3715
+#: camlibs/ptp2/config.c:2281
 msgid "Capture Settings"
 msgstr "キャプチャの設定"
 
-#: camlibs/ptp2/library.c:3772
+#: camlibs/ptp2/config.c:2282
+msgid "Wifi profiles"
+msgstr ""
+
+#: camlibs/ptp2/config.c:2350
 msgid "Number of values"
 msgstr "値の数"
 
-#: camlibs/ptp2/library.c:3776
+#: camlibs/ptp2/config.c:2354
 msgid "Supported values"
 msgstr "サポートしている値"
 
-#: camlibs/ptp2/library.c:3784
+#: camlibs/ptp2/config.c:2362
 msgid "Current value"
 msgstr "現在の値"
 
-#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
+#: camlibs/ptp2/library.c:110
+msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
+msgstr ""
+
+#: camlibs/ptp2/library.c:149
+msgid "PTP Undefined Error"
+msgstr "PTP の不明なエラー"
+
+#: camlibs/ptp2/library.c:150
+msgid "PTP OK!"
+msgstr "PTP OK!"
+
+#: camlibs/ptp2/library.c:151
+msgid "PTP General Error"
+msgstr "PTP の一般的なエラー"
+
+#: camlibs/ptp2/library.c:152
+msgid "PTP Session Not Open"
+msgstr "PTP のセッションが開かれていません"
+
+#: camlibs/ptp2/library.c:153
+msgid "PTP Invalid Transaction ID"
+msgstr "PTP の不正なトランザクション ID"
+
+#: camlibs/ptp2/library.c:154
+msgid "PTP Operation Not Supported"
+msgstr "サポートされていない PTP 操作"
+
+#: camlibs/ptp2/library.c:155
+msgid "PTP Parameter Not Supported"
+msgstr "サポートされていない PTP パラメータ"
+
+#: camlibs/ptp2/library.c:156
+msgid "PTP Incomplete Transfer"
+msgstr "PTP の転送が完了していません"
+
+#: camlibs/ptp2/library.c:157
+msgid "PTP Invalid Storage ID"
+msgstr "PTP の不正なストレージ ID"
+
+#: camlibs/ptp2/library.c:158
+msgid "PTP Invalid Object Handle"
+msgstr "PTP 不正なオブジェクト操作"
+
+#: camlibs/ptp2/library.c:159
+msgid "PTP Device Prop Not Supported"
+msgstr "サポートされていない PTP デバイス Prop"
+
+#: camlibs/ptp2/library.c:160
+msgid "PTP Invalid Object Format Code"
+msgstr "PTP の不正なオブジェクト書式コード"
+
+#: camlibs/ptp2/library.c:161
+msgid "PTP Store Full"
+msgstr "PTP の空き容量がありません"
+
+#: camlibs/ptp2/library.c:162
+msgid "PTP Object Write Protected"
+msgstr "PTP オブジェクトへの書き込み保護が有効です"
+
+#: camlibs/ptp2/library.c:163
+msgid "PTP Store Read Only"
+msgstr "PTP は読み込み専用です"
+
+#: camlibs/ptp2/library.c:164
+msgid "PTP Access Denied"
+msgstr "PTP へのアクセスが拒否されました"
+
+#: camlibs/ptp2/library.c:165
+msgid "PTP No Thumbnail Present"
+msgstr "PTP にはサムネイルがありません"
+
+#: camlibs/ptp2/library.c:166
+msgid "PTP Self Test Failed"
+msgstr "PTP の自己診断に失敗しました"
+
+#: camlibs/ptp2/library.c:167
+msgid "PTP Partial Deletion"
+msgstr "PTP の部分的な削除"
+
+#: camlibs/ptp2/library.c:168
+msgid "PTP Store Not Available"
+msgstr "PTP に格納できません"
+
+#: camlibs/ptp2/library.c:170
+msgid "PTP Specification By Format Unsupported"
+msgstr "サポートしていない PTP 書式の指定"
+
+#: camlibs/ptp2/library.c:171
+msgid "PTP No Valid Object Info"
+msgstr "PTP の不正なオブジェクト情報"
+
+#: camlibs/ptp2/library.c:172
+msgid "PTP Invalid Code Format"
+msgstr "PTP の不正なコード書式"
+
+#: camlibs/ptp2/library.c:173
+msgid "PTP Unknown Vendor Code"
+msgstr "PTP の不明なベンダーコードです"
+
+#: camlibs/ptp2/library.c:175
+msgid "PTP Capture Already Terminated"
+msgstr "PTP のキャプチャは中断しました"
+
+#: camlibs/ptp2/library.c:176
+#, fuzzy
+msgid "PTP Device Busy"
+msgstr "PTP のデバイス・バス"
+
+#: camlibs/ptp2/library.c:177
+msgid "PTP Invalid Parent Object"
+msgstr "PTP 不正なオブジェクト"
+
+#: camlibs/ptp2/library.c:178
+msgid "PTP Invalid Device Prop Format"
+msgstr "PTP の不正なデバイス Prop 書式"
+
+#: camlibs/ptp2/library.c:179
+msgid "PTP Invalid Device Prop Value"
+msgstr "PTP の不正なデバイス Prop 値"
+
+#: camlibs/ptp2/library.c:180
+msgid "PTP Invalid Parameter"
+msgstr "PTP の不正なパラメータ"
+
+#: camlibs/ptp2/library.c:181
+msgid "PTP Session Already Opened"
+msgstr "PTP のセッションはオープンしています"
+
+#: camlibs/ptp2/library.c:182
+msgid "PTP Transaction Canceled"
+msgstr "PTP トランザクションがキャンセルされました"
+
+#: camlibs/ptp2/library.c:184
+msgid "PTP Specification Of Destination Unsupported"
+msgstr "サポートしていない PTP 転送先の指定"
+
+#: camlibs/ptp2/library.c:185
+msgid "PTP EK Filename Required"
+msgstr "PTP EK ファイル名が必要です"
+
+#: camlibs/ptp2/library.c:186
+msgid "PTP EK Filename Conflicts"
+msgstr "PTP EK ファイル名が重複しています"
+
+#: camlibs/ptp2/library.c:187
+msgid "PTP EK Filename Invalid"
+msgstr "PTP EK 不正なファイル名です"
+
+#: camlibs/ptp2/library.c:189
+msgid "PTP I/O error"
+msgstr "PTP I/O エラーです"
+
+#: camlibs/ptp2/library.c:190
+msgid "PTP Error: bad parameter"
+msgstr "PTP エラー: パラメータが正しくありません"
+
+#: camlibs/ptp2/library.c:191
+msgid "PTP Protocol error, data expected"
+msgstr "PTP プロトコル・エラー (期待値: データ)"
+
+#: camlibs/ptp2/library.c:192
+msgid "PTP Protocol error, response expected"
+msgstr "PTP プロトコル・エラー (期待値: 応答)"
+
+#: camlibs/ptp2/library.c:1034
+msgid ""
+"PTP2 driver\n"
+"(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+"(c)2003-2006 by Marcus Meissner <marcus@jet.franken.de>.\n"
+"This driver supports cameras that support PTP or PictBridge(tm), and\n"
+"Media Players that support the Media Transfer Protocol (MTP).\n"
+"\n"
+"This driver is not a 'Licensed Implementation' of the Media Transfer "
+"Protocol.\n"
+"\n"
+"Enjoy!"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1111
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:1116
+#, c-format
+msgid "Canon enable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1121
+#, c-format
+msgid "Canon get viewfinder image failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1131
+#, c-format
+msgid "Canon disable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1233
+#, fuzzy
+msgid "Sorry, your camera does not support Nikon capture"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:1314
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:1328
+#, c-format
+msgid "Canon Capture failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1422
+msgid "Sorry, your camera does not support generic capture"
+msgstr ""
+"すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
+
+#: camlibs/ptp2/library.c:1470
+msgid "Capture command completed, but no confirmation received"
+msgstr ""
+"キャプチャ・コマンドが完了しましたが、確認イベントは受け取りませんでした"
+
+#: camlibs/ptp2/library.c:1477
+#, c-format
+msgid "Received event 0x%04x"
+msgstr "受信したイベント 0x%04x"
+
+#: camlibs/ptp2/library.c:1639
+msgid "read only"
+msgstr "読み込みのみ"
+
+#: camlibs/ptp2/library.c:1640
+msgid "readwrite"
+msgstr "読み書き"
+
+#: camlibs/ptp2/library.c:1771
+#, c-format
+msgid ""
+"Model: %s\n"
+"  device version: %s\n"
+"  serial number:  %s\n"
+"Vendor extension ID: 0x%08x\n"
+"Vendor extension description: %s\n"
+msgstr ""
+"型式: %s\n"
+"  デバイスのバージョン: %s\n"
+"  シリアル番号:  %s\n"
+"ベンダの拡張 ID: 0x%08x\n"
+"ベンダの拡張情報: %s\n"
+
+#: camlibs/ptp2/library.c:1789
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Capture Formats: "
+msgstr "データ形式"
+
+#: camlibs/ptp2/library.c:1803
+#, fuzzy, c-format
+msgid "Display Formats: "
+msgstr "データ形式"
+
+#: camlibs/ptp2/library.c:1819
+#, c-format
+msgid "Supported MTP Object Properties:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1835
+#, c-format
+msgid " PTP error %04x on query"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1852
+#, c-format
+msgid ""
+"\n"
+"Device Capabilities:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1856
+#, c-format
+msgid "\tFile Download, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1859
+#, fuzzy, c-format
+msgid "File Deletion, "
+msgstr "ファイルの解像度"
+
+#: camlibs/ptp2/library.c:1861
+#, fuzzy, c-format
+msgid "No File Deletion, "
+msgstr "ファイルの解像度"
+
+#: camlibs/ptp2/library.c:1865
+#, fuzzy, c-format
+msgid "File Upload\n"
+msgstr "ファイルのアップロードに失敗しました"
+
+#: camlibs/ptp2/library.c:1867
+#, c-format
+msgid "No File Upload\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1872
+#, c-format
+msgid "\tGeneric Image Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1874
+#, c-format
+msgid "\tNo Image Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1877
+#, fuzzy, c-format
+msgid "Open Capture, "
+msgstr "キャプチャ"
+
+#: camlibs/ptp2/library.c:1879
+#, c-format
+msgid "No Open Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1885
+#, fuzzy, c-format
+msgid "Canon Capture\n"
+msgstr "キャプチャ"
+
+#: camlibs/ptp2/library.c:1889
+#, fuzzy, c-format
+msgid "Nikon Capture\n"
+msgstr "キャプチャ"
+
+#: camlibs/ptp2/library.c:1891
+#, c-format
+msgid "No vendor specific capture\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1899
+#, c-format
+msgid "\tNikon Wifi support\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1910
+#, c-format
+msgid ""
+"\n"
+"Storage Devices Summary:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1925
+#, c-format
+msgid "\tStorageDescription: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1929
+#, c-format
+msgid "\tVolumeLabel: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1936
+msgid "Builtin ROM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1937
+msgid "Removable ROM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1938
+msgid "Builtin RAM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1939
+msgid "Removable RAM (memory card)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1941 camlibs/ptp2/library.c:1954
+#: camlibs/ptp2/library.c:1966
+#, fuzzy, c-format
+msgid "Unknown: 0x%04x\n"
+msgstr "不明 (0x%02x)"
+
+#: camlibs/ptp2/library.c:1945
+#, c-format
+msgid "\tStorage Type: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1950
+#, fuzzy
+msgid "Generic Flat"
+msgstr "全般"
+
+#: camlibs/ptp2/library.c:1951
+msgid "Generic Hierarchical"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1952
+msgid "Digital Camera Layout (DCIM)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1958
+#, c-format
+msgid "\tFilesystemtype: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1962
+#, fuzzy
+msgid "Read-Write"
+msgstr "読み書き"
+
+#: camlibs/ptp2/library.c:1963
+#, fuzzy
+msgid "Read-Only"
+msgstr "準備 OK"
+
+#: camlibs/ptp2/library.c:1964
+msgid "Read Only with Object deletion"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1970
+#, c-format
+msgid "\tAccess Capability: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1972
+#, c-format
+msgid "\tMaximum Capability: %llu (%lu MB)\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1977
+#, c-format
+msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1982
+#, fuzzy, c-format
+msgid "\tFree Space (Images): %d\n"
+msgstr "写真の数: %d\n"
+
+#: camlibs/ptp2/library.c:1987
+#, c-format
+msgid ""
+"\n"
+"Device Property Summary:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2736 camlibs/ptp2/library.c:2740
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4438
+#: camlibs/ptp2/library.c:2746
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4847
+#: camlibs/ptp2/library.c:3165
 msgid "Initializing Camera"
 msgstr "カメラの初期化中..."
 
-#: camlibs/ptp2/library.c:4955
+#: camlibs/ptp2/library.c:3273
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP は USB カメラのみサポートしています。"
 
-#: camlibs/ptp2/ptp.c:2085
+#: camlibs/ptp2/ptp.c:2363
 msgid "PTP: Undefined Error"
 msgstr "PTP: 未定義のエラー"
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2364
 msgid "PTP: OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/ptp.c:2087
+#: camlibs/ptp2/ptp.c:2365
 msgid "PTP: General Error"
 msgstr "PTP: 一般エラー"
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2366
 msgid "PTP: Session Not Open"
 msgstr "PTP: セッションがオープンされていません"
 
-#: camlibs/ptp2/ptp.c:2089
+#: camlibs/ptp2/ptp.c:2367
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: 不正なトランザクション ID"
 
-#: camlibs/ptp2/ptp.c:2090
+#: camlibs/ptp2/ptp.c:2368
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: サポートされていない操作"
 
-#: camlibs/ptp2/ptp.c:2091
+#: camlibs/ptp2/ptp.c:2369
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: サポートされていないパラメータ"
 
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2370
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: 転送が完了していません"
 
-#: camlibs/ptp2/ptp.c:2093
+#: camlibs/ptp2/ptp.c:2371
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: 不正なストレージ ID"
 
-#: camlibs/ptp2/ptp.c:2094
+#: camlibs/ptp2/ptp.c:2372
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: 不正なオブジェクト操作"
 
-#: camlibs/ptp2/ptp.c:2095
+#: camlibs/ptp2/ptp.c:2373
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: サポートされていないデバイス Prop"
 
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2374
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: 不正なオブジェクト書式コード"
 
-#: camlibs/ptp2/ptp.c:2097
+#: camlibs/ptp2/ptp.c:2375
 msgid "PTP: Store Full"
 msgstr "PTP: 空き容量がありません"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2376
 msgid "PTP: Object Write Protected"
 msgstr "PTP: オブジェクトへの書き込み保護が有効です"
 
-#: camlibs/ptp2/ptp.c:2099
+#: camlibs/ptp2/ptp.c:2377
 msgid "PTP: Store Read Only"
 msgstr "PTP: 読み込み専用です"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2378
 msgid "PTP: Access Denied"
 msgstr "PTP: アクセスが拒否されました"
 
-#: camlibs/ptp2/ptp.c:2101
+#: camlibs/ptp2/ptp.c:2379
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: サムネイルがありません"
 
-#: camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/ptp.c:2380
 msgid "PTP: Self Test Failed"
 msgstr "PTP: 自己診断に失敗しました"
 
-#: camlibs/ptp2/ptp.c:2103
+#: camlibs/ptp2/ptp.c:2381
 msgid "PTP: Partial Deletion"
 msgstr "PTP: 部分的な削除"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2382
 msgid "PTP: Store Not Available"
 msgstr "PTP: 格納できません"
 
-#: camlibs/ptp2/ptp.c:2106
+#: camlibs/ptp2/ptp.c:2384
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: サポートしていない書式を指定しました"
 
-#: camlibs/ptp2/ptp.c:2107
+#: camlibs/ptp2/ptp.c:2385
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: 不正なオブジェクト情報"
 
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2386
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: 不正なコード書式"
 
-#: camlibs/ptp2/ptp.c:2109
+#: camlibs/ptp2/ptp.c:2387
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: 不明なベンダーコードです"
 
-#: camlibs/ptp2/ptp.c:2111
+#: camlibs/ptp2/ptp.c:2389
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: キャプチャを中断しました"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2390
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP: デバイスのバス"
 
-#: camlibs/ptp2/ptp.c:2113
+#: camlibs/ptp2/ptp.c:2391
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: 不正な親オブジェクト"
 
-#: camlibs/ptp2/ptp.c:2114
+#: camlibs/ptp2/ptp.c:2392
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: 不正なデバイス Prop 書式"
 
-#: camlibs/ptp2/ptp.c:2115
+#: camlibs/ptp2/ptp.c:2393
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: 不正なデバイス Prop 値"
 
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2394
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: 不正なパラメータ"
 
-#: camlibs/ptp2/ptp.c:2117
+#: camlibs/ptp2/ptp.c:2395
 msgid "PTP: Session Already Opened"
 msgstr "PTP: セッションはオープンしています"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2396
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: トランザクションがキャンセルされました"
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2398
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: サポートしていない転送先を指定しました"
 
-#: camlibs/ptp2/ptp.c:2121
+#: camlibs/ptp2/ptp.c:2399
 msgid "PTP: EK Filename Required"
 msgstr "PTP: EK ファイル名が必要です"
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2400
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: EK ファイル名が重複しています"
 
-#: camlibs/ptp2/ptp.c:2123
+#: camlibs/ptp2/ptp.c:2401
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: EK 不正なファイル名です"
 
-#: camlibs/ptp2/ptp.c:2125
+#: camlibs/ptp2/ptp.c:2403
 msgid "PTP: I/O error"
 msgstr "PTP: I/O エラーです"
 
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2404
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: エラー: パラメータが正しくありません"
 
-#: camlibs/ptp2/ptp.c:2127
+#: camlibs/ptp2/ptp.c:2405
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: プロトコル・エラー (期待値: データ)"
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2406
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2424
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:2147
+#: camlibs/ptp2/ptp.c:2425
 msgid "Battery Level"
 msgstr "バッテリーのレベル"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2426
 msgid "Functional Mode"
 msgstr "操作モード"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2428
 msgid "Compression Setting"
 msgstr "圧縮の設定"
 
-#: camlibs/ptp2/ptp.c:2151 camlibs/ptp2/ptp.c:2209
+#: camlibs/ptp2/ptp.c:2429 camlibs/ptp2/ptp.c:2487
 #: 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:1055
-#: camlibs/sierra/sierra.c:1338 camlibs/sierra/sierra.c:1532
-#: camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1062
+#: camlibs/sierra/sierra.c:1345 camlibs/sierra/sierra.c:1539
+#: camlibs/sierra/sierra.c:1762
 msgid "White Balance"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2430
 msgid "RGB Gain"
 msgstr "RGB ゲイン"
 
-#: camlibs/ptp2/ptp.c:2153
+#: camlibs/ptp2/ptp.c:2431
 msgid "F-Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/ptp.c:2155
+#: camlibs/ptp2/ptp.c:2433
 msgid "Focus Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2438
 msgid "Exposure Program Mode"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2440
 msgid "Exposure Index (film speed ISO)"
 msgstr "露出のインデックス (フィルム速度 ISO)"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2442
 msgid "Exposure Bias Compensation"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:2165
+#: camlibs/ptp2/ptp.c:2443
 msgid "Date Time"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2444
 msgid "Pre-Capture Delay"
 msgstr "キャプチャの遅れ"
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2446
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/ptp.c:2170 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2448 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:2173
+#: camlibs/ptp2/ptp.c:2451
 msgid "Burst Interval"
 msgstr "バーストの間隔"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2452
 msgid "Timelapse Number"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/ptp.c:2175
+#: camlibs/ptp2/ptp.c:2453
 msgid "Timelapse Interval"
 msgstr "低速度撮影の間隔"
 
-#: camlibs/ptp2/ptp.c:2177
+#: camlibs/ptp2/ptp.c:2455
 msgid "Upload URL"
 msgstr "アップロードする URL"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2456
 msgid "Artist"
 msgstr "作者"
 
-#: camlibs/ptp2/ptp.c:2179
+#: camlibs/ptp2/ptp.c:2457
 msgid "Copyright Info"
 msgstr "コピーライト"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2464
 msgid "Color Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/ptp.c:2466
 msgid "Date Time Stamp Format"
 msgstr "日時の書式"
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2468
 msgid "Video Out"
 msgstr "ビデオ出力"
 
-#: camlibs/ptp2/ptp.c:2191
+#: camlibs/ptp2/ptp.c:2469
 msgid "Power Saving"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2470
 msgid "UI Language"
 msgstr "使用する言語"
 
-#: camlibs/ptp2/ptp.c:2201
+#: camlibs/ptp2/ptp.c:2479
 msgid "Viewfinder Mode"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:2205
+#: camlibs/ptp2/ptp.c:2483
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2490
 msgid "ShutterSpeed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2215
+#: camlibs/ptp2/ptp.c:2493
 msgid "Size Quality Mode"
 msgstr "サイズと品質モード"
 
-#: camlibs/ptp2/ptp.c:2219
+#: camlibs/ptp2/ptp.c:2497
 msgid "UNIX Time"
 msgstr "UNIX 時刻"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2498
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:2231
+#: camlibs/ptp2/ptp.c:2509
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2233
+#: camlibs/ptp2/ptp.c:2511
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2235
+#: camlibs/ptp2/ptp.c:2513
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2237
+#: camlibs/ptp2/ptp.c:2515
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2239
+#: camlibs/ptp2/ptp.c:2517
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2241
+#: camlibs/ptp2/ptp.c:2519
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2243
+#: camlibs/ptp2/ptp.c:2521
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2245
+#: camlibs/ptp2/ptp.c:2523
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:2255
+#: camlibs/ptp2/ptp.c:2533
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2257
+#: camlibs/ptp2/ptp.c:2535
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2285
+#: camlibs/ptp2/ptp.c:2563
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2289
+#: camlibs/ptp2/ptp.c:2567
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/ptp.c:2291
+#: camlibs/ptp2/ptp.c:2569
 #, fuzzy
 msgid "Exposure Step"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:2293
+#: camlibs/ptp2/ptp.c:2571
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "露出度"
 
-#: camlibs/ptp2/ptp.c:2297
+#: camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:2301
+#: camlibs/ptp2/ptp.c:2579
 #, fuzzy
 msgid "Focus Lock"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/ptp.c:2303
+#: camlibs/ptp2/ptp.c:2581
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:2305
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/ptp.c:2309
+#: camlibs/ptp2/ptp.c:2587
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2311
+#: camlibs/ptp2/ptp.c:2589
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2315
+#: camlibs/ptp2/ptp.c:2593
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2603
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2331
+#: camlibs/ptp2/ptp.c:2609
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "強制発光\n"
 
-#: camlibs/ptp2/ptp.c:2335
+#: camlibs/ptp2/ptp.c:2613
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/ptp.c:2617
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/ptp.c:2619
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2621
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "現在のモード: 再生モード\n"
 
-#: camlibs/ptp2/ptp.c:2345
+#: camlibs/ptp2/ptp.c:2623
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2347
+#: camlibs/ptp2/ptp.c:2625
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2349
+#: camlibs/ptp2/ptp.c:2627
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/ptp.c:2629
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2353
+#: camlibs/ptp2/ptp.c:2631
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "外観の設定"
 
-#: camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/ptp.c:2635
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/ptp.c:2637
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2361
+#: camlibs/ptp2/ptp.c:2639
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2363
+#: camlibs/ptp2/ptp.c:2641
 #, fuzzy
 msgid "Image Rotation"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/ptp.c:2365
+#: camlibs/ptp2/ptp.c:2643
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:2367
+#: camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2369
+#: camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2371
+#: camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:2373
+#: camlibs/ptp2/ptp.c:2651
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/ptp.c:2657
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2389
+#: camlibs/ptp2/ptp.c:2667
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/ptp.c:2391
+#: camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "補助光"
 
-#: camlibs/ptp2/ptp.c:2393
+#: camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "TV A/V 設定"
 
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/ptp2/ptp.c:2675
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:2411
+#: camlibs/ptp2/ptp.c:2689
 #, fuzzy
 msgid "Image Comment String"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/ptp.c:2413
+#: camlibs/ptp2/ptp.c:2691
 #, fuzzy
 msgid "Flash Open"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/ptp.c:2415
+#: camlibs/ptp2/ptp.c:2693
 #, fuzzy
 msgid "Flash Charged"
 msgstr "コンパクトフラッシュ・カード"
 
-#: camlibs/ptp2/ptp.c:2417
+#: camlibs/ptp2/ptp.c:2695
 #, fuzzy
 msgid "Lens ID"
 msgstr "レンズモード"
 
-#: camlibs/ptp2/ptp.c:2419
+#: camlibs/ptp2/ptp.c:2697
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2421
+#: camlibs/ptp2/ptp.c:2699
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2423
+#: camlibs/ptp2/ptp.c:2701
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2425
+#: camlibs/ptp2/ptp.c:2703
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2427
+#: camlibs/ptp2/ptp.c:2705
 #, fuzzy
 msgid "Low Light"
 msgstr "光源"
 
-#: camlibs/ptp2/ptp.c:2434
+#: camlibs/ptp2/ptp.c:2712
 #, fuzzy
 msgid "Secure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:2435
+#: camlibs/ptp2/ptp.c:2713
 msgid "Device Certificate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2437
+#: camlibs/ptp2/ptp.c:2715
 msgid "Synchronization Partner"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2439
+#: camlibs/ptp2/ptp.c:2717
 msgid "Device Friendly Name"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2440
+#: camlibs/ptp2/ptp.c:2718
 msgid "Volume Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2441
+#: camlibs/ptp2/ptp.c:2719
 msgid "Device Icon"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2442
+#: camlibs/ptp2/ptp.c:2720
 msgid "Playback Rate"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2443
+#: camlibs/ptp2/ptp.c:2721
 msgid "Playback Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2445
+#: camlibs/ptp2/ptp.c:2723
 msgid "Playback Container Index"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2446
+#: camlibs/ptp2/ptp.c:2724
 msgid "Playback Position"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
+#: camlibs/ptp2/ptp.c:2824 camlibs/ptp2/ptp.c:2825 camlibs/ptp2/ptp.c:2826
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/ptp.c:2827
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2563
+#: camlibs/ptp2/ptp.c:2841
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2844
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2846 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "白熱灯"
 
-#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
-#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
+#: camlibs/ptp2/ptp.c:2854 camlibs/sierra/epson-desc.c:154
+#: camlibs/sierra/sierra.c:1005 camlibs/sierra/sierra.c:1015
+#: camlibs/sierra/sierra.c:1312 camlibs/sierra/sierra.c:1515
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1751
 msgid "Red-eye Reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/ptp.c:2861
 #, fuzzy
 msgid "Manual Focus"
 msgstr "取り扱い説明書"
 
-#: camlibs/ptp2/ptp.c:2590
+#: camlibs/ptp2/ptp.c:2868
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2594
+#: camlibs/ptp2/ptp.c:2872
 #, fuzzy
 msgid "Flash Lock"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2874 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "マトリックス"
 
-#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2875 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "スポット"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2888
 #, fuzzy
 msgid "Power Wind"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:2633
+#: camlibs/ptp2/ptp.c:2911
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2634
+#: camlibs/ptp2/ptp.c:2912
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2635
+#: camlibs/ptp2/ptp.c:2913
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2636
+#: camlibs/ptp2/ptp.c:2914
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:3063
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:3064
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:3065
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:3068
+msgid "Audible.com Codec"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:3069
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:3072
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:3073
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:3074
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:3075
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2797
+#: camlibs/ptp2/ptp.c:3076
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2798
+#: camlibs/ptp2/ptp.c:3077
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2799
+#: camlibs/ptp2/ptp.c:3078
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2800
+#: camlibs/ptp2/ptp.c:3079
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2801
+#: camlibs/ptp2/ptp.c:3080
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2802
+#: camlibs/ptp2/ptp.c:3081
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2803
+#: camlibs/ptp2/ptp.c:3082
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2804
+#: camlibs/ptp2/ptp.c:3083
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2805
+#: camlibs/ptp2/ptp.c:3084
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2806
+#: camlibs/ptp2/ptp.c:3085
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2807
+#: camlibs/ptp2/ptp.c:3086
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:2808
+#: camlibs/ptp2/ptp.c:3087
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2809
+#: camlibs/ptp2/ptp.c:3088
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2810
+#: camlibs/ptp2/ptp.c:3089
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2811
+#: camlibs/ptp2/ptp.c:3090
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2812
+#: camlibs/ptp2/ptp.c:3091
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:3092
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2814
+#: camlibs/ptp2/ptp.c:3093
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2815
+#: camlibs/ptp2/ptp.c:3094
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2816
+#: camlibs/ptp2/ptp.c:3095
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2817
+#: camlibs/ptp2/ptp.c:3096
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2818
+#: camlibs/ptp2/ptp.c:3097
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2819
+#: camlibs/ptp2/ptp.c:3098
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2836
+#: camlibs/ptp2/ptp.c:3115
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2849
+#: camlibs/ptp2/ptp.c:3128
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "不明 (0x%02x)"
@@ -6288,8 +6397,8 @@ msgstr "画像とサウンド"
 msgid "Character & Sound"
 msgstr "文字とサウンド"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1135
-#: camlibs/sierra/sierra.c:1141
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1142
+#: camlibs/sierra/sierra.c:1148
 msgid "2x"
 msgstr "2x"
 
@@ -6446,8 +6555,8 @@ msgid "Aperature Settings"
 msgstr "外観の設定"
 
 #: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:1274
-#: camlibs/sierra/sierra.c:1603 camlibs/sierra/sierra.c:1804
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1811
 msgid "Color Mode"
 msgstr "カラーモード"
 
@@ -6464,59 +6573,59 @@ msgstr "ホストのパワーセーブ (秒)"
 msgid "Camera power save (seconds)"
 msgstr "カメラのパワーセーブ (秒)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1086
-#: camlibs/sierra/sierra.c:1359 camlibs/sierra/sierra.c:1558
-#: camlibs/sierra/sierra.c:1771
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1093
+#: camlibs/sierra/sierra.c:1366 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1778
 msgid "Lens Mode"
 msgstr "レンズモード"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1654
-#: camlibs/sierra/sierra.c:1663 camlibs/sierra/sierra.c:1840
+#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1670 camlibs/sierra/sierra.c:1847
 msgid "Korean"
 msgstr "韓国語"
 
 #: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1665
-#: camlibs/sierra/sierra.c:1842
+#: camlibs/sierra/sierra.c:1662 camlibs/sierra/sierra.c:1672
+#: camlibs/sierra/sierra.c:1849
 msgid "English"
 msgstr "英語"
 
 #: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1656 camlibs/sierra/sierra.c:1667
-#: camlibs/sierra/sierra.c:1844
+#: camlibs/sierra/sierra.c:1663 camlibs/sierra/sierra.c:1674
+#: camlibs/sierra/sierra.c:1851
 msgid "French"
 msgstr "フランス語"
 
 #: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1657 camlibs/sierra/sierra.c:1669
-#: camlibs/sierra/sierra.c:1846
+#: camlibs/sierra/sierra.c:1664 camlibs/sierra/sierra.c:1676
+#: camlibs/sierra/sierra.c:1853
 msgid "German"
 msgstr "ドイツ語"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1658
-#: camlibs/sierra/sierra.c:1671 camlibs/sierra/sierra.c:1848
+#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1665
+#: camlibs/sierra/sierra.c:1678 camlibs/sierra/sierra.c:1855
 msgid "Italian"
 msgstr "イタリア語"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1659
-#: camlibs/sierra/sierra.c:1673 camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1666
+#: camlibs/sierra/sierra.c:1680 camlibs/sierra/sierra.c:1857
 msgid "Japanese"
 msgstr "日本語"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1660
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1852
+#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1667
+#: camlibs/sierra/sierra.c:1682 camlibs/sierra/sierra.c:1859
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1661
-#: camlibs/sierra/sierra.c:1677 camlibs/sierra/sierra.c:1854
+#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1668
+#: camlibs/sierra/sierra.c:1684 camlibs/sierra/sierra.c:1861
 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:885 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:892 camlibs/sierra/sierra.c:1559
 msgid "Picture Settings"
 msgstr "写真の設定"
 
@@ -6656,13 +6765,13 @@ msgstr "赤目対策"
 msgid "Slow-sync"
 msgstr "スローシンクロ"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1029
-#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1327
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1036
+#: camlibs/sierra/sierra.c:1046 camlibs/sierra/sierra.c:1334
 msgid "Contrast+"
 msgstr "コントラスト(+)"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1037
+#: camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1336
 msgid "Contrast-"
 msgstr "コントラスト(-)"
 
@@ -6707,7 +6816,7 @@ msgid "Operation Mode"
 msgstr "操作モード"
 
 #: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:531
-#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1431
+#: camlibs/sierra/sierra.c:1199 camlibs/sierra/sierra.c:1438
 msgid "LCD Brightness"
 msgstr "液晶モニタの明るさ"
 
@@ -6952,239 +7061,239 @@ msgstr ""
 "    設定機能を完全にするために開発に協力してくれるのならば\n"
 "    開発者のメーリング・リストまで連絡して下さい。\n"
 
-#: camlibs/sierra/sierra.c:742 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:749 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "アップロードしたファイルのサイズが NULL です"
 
-#: camlibs/sierra/sierra.c:756
+#: camlibs/sierra/sierra.c:763
 msgid "Not enough memory available on the memory card"
 msgstr "メモリカードに空き容量がありません"
 
-#: camlibs/sierra/sierra.c:763
+#: camlibs/sierra/sierra.c:770
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "写真を格納するフォルダ名が取得できません"
 
-#: camlibs/sierra/sierra.c:770
+#: camlibs/sierra/sierra.c:777
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "フォルダ '%s' へのアップロードのみサポートしています"
 
-#: camlibs/sierra/sierra.c:898 camlibs/sierra/sierra.c:907
-#: camlibs/sierra/sierra.c:1236
+#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:914
+#: camlibs/sierra/sierra.c:1243
 msgid "Best"
 msgstr "ベスト"
 
-#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:1013
-#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1075
-#: camlibs/sierra/sierra.c:1099 camlibs/sierra/sierra.c:1121
-#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1494
-#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1545
-#: camlibs/sierra/sierra.c:1567 camlibs/sierra/sierra.c:1593
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1680
+#: camlibs/sierra/sierra.c:917 camlibs/sierra/sierra.c:957
+#: camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1020
+#: camlibs/sierra/sierra.c:1051 camlibs/sierra/sierra.c:1082
+#: camlibs/sierra/sierra.c:1106 camlibs/sierra/sierra.c:1128
+#: camlibs/sierra/sierra.c:1157 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1529 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1600
+#: camlibs/sierra/sierra.c:1619 camlibs/sierra/sierra.c:1687
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (不明)"
 
-#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1246
+#: camlibs/sierra/sierra.c:929 camlibs/sierra/sierra.c:1253
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "シャッター速度 (マイクロ秒, 0:自動)"
 
-#: camlibs/sierra/sierra.c:966 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1280
+#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:981
+#: camlibs/sierra/sierra.c:1287
 msgid "Black/White"
 msgstr "モノクロ"
 
-#: camlibs/sierra/sierra.c:968 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1284
+#: camlibs/sierra/sierra.c:975 camlibs/sierra/sierra.c:985
+#: camlibs/sierra/sierra.c:1291
 msgid "White Board"
 msgstr "白板"
 
-#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:980
-#: camlibs/sierra/sierra.c:1286
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:987
+#: camlibs/sierra/sierra.c:1293
 msgid "Black Board"
 msgstr "黒板"
 
-#: camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1317
+#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1324
 msgid "Brightness/Contrast"
 msgstr "明るさ/コントラスト"
 
-#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1035
-#: camlibs/sierra/sierra.c:1323
+#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1042
+#: camlibs/sierra/sierra.c:1330
 msgid "Bright+"
 msgstr "明るさ(+)"
 
-#: camlibs/sierra/sierra.c:1028 camlibs/sierra/sierra.c:1037
-#: camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1044
+#: camlibs/sierra/sierra.c:1332
 msgid "Bright-"
 msgstr "明るさ(-)"
 
-#: camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1065
-#: camlibs/sierra/sierra.c:1344
+#: camlibs/sierra/sierra.c:1064 camlibs/sierra/sierra.c:1072
+#: camlibs/sierra/sierra.c:1351
 msgid "Skylight"
 msgstr "晴天"
 
-#: camlibs/sierra/sierra.c:1089 camlibs/sierra/sierra.c:1096
-#: camlibs/sierra/sierra.c:1367
+#: camlibs/sierra/sierra.c:1096 camlibs/sierra/sierra.c:1103
+#: camlibs/sierra/sierra.c:1374
 msgid "Infinity/Fish-eye"
 msgstr "∞/フラッシュアイ"
 
-#: camlibs/sierra/sierra.c:1110 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1384
 msgid "Spot Metering Mode"
 msgstr "スポット測光モード"
 
-#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1139
+#: camlibs/sierra/sierra.c:1140 camlibs/sierra/sierra.c:1146
 msgid "1x"
 msgstr "x1"
 
-#: camlibs/sierra/sierra.c:1134 camlibs/sierra/sierra.c:1144
+#: camlibs/sierra/sierra.c:1141 camlibs/sierra/sierra.c:1151
 msgid "1.6x"
 msgstr "x1.6"
 
-#: camlibs/sierra/sierra.c:1136 camlibs/sierra/sierra.c:1147
+#: camlibs/sierra/sierra.c:1143 camlibs/sierra/sierra.c:1154
 msgid "2.5x"
 msgstr "x2.5"
 
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1411
-#: camlibs/sierra/sierra.c:1626 camlibs/sierra/sierra.c:1818
+#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1418
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1825
 msgid "Auto Off (host) (in seconds)"
 msgstr "自動パワーオフ (host) (秒後)"
 
-#: camlibs/sierra/sierra.c:1166 camlibs/sierra/sierra.c:1628
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1635
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr "コンピュータに接続した時に自動的にパワーオフするまでの時間です"
 
-#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1421
-#: camlibs/sierra/sierra.c:1640 camlibs/sierra/sierra.c:1828
+#: camlibs/sierra/sierra.c:1185 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1835
 msgid "Auto Off (field) (in seconds)"
 msgstr "自動パワーオフ (屋外) (秒後)"
 
-#: camlibs/sierra/sierra.c:1180 camlibs/sierra/sierra.c:1642
+#: camlibs/sierra/sierra.c:1187 camlibs/sierra/sierra.c:1649
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "屋外で自動的にパワーオフするまでの時間です"
 
-#: camlibs/sierra/sierra.c:1202 camlibs/sierra/sierra.c:1440
+#: camlibs/sierra/sierra.c:1209 camlibs/sierra/sierra.c:1447
 msgid "LCD Auto Off (in seconds)"
 msgstr "液晶モニタの自動オフ (秒後)"
 
-#: camlibs/sierra/sierra.c:1464
+#: camlibs/sierra/sierra.c:1471
 msgid "Shot Settings"
 msgstr "ショットの設定"
 
-#: camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/sierra.c:1478 camlibs/sierra/sierra.c:1486
+#: camlibs/sierra/sierra.c:1721
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1472 camlibs/sierra/sierra.c:1481
-#: camlibs/sierra/sierra.c:1716
+#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1723
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1473 camlibs/sierra/sierra.c:1483
-#: camlibs/sierra/sierra.c:1718
+#: camlibs/sierra/sierra.c:1480 camlibs/sierra/sierra.c:1490
+#: camlibs/sierra/sierra.c:1725
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1474 camlibs/sierra/sierra.c:1485
-#: camlibs/sierra/sierra.c:1720
+#: camlibs/sierra/sierra.c:1481 camlibs/sierra/sierra.c:1492
+#: camlibs/sierra/sierra.c:1727
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1475 camlibs/sierra/sierra.c:1487
-#: camlibs/sierra/sierra.c:1722
+#: camlibs/sierra/sierra.c:1482 camlibs/sierra/sierra.c:1494
+#: camlibs/sierra/sierra.c:1729
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1489
-#: camlibs/sierra/sierra.c:1724
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1496
+#: camlibs/sierra/sierra.c:1731
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1580 camlibs/sierra/sierra.c:1588
-#: camlibs/sierra/sierra.c:1793
+#: camlibs/sierra/sierra.c:1587 camlibs/sierra/sierra.c:1595
+#: camlibs/sierra/sierra.c:1800
 msgid "SuperFine"
 msgstr "スーパーファイン"
 
-#: camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1590
-#: camlibs/sierra/sierra.c:1795
+#: camlibs/sierra/sierra.c:1588 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1802
 msgid "HyPict"
 msgstr "高解像度"
 
-#: camlibs/sierra/sierra.c:1604 camlibs/sierra/sierra.c:1607
-#: camlibs/sierra/sierra.c:1807
+#: camlibs/sierra/sierra.c:1611 camlibs/sierra/sierra.c:1614
+#: camlibs/sierra/sierra.c:1814
 msgid "color"
 msgstr "色彩"
 
-#: camlibs/sierra/sierra.c:1605 camlibs/sierra/sierra.c:1609
-#: camlibs/sierra/sierra.c:1809
+#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1616
+#: camlibs/sierra/sierra.c:1816
 msgid "black & white"
 msgstr "モノクロ"
 
-#: camlibs/sierra/sierra.c:1911
+#: camlibs/sierra/sierra.c:1918
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "注意: メモリ・カードがありません。いくつかの値が不正になるかもしれません。\n"
 
-#: camlibs/sierra/sierra.c:1919
+#: camlibs/sierra/sierra.c:1926
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sカメラの型式: %s\n"
 
-#: camlibs/sierra/sierra.c:1921
+#: camlibs/sierra/sierra.c:1928
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%s製造: %s\n"
 
-#: camlibs/sierra/sierra.c:1923
+#: camlibs/sierra/sierra.c:1930
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sカメラID: %s\n"
 
-#: camlibs/sierra/sierra.c:1925
+#: camlibs/sierra/sierra.c:1932
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sシリアル番号: %s\n"
 
-#: camlibs/sierra/sierra.c:1927
+#: camlibs/sierra/sierra.c:1934
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sソフトウェア・リビジョン: %s\n"
 
-#: camlibs/sierra/sierra.c:1932 camlibs/sierra/sierra.c:1935
+#: camlibs/sierra/sierra.c:1939 camlibs/sierra/sierra.c:1942
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sフレーム数: %i\n"
 
-#: camlibs/sierra/sierra.c:1938
+#: camlibs/sierra/sierra.c:1945
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%s残りフレーム数: %i\n"
 
-#: camlibs/sierra/sierra.c:1940
+#: camlibs/sierra/sierra.c:1947
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sバッテリーの寿命: %i\n"
 
-#: camlibs/sierra/sierra.c:1942
+#: camlibs/sierra/sierra.c:1949
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sメモリの空き容量: %i バイト\n"
 
-#: camlibs/sierra/sierra.c:1947
+#: camlibs/sierra/sierra.c:1954
 #, c-format
 msgid "%sDate: %s"
 msgstr "%s日付: %s"
 
-#: camlibs/sierra/sierra.c:1963
+#: camlibs/sierra/sierra.c:1970
 msgid "No camera manual available.\n"
 msgstr "取り扱い説明書は利用できません。\n"
 
-#: camlibs/sierra/sierra.c:1970
+#: camlibs/sierra/sierra.c:1977
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -7205,7 +7314,7 @@ msgstr ""
 "  お使いのカメラがおかしな動きをした場合は\n"
 "  %s まで (英語で) 連絡して下さい。\n"
 
-#: camlibs/sierra/sierra.c:1982
+#: camlibs/sierra/sierra.c:1989
 #, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
@@ -7242,7 +7351,7 @@ msgstr ""
 "    もしこのような状態になったら、PC から取り外しして再び接続し\n"
 "    液晶を \"OFF\" に切り替えて下さい。"
 
-#: camlibs/sierra/sierra.c:2011
+#: camlibs/sierra/sierra.c:2018
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -7302,7 +7411,7 @@ msgstr ""
 "Lee Benfield <lee@benf.org>\n"
 "Smal Ultrapocket カメラ向のドライバで、OEM 版です (slimshot)。"
 
-#: camlibs/sonix/library.c:98
+#: camlibs/sonix/library.c:111
 #, fuzzy, c-format
 msgid ""
 "Sonix camera.\n"
@@ -7317,31 +7426,22 @@ msgstr[1] ""
 "Mars MR97310 カメラ。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/sonix/library.c:109
-#, fuzzy
+#: camlibs/sonix/library.c:122
 msgid ""
-"This driver supports cameras with Sonix chip\n"
-"and should work with gtkam.\n"
-"The driver allows you to get\n"
-"   - thumbnails for gtkam\n"
+"This driver supports some cameras with Sonix sn9c2028 chip.\n"
+"The following operations are supported:\n"
+"   - thumbnails for a GUI frontend\n"
 "   - full images in PPM format\n"
+"   - delete all images\n"
+"   - delete last image (may not work on all Sonix cameras)\n"
+"   - image capture to camera (\t\tditto\t\t)\n"
 "If present on the camera, video clip frames are downloaded \n"
-"as consecutive still photos.\n"
-"Capture not supported"
+"as consecutive still photos or as AVI files, depending on model.\n"
+"Thumbnails for AVIs are still photos made from the first frame.\n"
+"A single image cannot be deleted unless it is the last one.\n"
 msgstr ""
-"このドライバは Mars MR97310 チップを搭載したカメラ\n"
-"(と、??Pixart PACx07?? に等価なもの) をサポートしており、\n"
-"gtkam も利用できます。\n"
-"このドライバは次のような機能を提供しています:\n"
-"   - gtkam 向けのサムネイル生成\n"
-"   - フル画像 (640x480 または 320x240 PPM) (??352x288 & 176x144??)\n"
-"このチップを搭載したカメラでは、写真の削除、画像データのアップロード\n"
-"はサポートしていません。このドライバでは、オプションである\n"
-"写真の圧縮モードをサポートしていません。\n"
-"お使いのカメラが動画のキャプチャ機能を提供している場合、\n"
-"ビデオ・クリップのフレームは連続した写真としてダウンロードします。\n"
 
-#: camlibs/sonix/library.c:125
+#: camlibs/sonix/library.c:141
 #, fuzzy
 msgid ""
 "Sonix camera library\n"
@@ -7721,16 +7821,16 @@ msgstr ""
 "David Hogue <david@jawa.gotdns.org>\n"
 "Toshiba pdr-m11 向けのドライバ。\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:190
+#: libgphoto2/gphoto2-abilities-list.c:183
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:199
+#: libgphoto2/gphoto2-abilities-list.c:192
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "'%s' からカメラのドライバを読み込み中..."
 
-#: libgphoto2/gphoto2-abilities-list.c:615
+#: libgphoto2/gphoto2-abilities-list.c:608
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "'%s' 用のドライバが見つかりませんでした"
@@ -7800,11 +7900,6 @@ msgstr "カメラはスピード %i をサポートしていません。"
 msgid "The path '%s' is not absolute."
 msgstr "パス名 '%s' が無効です。"
 
-#: libgphoto2/gphoto2-filesys.c:416
-#, c-format
-msgid "Could not append folder '%s' as this folder already exists."
-msgstr "フォルダ '%s' が既に存在しているので追加できませんでした。"
-
 #: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
@@ -7942,6 +8037,32 @@ msgstr "カメラライブラリの不明なエラー"
 msgid "Unknown error"
 msgstr "不明なエラー"
 
+#, fuzzy
+#~ msgid ""
+#~ "This driver supports cameras with Sonix chip\n"
+#~ "and should work with gtkam.\n"
+#~ "The driver allows you to get\n"
+#~ "   - thumbnails for gtkam\n"
+#~ "   - full images in PPM format\n"
+#~ "If present on the camera, video clip frames are downloaded \n"
+#~ "as consecutive still photos.\n"
+#~ "Capture not supported"
+#~ msgstr ""
+#~ "このドライバは Mars MR97310 チップを搭載したカメラ\n"
+#~ "(と、??Pixart PACx07?? に等価なもの) をサポートしており、\n"
+#~ "gtkam も利用できます。\n"
+#~ "このドライバは次のような機能を提供しています:\n"
+#~ "   - gtkam 向けのサムネイル生成\n"
+#~ "   - フル画像 (640x480 または 320x240 PPM) (??352x288 & 176x144??)\n"
+#~ "このチップを搭載したカメラでは、写真の削除、画像データのアップロード\n"
+#~ "はサポートしていません。このドライバでは、オプションである\n"
+#~ "写真の圧縮モードをサポートしていません。\n"
+#~ "お使いのカメラが動画のキャプチャ機能を提供している場合、\n"
+#~ "ビデオ・クリップのフレームは連続した写真としてダウンロードします。\n"
+
+#~ msgid "Could not append folder '%s' as this folder already exists."
+#~ msgstr "フォルダ '%s' が既に存在しているので追加できませんでした。"
+
 #~ msgid ""
 #~ "PTP2 driver\n"
 #~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
author	Hubert Figuiere <hub@figuiere.net>	2006-09-20 00:48:20 +0000
committer	Hubert Figuiere <hub@figuiere.net>	2006-09-20 00:48:20 +0000
commit	ea2fe43c3edfb43429e2b29a775dc720e6cc2950 (patch)
tree	a9c258972935cdfcd78ee201ad80200af68161b3 /po/ja.po
parent	73949bf4de11d2942e71a0b31d73b28dc70fc4d2 (diff)
download	libgphoto2-ea2fe43c3edfb43429e2b29a775dc720e6cc2950.tar.gz