update-po

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8796 67ed7778-7388-44ab-90cf-0a291f65f57c

13 files changed, 14052 insertions, 9049 deletions

diff --git a/po/da.po b/po/da.po
index 32f75bae7..3a377d961 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.99\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2005-12-29 15:49+0100\n"
 "Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -401,8 +401,8 @@ msgstr "Kunne ikke oprette \\DCIM katalog."
 msgid "Could not create destination directory."
 msgstr "Kunne ikke oprette m�l-katalog."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguration af kamera og driver"
 
@@ -439,8 +439,8 @@ msgstr "S�t kameradato til PC-dato"
 msgid "Firmware revision (readonly)"
 msgstr "Firmware revision (skrivebeskyttet)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Str�m (skrivebeskyttet)"
 
@@ -582,7 +582,7 @@ msgid "Communication error 1"
 msgstr "Kommunikationsfejl 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Intet svar fra kamera"
 
@@ -1020,7 +1020,7 @@ msgstr ""
 "iClick 5X driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 "Dit USB-kamera har et SQ905C chips�t.\n"
 "Der er i alt taget %i billeder.\n"
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Kompressionstilstand er IKKE underst�ttet. Et komprimeret\n"
 "billede bliver med garanti hjemhentet som rent affald.\n"
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1124,8 +1124,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blitz"
@@ -1247,7 +1247,7 @@ msgid "Problem reading image from flash"
 msgstr "Problem med l�sning af billede fra kort"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
@@ -1289,19 +1289,19 @@ msgstr "Eksponeringsniveau ved forh�ndsvisning"
 msgid "Automatic flash on capture"
 msgstr "Automatisk blitz ved optagning"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Problem med �bning af port"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Problem ved nulstilling af kamera"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Problem ved indstilling af kameraets kommunikationshastighed"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Ligner et modem, og ikke et kamera"
 
@@ -1367,7 +1367,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kameraet sendte kun %i byte, men vi skal bruge mindst %i."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Kunne ikke kontakte kamera."
 
@@ -1410,7 +1410,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kameraet sendte uventede byte 0x%02x."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Hjemhenter..."
@@ -1502,17 +1502,18 @@ msgstr ""
 "venligst leveret af Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
-"Ikke-underst�ttet porttype: %d. Denne driver virker kun med USB-kameraer.\n"
+"Ikkeunderst�ttet porttype: %d. Denne driver kan kun bruges med USB-"
+"kameraer.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke nulstille kameraet.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1765,20 +1766,20 @@ msgid "High (good quality)"
 msgstr "H�j (god kvalitet)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Optag"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1820,30 +1821,32 @@ msgstr "Eksponeringskompensation"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Automatisk"
 
@@ -1857,7 +1860,8 @@ msgid "Force"
 msgstr "Gennemtving"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ingen"
@@ -1874,13 +1878,13 @@ msgstr "R�d�je blitz"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1896,14 +1900,14 @@ msgstr "T�ndt"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2627,7 +2631,10 @@ msgstr "Selvudl�ser (kun for n�ste billede)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2703,6 +2710,7 @@ msgid "No answer from the camera."
 msgstr "Intet svar fra kamera."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2715,6 +2723,7 @@ msgid "Medium"
 msgstr "Mellem"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2753,7 +2762,7 @@ msgstr "Kontor"
 msgid "Day-lt"
 msgstr "Dag-lt"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "Skarphed"
 
@@ -2783,7 +2792,7 @@ msgid "Black and White"
 msgstr "Sort/hvid"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2823,13 +2832,13 @@ msgstr "Overalt"
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Afspil"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2910,15 +2919,7 @@ msgstr ""
 "\n"
 "Tak for brug af gphoto2 og UNIX/Linux OS.\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Der er ikke noget at summere for dette kamera."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Ingen manual"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2996,7 +2997,7 @@ msgstr ""
 "Mars MR97310 kamera bibliotek\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3007,7 +3008,7 @@ msgstr ""
 "Hardware revision:\t%s\n"
 "Firmware revision:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3034,61 +3035,61 @@ msgstr ""
 "Kort ID:\t\t%d\n"
 "Blitztilstand:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Fjern"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Lokal"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Nej"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisk\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Gennemtving blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Forhindr blitz\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ugyldig v�rdi ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3105,73 +3106,73 @@ msgstr ""
 "Opladning blitz:\t\t%s\n"
 "Objektivstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Ikke fuld"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Fuld"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Optaget"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Ledig"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Oplader"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Klar"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Objektivretning svarer ikke til blitzlys\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objektiv er ikke tilsluttet\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Forkert v�rdi for objektivstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kortstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Skrivebeskyttet"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Uegnet kort"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Forkert v�rdi for kortstatus %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3293,7 +3294,7 @@ msgstr ""
 "Filst�rrelse er %ld byte. St�rst mulige fil der kan opl�gges er: %i byte."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Opl�gger..."
 
@@ -3490,13 +3491,13 @@ msgstr ""
 "JD350e ved Michael Trawny <trawny99@users.sourceforge.net>.Fejlrettelser ved "
 "Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Billede kvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Billede st�rrelse"
 
@@ -3512,11 +3513,11 @@ msgstr "Automatisk sluk efter (minutter)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fin"
 
@@ -3524,21 +3525,21 @@ msgstr "fin"
 msgid "superfine"
 msgstr "superfin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "t�ndt"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "slukket"
@@ -3652,246 +3653,254 @@ msgstr ""
 "Automatisk sluk: %i minutter\n"
 "Str�mkilde: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den efterspurgte porttype (%i) er ikke underst�ttet af denne driver."
 
-#: camlibs/ptp2/library.c:147
+#: 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 ikke defineret fejl"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP O.k.!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP generel fejl"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP session ikke �ben"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ugyldig transaktions ID"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP handling ikke underst�ttet"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter ikke underst�ttet"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ikke fuldst�ndig overf�rsel"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ugyldig lagrings ID"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ugyldig objekth�ndtering"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhedsegenskaber ikke underst�ttet"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ugyldig objekt formatkode"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP lager fuldt"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP Objektet er skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP lager skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP tilgang n�gtet"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen miniature tilstede"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP selvtest mislykkedes"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis sletning"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP lager ikke tilg�ngeligt"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation efter format ikke underst�ttet"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen gyldige objektinformationer"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP ugyldig kodeformat"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP ukendt fremstillerkode"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP optagning allerede afbrudt"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr "PTP enhed optaget"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ugyldigt for�ldre-objekt"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ugyldig enhedsegenskabsformat"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ugyldig enhedsegenskabsv�rdi"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP ugyldig parameter"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP session allerede �bnet"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktion afbrudt"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP angivelse af m�l ikke underst�ttet"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP EK filnavn n�dvendig"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK filnavn konflikter"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK filnavn ugyldigt"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP I/O fejl"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP fejl: forkert parameter"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokol fejl, data forventet"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokol fejl, svar forventet"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"Held og lykke!"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Beklager, dit Canon kamera underst�tter ikke Canon-optagning"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Beklager, dit Canon kamera underst�tter ikke Canon s�ger tilstand"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "Canon tillad-s�ger fejlede: %d"
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Canon hent-s�gerbillede fejlede: %d"
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Canon sl�-s�ger-fra fejlede: %d"
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Beklager, dit kamera underst�tter ikke almen optagning"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 "Beklager, dit Canon kamera underst�tter ikke Canon optagningsinitiering"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Beklager, dit kamera underst�tter ikke almen optagning"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr "Optagekommando afsluttet, men modtog ingen bekr�ftelse"
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Modtog h�ndelse 0x%04x"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr "skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr "l�se/skrive"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3906,444 +3915,488 @@ msgstr ""
 "Fremstiller udvidelses ID: 0x%08x\n"
 "Fremstiller udvidelsesbeskrivelse: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Datoformat"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Datoformat"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Filopl�sning"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Filopl�sning"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Filopl�gning mislykkedes."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Optag"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Optag"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ukendt (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generel"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 #, fuzzy
 msgid "Read-Write"
 msgstr "l�se/skrive"
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Klar"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Antal billeder: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ukendt filtype %i."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "uventet datatype %i"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr "En-knaps automatik"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "Dagslys"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluorescerende"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Wolfram"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Skyet"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr "Skygge"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Forvalgt"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr "JPEG basis"
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr "JPEG normal"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr "JPEG fin"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr "NEF (r�)"
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr "NEF+basis"
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr "superfin"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr "automatisk r�d�je"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr "r�d�je til"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+msgid "Commander"
+msgstr "Fjernbetjener"
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr "spot"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "center"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 msgid "large"
 msgstr "stor"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr "middel 1"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr "middel 2"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr "lille"
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr "Fabriksstandard"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 msgid "Portrait"
 msgstr "Portr�t"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr "Landskab"
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr "Nat-portr�t"
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr "Nat-landskab"
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr "Enkelt-skud"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Bedst"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 #, fuzzy
 msgid "Timelapse"
 msgstr "Tidsforkortelses antal"
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 msgid "Timer"
 msgstr "Timer"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr "Timer + Fjernbetjening"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr "Dynamisk omr�de"
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr "Enkelt omr�de"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr "N�rmeste emne"
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Portr�t"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+msgid "Centre"
+msgstr "Centrum"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr "Top"
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr "Bund"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr "Venstre"
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+msgid "Right"
+msgstr "H�jre"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr "Centerv�gtet"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centerv�gtet"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Blitz"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "R�d�jereduktion"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "R�d�je blitz"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "eksternt"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 msgid "Default"
 msgstr "Standard"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4351,208 +4404,610 @@ msgstr "Standard"
 msgid "Slow Sync"
 msgstr "Langsom synkronisering"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Bagestegardin synkronisering + langsom synkronisering"
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "R�d�jereduktion + langsom synkronisering"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Sort/hvid"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Afstandsl�s"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "1 min."
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+#, fuzzy
+msgid "5 minutes"
+msgstr "5 min."
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "10 min."
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+#, fuzzy
+msgid "30 minutes"
+msgstr "10 min."
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "15 min."
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr "Skarp"
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Skarp"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Bl�dt"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "Kataloget eksisterer"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Mellem"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Mellem"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Kontrast"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Mellem"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr "Lang afstand"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
-msgstr "Fluorescerende H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "Tilpasset"
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "AC"
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr "Skarp"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
+msgstr "Fluorescerende H"
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr "Lav skarphed"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr "Sort/hvid"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "Ingen blitz"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "skrivebeskyttet"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Blitz-tilstand"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Eksponeringssammenstilling"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internt"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Intet kort"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 msgid "Camera Owner"
 msgstr "Kameraejer"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 msgid "Camera Model"
 msgstr "Kameramodel"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmware revision: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 msgid "Camera Time"
 msgstr "Kameratid"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr "Bippetilstand"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 msgid "Image Comment"
 msgstr "Billedkommentar"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr "LCD slukket tid"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Automatisk m�ler slukket tid"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Optageindstillinger"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO hastighed"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr "Hvidbalance"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr "Fotoeffekt"
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Farvetilstand"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr "Automatisk ISO"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr "Lang eksponerings st�jreduktion"
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Auto-fokuseringstilstand"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr "Hj�lpelys"
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Eksponeringskompensation"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr "AF omr�de belysning"
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 msgid "AF Beep Mode"
 msgstr "AF bippetilstand"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr "Bl�nde-tal"
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr "Br�ndvidde"
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokuseringstilstand"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr "Eksponeringstid"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr "Effekttilstand"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 msgid "Exposure Program"
 msgstr "Eksponeringsprogram"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr "Stilbilledeoptagetilstand"
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr "Afstandsinstillingstilstand"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr "Eksponerings-m�lingstilstand"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Bl�nde�bning"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr "Fokuseringspunkt"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr "M�lingstilstand"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Fokuseringsafstand"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+msgid "Focus Area Wrap"
+msgstr "Nulstilling af fokuseringsomr�de"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr "Eksponeringsl�s"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr "S�t filnumre i r�kkef�lge"
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+msgid "Flash Sign"
+msgstr "Blitzsymbol"
+
+#: camlibs/ptp2/library.c:3646
+#, fuzzy
+msgid "Viewfinder Grid"
+msgstr "S�gertilstand"
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+msgid "Image Review"
+msgstr "Billedgennemsyn"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Billedrotation"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+msgid "Flash Mode Manual Power"
+msgstr "Blitztilstand manuel-str�m"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Auto-fokuseringstilstand"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr "Blitzeksponeringskompensation"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+msgid "Bracket Set"
+msgstr "Sammensat s�t"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr "Sammensat orden"
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr "Serie antal"
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Automatisk hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Wolfram hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Fluorescerende hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Dagslys hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Blitz hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Skyet hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Skygget hvidbalance korrektion"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Selvudl�ser forsinkelse"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "Centerv�gt omr�de"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr "Blitz lukkerhastighed"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr "Fjernbetjent tidsudl�b"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr "G�r skarpere"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr "Tone kompensation"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Konfiguration"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+msgid "Hue Adjustment"
+msgstr "Farvetonejustering"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4560,217 +5015,222 @@ msgstr "Fokuseringsafstand"
 msgid "Camera Settings"
 msgstr "Kameraindstillinger"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 msgid "Image Settings"
 msgstr "Billedindstillinger"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 msgid "Capture Settings"
 msgstr "Optageindstillinger"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Antal v�rdier"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Underst�ttede v�rdier"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Nuv�rende v�rdi"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Initialisation af kamera"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP er kun implementeret for USB kameraer."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP er kun implementeret for USB kameraer."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: Ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: O.k.!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: Generel fejl"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: session ikke �ben"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: Ugyldig transaktions ID"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: Handling ikke underst�ttet"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: Parameter ikke underst�ttet"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: Ikke fuldst�ndig overf�rsel"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: Ugyldig lagrings ID"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: Ugyldig objekth�ndtering"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: Enhedsegenskaber ikke underst�ttet"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: Ugyldig objekt formatkode"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP: Lager fuldt"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: Objektet er skrivebeskyttet"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP: Lager skrivebeskyttet"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: Tilgang n�gtet"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: Ingen miniature tilstede"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP: Selvtest mislykkedes"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: Delvis sletning"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP: Lager ikke tilg�ngeligt"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: Specifikation efter format ikke underst�ttet"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: Ingen gyldige objektinformationer"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: Ugyldig kodeformat"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: Ukendt fremstillerkode"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: Optagning allerede afbrudt"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr "PTP: Enhed optaget"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: Ugyldigt for�ldre-objekt"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: Ugyldig enhedsegenskabsformat"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: Ugyldig enhedsegenskabsv�rdi"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: Ugyldig parameter"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: Session allerede �bnet"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: Transaktion afbrudt"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: Angivelse af m�l ikke underst�ttet"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: EK filnavn n�dvendig"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: EK filnavn konflikter"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: EK filnavn ugyldigt"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: I/O fejl"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: Fejl: forkert parameter"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: Protokol fejl, data forventet"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Protokol fejl, svar forventet"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr "Batteriniveau"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr "Funktionstilstand"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr "Kompressions indstillinger"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4779,715 +5239,625 @@ msgstr "Kompressions indstillinger"
 msgid "White Balance"
 msgstr "Hvidbalance"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr "RGB-forst�rkning"
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr "Bl�nde-tal"
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr "Fokuseringsafstand"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr "Eksponeringsprogramtilstand"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr "Eksponeringsindeks (filmhastigheds ISO)"
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr "Eksponeringskorrektions kompensation"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr "Dato tid"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr "Forud-optageforsinkelse"
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Digital zoom"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr "Serie antal"
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr "Serie interval"
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr "Tidsforkortelses antal"
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr "Tidsforkortelses interval"
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr "Opl�g URL"
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr "Kunstner"
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr "Ophavsretsinformation"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr "Farvetemperatur"
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr "Dato/tid stempelformat"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr "Video ud"
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr "Str�mspare"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr "UI sprog"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr "S�gertilstand"
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr "St�rrelse/kvalitetstilstand"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr "UNIX-tid"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Digital zoom"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr "Automatisk hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr "Wolfram hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr "Fluorescerende hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr "Dagslys hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr "Blitz hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr "Skyet hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr "Skygget hvidbalance korrektion"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr "Hvidbalance farvetemperatur"
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr "G�r skarpere"
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr "Tone kompensation"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Farvetilstand"
-
-#: camlibs/ptp2/ptp.c:2060
-msgid "Hue Adjustment"
-msgstr "Farvetonejustering"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Objektivets br�ndvidde (ikke CPU)"
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr "Objektivets st�rste bl�nde�bning (ikke CPU)"
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr "PTP_DPC_NIKON_CSMMenuBankSelect"
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr "PTP_DPC_NIKON_MenuBankNameA"
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr "PTP_DPC_NIKON_MenuBankNameB"
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr "PTP_DPC_NIKON_MenuBankNameC"
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr "PTP_DPC_NIKON_MenuBankNameD"
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr "PTP_DPC_NIKON_A1AFCModePriority"
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr "PTP_DPC_NIKON_A2AFSModePriority"
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr "PTP_DPC_NIKON_A3GroupDynamicAF"
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr "PTP_DPC_NIKON_A4AFActivation"
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 
-#: camlibs/ptp2/ptp.c:2090
-msgid "Focus Area Wrap"
-msgstr "Nulstilling af fokuseringsomr�de"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr "Lodret AF til"
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr "Automatisk ISO"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr "ISO skridt"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 msgid "Exposure Step"
 msgstr "Eksponeringsskridt"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr "Eksponeringskompensation (EV)"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr "Centerv�gt omr�de"
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr "Eksponeringsl�s"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 msgid "Focus Lock"
 msgstr "Afstandsl�s"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr "Automatisk m�ler slukket tid"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr "Selvudl�ser forsinkelse"
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr "LCD slukket tid"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr "Maks. antal skud"
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr "PTP_DPC_NIKON_D3ExpDelayMode"
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr "Langtidseksponeringsst�jreduktion"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr "S�t filnumre i r�kkef�lge"
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr "PTP_DPC_NIKON_D7Illumination"
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr "Blitz synkroniseringshastighed"
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr "Blitz lukkerhastighed"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr "Modeler blitz"
 
-#: camlibs/ptp2/ptp.c:2140
-msgid "Bracket Set"
-msgstr "Sammensat s�t"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr "Manueltilstand sammens�tning"
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr "Sammensat orden"
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr "Automatisk sammens�tning udv�lgelse"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 msgid "Center Button Shooting Mode"
 msgstr "Centerknap optagetilstand"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr "Centerknap afspilletilstand"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr "Multiv�lger"
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr "Fotoinformation. Afspilning"
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr "Tilknytningsfunktion. Knap"
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr "Tilpas kommando drejeskiver"
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr "Omvendt kommando drejeskive"
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 msgid "Aperture Setting"
 msgstr "Bl�nde�bningsindstilling"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr "Menuer og afspilning"
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr "Knapper og drejeskiver"
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr "Ingen CF-kort udl�st"
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 msgid "Image Rotation"
 msgstr "Billedrotation"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 msgid "Exposure Bracketing"
 msgstr "Eksponeringssammenstilling"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 msgid "Exposure Bracketing Distance"
 msgstr "Eksponeringssammenstilling afstand"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 msgid "Exposure Bracketing Number"
 msgstr "Eksponeringssammenstilling antal"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD-topindstilling 2"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr "Aktiv AF-sensor"
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 msgid "Exposure Meter"
 msgstr "Eksponeringsm�ler"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 msgid "Exposure Aperture Lock"
 msgstr "Eksponeringsbl�ndel�s"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr "Maksimale antal skud"
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 msgid "Autofocus Mode"
 msgstr "Auto-fokuseringstilstand"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr "AF hj�lpelys"
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Auto ISO P/A/DVP ops�tning"
 
-#: camlibs/ptp2/ptp.c:2196
-msgid "Image Review"
-msgstr "Billedgennemsyn"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr "S�ger gittervisning"
 
-#: camlibs/ptp2/ptp.c:2204
-msgid "Flash Mode Manual Power"
-msgstr "Blitztilstand manuel-str�m"
-
-#: camlibs/ptp2/ptp.c:2206
-msgid "Flash Sign"
-msgstr "Blitzsymbol"
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr "Blitzeksponeringskompensation"
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr "Fjernbetjent tidsudl�b"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 msgid "Image Comment String"
 msgstr "Billedkommentar streng"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 msgid "Flash Open"
 msgstr "Blitz �ben"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr "Blitz opladet"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr "Objektiv ID"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr "Min. fokusl�ngde"
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr "Maks. fokusl�ngde"
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Maks. bl�nde�bning ved min. fokusl�ngde"
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Maks. bl�nde�bning ved max. fokusl�ngde"
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 msgid "Low Light"
 msgstr "Low-Light"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr "R�"
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr "R� + JPEG basis"
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Hvidgl�dende"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "R�d�jereduktion"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr "Manuel fokusering"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Blitz-tilstand"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr "Motordrev"
 
-#: camlibs/ptp2/ptp.c:2396
-msgid "Commander"
-msgstr "Fjernbetjener"
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr "1 min."
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr "5 min."
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr "10 min."
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr "15 min."
 
-#: camlibs/ptp2/ptp.c:2415
-msgid "Centre"
-msgstr "Centrum"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr "Top"
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr "Bund"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr "Venstre"
-
-#: camlibs/ptp2/ptp.c:2419
-msgid "Right"
-msgstr "H�jre"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 #, fuzzy
 msgid "Firmware"
 msgstr "Firmware revision: %8s"
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ukendt (0x%02x)"
@@ -5737,7 +6107,7 @@ msgstr "Optagetilstand"
 msgid "Compression"
 msgstr "Kompression"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Hastigheden %i er ikke underst�ttet!"
@@ -5827,6 +6197,12 @@ msgstr "Dato og tid (GMT)"
 msgid "Aperature Settings"
 msgstr "Bl�nde�bningsindstillinger"
 
+#: 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
+msgid "Color Mode"
+msgstr "Farvetilstand"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6642,7 +7018,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (ukendt)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6652,7 +7028,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Kunne ikke tilf�je USB ops�tning"
 
@@ -6866,13 +7242,6 @@ msgstr ""
 "Mustek.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Ikkeunderst�ttet porttype: %d. Denne driver kan kun bruges med USB-"
-"kameraer.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7082,11 +7451,11 @@ msgstr ""
 "Send bugreporter og kommentarer.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z er kun USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7105,7 +7474,7 @@ msgstr "Intern fejl ved s�gning efter camlibs. (stinavne for lange?)"
 msgid "Loading camera drivers from '%s'..."
 msgstr "Henter kameradrivere fra '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Kunne ikke finde nogen drivere til '%s'"
@@ -7165,33 +7534,38 @@ msgstr "Kameraet kan ikke optage."
 msgid "This camera can not capture previews."
 msgstr "Kameraet kan ikke optage smugkig."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Kameraet underst�tter ikke hastigheden %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Stien '%s' er ikke absolut."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Kunne ikke tilf�je mappen '%s' da mappen allerede eksisterer."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Kunne ikke finde mappen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Mappen '%s' indeholder ikke mappen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Kunne ikke tilf�je '%s' til mappen '%s' da denne fil allerede eksisterer."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7200,22 +7574,22 @@ msgstr ""
 "Du har pr�vet at slette '%s' fra mappen '%s', men filsystemet underst�tter "
 "ikke sletning af filer."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "Der er stadig undermapper i mappen '%s' som du pr�ver at fjerne."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Der er stadig filer i mappen '%s' som du pr�ver at fjerne."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet underst�tter ikke opl�gning af filer."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7223,40 +7597,40 @@ msgid ""
 msgstr ""
 "Mappen '%s' indeholder kun %i filer, men du efterspurgte fil nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Filen '%s' kunne ikke findes i mappe '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunne ikke finde filen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet underst�tter ikke hentning af filer."
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ukendt filtype %i."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Hjemhenter '%s' fra mappe '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "Filsystemet underst�tter ikke hentning af filinformationer."
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "Filsystemet underst�tter ikke indstilling af filinformationer."
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivebeskyttede filattributter som bredde og h�jde kan ikke �ndres."
 
@@ -7312,6 +7686,29 @@ msgstr "Ukendt kamerabiblioteks fejl"
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Held og lykke!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Der er ikke noget at summere for dette kamera."
+
+#~ msgid "No manual"
+#~ msgstr "Ingen manual"
+
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Ikke-underst�ttet porttype: %d. Denne driver virker kun med USB-"
+#~ "kameraer.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP er kun implementeret for USB kameraer."
+
 #~ msgid "Incadescent"
 #~ msgstr "Hvidgl�dende"
 
diff --git a/po/es.po b/po/es.po
index cb4c9f270..606496575 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.4\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2004-05-11 13:12+0200\n"
 "Last-Translator: Quique <quique@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -379,8 +379,8 @@ msgstr "No se puede crear el directorio \\DCIM."
 msgid "Could not create destination directory."
 msgstr "No se puede crear el directorio de destino."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Configuraci�n del controlador y de la c�mara"
 
@@ -417,8 +417,8 @@ msgstr "Configurar la fecha de la c�mara con la de la computadora"
 msgid "Firmware revision (readonly)"
 msgstr "Revisi�n del firmware (s�lo lectura)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Energ�a (s�lo lectura)"
 
@@ -565,7 +565,7 @@ msgid "Communication error 1"
 msgstr "Error de comunicaci�n 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "No hay respuesta de la c�mara"
 
@@ -1014,14 +1014,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1034,7 +1034,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1108,8 +1108,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1231,7 +1231,7 @@ msgid "Problem reading image from flash"
 msgstr "Problema al leer la imagen de la memoria flash"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Sin memoria"
 
@@ -1273,19 +1273,19 @@ msgstr "Nivel de exposici�n en la previsualizaci�n"
 msgid "Automatic flash on capture"
 msgstr "Flash autom�tico en la captura"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Problema al abrir el puerto"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Problema al reinicializar la c�mara"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Problema al configurar la velocidad de comunicaci�n de la c�mara"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Parece un m�dem, no una c�mara"
 
@@ -1350,7 +1350,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "La c�mara ha enviado s�lo %i byte(s), pero se necesitan al menos %i."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "No se puede contactar con la c�mara."
 
@@ -1396,7 +1396,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "La c�mara ha enviado un byte 0x%02x no esperado."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Descargando..."
@@ -1490,18 +1490,18 @@ msgstr ""
 "amablemente proporcionadas por Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Tipo de puerto no soportado: %d. Este controlador s�lo funciona con c�maras "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "No se puede reinicializar la c�mara.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1733,20 +1733,20 @@ msgid "High (good quality)"
 msgstr "Alta (buena calidad)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Captura"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Ampliaci�n"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1788,30 +1788,32 @@ msgstr "Compensaci�n de la exposici�n"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Autom�tica"
 
@@ -1825,7 +1827,8 @@ msgid "Force"
 msgstr "Forzar"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ninguno"
@@ -1842,13 +1845,13 @@ msgstr "Flash anti ojos rojos"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1864,14 +1867,14 @@ msgstr "S�"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2590,7 +2593,10 @@ msgstr "Temporizador (s�lo la foto siguiente)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2666,6 +2672,7 @@ msgid "No answer from the camera."
 msgstr "No hay respuesta de la c�mara."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2678,6 +2685,7 @@ msgid "Medium"
 msgstr "Media"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2716,7 +2724,7 @@ msgstr "Oficina"
 msgid "Day-lt"
 msgstr "Luz natural"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "Nitidez"
 
@@ -2746,7 +2754,7 @@ msgid "Black and White"
 msgstr "Blanco y negro"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2786,13 +2794,13 @@ msgstr "En todos lados"
 msgid "AC"
 msgstr "CA"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Reproducci�n"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2874,15 +2882,7 @@ msgstr ""
 "\n"
 "Gracias por usar GPhoto2 y los sistemas operativos UNIX/Linux.\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "No hay nada que resumir para esta c�mara."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Sin manual"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2942,7 +2942,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2953,7 +2953,7 @@ msgstr ""
 "Revisi�n de hardware:\t%s\n"
 "Revisi�n de firmware:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2980,61 +2980,61 @@ msgstr ""
 "Identificador de tarjeta:\t\t%d\n"
 "Modo del flash:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Remota"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Local"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "S�"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "No"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Est�ndar"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Autom�tica\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Forzar el flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Prohibir el flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valor no v�lido (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3051,73 +3051,73 @@ msgstr ""
 "Cargando el flash:\t\t%s\n"
 "Estado de la lente:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "No llena"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Llena"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Ocupado"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Libre"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Cargando"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Preparada"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "La direcci�n de la lente no coincide con la luz del flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "La lente no est� conectada\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Valor incorrecto para el estado de la lente %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Estado de la tarjeta:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Protegida contra escritura"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Tarjeta no conveniente"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Valor no v�lido para el estado de la tarjeta %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3240,7 +3240,7 @@ msgstr ""
 "de: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Enviando..."
 
@@ -3439,13 +3439,13 @@ msgstr ""
 "sourceforge.net>. Correcci�n de errores por Marcus Meissner <marcus@jet."
 "franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Calidad de imagen"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Tama�o de la imagen"
 
@@ -3461,11 +3461,11 @@ msgstr "Apagado autom�tico (en minutos)"
 msgid "Information"
 msgstr "Informaci�n"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fina"
 
@@ -3473,21 +3473,21 @@ msgstr "fina"
 msgid "superfine"
 msgstr "superfina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "autom�tica"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "activa"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "inactiva"
@@ -3603,252 +3603,260 @@ msgstr ""
 "Apagado autom�tico: %i minutos\n"
 "Fuente de energ�a: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Este controlador no soporta el tipo de puerto solicitado (%i)."
 
-#: camlibs/ptp2/library.c:147
+#: 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 "Error no definido de PTP"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP ok."
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "Error general de PTP"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "Sesi�n PTP no abierta"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID de transacci�n no v�lido"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "Operaci�n PTP no soportada"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "Par�metro PTP no soportado"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP. Transferencia incompleta"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP. ID de almacenamiento no v�lido"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP. Manejador de objeto no v�lido"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "Propiedad de dispositivo PTP no soportada"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP. C�digo de formato de objeto no v�lido"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP. Almac�n completo"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP. Objeto protegido contra escritura"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP. Almac�n de s�lo lectura"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP. Acceso denegado"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP. Sin miniatura presente"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP. Fall� la auto-comprobaci�n"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP. Borrado parcial"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP. Almac�n no disponible"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP. No se soporta especificaci�n por formato"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP. No hay informaci�n v�lida del objeto"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP. Formato de c�digo no v�lido"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP. C�digo de fabricante desconocido"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP. Captura ya terminada"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP. Bus del dispositivo"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP. Objeto padre no v�lido"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP. Formato de propiedad del dispositivo no v�lido"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP. Valor de propiedad del dispositivo no v�lido"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP. Par�metro no v�lido"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP. La sesi�n ya est� abierta"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP. Transacci�n cancelada"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP. No se soporta especificaci�n del destino"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP. Se necesita nombre de fichero EK"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP. Conflictos con nombre de fichero EK"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP. Nombre de fichero EK no v�lido"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP. Error de E/S"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP. Error: par�metro incorrecto"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP. Error de protocolo, se esperaban datos"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP. Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"Controlador PTP2\n"
-"(c)2001-2003 por Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"�Disfrute!"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Su c�mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Su c�mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Su c�mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Su c�mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Su c�mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "preparada"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Unknown"
 msgstr "Error desconocido"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3863,463 +3871,511 @@ msgstr ""
 "ID extensi�n del fabricante: 0x%08x\n"
 "Descripci�n extensi�n del fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Resoluci�n del fichero"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Resoluci�n del fichero"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "El env�o de fichero ha fallado."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "desconocido (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "General"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Preparada"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Cantidad de im�genes: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Tipo de fichero %i desconocido."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "ERROR: tipo de paquete inesperado."
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manual"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "Autom�tica\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Autom�tica\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "Luz natural"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Nublado"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 #, fuzzy
 msgid "Shade"
 msgstr "N�tida"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Preconfigurado"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "superfina"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 #, fuzzy
 msgid "auto red eye"
 msgstr "Anti ojos rojos"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 #, fuzzy
 msgid "on red eye"
 msgstr "Anti ojos rojos"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "Error en el orden de los mandatos."
+
+#: camlibs/ptp2/library.c:2737
 #, fuzzy
 msgid "spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Imagen"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "Luz natural"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Autom�tica"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 #, fuzzy
 msgid "Sports"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 #, fuzzy
 msgid "Single Shot"
 msgstr "�nica"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Mejor"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Temporizador"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Remota"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 #, fuzzy
 msgid "Single Area"
 msgstr "�nica"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Contraste-"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Captura"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "Ampliaci�n"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "Suave"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Autom�tica\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Reducci�n de ojos rojos"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flash anti ojos rojos"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "externamente"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Luz natural"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4327,231 +4383,644 @@ msgstr "Luz natural"
 msgid "Slow Sync"
 msgstr "Sincronizaci�n lenta"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Reducci�n de ojos rojos"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Blanco y Negro"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Modo del enfoque"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1,5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "N�tida"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Suave"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "El directorio existe"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "Personalizada"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Contraste-"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "Posici�n del foco"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Autom�tica\n"
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "CA"
+
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "Personalizada"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Cargando"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "Blanco y Negro"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "SIN Flash"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "preparada"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Modo del flash"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Medida de la exposici�n"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internamente"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Sin tarjeta"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "C�mara OK.\n"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sModelo de la c�mara: %s\n"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Revisi�n del firmware: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "C�mara"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Modo de la lente"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "Hora de apagado autom�tico"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Hora de apagado autom�tico"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Opciones de apertura"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Velocidad ISO"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Modo de color"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Autom�tica"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Compensaci�n de la exposici�n"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Modo de la lente"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Tiempo de exposici�n de la l�mpara"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Modo de grabaci�n"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Tiempo de exposici�n de la l�mpara"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Modo de medici�n de punto"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Apertura"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Error de enfoque."
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Velocidad del obturador (en segundos)"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Modo de medici�n de punto"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Posici�n del foco"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Modo del enfoque"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "Exposici�n"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "Configuraci�n del flash"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Tama�o de la imagen"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Opciones de la c�mara"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Modo del flash"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Modo del enfoque"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Compensaci�n de la exposici�n"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Autom�tica, reducci�n de ojos rojos"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Balance de blancos"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Hora del temporizador"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "Centrado en el medio"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "Velocidad del obturador (en segundos)"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "Fecha y hora"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "Cargando"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Compensaci�n de la exposici�n"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Configuraci�n"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Ajuste de la imagen"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4559,224 +5028,229 @@ msgstr "Posici�n del foco"
 msgid "Camera Settings"
 msgstr "Opciones de la c�mara"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "Opciones de la c�mara"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Opciones de apertura"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Cantidad de valores"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Valores soportados"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Valor actual"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Inicializando la c�mara"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP est� implementado s�lo para c�maras USB."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP est� implementado s�lo para c�maras USB."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: Error no definido"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: �OK!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: Error general"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: Sesi�n no abierta"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: ID de transacci�n no v�lido"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: Operaci�n no soportada"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: Par�metro no soportado"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: Transferencia incompleta"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: ID de almacenamiento no v�lido"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: Manejador de objeto no v�lido"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: Propiedad del dispositivo no soportada"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: C�digo de formato de objeto no v�lido"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP: Almac�n completo"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: Objeto protegido contra escritura"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP: Almac�n de s�lo lectura"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: Acceso denegado"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: No hay ninguna miniatura"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP: La auto-comprobaci�n ha fallado"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: Borrado parcial"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP: Almac�n no disponible"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: No se soporta especificaci�n por formato"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: No hay informaci�n v�lida del objeto"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: Formato de c�digo no v�lido"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: C�digo de fabricante desconocido"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: Captura ya terminada"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP: Bus del dispositivo"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: Objeto padre no v�lido"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: Formato de propiedad del dispositivo no v�lido"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: Valor de propiedad del dispositivo no v�lido"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: Par�metro no v�lido"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: La sesi�n ya est� abierta"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: Transacci�n cancelada"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: No se soporta la especificaci�n del destino"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: Se necesita nombre de fichero EK"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: Conflictos con el nombre de fichero EK"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: Nombre de fichero EK no v�lido"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: Error de E/S"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: Error: par�metro incorrecto"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: Error de protocolo, se esperaban datos"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 #, fuzzy
 msgid "Battery Level"
 msgstr "Bater�a"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Modo de operaci�n"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Compresi�n"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4785,781 +5259,673 @@ msgstr "Compresi�n"
 msgid "White Balance"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Posici�n del foco"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Compensaci�n de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 #, fuzzy
 msgid "Date Time"
 msgstr "Fecha y hora"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 #, fuzzy
 msgid "Contrast"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Zoom digital"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Power Saving"
 msgstr "SIN indicador de energ�a"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 #, fuzzy
 msgid "UI Language"
 msgstr "Idioma"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Calidad de imagen"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Zoom digital"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "Cargando"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "Compensaci�n de la exposici�n"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Modo de color"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Ajuste de la imagen"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Modo del enfoque"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "Autom�tica"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "Velocidad ISO"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Tiempo de exposici�n de la l�mpara"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Compensaci�n de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "Exposici�n"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Hora de apagado autom�tico"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Hora del temporizador"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "Hora de apagado autom�tico"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Compensaci�n de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "Velocidad del obturador (en segundos)"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Forzar el flash\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Autom�tica, reducci�n de ojos rojos"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Autom�tica, reducci�n de ojos rojos"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Modo de medici�n de punto"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Modo actual: Modo de reproducci�n\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Opciones de apertura"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Opciones de la c�mara"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Modo LCD"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Medida de la exposici�n"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Tama�o de la imagen"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Modo del flash"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "Configuraci�n del flash"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Compensaci�n de la exposici�n"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "Fecha y hora"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "Tarjeta CompactFlash"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "Modo de la lente"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "Suave"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "Reducci�n de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Manual"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Modo del flash"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matriz"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "SIN indicador de energ�a"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "Error en el orden de los mandatos."
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Captura"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "Ampliaci�n"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "Suave"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "desconocido (0x%02x)"
@@ -5810,7 +6176,7 @@ msgstr "Modo de grabaci�n"
 msgid "Compression"
 msgstr "Compresi�n"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "No se soporta la velocidad %i."
@@ -5911,6 +6277,12 @@ msgstr "Fecha y hora (GMT)"
 msgid "Aperature Settings"
 msgstr "Opciones de apertura"
 
+#: 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
+msgid "Color Mode"
+msgstr "Modo de color"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6758,7 +7130,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (desconocida)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6768,7 +7140,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "No se pueden aplicar las opciones de USB"
 
@@ -6968,13 +7340,6 @@ msgstr ""
 "por Mustek.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Tipo de puerto no soportado: %d. Este controlador s�lo funciona con c�maras "
-"USB.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7161,11 +7526,11 @@ msgstr ""
 "Por favor env�e informes de errores y comentarios.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z es s�lo USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7181,7 +7546,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Cargando los controladores para la c�mara desde '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "No se ha podido encontrar ning�n controlador para '%s'"
@@ -7242,34 +7607,39 @@ msgstr "Esta c�mara no puede capturar."
 msgid "This camera can not capture previews."
 msgstr "Esta c�mara no permite la pre-visualizaci�n de las capturas."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "La c�mara no soporta la velocidad %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "La ruta '%s' no es absoulta."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "No se puede adjuntar la carpeta '%s' porque �sta ya existe."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "No se puede encontrar la carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "La carpeta '%s' no contiene una sub-carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "No se puede adjuntar el fichero '%s' a la carpeta '%s' porque este fichero "
 "ya existe."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7278,23 +7648,23 @@ msgstr ""
 "Ha estado intentando borrar '%s' de la carpeta '%s', pero el sistema de "
 "ficheros no soporta el borrado de ficheros."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 "Todav�a hay sub-carpetas en la carpeta '%s' que est� intentando eliminar."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Todav�a hay ficheros en la carpeta '%s' que est� intentando eliminar."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Este sistema de ficheros no soporta el env�o de ficheros."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7303,44 +7673,44 @@ msgstr ""
 "La carpeta '%s' s�lo contiene %i ficheros, pero usted ha pedido un fichero "
 "con n�mero %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "No se ha podido encontrar el fichero '%s' en la carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "No se ha podido encontrar el fichero '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "El sistema de ficheros no soporta la obtenci�n de ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Tipo de fichero %i desconocido."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Descargando '%s' de la carpeta '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "El sistema de ficheros no soporta la obtenci�n de informaci�n sobre los "
 "ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "El sistema de ficheros no soporta la modificaci�n de la informaci�n sobre "
 "los ficheros"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Los atributos de s�lo lectura como anchura y altura no se pueden cambiar."
@@ -7398,6 +7768,30 @@ msgstr "Error desonocido de la biblioteca de la c�mara"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "Controlador PTP2\n"
+#~ "(c)2001-2003 por Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "�Disfrute!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "No hay nada que resumir para esta c�mara."
+
+#~ msgid "No manual"
+#~ msgstr "Sin manual"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Tipo de puerto no soportado: %d. Este controlador s�lo funciona con "
+#~ "c�maras USB.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP est� implementado s�lo para c�maras USB."
+
 #, fuzzy
 #~ msgid ""
 #~ "Download program for Casio QV cameras. Originally written for gphoto-0.4. "
diff --git a/po/eu.po b/po/eu.po
index 2ec999398..f8b11b53b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2005-05-12 16:52+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n"
 "Language-Team:  <itzulpena@euskalgnu.org>\n"
@@ -384,8 +384,8 @@ msgstr "Ezin izan da \\DCIM direktorioa sortu."
 msgid "Could not create destination directory."
 msgstr "Ezin izan da helburuko direktorioa sortu."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Kameraren eta kontrolatzailearen konfigurazioa"
 
@@ -422,8 +422,8 @@ msgstr "Ezarri PCko data kameran"
 msgid "Firmware revision (readonly)"
 msgstr "Firmwarearen berrikuspena (irakurtzeko soilik)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Energia (irakurtzeko soilik)"
 
@@ -570,7 +570,7 @@ msgid "Communication error 1"
 msgstr "Komunikazio-errorea 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Kamerak ez du erantzuten"
 
@@ -1021,7 +1021,7 @@ msgstr ""
 "Aox kontrolatzaile orokorra\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, fuzzy, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 "Zure USB kamera Kodak EZ200 da.\n"
 "IRUD kopurua = %i\n"
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1043,7 +1043,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 #, fuzzy
 msgid ""
 "sq905C generic driver\n"
@@ -1119,8 +1119,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flasha"
@@ -1242,7 +1242,7 @@ msgid "Problem reading image from flash"
 msgstr "Arazoa irudia Flashetik irakurtzean"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Memoriarik ez"
 
@@ -1284,19 +1284,19 @@ msgstr "Esposizio-maila aurrebistan"
 msgid "Automatic flash on capture"
 msgstr "Flash automatikoa irudia kapturatzean"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Arazoa ataka irekitzean"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Arazoa kamera berrezartzean"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Arazoa kameraren komunikazio-abiadura ezartzean"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Modema dirudi, ez kamera"
 
@@ -1364,7 +1364,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kamerak %i byte baino ez ditu bidali, eta gutxienez %i behar ditugu."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Ezin izan da kamerarekin kontaktuan jarri."
 
@@ -1407,7 +1407,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kamerak espero ez zen 0x%02x bytea bidali du."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Deskargatzen..."
@@ -1499,18 +1499,18 @@ msgstr ""
 "ek atseginez emanak.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Onartzen ez den ataka-mota: %d. Kontrolatzaile honek USB kamerekin baino ez "
 "du funtzionatzen.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Ezin izan da kamera berrezarri.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1746,20 +1746,20 @@ msgid "High (good quality)"
 msgstr "Handia (kalitate ona)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Kapturatu"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zooma"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1801,30 +1801,32 @@ msgstr "Esposizio-konpentsazioa"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Automatikoa"
 
@@ -1838,7 +1840,8 @@ msgid "Force"
 msgstr "Behartu"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Bat ere ez"
@@ -1855,13 +1858,13 @@ msgstr "Begi gorrien kontrako flasha"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1877,14 +1880,14 @@ msgstr "Aktibatuta"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2605,7 +2608,10 @@ msgstr "Tenporizadorea (hurrengo irudia soilik)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2681,6 +2687,7 @@ msgid "No answer from the camera."
 msgstr "Kamerak ez du erantzuten."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2693,6 +2700,7 @@ msgid "Medium"
 msgstr "Tartekoa"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2731,7 +2739,7 @@ msgstr "Bulegoa"
 msgid "Day-lt"
 msgstr "Argi naturala"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "Zorroztasuna"
 
@@ -2761,7 +2769,7 @@ msgid "Black and White"
 msgstr "Zuri-beltza"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2801,13 +2809,13 @@ msgstr "Leku guztietan"
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2889,15 +2897,7 @@ msgstr ""
 "\n"
 "Eskerrik asko GPhoto2 eta UNIX/Linux sistema eragileak erabiltzeagatik.\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Ez dago kamera honi buruz laburtzeko ezer."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Eskulibururik ez"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2976,7 +2976,7 @@ msgstr ""
 "Mars MR97310 kameraren liburutegia\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2987,7 +2987,7 @@ msgstr ""
 "Hardwarearen berrikuspena:\t%s\n"
 "Firmwarearen berrikuspena:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3014,61 +3014,61 @@ msgstr ""
 "Txartelaren IDa:\t\t%d\n"
 "Flash-modua:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Lokala"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Bai"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Ez"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Estandarra"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatikoa\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Behartu flasha\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Debekatu flasha\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Balio baliogabea ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3085,73 +3085,73 @@ msgstr ""
 "Flasha kargatzen:\t\t%s\n"
 "Lentearen egoera:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Ez dago beteta"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Beteta"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Inaktibo"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Kargatzen"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Prest"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Lentearen noranzkoa ez dator bat flasharen argiarekin\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Lentea ez dago konektatuta\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Balio okerra lentearen egoerarako %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Txartelaren egoera:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Idazketaren kontra babestuta"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Txartel desegokia"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Balio okerra txartelaren egoerarako %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3274,7 +3274,7 @@ msgstr ""
 "tamaina hau da: %i byte."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Kargatzen..."
 
@@ -3473,13 +3473,13 @@ msgstr ""
 "sourceforge.net> egina. Akats-konponketak Marcus Meissner-ek <marcus@jet."
 "franken.de> eginak."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Irudiaren kalitatea"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Irudiaren tamaina"
 
@@ -3495,11 +3495,11 @@ msgstr "Automatikoki itzaltzea (minutuak)"
 msgid "Information"
 msgstr "Informazioa"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normala"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fina"
 
@@ -3507,21 +3507,21 @@ msgstr "fina"
 msgid "superfine"
 msgstr "oso fina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatikoa"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "aktibatuta"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "desaktibatuta"
@@ -3637,249 +3637,257 @@ msgstr ""
 "Automatikoki itzaltzea: %i minutu\n"
 "Energia-iturria: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Kontrolatzaile honek ez du onartzen eskatutako ataka-mota (%i)."
 
-#: camlibs/ptp2/library.c:147
+#: 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 Definitu gabeko errorea"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP Ondo!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP Errore orokorra"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP Saioa ez dago irekita"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP Transakzio baliogabearen IDa"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP Eragiketa ez da onartzen"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Parametroa ez da onartzen"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Osatu gabeko transferentzia"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP Biltegiratze baliogabearen IDa"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP Objektu baliogabeen heldulekua"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP Gailuaren propietatea ez da onartzen"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Objektu-formatuaren kode baliogabea"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP Biltegia beteta"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP Objektua idazketaren kontra babestuta"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP Biltegia irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP Atzipena ukatu egin da"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP Ez dago koadro txikirik"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP Proba automatikoak huts egin du"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP Zatika ezabatzea"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP Biltegia ez dago erabilgarri"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Formatuaren zehaztapenak ez dira onartzen"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP Ez dago objektuari buruzko baliozko informaziorik"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP Kodearen formatu baliogabea"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Fabrikatzailearen kode ezezaguna"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Kapturatzea amaitu da"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP Gailuaren busa"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP Objektu guraso baliogabea"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP Gailuaren propietatearen formatu baliogabea"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP Gailuaren propietatearen balio baliogabea"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP Parametro baliogabea"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP Saioa irekita dago"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP Transakzioa bertan behera utzi da"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Helburuaren zehaztapena ez da onartzen"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP EK fitxategi-izena behar da"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK fitxategi-izenaren gatazkak"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK fitxategi-izen baliogabea"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP S/I errorea"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP Errorea: parametro okerra"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP Protokolo-errorea, datuak espero ziren"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Protokolo-errorea, erantzuna espero zen"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"PTP2 kontrolatzailea\n"
-"(c)2001-2003 Mariusz Woloszyn-en <emsi@ipartners.pl> eskutik.\n"
-"Goza ezazu!"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr "Kaptura komandoa osatuta, baina ez da berrespenik jaso"
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "0x%04x gertaera jaso da"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3894,464 +3902,512 @@ msgstr ""
 "Fabrikatzailearen luzapenaren IDa: 0x%08x\n"
 "Fabrikatzailearen luzapenaren deskribapena: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 #, fuzzy
 msgid "Read-Write"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Prest"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Irudi-kopurua: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "ustegabeko %i datu mota"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Tungstenoa"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Lainotua"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 #, fuzzy
 msgid "Shade"
 msgstr "Garbia"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normala"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "oso fina"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 #, fuzzy
 msgid "auto red eye"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 #, fuzzy
 msgid "on red eye"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "Komando-ordenan errorea."
+
+#: camlibs/ptp2/library.c:2737
 #, fuzzy
 msgid "spot"
 msgstr "Puntua"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Irudia"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 #, fuzzy
 msgid "Sports"
 msgstr "Puntua"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 #, fuzzy
 msgid "Single Shot"
 msgstr "Soila"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Onena"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 #, fuzzy
 msgid "Timelapse"
 msgstr "Denbora-hutsune zenbakia"
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 #, fuzzy
 msgid "Single Area"
 msgstr "Soila"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Kontrastea"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Kapturatu"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "Zooma"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "Argia"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flasha"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Begi gorrien kontrako flasha"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4359,219 +4415,633 @@ msgstr "Argi naturala"
 msgid "Slow Sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Zuri-beltza"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Garbia"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Suabea"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "Direktorioa badago"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "Pertsonalizatua"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Kontrastea"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Tartekoa"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "AC"
+
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "Pertsonalizatua"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "Normala"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "Zuri-beltza"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "Flashik GABE"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "irakurtzeko soilik"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Flasharen modua"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Esposizioa neurtzea"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "barnetik"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Txartelik ez"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 msgid "Camera Owner"
 msgstr "Kameraren jabea"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 msgid "Camera Model"
 msgstr "Kamera-modeloa"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmwarearen berrikuspena: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 msgid "Camera Time"
 msgstr "Kamera-denbora"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "Automatikoki itzaltzeko ordua"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Automatikoki itzaltzeko ordua"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr "Argazki efektua"
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Kolorearen modua"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Automatikoa"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr "Argi-laguntza"
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 #, fuzzy
 msgid "F Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr "Efektu-modua"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr "Kaptura modua"
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr "Fokua neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Irekiera"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "Esposizioa"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "Flasharen konfigurazioa"
+
+#: camlibs/ptp2/library.c:3646
+#, fuzzy
+msgid "Viewfinder Grid"
+msgstr "Aurreikustaile modua"
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Irudiaren tamaina"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Kameraren ezarpenak"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Flasharen modua"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Fokuaren modua"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Esposizio-konpentsazioa"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Automatikoa, begi gorriak gutxitzea"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr "Jarraitasun zenbakia"
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Zuri-balantzea"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Tenporizadore automatikoaren ordua"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "Erdian zentratuta"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "Data eta ordua"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "Kargatzen"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Esposizio-konpentsazioa"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Konfigurazioa"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Irudia doitzea"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4579,220 +5049,225 @@ msgstr "Foku-distantzia"
 msgid "Camera Settings"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 msgid "Capture Settings"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Balio-kopurua"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Onartutako balioak"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Uneko balioa"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Kamera hasieratzen"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP USB kameretarako bakarrik dago ezarrita."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP USB kameretarako bakarrik dago ezarrita."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: Ados!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: Errore orokorra"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: Saioa ez dago irekita"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: Transakzio baliogabearen IDa"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: Eragiketa ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: Parametroa ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: Osatu gabeko transferentzia"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: Biltegiratze baliogabearen IDa"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: Objektu baliogabeen heldulekua"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: Gailuaren propietatea ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: Objektu-formatuaren kode baliogabea"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP: Biltegia beteta"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: Objektua idazketaren kontra babestuta"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP: Biltegia irakurtzeko soilik"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: Atzipena ukatu egin da"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: Ez dago koadro txikirik"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP: Proba automatikoak huts egin du"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: Zatika ezabatzea"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP: Biltegia ez dago erabilgarri"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: Formatuaren zehaztapenak ez dira onartzen"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: Ez dago objektuari buruzko baliozko informaziorik"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: Kodearen formatu baliogabea"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: Fabrikatzailearen kode ezezaguna"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: Kapturatzea amaitu da"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP: Gailuaren busa"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: Objektu guraso baliogabea"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: Gailuaren propietatearen formatu baliogabea"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: Gailuaren propietatearen balio baliogabea"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: Parametro baliogabea"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: Saioa irekita dago"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: Transakzioa bertan behera utzi da"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: Helburuaren zehaztapena ez da onartzen"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: EK fitxategi-izena behar da"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: EK fitxategi-izenaren gatazkak"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: EK fitxategi-izen baliogabea"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: S/I errorea"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: Errorea: parametro okerra"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: Protokolo-errorea, datuak espero ziren"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Protokolo-errorea, erantzuna espero zen"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr "Bateria maila"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr "Funtzionalitate-modua"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr "Konpresio-ezarpena"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4801,776 +5276,668 @@ msgstr "Konpresio-ezarpena"
 msgid "White Balance"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr "RGB irabazia"
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr "Esposizio-indizea (pelikularen ISO abiadura)"
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr "Aurre-kapturaren atzerapena"
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Zoom digitala"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr "Jarraitasun zenbakia"
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr "Jarraitasun tartea"
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr "Denbora-hutsune zenbakia"
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr "Denbora-hutsune tartea"
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr "Kargatu URLa"
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr "Artista"
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr "Copyright informazioa"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr "Data-/denbora-markaren formatua"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr "Bideo irteera"
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr "UI hizkuntza"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr "Tamaina-kalitatea modua"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr "UNIX ordua"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Zoom digitala"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "Kolorearen tenperatura"
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "Kargatzen"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "Esposizio-konpentsazioa"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Kolorearen modua"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Irudia doitzea"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Fokuaren modua"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "Automatikoa"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "Esposizioa"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "Automatikoki itzaltzeko ordua"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Esposizio-konpentsazio joera"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "Obturadorearen abiadura"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Behartu flasha\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Automatikoa, begi gorriak gutxitzea"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Uneko modua: erreproduzitze-modua\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Irekiduraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD modua"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "Argi-laguntza"
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "TB A/B ezarpena"
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Irudiaren tamaina"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Flasharen modua"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "Flasharen konfigurazioa"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Esposizio-konpentsazioa"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "Data eta ordua"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "CompactFlash txartela"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "Lentearen modua"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "Argia"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Goria"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Flasharen modua"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrizea"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Puntua"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "Komando-ordenan errorea."
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Kapturatu"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "Zooma"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "Argia"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ezezaguna (0x%02x)"
@@ -5820,7 +6187,7 @@ msgstr "Grabatze-modua"
 msgid "Compression"
 msgstr "Konprimitzea"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "%i abiadura ez da onartzen!"
@@ -5912,6 +6279,12 @@ msgstr "Data eta ordua (GTM)"
 msgid "Aperature Settings"
 msgstr "Irekiduraren ezarpenak"
 
+#: 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
+msgid "Color Mode"
+msgstr "Kolorearen modua"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6744,7 +7117,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (ezezaguna)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6754,7 +7127,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Ezin izan dira USB ezarpenak aplikatu"
 
@@ -6975,13 +7348,6 @@ msgstr ""
 "informazioa.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Onartzen ez den ataka-mota: %d. Kontrolatzaile honek USB kamerekin baino ez "
-"du funtzionatzen.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7192,11 +7558,11 @@ msgstr ""
 "Eman erroreen berri eta bidali iruzkinak.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z USB da soilik"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7215,7 +7581,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Kamera-kontrolatzaileak kargatzen '%s'(e)tik..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Ezin izan da kontrolatzailerik bidali '%s'(e)rako"
@@ -7275,34 +7641,39 @@ msgstr "Kamera honek ezin du kapturatu."
 msgid "This camera can not capture previews."
 msgstr "Kamera honek ezin ditu aurrebistak kapturatu."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Kamerak ez du %i abiadura onartzen."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "'%s' bidea ez da absolutua."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Ezin izan da '%s' karpeta erantsi, lehendik badagoelako."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Ezin izan da '%s' karpeta aurkitu."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "'%s' karpetak ez du '%s' karpetarik."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Ezin izan zaio '%s' '%s' karpetari erantsi, fitxategi hori lehendik "
 "badagoelako."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7311,22 +7682,22 @@ msgstr ""
 "'%s' ezabatzen saiatu zara '%s' karpetatik, baina fitxategi-sistemak ez du "
 "onartzen fitxategiak ezabatzea."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "Kentzen saiatzen ari zaren azpikarpetak daude oraindik '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Kentzen saiatzen ari zaren fitxategiak daude oraindik '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Fitxategi-sistemak ez du onartzen fitxategiak kargatzea."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7335,42 +7706,42 @@ msgstr ""
 "'%s' karpetak  %i fitxategiak bakarrik ditu, baina %i zenbakia duen "
 "fitxategia eskatu duzu."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Ezin izan da '%s' fitxategia aurkitu '%s' karpetan."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Ezin izan da '%s' fitxategia aurkitu."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "Fitxategi-sistemak ez du onartzen fitxategiak eskuratzea"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "'%s' deskargatzen '%s' karpetatik..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "Fitxategi-sistemak ez du onartzen fitxategiei buruzko informazioa eskuratzea"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Fitxategi-sistemak ez du onartzen fitxategiei buruzko informazioa ezartzea"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Irakurtzeko soilik fitxategien atributuak, adibidez zabalera eta altuera, "
@@ -7429,6 +7800,30 @@ msgstr "Kamera-liburutegiaren errore ezezaguna"
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "PTP2 kontrolatzailea\n"
+#~ "(c)2001-2003 Mariusz Woloszyn-en <emsi@ipartners.pl> eskutik.\n"
+#~ "Goza ezazu!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Ez dago kamera honi buruz laburtzeko ezer."
+
+#~ msgid "No manual"
+#~ msgstr "Eskulibururik ez"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Onartzen ez den ataka-mota: %d. Kontrolatzaile honek USB kamerekin baino "
+#~ "ez du funtzionatzen.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP USB kameretarako bakarrik dago ezarrita."
+
 #, fuzzy
 #~ msgid ""
 #~ "Download program for Casio QV cameras. Originally written for gphoto-0.4. "
diff --git a/po/fr.po b/po/fr.po
index 5a74d2bd3..93a9d2eef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2003-06-22 23:47+0200\n"
 "Last-Translator: Aur�lien Croc <aurelien@ap2c.com>\n"
 "Language-Team: Fran�ais\n"
@@ -378,8 +378,8 @@ msgstr "Impossible de cr�er le dossier \\DCIM."
 msgid "Could not create destination directory."
 msgstr "Impossible d'obtenir le contenu du r�pertoire destination."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Configuration de l'appareil et du pilote"
 
@@ -416,8 +416,8 @@ msgstr "Mettre l'appareil � la date du PC"
 msgid "Firmware revision (readonly)"
 msgstr "R�vision de microcode (lecture seule)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "�nergie (lecture seule)"
 
@@ -560,7 +560,7 @@ msgid "Communication error 1"
 msgstr "Erreur de communication 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Pas de r�ponse de l'appareil"
 
@@ -1010,14 +1010,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1030,7 +1030,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1103,8 +1103,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1227,7 +1227,7 @@ msgid "Problem reading image from flash"
 msgstr "Probl�me � la lecture de l'image depuis la m�moire flash"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Plus de m�moire"
 
@@ -1269,20 +1269,20 @@ msgstr "Mesure de l'exposition en pr�visualisation"
 msgid "Automatic flash on capture"
 msgstr "Flash automatique lors de la prise d'une photo"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Probl�me � l'ouverture du port"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Probl�me � la remise � z�ro de l'appareil"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr ""
 "Probl�me � la configuration du d�bit de la communication vers l'appareil"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "�a ressemble � un modem, pas � un appareil photo"
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "L'appareil a envoy� seulement %i octet(s), mais  %i sont n�cessaires."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Impossible de se connecter � l'appareil."
 
@@ -1389,7 +1389,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "L'Apareil a envoy� un octet inattendu 0x%02x."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "T�l�chargement..."
@@ -1482,17 +1482,17 @@ msgstr ""
 "gentiment fournies par Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Type de port non g�r� : %d. Ce pilote ne marche qu'avec des appareils USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Impossible de remettre l'appareil � z�ro.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1724,20 +1724,20 @@ msgid "High (good quality)"
 msgstr "Haute (qualit� correcte)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Capture"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1779,30 +1779,32 @@ msgstr "Compensation de l'exposition"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Automatique"
 
@@ -1816,7 +1818,8 @@ msgid "Force"
 msgstr "Forcer"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Aucune"
@@ -1833,13 +1836,13 @@ msgstr "Flash anti-yeux rouges"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1855,14 +1858,14 @@ msgstr "Oui"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2581,7 +2584,10 @@ msgstr "Retardateur (image suivante uniquement)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2659,6 +2665,7 @@ msgid "No answer from the camera."
 msgstr "Pas de r�ponse de l'appareil"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2671,6 +2678,7 @@ msgid "Medium"
 msgstr "Moyenne"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2709,7 +2717,7 @@ msgstr "Bureau"
 msgid "Day-lt"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "Duret�"
 
@@ -2739,7 +2747,7 @@ msgid "Black and White"
 msgstr "Noir & Blanc"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2779,13 +2787,13 @@ msgstr "N'importe o�"
 msgid "AC"
 msgstr "Secteur"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Lecture"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2868,15 +2876,7 @@ msgstr ""
 "Merci d'utiliser GPhoto2 ainsi que les syst�mes d'exploitations UNIX/Linux :"
 "o)\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Il n'y a rien � r�sumer pour cet appareil."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Pas de manuel"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2936,7 +2936,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2947,7 +2947,7 @@ msgstr ""
 "Revision de mat�riel :\t%s\n"
 "Revision de microcode : \t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2974,61 +2974,61 @@ msgstr ""
 "Identifiant de carte :\t\t%d\n"
 "Mode de flash:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Distante"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Locale"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Oui"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Non"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatique\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Forcer le flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Interdire le flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valeur invalide (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3045,73 +3045,73 @@ msgstr ""
 "Chargement du flash :\t\t%s\n"
 "�tat de l'objectif :\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Non pleine"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Pleine"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Occup�"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Libre"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "En cours de chargement"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Pr�t"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "La direction de l'objectif ne cadre pas avec le flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Objectif non connect�\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Valeur incorrecte pour l'�tat de l'objectif %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "�tat de la carte :\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Prot�g� en �criture"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Carte ne convenant pas"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Mauvaise valeur pour l'�tat de la carte %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3234,7 +3234,7 @@ msgstr ""
 "de : %i octets."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "T�l�chargement du fichier..."
 
@@ -3434,13 +3434,13 @@ msgstr ""
 "<trawny99@users.sourceforge.net>. R�solution de bugs par Marcus Meissner "
 "<marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Qualit� de l'image"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Taille de l'image"
 
@@ -3456,11 +3456,11 @@ msgstr "Auto-extinction (en minutes)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fine"
 
@@ -3468,21 +3468,21 @@ msgstr "fine"
 msgid "superfine"
 msgstr "tr�s fine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatique"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "activ�"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "d�sactiv�"
@@ -3598,252 +3598,260 @@ msgstr ""
 "Extinction automatique : %i minutes\n"
 "Source �nergie : %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Le type de port demand� (%i) n'est pas g�r� par ce pilote logiciel."
 
-#: camlibs/ptp2/library.c:147
+#: 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 Erreur non d�finie"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP Erreur g�n�rale"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP Session non ouverte"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID de transaction invalide"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP Op�ration non g�r�e"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Param�tre non g�r�"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Transfert incomplet"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP Storage ID invalide"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP identificateur d'objet invalide"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP Propri�t� de p�riph�rique non g�r�e"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Code de format d'objet incorrect"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP plus d'espace"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP Objet prot�g� en �criture"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP M�moire en lecture seule"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP Acc�s refus�"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "Pas de miniature pr�sente"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP Echec de l'autotest "
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP Effacement partiel"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP espace non disponible"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Sp�cification de format non g�r�e"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP Pas d'information valide sur l'objet"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP Format de code incorrect"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Mod�le inconnu"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Capture d�j� termin�"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP Bus des p�riph�riques"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP Objet p�re incorrect"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP Format de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP Valeur de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP Param�tre incorrect"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP Session d�j� ouverte"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP Op�ration annul�e"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Sp�cification de la destination non g�r�e "
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP Nom de fichier EK n�cessaire"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP Conflit de nom de fichier EK"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP Nom de fichier EK incorrect"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP erreur d'entr�e sortie"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP Erreur: mauvais param�tre"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP Erreur de protocole, donn�es attendues"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Erreur de protocole, r�ponse attendue"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"Pilote PTP2\n"
-"(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"Bonne chance !"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "pr�t"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Unknown"
 msgstr "Erreur inconnue"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3858,463 +3866,511 @@ msgstr ""
 "ID �tendue du vendeur : 0x%08x\n"
 "Description �tendue du vendeur : %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "R�solution du fichier"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "R�solution du fichier"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Envoi du fichier rat�."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "inconnu (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "G�n�ral"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Pr�t"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Nombre de fichiers : %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Type de fichier %i inconnu."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "ERREUR : paquet de type inattendu."
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Tungst�ne"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Nuageux"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 #, fuzzy
 msgid "Shade"
 msgstr "Dur"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Pr�-configur�"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "tr�s fine"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 #, fuzzy
 msgid "auto red eye"
 msgstr "Anti yeux rouges"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 #, fuzzy
 msgid "on red eye"
 msgstr "Anti yeux rouges"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "Erreur d'ordre de commandes. "
+
+#: camlibs/ptp2/library.c:2737
 #, fuzzy
 msgid "spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Image"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Automatique"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 #, fuzzy
 msgid "Sports"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 #, fuzzy
 msgid "Single Shot"
 msgstr "Unique"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Meilleure"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Retardateur"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Distante"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 #, fuzzy
 msgid "Single Area"
 msgstr "Unique"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Contraste-"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Capture"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "Zoom"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "Lumi�re"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Poids centr�"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "Poids centr�"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "R�duction des yeux rouges"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flash anti-yeux rouges"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "externe"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4322,231 +4378,644 @@ msgstr "Lumi�re naturelle"
 msgid "Slow Sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "R�duction des yeux rouges"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "noir & blanc"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Mode focus"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1,5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Dur"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Doux"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "Le dossier existe"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "Personnalis�"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Moyenne"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Moyenne"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Contraste-"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Moyenne"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "Secteur"
+
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluorescent"
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "Personnalis�"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "En cours de chargement"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "noir & blanc"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "PAS de flash"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "pr�t"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Mode flash"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Mesure de l'exposition"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "interne"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Pas de carte"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Appareil OK.\n"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sMod�le de l'appareil : %s\n"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "R�vision de microcode : %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "Appareil"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Mode de l'objectif"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Ajustement de l'image"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "Heure d'extinction automatique"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Heure d'extinction automatique"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "R�glages de l'image"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Vitesse ISO"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Mode couleur"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Automatique"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Mode de l'objectif"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Temps d'exposition de la lampe"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Enregistrement"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Temps d'exposition de la lampe"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Mode macro"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Ouverture"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Erreur de convergence."
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Mode macro"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Mode focus"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "Exposition"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "R�glage du flash"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Taille de l'image"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "R�glages de l'appareil"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Mode flash"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Mode focus"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Compensation de l'exposition"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Automatique, r�duction des yeux rouges"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Balance des blancs"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Heure du retardateur"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "Poids centr�"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "Vitesse de l'obturateur (en secondes)"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "Date & heure"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "En cours de chargement"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Compensation de l'exposition"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Configuration"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Ajustement de l'image"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4554,224 +5023,229 @@ msgstr "Position du focus"
 msgid "Camera Settings"
 msgstr "R�glages de l'appareil"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "R�glages de l'appareil"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "R�glages de l'image"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Nombre de valeurs"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Valeurs g�r�es"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Valeur actuelle"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Initialisation de l'appareil photo"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP est impl�ment� uniquement pour les appareils USB."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP est impl�ment� uniquement pour les appareils USB."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP OK !"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP Erreur g�n�rale"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP Session non ouverte"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP ID de transaction invalide"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP Op�ration non g�r�e"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP Param�tre non g�r�"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP Transfert incomplet"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP ID de stockage invalide"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP identificateur d'objet invalide"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP Propri�t� de p�riph�rique non g�r�e"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP Code de format d'objet incorrect"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP plus d'espace disponible"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP Objet prot�g� en �criture"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP M�moire en lecture seule"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP Acc�s refus�"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP Pas d'aper�u disponible"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP �chec de l'autotest "
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP Effacement partiel"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP Espace non disponible"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP Sp�cification de format non g�r�e"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP Pas d'information valide sur l'objet"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP Format de code incorrect"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: code vendeur inconnu"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: capture d�j� termin�e"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP: bus des p�riph�riques"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: objet p�re incorrect"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: format de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: valeur de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: param�tre incorrect"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: session d�j� ouverte"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: op�ration annul�e"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: Sp�cification de la destination non g�r�e "
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: Nom de fichier EK n�cessaire"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: Conflit de nom de fichier EK"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: Nom de fichier EK incorrect"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: erreur d'entr�e sortie"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: Erreur: mauvais param�tre"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: Erreur de protocole, donn�es attendues"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Erreur de protocole, r�ponse attendue"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 #, fuzzy
 msgid "Battery Level"
 msgstr "Batterie"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Mode d'op�ration"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Compression"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4780,781 +5254,673 @@ msgstr "Compression"
 msgid "White Balance"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 #, fuzzy
 msgid "Date Time"
 msgstr "Date & heure"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 #, fuzzy
 msgid "Contrast"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Zoom num�rique"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Format de date"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Power Saving"
 msgstr "Pas d'indicateur de mise sous tension"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 #, fuzzy
 msgid "UI Language"
 msgstr "Langue"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Qualit� de l'image"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Zoom num�rique"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "En cours de chargement"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "Compensation de l'exposition"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Mode couleur"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Ajustement de l'image"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Mode focus"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "Automatique"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "Vitesse ISO"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Temps d'exposition de la lampe"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "Poids centr�"
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "Exposition"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Heure d'extinction automatique"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Heure du retardateur"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "Heure d'extinction automatique"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "Vitesse de l'obturateur (en secondes)"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Forcer le flash\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Automatique, r�duction des yeux rouges"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Automatique, r�duction des yeux rouges"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Mode macro"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Mode actuel: lecture\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "R�glages de l'image"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "R�glages de l'appareil"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Mode LCD"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Taille de l'image"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Mode flash"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "R�glage du flash"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Compensation de l'exposition"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "Date & heure"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Ajustement de l'image"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "Carte CompactFlash"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "Mode de l'objectif"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "Lumi�re"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescent"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "R�duction des yeux rouges"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Manuel"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Mode flash"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "Pas d'indicateur de mise sous tension"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "Erreur d'ordre de commandes. "
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Capture"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "Zoom"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "Lumi�re"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "inconnu (0x%02x)"
@@ -5804,7 +6170,7 @@ msgstr "Enregistrement"
 msgid "Compression"
 msgstr "Compression"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "La vitesse %i n'est pas g�r�e !"
@@ -5897,6 +6263,12 @@ msgstr "Date et heure (GMT)"
 msgid "Aperature Settings"
 msgstr "R�glages de l'image"
 
+#: 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
+msgid "Color Mode"
+msgstr "Mode couleur"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6727,7 +7099,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (inconnu)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6737,7 +7109,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Ne peut appliquer les propri�t�s USB"
 
@@ -6936,12 +7308,6 @@ msgstr ""
 "fournies par Mustek.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Type de port non g�r� : %d. Ce pilote ne marche qu'avec des appareils USB.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7128,11 +7494,11 @@ msgstr ""
 "Envoyez les rapports de bugs et les commentaires �:\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z ne supporte que l'USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7148,7 +7514,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Chargement des pilotes depuis '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Impossible de trouver un pilote pour '%s'"
@@ -7209,33 +7575,38 @@ msgstr "Cet appareil ne peut �tre pilot� pour la capture."
 msgid "This camera can not capture previews."
 msgstr "Cet appareil ne peut fournir de pr�-visualisation de la capture."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Cet appareil ne supporte pass cette vitesse %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Le chemin '%s' n'est pas absolu."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Impossible d'ajouter le dossier '%s' car il existe d�j�."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Impossible de trouver le dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Le dossier '%s' ne contient pas de sous-dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Impossible d'ajouter le fichier '%s' au dossier '%s' car il existe d�j�."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7244,7 +7615,7 @@ msgstr ""
 "Vous avez essay� d'effacer '%s' du dossier '%s', mais le syst�me de fichiers "
 "ne supporte pas l'effacement de fichier."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
@@ -7252,18 +7623,18 @@ msgstr ""
 "Il existe toujours des sous-dossiers dans le dossier '%s' que vous essayez "
 "d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 "Il existe toujours des fichiers dans le dossier '%s' que vous essayez "
 "d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Ce syst�me de fichier ne supporte pas la r�cup�ration des fichiers."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7272,44 +7643,44 @@ msgstr ""
 "Le dossier '%s' ne contient que %i fichiers, alors que vous avez demand� un "
 "fichier num�rot� %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Le dossier '%s' ne contient pas de sous-dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Impossible de trouver le fichier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "Ce syst�me de fichier ne supporte pas la r�cup�ration des fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Type de fichier %i inconnu."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "T�l�chargement de '%s' du dossier '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "Ce syst�me de fichier ne supporte pas la r�cup�ration d'informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Ce syst�me de fichier ne supporte pas la modification d'informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Les attributs en lecture seule ne peuvent �tre modifi�s (comme la hauteur et "
@@ -7369,6 +7740,30 @@ msgstr "Erreur inconnue de la biblioth�que de l'appareil"
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "Pilote PTP2\n"
+#~ "(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Bonne chance !"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Il n'y a rien � r�sumer pour cet appareil."
+
+#~ msgid "No manual"
+#~ msgstr "Pas de manuel"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Type de port non g�r� : %d. Ce pilote ne marche qu'avec des appareils "
+#~ "USB.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP est impl�ment� uniquement pour les appareils USB."
+
 #, fuzzy
 #~ msgid ""
 #~ "Download program for Casio QV cameras. Originally written for gphoto-0.4. "
diff --git a/po/hu.po b/po/hu.po
index 99395cf85..201fc458c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2003-02-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -360,8 +360,8 @@ msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 msgid "Could not create destination directory."
 msgstr "Nem sikerült létrehozni a célkönyvtárat."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "A kamera és a meghajtóprogram beállításai"
 
@@ -398,8 +398,8 @@ msgstr "A kamera dátumának beállítása a számítógép dátumára"
 msgid "Firmware revision (readonly)"
 msgstr "A firmware revíziószáma (csak olvasható)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Energia (csak olvasható)"
 
@@ -537,7 +537,7 @@ msgid "Communication error 1"
 msgstr "Kommunikációs hiba (1)"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "A kamera nem válaszolt"
 
@@ -941,14 +941,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -961,7 +961,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1033,8 +1033,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Vaku"
@@ -1157,7 +1157,7 @@ msgid "Problem reading image from flash"
 msgstr "Nem sikerült beolvasni egy képet a Flash kártyáról"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
@@ -1200,19 +1200,19 @@ msgstr "Exponálásmérés"
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Hiba történt a port megnyitásakor"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Nem sikerült alapállapotba hozni a kamerát"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Nem sikerült beállítani a kamera átviteli sebességét"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Az eszköz modemnek tűnik, nem kamerának"
 
@@ -1276,7 +1276,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "A kamera csak %i bájtot küldött, de legalább %i bájtot kellett volna."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Nem sikerült felvenni a kapcsolatot a kamerával."
 
@@ -1319,7 +1319,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Nem várt bájt (0x%02x) érkezett a kamerától."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Letöltés..."
@@ -1411,18 +1411,18 @@ msgstr ""
 "rendelkezésre).\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
 "működik.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "A kamerát nem sikerült alapállapotba hozni.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1652,20 +1652,20 @@ msgid "High (good quality)"
 msgstr "Magas (jó minőség)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Rögzítés"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Nagyítás"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1707,30 +1707,32 @@ msgstr "Exponálási kompenzáció"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Automatikus"
 
@@ -1744,7 +1746,8 @@ msgid "Force"
 msgstr "Kényszerítés"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Nincs"
@@ -1761,13 +1764,13 @@ msgstr "Vörösszem-vaku"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1783,14 +1786,14 @@ msgstr "Be"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2508,7 +2511,10 @@ msgstr "Saját időzítő (csak a következő képnél)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2584,6 +2590,7 @@ msgid "No answer from the camera."
 msgstr "A kamera nem válaszolt"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2596,6 +2603,7 @@ msgid "Medium"
 msgstr "Közepes"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2639,7 +2647,7 @@ msgstr "Ki"
 msgid "Day-lt"
 msgstr "Égbolt"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2673,7 +2681,7 @@ msgid "Black and White"
 msgstr "Fekete-fehér"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2715,13 +2723,13 @@ msgstr ""
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Lejátszás"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2780,15 +2788,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Nincs összefoglalás ennél a kameránál."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Nincs kézikönyv"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2848,7 +2848,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2859,7 +2859,7 @@ msgstr ""
 "Hardver-verzió:\t%s\n"
 "Firmware-verzió:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2886,61 +2886,61 @@ msgstr ""
 "Kártyaazonosító:\t\t%d\n"
 "Vakuzási mód:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "távoli"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "helyi"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Igen"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Nem"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Finom"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatikus\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Vaku mindig\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "A vaku letiltása\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Érvénytelen érték ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2957,73 +2957,73 @@ msgstr ""
 "vaku-feltöltés:\t\t%s\n"
 "A lencse állapota:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Nincs tele"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Tele"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Üresjárat"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Töltés"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Kész"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normál\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "A lencse iránya nem felel meg a vakuénak\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "A lencse nincs bekötve\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Hibás értékű lencse-állapotkód: %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "A kártya állapota:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Írásvédett"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Nem megfelelő kártya"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Hibás kártya-állapotkód: %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3144,7 +3144,7 @@ msgid ""
 msgstr "A fájlméret %i bájt. A feltölthető fájlok maximális mérete: %i bájt."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -3323,13 +3323,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Képminőség"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Képméret"
 
@@ -3345,11 +3345,11 @@ msgstr "Automatikus kikapcsolás (perc)"
 msgid "Information"
 msgstr "Információ"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normál"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "finom"
 
@@ -3357,21 +3357,21 @@ msgstr "finom"
 msgid "superfine"
 msgstr "nagyon finom"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatikus"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "be"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "ki"
@@ -3484,250 +3484,260 @@ msgstr ""
 "Automatikus kikapcsolás: %i perc után\n"
 "Áramellátás: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "A kért porttípust (%i) nem támogatja ez a meghajtó."
 
-#: camlibs/ptp2/library.c:147
+#: 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 - nem definiált hiba"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK."
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP - általános hiba"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP - a munkafolyamat nincs megnyitva"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP - érvénytelen tranzakciós azonosító"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP - nem támogatott művelet"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP - nem támogatott paraméter"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP - nem teljes transzfer"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP érvénytelen tárolóazonosító"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "Érvénytelen PTP objektumazonosító"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP érvénytelen objektumformátum-kód"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP - az objektum írásvédett"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP - a tároló csak olvasható"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP - a hozzáférés megtagadva"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP - nem érhető el előnézeti kép"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "A PTP-tároló nem érhető el"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "Nem támogatott formátumú PTP-specifikáció"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP érvénytelen objektuminformáció"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP érvénytelen kódformátum"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "A PTP-felvétel már befejeződött"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP érvénytelen eszköztulajdonság-formátum"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP érvénytelen eszköztulajdonság-érték"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP - érvénytelen paraméter"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP - a munkafolyamat már meg van nyitva"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP - a tranzakció félbeszakadt"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Nem támogatott PTP specifikáció vagy cél"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP EK fájlnév szükséges"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK fájlnévütközés"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "Érvénytelen PTP EK fájlnév"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP I/O-hiba"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP hiba: nem megfelelő paraméter"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollhiba, nem érkezett adat"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/library.c:916
-#, fuzzy
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
+msgstr ""
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "kész"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Unknown"
 msgstr "Ismeretlen hiba"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3737,457 +3747,505 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fájl feltöltése..."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Általános"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Kész"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ismeretlen fájltípus: %i."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "HIBA: nem várt csomagtípus"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 #, fuzzy
 msgid "Daylight"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Tungsten"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Felhős"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "portugál"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normál"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "Hibás parancssorrend."
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Kép"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Automatikus"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Legjobb"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "távoli"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Kontraszt-"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Rögzítés"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "Nagyítás"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "Magas"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Vaku"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Vörösszem-vaku"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "külső"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4195,229 +4253,640 @@ msgstr "Égbolt"
 msgid "Slow Sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+#, fuzzy
+msgid "1/15"
+msgstr "115200"
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1,5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Töltés"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "A könyvtár már létezik"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "egyéni"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Közepes"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Közepes"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Kontraszt-"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Közepes"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "egyéni"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "Normál"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Töltés"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "NINCS vaku"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "kész"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Vakus mód"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Exponálásmérés"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "belső"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Nincs kártya"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "A kamera OK.\n"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmware-revízió: %d.%d\n"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "Automatikus lekapcsolási idő"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Automatikus lekapcsolási idő"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Színmód"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Automatikus"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Apertúra"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "Exponálás"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "A vaku beállításai"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Képméret"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "A kamera beállításai"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Vakus mód"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Fókuszálási mód"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Exponálási kompenzáció"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Automatikus, vörösszemeffektus-csökkentés"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Fehéregyensúly"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "A saját időzítő ideje"
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "Zársebesség (s)"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "Dátum és idő"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "Töltés"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Exponálási kompenzáció"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Beállítások"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Képkiigazítás"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4425,265 +4894,270 @@ msgstr "A fókusz helyzete"
 msgid "Camera Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "A PTP csak USB-csatolós kameráknál használható."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "A PTP csak USB-csatolós kameráknál használható."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 #, fuzzy
 msgid "PTP: Undefined Error"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 #, fuzzy
 msgid "PTP: OK!"
 msgstr "PTP OK."
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 #, fuzzy
 msgid "PTP: General Error"
 msgstr "PTP - általános hiba"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 #, fuzzy
 msgid "PTP: Session Not Open"
 msgstr "PTP - a munkafolyamat nincs megnyitva"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP - érvénytelen tranzakciós azonosító"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "PTP - nem támogatott művelet"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP - nem támogatott paraméter"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 #, fuzzy
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP - nem teljes transzfer"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 #, fuzzy
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP érvénytelen tárolóazonosító"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 #, fuzzy
 msgid "PTP: Invalid Object Handle"
 msgstr "Érvénytelen PTP objektumazonosító"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 #, fuzzy
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP érvénytelen objektumformátum-kód"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 #, fuzzy
 msgid "PTP: Object Write Protected"
 msgstr "PTP - az objektum írásvédett"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 #, fuzzy
 msgid "PTP: Store Read Only"
 msgstr "PTP - a tároló csak olvasható"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 #, fuzzy
 msgid "PTP: Access Denied"
 msgstr "PTP - a hozzáférés megtagadva"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 #, fuzzy
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP - nem érhető el előnézeti kép"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 #, fuzzy
 msgid "PTP: Self Test Failed"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 #, fuzzy
 msgid "PTP: Partial Deletion"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "A PTP-tároló nem érhető el"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 #, fuzzy
 msgid "PTP: Specification By Format Unsupported"
 msgstr "Nem támogatott formátumú PTP-specifikáció"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 #, fuzzy
 msgid "PTP: No Valid Object Info"
 msgstr "PTP érvénytelen objektuminformáció"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 #, fuzzy
 msgid "PTP: Invalid Code Format"
 msgstr "PTP érvénytelen kódformátum"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 #, fuzzy
 msgid "PTP: Unknown Vendor Code"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 #, fuzzy
 msgid "PTP: Capture Already Terminated"
 msgstr "A PTP-felvétel már befejeződött"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 #, fuzzy
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 #, fuzzy
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP érvénytelen eszköztulajdonság-formátum"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 #, fuzzy
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP érvénytelen eszköztulajdonság-érték"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 #, fuzzy
 msgid "PTP: Invalid Parameter"
 msgstr "PTP - érvénytelen paraméter"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 #, fuzzy
 msgid "PTP: Session Already Opened"
 msgstr "PTP - a munkafolyamat már meg van nyitva"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "PTP - a tranzakció félbeszakadt"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 #, fuzzy
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "Nem támogatott PTP specifikáció vagy cél"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 #, fuzzy
 msgid "PTP: EK Filename Required"
 msgstr "PTP EK fájlnév szükséges"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 #, fuzzy
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP EK fájlnévütközés"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 #, fuzzy
 msgid "PTP: EK Filename Invalid"
 msgstr "Érvénytelen PTP EK fájlnév"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 #, fuzzy
 msgid "PTP: I/O error"
 msgstr "PTP I/O-hiba"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 #, fuzzy
 msgid "PTP: Error: bad parameter"
 msgstr "PTP hiba: nem megfelelő paraméter"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 #, fuzzy
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP protokollhiba, nem érkezett adat"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 #, fuzzy
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4692,780 +5166,672 @@ msgstr "Tömörítés"
 msgid "White Balance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Focus Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 #, fuzzy
 msgid "Date Time"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Digitális nagyítás"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Power Saving"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 #, fuzzy
 msgid "UI Language"
 msgstr "Nyelv"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Képminőség"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Digitális nagyítás"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "Töltés"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "Exponálási kompenzáció"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Színmód"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Képkiigazítás"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Fókuszálási mód"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "Automatikus"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "Exponálás"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "Automatikus lekapcsolási idő"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "Zársebesség (s)"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Vaku mindig\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Automatikus, vörösszemeffektus-csökkentés"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Jelenlegi üzemmód: lejátszás\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD-mód"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Képméret"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Vakus mód"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "A vaku beállításai"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Exponálási kompenzáció"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "Dátum és idő"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "Compact Flash kártya"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "Lencsemód"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "Magas"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Fehéren izzó"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Vakus mód"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "Hibás parancssorrend."
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Rögzítés"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "Nagyítás"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "Magas"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ismeretlen (0x%02x)"
@@ -5717,7 +6083,7 @@ msgstr "Felvételi mód"
 msgid "Compression"
 msgstr "Tömörítés"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "A megadott sebesség (%i) nem támogatott."
@@ -5828,6 +6194,12 @@ msgstr "Dátum és idő (GMT)"
 msgid "Aperature Settings"
 msgstr "Az apertúra beállításai"
 
+#: 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
+msgid "Color Mode"
+msgstr "Színmód"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6686,7 +7058,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (ismeretlen)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6696,7 +7068,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Nem sikerült alkalmazni az USB-beállításokat"
 
@@ -6883,13 +7255,6 @@ msgstr ""
 "rendelkezésre).\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
-"működik.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7068,11 +7433,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "az sx330z csak USB-s"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7088,7 +7453,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Kamerameghajtók letöltése innen: '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Nem található meghajtó ehhez: '%s'"
@@ -7148,36 +7513,41 @@ msgstr "Ez a kamera nem támogat rögzítést."
 msgid "This camera can not capture previews."
 msgstr "Ez a kamera nem támogat gyorsnézeteket."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "A kamera nem támogatja a(z) %i sebességet."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Az elérési út ('%s') nem abszolút."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 "A(z) '%s' nevű könyvtár hozzáfűzése nem sikerült, mert már létezik ilyen "
 "nevű könyvtár."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "'%s' nevű könyvtár nem ttalálható."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "A(z) '%s' nevű könyvtár nem tartalmaz '%s' nevű fájlt."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Nem sikerült hozzáfűzni ezt: '%s' a(z) '%s' mappához, mert a fájl már "
 "létezik."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7186,23 +7556,23 @@ msgstr ""
 "A program megpróbálta törölni a(z) '%s' fájlt a(z) '%s' mappából, de a "
 "fájlrendszer nem támogatja fájlok törlését."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 "Az eltávolítani kívánt '%s' könyvtár nem üres, még tartalmaz alkönyvtárakat."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Az eltávolítani kívánt '%s' könyvtár még nem üres, fájlokat tartalmaz."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "A fájlrendszer nem támogatja fájlok feltöltését."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7210,40 +7580,40 @@ msgid ""
 msgstr ""
 "A(z) '%s' könyvtár csak %i fájlt tartalmaz, de a kért fájl száma %i volt."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "A(z) '%s' fájl nem található."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "A fájlrendszer nem támogatja fájlok letöltését"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ismeretlen fájltípus: %i."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "'%s' letöltése a(z) '%s' mappából..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "A fájlrendszer nem támogatja a fájljellemzők lekérdezését."
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "A fájlrendszer nem támogatja fájlinformációk beállítását"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "A csak olvasható fájljellemzők (pl. szélesség, magasság) nem változtathatók "
@@ -7302,6 +7672,28 @@ msgstr "Ismeretlen hiba a kamerakezelő programkönyvtárban"
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
+#, fuzzy
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Nincs összefoglalás ennél a kameránál."
+
+#~ msgid "No manual"
+#~ msgstr "Nincs kézikönyv"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
+#~ "működik.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "A PTP csak USB-csatolós kameráknál használható."
+
 #~ msgid "Could not follow the link '%s' (%m)."
 #~ msgstr "A(z) '%s' link követése nem sikerült (%m)."
 
@@ -7480,9 +7872,6 @@ msgstr "Ismeretlen hiba"
 #~ msgid "57600"
 #~ msgstr "57600"
 
-#~ msgid "115200"
-#~ msgstr "115200"
-
 #~ msgid "VGA (640x480)"
 #~ msgstr "VGA (640x480)"
 
diff --git a/po/it.po b/po/it.po
index 726292dbd..ff33b6a4f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.99\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2006-01-10 11:47+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -370,8 +370,8 @@ msgstr "Impossibile creare la directory \\DCIM."
 msgid "Could not create destination directory."
 msgstr "Impossibile creare la directory di destinazione."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Configurazione fotocamera e driver"
 
@@ -408,8 +408,8 @@ msgstr "Imposta la data della fotocamera alla data del PC"
 msgid "Firmware revision (readonly)"
 msgstr "Revisione del firmware (solo lettura)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Alimentazione (solo lettura)"
 
@@ -551,7 +551,7 @@ msgid "Communication error 1"
 msgstr "Errore di comunicazione 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Nessuna risposta dalla fotocamera"
 
@@ -981,7 +981,7 @@ msgstr ""
 "Driver iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -990,7 +990,7 @@ msgstr ""
 "La fotocamera USB ha un chipset SQ905C.\n"
 "Il numero complessivo di foto scattate è %i\n"
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1003,7 +1003,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1071,8 +1071,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1174,7 +1174,7 @@ msgid "Problem reading image from flash"
 msgstr ""
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
@@ -1216,21 +1216,21 @@ msgstr "Livello di esposizione nell'anteprima"
 msgid "Automatic flash on capture"
 msgstr "Flash automatico alla cattura"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Problema durante l'apertura della porta"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Problema durante la reimpostazione della fotocamera"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr ""
 "Problema durante l'impostazione della velocità di comunicazione della "
 "fotocamera"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Sembra un modem, non una fotocamera"
 
@@ -1292,7 +1292,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "La fotocamera ha inviato solo %i byte, ma ne sono necessari almeno %i."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Impossibile contattare la fotocamera."
 
@@ -1335,7 +1335,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "La fotocamera ha inviato il byte 0x%02x inatteso."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Scaricamento in corso..."
@@ -1430,18 +1430,18 @@ msgstr ""
 "Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Tipo di porta non gestito: %d. Questo driver funziona solo con fotocamere "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Impossibile reimpostare la fotocamera.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1661,20 +1661,20 @@ msgid "High (good quality)"
 msgstr "Alta (buona qualità)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Cattura"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1716,30 +1716,32 @@ msgstr "Compensazione dell'esposizione"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Auto"
 
@@ -1753,7 +1755,8 @@ msgid "Force"
 msgstr "Forza"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Nessuno"
@@ -1770,13 +1773,13 @@ msgstr "Riduzione occhi rossi"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1792,14 +1795,14 @@ msgstr "Acceso"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2507,7 +2510,10 @@ 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2584,6 +2590,7 @@ msgid "No answer from the camera."
 msgstr "Nessuna risposta dalla fotocamera."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2596,6 +2603,7 @@ msgid "Medium"
 msgstr "Media"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2634,7 +2642,7 @@ msgstr "Ufficio"
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2664,7 +2672,7 @@ msgid "Black and White"
 msgstr "Bianco e nero"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2704,13 +2712,13 @@ msgstr ""
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2774,15 +2782,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Nessun manuale"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2853,7 +2853,7 @@ msgstr ""
 "Libreria per la fotocamera Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2864,7 +2864,7 @@ msgstr ""
 "Revisione hardware:\t%s\n"
 "Revisione firmware:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2880,61 +2880,61 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Remoto"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Locale"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Sì"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "No"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatico\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Forza flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Proibisci flash\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Valore non valido (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2945,74 +2945,74 @@ msgid ""
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Non piena"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Piena"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Occupata"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "In attesa"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Caricamento in corso"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Pronta"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normale\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Stato scheda:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Protetto da scrittura"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr ""
 
 # FIXME UPSTREAM
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3135,7 +3135,7 @@ msgstr ""
 "possibile da caricare è %i byte."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Caricamento in corso..."
 
@@ -3308,13 +3308,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Qualità immagine"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Dimensioni immagine"
 
@@ -3330,11 +3330,11 @@ msgstr "Spegnimento automatico (minuti)"
 msgid "Information"
 msgstr "Informazioni"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normale"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fine"
 
@@ -3342,21 +3342,21 @@ msgstr "fine"
 msgid "superfine"
 msgstr "superfine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "acceso"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "spento"
@@ -3453,245 +3453,253 @@ msgid ""
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Il tipo di porta richiesto (%i) non è gestito da questo driver."
 
-#: camlibs/ptp2/library.c:147
+#: 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 Errore non definito"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP Errore generico"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP Sessione non aperta"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID di transazione non valido"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP Operazione non gestita"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Parametro non gestito"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Trasferimento incompleto"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Codice di formato dell'oggetto non valido"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP Oggetto protetto da scrittura"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP Accesso negato"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP Nessuna miniatura presente"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP Eliminazione parziale"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr ""
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP Formato codice non valido"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Codice fornitore sconosciuto"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Cattura già completata"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr "PTP Dispositivo occupato"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP Parametro non valido"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP Sessione già aperta"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP Transazione annullata"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Specificazione di destinazione non gestita"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP Errore di I/O"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP Errore: parametro non corretto"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP Errore di protocollo, dati attesi"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Errore di protocollo, risposta attesa"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"PTP2 driver\n"
-"(c)2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"Buon divertimento!"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Questa fotocamera Canon non gestisce la cattura Canon"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Questa fotocamera Canon non gestisce la modalità Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Questa fotocamera Canon non gestisce Canon Captureinitiation"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr "Comando di cattura completato, ma nessuna conferma ricevuta"
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Ricevuto evento 0x%04x"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr "solo lettura"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3706,442 +3714,486 @@ msgstr ""
 "Estensione ID vendor: 0x%08x\n"
 "Descrizione estensione vendor: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Formato data"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Formato data"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Risoluzione file"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Risoluzione file"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Caricamento del file non riuscito."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Cattura"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Cattura"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "sconosciuto (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generale"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 #, fuzzy
 msgid "Read-Write"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Pronta"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Numero di immagini: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Tipo di file %i sconosciuto."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "tipo di dati %i inatteso"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuale"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 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:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Nuvoloso"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr "Ombra"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr "JPEG Base"
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr "JPEG Fine"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr "NEF+BASIC"
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr "super fine"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr "auto occhi rossi"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr "acceso occhi rossi"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+msgid "Commander"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr "spot"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "centro"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 msgid "large"
 msgstr "largo"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr "medio 1"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr "medio 2"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr "piccolo"
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr "Predefinito"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 msgid "Portrait"
 msgstr "Ritratto"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr "Paesaggio"
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr "Ritratto notturno"
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr "Paesaggio notturno"
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Migliore"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Ritratto"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+msgid "Centre"
+msgstr "Centro"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr "Alto"
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr "Basso"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr "Sinistra"
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+msgid "Right"
+msgstr "Destra"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "esternamente"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 msgid "Default"
 msgstr "Predefinito"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4149,208 +4201,605 @@ msgstr "Predefinito"
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Bianco e nero"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+msgid "AE/AF Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "1 min"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+#, fuzzy
+msgid "5 minutes"
+msgstr "5 min"
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "10 min"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+#, fuzzy
+msgid "30 minutes"
+msgstr "10 min"
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "15 min"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr "Vivo"
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Ombra"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Spot"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "La directory esiste"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "Personalizzato"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Contrasto"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Media"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr "Lunga distanza"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
-msgstr "Fluorescente H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "Personalizzato"
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "AC"
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr "Vivo"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
+msgstr "Fluorescente H"
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr "Neutro"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr "Bianco e nero"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "Flash"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "solo lettura"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Modo flash"
+
+#: camlibs/ptp2/library.c:3321
+msgid "WB bracketing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internamente"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Nessuna scheda"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 msgid "Camera Owner"
 msgstr "Proprietario fotocamera"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 msgid "Camera Model"
 msgstr "Modello fotocamera"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Revisione del firmware: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 msgid "Camera Time"
 msgstr "Orario fotocamera"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 msgid "Image Comment"
 msgstr "Commento all'immagine"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Tempo di spegnimento automatico"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Impostazioni di cattura"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Velocità ISO"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr "Bilanciamento bianco"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Modello fotocamera"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr "Auto ISO"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Modalità autofocus."
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Compensazione esposizione"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr "Lunghezza focale"
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Modalità messa a fuoco"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr "Tempo di esposizione"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 msgid "Exposure Program"
 msgstr "Programma di esposizione"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Apertura"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr "Velocità otturatore"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Distanza messa a fuoco"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+msgid "Focus Area Wrap"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+msgid "Flash Sign"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+msgid "Image Review"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Rotazione immagine"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Modo flash"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Modalità autofocus."
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+msgid "Bracket Set"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3658
+msgid "Flourescent Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Bilanciamento del bianco"
+
+#: camlibs/ptp2/library.c:3663
+msgid "Selftimer Delay"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Configurazione"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+msgid "Hue Adjustment"
+msgstr "Aggiustamento tonalità"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4358,217 +4807,222 @@ msgstr "Distanza messa a fuoco"
 msgid "Camera Settings"
 msgstr "Impostazioni fotocamera"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 msgid "Image Settings"
 msgstr "Impostazioni immagine"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 msgid "Capture Settings"
 msgstr "Impostazioni di cattura"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Numero di valori"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Valori gestiti"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Valore corrente"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Inizializzazione fotocamera"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP è implementato solo per fotocamere USB."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP è implementato solo per fotocamere USB."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: Errore non definito"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: Errore generico"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: Sessione non aperta"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: ID di transazione non valido"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: Operazione non gestita"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: Parametro non gestito"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: Trasferimento incompleto"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: Codice di formato dell'oggetto non valido"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: Oggetto protetto da scrittura"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: Accesso negato"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: Nessuna miniatura presente"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: Eliminazione parziale"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: Formato codice non valido"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: Codice fornitore sconosciuto"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: Cattura già terminata"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr "PTP: Dispositivo occupato"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: Parametro non valido"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: Sessione già aperta"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: Transazione annullata"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: Specificazione di destinazione non gestita"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: Errore di I/O"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: Errore: parametro non valido"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: Errore di protocollo, dati attesi"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Errore di protocollo, risposta attesa"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr "Livello batteria"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr "Impostazioni di compressione"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4577,715 +5031,624 @@ msgstr "Impostazioni di compressione"
 msgid "White Balance"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr "Distanza messa a fuoco"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr "Data ora"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Zoom digitale"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr "Artista"
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr "Informazioni di copyright"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr "Temperatura colore"
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr "Uscita video"
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr "Salvataggio energia"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr "Lingua interfaccia"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 msgid "Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr "Velocità otturatore"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr "Orario UNIX"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Zoom digitale"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2060
-msgid "Hue Adjustment"
-msgstr "Aggiustamento tonalità"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr "PTP_DPC_NIKON_CSMMenuBankSelect"
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr "PTP_DPC_NIKON_MenuBankNameA"
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr "PTP_DPC_NIKON_MenuBankNameB"
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr "PTP_DPC_NIKON_MenuBankNameC"
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr "PTP_DPC_NIKON_MenuBankNameD"
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr "PTP_DPC_NIKON_A1AFCModePriority"
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr "PTP_DPC_NIKON_A2AFSModePriority"
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr "PTP_DPC_NIKON_A3GroupDynamicAF"
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr "PTP_DPC_NIKON_A4AFActivation"
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 
-#: camlibs/ptp2/ptp.c:2090
-msgid "Focus Area Wrap"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr "Auto ISO"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 msgid "Exposure Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 msgid "Focus Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr "PTP_DPC_NIKON_D3ExpDelayMode"
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr "PTP_DPC_NIKON_D7Illumination"
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2140
-msgid "Bracket Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 msgid "Center Button Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 msgid "Aperture Setting"
 msgstr "Impostazione dell'apertura"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 msgid "Image Rotation"
 msgstr "Rotazione immagine"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 msgid "Exposure Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 msgid "Exposure Bracketing Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 msgid "Exposure Bracketing Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 msgid "AF LCD Top Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 msgid "Exposure Meter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 msgid "Exposure Aperture Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 msgid "Autofocus Mode"
 msgstr "Modalità autofocus."
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-msgid "Image Review"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Modo flash"
-
-#: camlibs/ptp2/ptp.c:2206
-msgid "Flash Sign"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 msgid "Flash Open"
 msgstr "Flash aperto"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr "Flash caricato"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr "Distanza focale minima"
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr "Distanza focale massima"
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Massima apertura alla distanza focale minima"
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Massima apertura alla distanza focale massima"
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 msgid "Low Light"
 msgstr "Luce bassa"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Base"
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr "Messa a fuoco manuale"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Modo flash"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2396
-msgid "Commander"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:2415
-msgid "Centre"
-msgstr "Centro"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr "Alto"
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr "Basso"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr "Sinistra"
-
-#: camlibs/ptp2/ptp.c:2419
-msgid "Right"
-msgstr "Destra"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 #, fuzzy
 msgid "Firmware"
 msgstr "Firmware: %d.%d\n"
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "sconosciuto (0x%02x)"
@@ -5527,7 +5890,7 @@ msgstr "Modalità di registrazione"
 msgid "Compression"
 msgstr "Compressione"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "La velocità %i non è supportata!"
@@ -5615,6 +5978,12 @@ msgstr "Data e ora (GMT)"
 msgid "Aperature Settings"
 msgstr "Impostazioni di apertura"
 
+#: 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
+msgid "Color Mode"
+msgstr ""
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6327,7 +6696,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (sconosciuto)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6337,7 +6706,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Impossibile applicare le impostazioni USB"
 
@@ -6518,13 +6887,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Tipo di porta non gestito: %d. Questo driver funziona solo con fotocamere "
-"USB.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -6704,11 +7066,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z è solo USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -6727,7 +7089,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Caricamento dei driver della fotocamera da \"%s\"..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Impossibile trovare alcun driver per \"%s\""
@@ -6789,35 +7151,40 @@ msgstr "Questa fotocamera non può catturare."
 msgid "This camera can not capture previews."
 msgstr "Questa fotocamera non può catturare anteprime."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "La fotocamera non supporta la velocità %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Il percorso \"%s\" non è assoluto."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 "Impossibile accodare la cartella \"%s\", dato che questa cartella esiste di "
 "già."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Impossibile trovare la cartella \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "La cartella \"%s\" non contiene la cartella \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Impossibile aggiungere \"%s\" alla cartella \"%s\" perché il file esiste già."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -6826,7 +7193,7 @@ msgstr ""
 "Si è cercato di eliminare \"%s\" dalla cartella \"%s\", ma il filesystem non "
 "gestisce l'eliminazione di file."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
@@ -6834,16 +7201,16 @@ msgstr ""
 "Ci sono ancora delle sottocartelle nella cartella \"%s\" che si vuole "
 "rimuovere."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Ci sono ancora dei file nella cartella \"%s\" che si vuole rimuovere."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Il filesystem non gestisce il caricamento di file."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -6852,40 +7219,40 @@ msgstr ""
 "La cartella \"%s\" contiene solo %i file, ma è stato richiesto un file con "
 "numero %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Il file \"%s\" non è stato trovato nella cartella \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Impossibile trovare il file \"%s\"."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "Il filesystem non gestisce la lettura dei file."
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Tipo di file %i sconosciuto."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Scaricamento di \"%s\" dalla cartella \"%s\" in corso..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "Il filesystem non gestisce la lettura delle informazioni del file."
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "Il filesystem non gestisce l'impostazione delle informazioni del file"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Attributi di sola lettura del file, come larghezza e altezza, non possono "
@@ -6944,6 +7311,26 @@ msgstr "Errore sconosciuto nella libreria della fotocamera"
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Buon divertimento!"
+
+#~ msgid "No manual"
+#~ msgstr "Nessun manuale"
+
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Tipo di porta non gestito: %d. Questo driver funziona solo con fotocamere "
+#~ "USB.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP è implementato solo per fotocamere USB."
+
 #~ msgid "Flash Memory"
 #~ msgstr "Memoria Flash"
 
diff --git a/po/ja.po b/po/ja.po
index 7c76a0187..ad417d4f9 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-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2004-12-21 00:59+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -379,8 +379,8 @@ msgstr "\\DCIM ディレクトリを作成できませんでした"
 msgid "Could not create destination directory."
 msgstr "対象となるディレクトリを作成できませんでした"
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "カメラとドライバの設定"
 
@@ -417,8 +417,8 @@ msgstr "カメラの日付を PC の日付にセットします"
 msgid "Firmware revision (readonly)"
 msgstr "ファームウェアのリビジョン (読み取りのみ)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "電源 (読み取りのみ)"
 
@@ -561,7 +561,7 @@ msgid "Communication error 1"
 msgstr "通信エラー 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "カメラから反応がありません"
 
@@ -1009,7 +1009,7 @@ msgstr ""
 "Aox 汎用ドライバ\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, fuzzy, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -1018,7 +1018,7 @@ msgstr ""
 "お使いの USB カメラは Kodak EZ200 です。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1031,7 +1031,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 #, fuzzy
 msgid ""
 "sq905C generic driver\n"
@@ -1106,8 +1106,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "フラッシュあり"
@@ -1228,7 +1228,7 @@ msgid "Problem reading image from flash"
 msgstr "フラッシュカードから画像の読み込み中に問題が発生しました"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
@@ -1270,19 +1270,19 @@ msgstr "露出レベルのプレビュー"
 msgid "Automatic flash on capture"
 msgstr "キャプチャ時の自動フラッシュ"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "ポートを開いている最中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "カメラの再設定中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "カメラの通信速度の設定中に問題が発生しました"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "カメラではなく、モデムのようです"
 
@@ -1349,7 +1349,7 @@ msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 "カメラが %i バイトのみ送信しましたが、必要なバイト数は少なくとも %i です。"
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "カメラに接続できませんでした。"
 
@@ -1395,7 +1395,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:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "ダウンロード中..."
@@ -1487,18 +1487,18 @@ msgstr ""
 "gPhoto2 camlib モジュールと Mustek が提供してくれた仕様。\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "サポートしていないポートの種類: %d 【このドライバは USB カメラでのみ動作しま"
 "す】\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "カメラをリセットできませんでした\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1733,20 +1733,20 @@ msgid "High (good quality)"
 msgstr "高 (普通の品質)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "キャプチャ"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "ズーム"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1788,30 +1788,32 @@ 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "自動"
 
@@ -1825,7 +1827,8 @@ msgid "Force"
 msgstr "強制発光"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "なし"
@@ -1842,13 +1845,13 @@ 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1864,14 +1867,14 @@ 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2591,7 +2594,10 @@ 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2666,6 +2672,7 @@ msgid "No answer from the camera."
 msgstr "カメラから応答がありません"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2678,6 +2685,7 @@ msgid "Medium"
 msgstr "中"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2716,7 +2724,7 @@ msgstr "オフィス"
 msgid "Day-lt"
 msgstr "屋外"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "鮮明度"
 
@@ -2746,7 +2754,7 @@ msgid "Black and White"
 msgstr "モノクロ"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2786,13 +2794,13 @@ msgstr "場所を問わず"
 msgid "AC"
 msgstr "電源"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "再生"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2873,15 +2881,7 @@ msgstr ""
 "\n"
 "GPhoto2 と UNIX/Linux を使ってくれてありがとう。\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "このカメラに対する説明はありません。"
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "取り扱い説明書なし"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2959,7 +2959,7 @@ msgstr ""
 "Mars MR97310 カメラのライブラリ。\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2970,7 +2970,7 @@ msgstr ""
 "ハードウェア・リビジョン:\t%s\n"
 "ファームウェア・リビジョン:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2997,61 +2997,61 @@ msgstr ""
 "カードID:\t\t%d\n"
 "フラッシュモード:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "リモート"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "ローカル"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "はい"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "いいえ"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "ファイン"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "標準"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "自動\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "強制発光\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "発光禁止\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "おかしな値 ( %d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3068,73 +3068,73 @@ msgstr ""
 "フラッシュ充電:\t%s\n"
 "レンズの状態:\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "使用中"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "フル充電"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "動作中"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "アイドル中"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "充電中"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "準備 OK"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "標準\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "レンズの向きがフラッシュの方向と同じではありません\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "レンズがついていません\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "レンズの状態がおかしいです %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "カードの状態:\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "書き込み保護つき"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "サポートしないカード"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "カード %d の状態がおかしい値"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3256,7 +3256,7 @@ msgstr ""
 "ファイルサイズは %ld バイトです。アップロード可能なサイズは %i バイトです。"
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -3454,13 +3454,13 @@ msgstr ""
 "Michael Trawny <trawny99@users.sourceforge.net> が担当しました。バグ修正は "
 "Marcus Meissner <marcus@jet.franken.de> が担当しました。"
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "画像の品質"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "画像サイズ"
 
@@ -3476,11 +3476,11 @@ msgstr "自動パワーオフ (分後)"
 msgid "Information"
 msgstr "情報"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "標準"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "ファイン"
 
@@ -3488,21 +3488,21 @@ msgstr "ファイン"
 msgid "superfine"
 msgstr "スーパーファイン"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "自動"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 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:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "OFF"
@@ -3616,255 +3616,263 @@ msgstr ""
 "自動パワーオフ: %i 分後\n"
 "電源元: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "このドライバでは要求したポート型式 (%i) をサポートしていません。"
 
-#: camlibs/ptp2/library.c:147
+#: 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:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP の一般的なエラー"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP のセッションが開かれていません"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP の不正なトランザクション ID"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "サポートされていない PTP 操作"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "サポートされていない PTP パラメータ"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP の転送が完了していません"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP の不正なストレージ ID"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP 不正なオブジェクト操作"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "サポートされていない PTP デバイス Prop"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP の不正なオブジェクト書式コード"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP の空き容量がありません"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP オブジェクトへの書き込み保護が有効です"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP は読み込み専用です"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP へのアクセスが拒否されました"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP にはサムネイルがありません"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP の自己診断に失敗しました"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP の部分的な削除"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP に格納できません"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "サポートしていない PTP 書式の指定"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP の不正なオブジェクト情報"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP の不正なコード書式"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP の不明なベンダーコードです"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP のキャプチャは中断しました"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP のデバイス・バス"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP 不正なオブジェクト"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP の不正なデバイス Prop 書式"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP の不正なデバイス Prop 値"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP の不正なパラメータ"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP のセッションはオープンしています"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP トランザクションがキャンセルされました"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "サポートしていない PTP 転送先の指定"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP EK ファイル名が必要です"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK ファイル名が重複しています"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK 不正なファイル名です"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP I/O エラーです"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP エラー: パラメータが正しくありません"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP プロトコル・エラー (期待値: データ)"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"PTP2 ドライバ  (C) 2001-2003。\n"
-"Mariusz Woloszyn 氏 <emsi@ipartners.pl> が担当しました。\n"
-"Enjoy! して下さい。"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 "キャプチャ・コマンドが完了しましたが、確認イベントは受け取りませんでした"
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "受信したイベント 0x%04x"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr "読み込みのみ"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr "不明"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3879,465 +3887,513 @@ msgstr ""
 "ベンダの拡張 ID: 0x%08x\n"
 "ベンダの拡張情報: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "ファイルの解像度"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "ファイルの解像度"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "ファイルのアップロードに失敗しました"
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "不明 (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "全般"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 #, fuzzy
 msgid "Read-Write"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "準備 OK"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "写真の数: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "不明なファイル形式 %i です。"
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "予期しないデータ種 %i"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "取り扱い説明書"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 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:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "電球"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "曇天"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 #, fuzzy
 msgid "Shade"
 msgstr "シャープ"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "プリセット"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "スーパーファイン"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 #, fuzzy
 msgid "auto red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 #, fuzzy
 msgid "on red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "コマンドの実行順でエラーです。"
+
+#: camlibs/ptp2/library.c:2737
 #, fuzzy
 msgid "spot"
 msgstr "スポット"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "画像"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "自動"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 #, fuzzy
 msgid "Sports"
 msgstr "スポット"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 #, fuzzy
 msgid "Single Shot"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "ベスト"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 #, fuzzy
 msgid "Timelapse"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "セルフタイマ"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "リモート"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 #, fuzzy
 msgid "Single Area"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "コントラスト"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "キャプチャ"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "ズーム"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "光源"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 #, fuzzy
 msgid "Center Weighted"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "フラッシュあり"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "赤目軽減フラッシュ"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4345,220 +4401,634 @@ msgstr "屋外"
 msgid "Slow Sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "x1"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "シャープ"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "ソフト"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "ディレクトリが存在します"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "カスタム"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "コントラスト"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "電源"
+
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "蛍光灯"
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "カスタム"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "フラッシュなし"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "読み込みのみ"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "フラッシュモード"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "露出補正"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "カードがありません"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 msgid "Camera Owner"
 msgstr "カメラの所有者"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 msgid "Camera Model"
 msgstr "カメラの型式"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "ファームウェアのリビジョン: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 msgid "Camera Time"
 msgstr "カメラの時刻"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "自動 OFF 時間"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "自動 OFF 時間"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "キャプチャの設定"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr "写真の効果"
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "カラーモード"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "自動"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr "補助光"
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: 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:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 #, fuzzy
 msgid "F Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr "効果モード"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr "キャプチャ・モード"
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr "フォーカス測光モード"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "絞り"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr "フォーカスの焦点"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "露出"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "フラッシュの設定"
+
+#: camlibs/ptp2/library.c:3646
+#, fuzzy
+msgid "Viewfinder Grid"
+msgstr "ビューファインダーモード"
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "画像サイズ"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "カメラの設定"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "フラッシュモード"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "フォーカス・モード"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "露出度"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "自動, Red-Eye 減少"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr "バースト数"
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "ホワイトバランス"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "セルフタイマーの時間"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "中央部重点"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "シャッター速度"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "日付と時間"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "充電中"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "露出度"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "設定"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "画像の調整"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4566,220 +5036,225 @@ msgstr "フォーカスの距離"
 msgid "Camera Settings"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 msgid "Capture Settings"
 msgstr "キャプチャの設定"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "値の数"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "サポートしている値"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "現在の値"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "カメラの初期化中..."
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP は USB カメラのみサポートしています。"
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP は USB カメラのみサポートしています。"
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: 未定義のエラー"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: 一般エラー"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: セッションがオープンされていません"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: 不正なトランザクション ID"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: サポートされていない操作"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: サポートされていないパラメータ"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: 転送が完了していません"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: 不正なストレージ ID"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: 不正なオブジェクト操作"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: サポートされていないデバイス Prop"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: 不正なオブジェクト書式コード"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP: 空き容量がありません"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: オブジェクトへの書き込み保護が有効です"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP: 読み込み専用です"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: アクセスが拒否されました"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: サムネイルがありません"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP: 自己診断に失敗しました"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: 部分的な削除"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP: 格納できません"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: サポートしていない書式を指定しました"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: 不正なオブジェクト情報"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: 不正なコード書式"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: 不明なベンダーコードです"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: キャプチャを中断しました"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP: デバイスのバス"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: 不正な親オブジェクト"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: 不正なデバイス Prop 書式"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: 不正なデバイス Prop 値"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: 不正なパラメータ"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: セッションはオープンしています"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: トランザクションがキャンセルされました"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: サポートしていない転送先を指定しました"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: EK ファイル名が必要です"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: EK ファイル名が重複しています"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: EK 不正なファイル名です"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: I/O エラーです"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: エラー: パラメータが正しくありません"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: プロトコル・エラー (期待値: データ)"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr "バッテリーのレベル"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr "操作モード"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr "圧縮の設定"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4788,777 +5263,669 @@ msgstr "圧縮の設定"
 msgid "White Balance"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr "RGB ゲイン"
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr "F-番号"
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr "露出のインデックス (フィルム速度 ISO)"
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr "日付と時間"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr "キャプチャの遅れ"
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr "バースト数"
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr "バーストの間隔"
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr "低速度撮影の間隔"
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr "アップロードする URL"
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr "作者"
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr "コピーライト"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr "日時の書式"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr "ビデオ出力"
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr "使用する言語"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr "サイズと品質モード"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr "UNIX 時刻"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "デジタル・ズーム"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "ホワイトバランス"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "White Balance Colour Temperature"
 msgstr "色温度"
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "充電中"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "露出度"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "カラーモード"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "画像の調整"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 #, fuzzy
 msgid "Lens Focal Length (Non CPU)"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "フォーカス・モード"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "自動"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "露出時間"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "露出度"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 #, fuzzy
 msgid "Centre Weight Area"
 msgstr "中央部重点"
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "露出"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "セルフタイマーの時間"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "自動 OFF 時間"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "露出バイアスの代償"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "シャッター速度"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "強制発光\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "自動, Red-Eye 減少"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "現在のモード: 再生モード\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "外観の設定"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "カメラの設定"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "液晶モード"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "露出補正"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "補助光"
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 #, fuzzy
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "TV A/V 設定"
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "画像サイズ"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 #, fuzzy
 msgid "Viewfinder Grid Display"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "フラッシュモード"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "フラッシュの設定"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "露出度"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "日付と時間"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "画像の調整"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "コンパクトフラッシュ・カード"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "レンズモード"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 #, fuzzy
 msgid "Min. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 #, fuzzy
 msgid "Max. Focal Length"
 msgstr "フォーカスの長さ"
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "光源"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "白熱灯"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "取り扱い説明書"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "フラッシュモード"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "マトリックス"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "スポット"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "コマンドの実行順でエラーです。"
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "キャプチャ"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "ズーム"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "光源"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP の不明なエラー"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP 未定義のプロパティ"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "不明 (0x%02x)"
@@ -5808,7 +6175,7 @@ msgstr "記録モード"
 msgid "Compression"
 msgstr "圧縮"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "シャッター速度 %i はサポートされていません！"
@@ -5900,6 +6267,12 @@ msgstr "日付と時間 (GMT)"
 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
+msgid "Color Mode"
+msgstr "カラーモード"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6717,7 +7090,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (不明)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6727,7 +7100,7 @@ msgstr ""
 "Vincent Sanders 氏 <vince@kyllikki.org>\n"
 "Marcus Meissner 氏 <marcus@jet.franken.de>\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "USB 設定を適用できませんでした"
 
@@ -6946,13 +7319,6 @@ msgstr ""
 "載したディジタル・カメラと Mustek 社から提供して頂いた情報をサポート。\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"サポートしていないポートの種類: %d 【このドライバは USB カメラでのみ動作しま"
-"す】\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7163,11 +7529,11 @@ msgstr ""
 "バグ報告とコメントは次にへメールして下さい:\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z は USB にのみ対応しています"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7186,7 +7552,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "'%s' からカメラのドライバを読み込み中..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "'%s' 用のドライバが見つかりませんでした"
@@ -7246,33 +7612,38 @@ msgstr "このカメラではキャプチャできません。"
 msgid "This camera can not capture previews."
 msgstr "このカメラはキャプチャのプレビューができません。"
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "カメラはスピード %i をサポートしていません。"
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "パス名 '%s' が無効です。"
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "フォルダ '%s' が既に存在しているので追加できませんでした。"
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "フォルダ '%s' が見つかりませんでした。"
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "フォルダ '%s' の中にフォルダ '%s' がありません。"
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "ファイル '%s' が既に存在しているのでフォルダ '%s' に追加できませんでした。"
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7281,22 +7652,22 @@ msgstr ""
 "'%s' をフォルダ '%s' から削除しようとしましたが、ファイルシステムはファイルの"
 "削除をサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "削除しようとしたフォルダ '%s' の中にサブフォルダが存在します。"
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "削除しようとしたフォルダ '%s' の中にファイルが存在しています。"
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "ファイルシステムではファイルのアップロードをサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7304,40 +7675,40 @@ msgid ""
 msgstr ""
 "フォルダ '%s' には %i 個のファイルがありますが、要求した番号は %i です。"
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "ファイル '%s' がフォルダ '%s' の中にありません。"
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "ファイル '%s' が見つかりませんでした。"
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "ファイルシステムはこの形式のファイル取得をサポートしていません。"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "不明なファイル形式 %i です。"
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "'%s' をフォルダ '%s' からダウンロード中..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "ファイルシステムはこの形式のファイル情報取得をサポートしていません"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "ファイルシステムはこの形式のファイル情報の設定をサポートしていません"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "ファイルの幅と高さなどの読み込み専用属性を変更することはできません。"
 
@@ -7393,6 +7764,30 @@ msgstr "カメラライブラリの不明なエラー"
 msgid "Unknown error"
 msgstr "不明なエラー"
 
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "PTP2 ドライバ  (C) 2001-2003。\n"
+#~ "Mariusz Woloszyn 氏 <emsi@ipartners.pl> が担当しました。\n"
+#~ "Enjoy! して下さい。"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "このカメラに対する説明はありません。"
+
+#~ msgid "No manual"
+#~ msgstr "取り扱い説明書なし"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "サポートしていないポートの種類: %d 【このドライバは USB カメラでのみ動作し"
+#~ "ます】\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP は USB カメラのみサポートしています。"
+
 #, fuzzy
 #~ msgid ""
 #~ "Download program for Casio QV cameras. Originally written for gphoto-0.4. "
diff --git a/po/nb.po b/po/nb.po
index 3222b192e..69d67e5a4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2000-04-11 10:12+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Kamerakonfigurasjon"
@@ -371,8 +371,8 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr ""
 
@@ -515,7 +515,7 @@ msgid "Communication error 1"
 msgstr ""
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
@@ -912,14 +912,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -932,7 +932,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -997,8 +997,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1100,7 +1100,7 @@ msgid "Problem reading image from flash"
 msgstr ""
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr ""
 
@@ -1145,19 +1145,19 @@ msgstr ""
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 #, fuzzy
 msgid "Could not contact camera."
 msgstr "Kunne ikke ta bilde."
@@ -1269,7 +1269,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr ""
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1353,17 +1353,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke ta bilde."
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1574,21 +1574,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 #, fuzzy
 msgid "Capture"
 msgstr "�pne bilde"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1630,30 +1630,32 @@ 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr ""
 
@@ -1667,7 +1669,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1685,13 +1688,13 @@ 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1707,14 +1710,14 @@ msgstr ""
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2405,7 +2408,10 @@ 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2480,6 +2486,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2492,6 +2499,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2531,7 +2539,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2564,7 +2572,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2605,13 +2613,13 @@ msgstr ""
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2670,15 +2678,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2734,7 +2734,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2742,7 +2742,7 @@ msgid ""
 "Firmware Revision:\t%s\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2758,61 +2758,61 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Nei"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2823,73 +2823,73 @@ msgid ""
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -2998,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Skalerer bilde med 50%..."
@@ -3148,13 +3148,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 #, fuzzy
 msgid "Image Size"
 msgstr "Bildeindeks"
@@ -3172,11 +3172,11 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr ""
 
@@ -3184,21 +3184,21 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr ""
@@ -3296,249 +3296,260 @@ msgid ""
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:147
-msgid "PTP Undefined Error"
+#: camlibs/ptp2/library.c:109
+msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
 #: camlibs/ptp2/library.c:148
-msgid "PTP OK!"
+msgid "PTP Undefined Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:149
-msgid "PTP General Error"
+msgid "PTP OK!"
 msgstr ""
 
 #: camlibs/ptp2/library.c:150
-msgid "PTP Session Not Open"
+msgid "PTP General Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:151
-msgid "PTP Invalid Transaction ID"
+msgid "PTP Session Not Open"
 msgstr ""
 
 #: camlibs/ptp2/library.c:152
-msgid "PTP Operation Not Supported"
+msgid "PTP Invalid Transaction ID"
 msgstr ""
 
 #: camlibs/ptp2/library.c:153
+msgid "PTP Operation Not Supported"
+msgstr ""
+
+#: camlibs/ptp2/library.c:154
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3548,433 +3559,478 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, c-format
 msgid "Display Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Skalerer bilde med 50%..."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "�pne bilde"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "�pne bilde"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "�pne bilde"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 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:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+msgid "Commander"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "�pne bilde"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Bildeindeks"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Nullstill"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+msgid "sRGB (portrait)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "�pne bilde"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "H�yde:"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 msgid "Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -3982,216 +4038,587 @@ msgstr ""
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Farger"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+msgid "1 minute"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+msgid "10 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+msgid "6 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3175
+msgid "8 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3176
+msgid "10 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3177
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+msgid "1"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3189
+msgid "2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3190
+msgid "4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3191
+msgid "8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3192
+msgid "15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+msgid "15 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+msgid "Sharper"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+msgid "Direct Print"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+msgid "Medium Low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+msgid "Medium high"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+msgid "Low contrast"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+msgid "Medium low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+msgid "AE & Flash"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3319
+msgid "AE only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Farger"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "Kamera modell:"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Behold"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Fargejustering"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3588
+msgid "Meter Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Farger"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: 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:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Behold"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Farger"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Bildeindeks"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+msgid "Flash Mode Manual Power"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Farger"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+msgid "Bracket Set"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+msgid "Auto Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3657
+msgid "Tungsten Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3658
+msgid "Flourescent Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3659
+msgid "Daylight Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3660
+msgid "Flash Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3661
+msgid "Cloudy Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3662
+msgid "Shade Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3663
+msgid "Selftimer Delay"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Kamerakonfigurasjon"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Fargejustering"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4200,229 +4627,234 @@ msgstr ""
 msgid "Camera Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "Nytt bilde er #%03i"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4431,731 +4863,634 @@ msgstr "Fargeinnstillinger"
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 msgid "Digital Zoom Magnification"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2058 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
-#, fuzzy
-msgid "Color Mode"
-msgstr "Farger"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Fargejustering"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Farger"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2140
-msgid "Bracket Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Bildeindeks"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-msgid "Flash Mode Manual Power"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "Fargeinnstillinger"
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Fargejustering"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "H�yde:"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2396
-msgid "Commander"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "�pne bilde"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "H�yde:"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
@@ -5411,7 +5746,7 @@ msgstr "Farger"
 msgid "Compression"
 msgstr ""
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, fuzzy, c-format
 msgid "Speed %i is not supported!"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
@@ -5508,6 +5843,13 @@ msgstr ""
 msgid "Aperature Settings"
 msgstr "Fargeinnstillinger"
 
+#: 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
+#, fuzzy
+msgid "Color Mode"
+msgstr "Farger"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 #, fuzzy
@@ -6236,14 +6578,14 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr ""
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 msgstr ""
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 #, fuzzy
 msgid "Could not apply USB settings"
 msgstr ""
@@ -6404,11 +6746,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -6580,11 +6917,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr ""
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -6600,7 +6937,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr ""
@@ -6665,102 +7002,107 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Lagring av indeks er ikke st�ttet enn�"
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Nedlasting stoppet."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index e4e610d79..466a081f9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.6\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2006-01-09 19:17+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -398,8 +398,8 @@ msgstr "Nie uda�o si� utworzy� katalogu \\DCIM."
 msgid "Could not create destination directory."
 msgstr "Nie uda�o si� utworzy� katalogu docelowego."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguracja aparatu i sterownika"
 
@@ -436,8 +436,8 @@ msgstr "Ustawienie daty aparatu na dat� PC"
 msgid "Firmware revision (readonly)"
 msgstr "Wersja firmware'u (tylko do odczytu)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Zasilanie (tylko do odczytu)"
 
@@ -581,7 +581,7 @@ msgid "Communication error 1"
 msgstr "B��d komunikacji 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Brak odpowiedzi od aparatu"
 
@@ -1021,7 +1021,7 @@ msgstr ""
 "Sterownik iClick 5X\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, fuzzy, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 "Ten aparat USB to iClick 5X.\n"
 "Ca�kowita liczba zrobionych zdj��: %i\n"
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1043,7 +1043,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 #, fuzzy
 msgid ""
 "sq905C generic driver\n"
@@ -1117,8 +1117,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flesz"
@@ -1239,7 +1239,7 @@ msgid "Problem reading image from flash"
 msgstr "Problem przy odczycie obrazu z pami�ci flash"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Brak pami�ci"
 
@@ -1281,19 +1281,19 @@ msgstr "Poziom ekspozycji przy podgl�dzie"
 msgid "Automatic flash on capture"
 msgstr "Automatyczny flesz przy robieniu zdj�cia"
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Problem przy otwieraniu portu"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Problem przy resetowaniu aparatu"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Problem przy ustawianiu pr�dko�ci komunikacji z aparatem"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Wygl�da jak modem, a nie aparat"
 
@@ -1359,7 +1359,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Aparat wys�a� tylko %i bajt(�w), ale potrzeba co najmniej %i."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Nie uda�o si� skontaktowa� z aparatem"
 
@@ -1402,7 +1402,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Aparat wys�a� nieoczekiwany bajt 0x%02x."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "�ci�ganie..."
@@ -1496,18 +1496,18 @@ msgstr ""
 "udost�pnionej przez Musteka.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nieobs�ugiwany rodzaj portu: %d. Ten sterownik dzia�a tylko z aparatami "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Nie uda�o si� zresetowa� aparatu.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1747,20 +1747,20 @@ msgid "High (good quality)"
 msgstr "Wysoka (dobra jako��)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Zdj�cia"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Powi�kszenie"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1802,30 +1802,32 @@ msgstr "Kompensacja ekspozycji"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Auto"
 
@@ -1839,7 +1841,8 @@ msgid "Force"
 msgstr "Wymuszenie"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Brak"
@@ -1856,13 +1859,13 @@ msgstr "Flesz z redukcj� czerwonych oczu"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1878,14 +1881,14 @@ msgstr "W��czono"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2606,7 +2609,10 @@ msgstr "Samowyzwalacz (tylko dla nast�pnego zdj�cia)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2681,6 +2687,7 @@ msgid "No answer from the camera."
 msgstr "Brak odpowiedzi od aparatu."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2693,6 +2700,7 @@ msgid "Medium"
 msgstr "�rednia"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2731,7 +2739,7 @@ msgstr "Biuro"
 msgid "Day-lt"
 msgstr "�wiat�o dzienne"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr "Ostro��"
 
@@ -2761,7 +2769,7 @@ msgid "Black and White"
 msgstr "Czarno-bia�y"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2801,13 +2809,13 @@ msgstr "Zawsze"
 msgid "AC"
 msgstr "AC"
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Odtwarzanie"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2888,15 +2896,7 @@ msgstr ""
 "\n"
 "Podzi�kowania za u�ywanie GPhoto2 i system�w operacyjnych UNIX/Linux.\n"
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Nie ma ni� opisuj�cego ten aparat."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Brak podr�cznika"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2973,7 +2973,7 @@ msgstr ""
 "Biblioteka dla aparat�w Mars MR97310\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2984,7 +2984,7 @@ msgstr ""
 "Wersja sprz�tu:\t%s\n"
 "Wersja firmware'u:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3011,61 +3011,61 @@ msgstr ""
 "ID karty:                      %d\n"
 "Tryb flesza:                   "
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Zdalny"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Lokalny"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Tak"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Nie"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Dobra"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Normalna"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Auto\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Wymuszenie flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Zakazanie flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Niepoprawna warto�� (%d)\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3082,73 +3082,73 @@ msgstr ""
 "�adowanie flesza:              %s\n"
 "Stan obiektywu:                "
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Niepe�ne"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Pe�ne"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Wolny"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "�adowany"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Gotowy"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normalny\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Kierunek obiektywu nie zgadza si� ze �wiat�em flesza\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Obiektyw nie pod��czony\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Z�a warto�� stanu obiektywu %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Stan karty:                    "
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Zabezpieczona przed zapisem"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Niepasuj�ca"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "Z�a warto�� stanu karty %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3271,7 +3271,7 @@ msgstr ""
 "si� przes�a� to %i bajt�w."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Przesy�anie..."
 
@@ -3467,13 +3467,13 @@ msgstr ""
 "aparat�w Jenoptik JD350e napisa� Michael Trawny <trawny99@users.sourceforge."
 "net>. Poprawek b��d�w dokona� Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Jako�� obrazu"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Rozmiar obrazu"
 
@@ -3489,11 +3489,11 @@ msgstr "Automatyczne wy��czanie (w minutach)"
 msgid "Information"
 msgstr "Informacje"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normalna"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "dobra"
 
@@ -3501,21 +3501,21 @@ msgstr "dobra"
 msgid "superfine"
 msgstr "bardzo dobra"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "w��czono"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "wy��czono"
@@ -3631,246 +3631,254 @@ msgstr ""
 "Automatyczne wy��czanie: %i minut\n"
 "�r�d�o zasilania: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "��dany rodzaj portu (%i) nie jest obs�ugiwany przez ten sterownik."
 
-#: camlibs/ptp2/library.c:147
+#: 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: Niezdefiniowany b��d"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PGP: Og�lny b��d"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP: Sesja nie otwarta"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP: Nieprawid�owy identyfikator transakcji"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP: Nieobs�ugiwana operacja"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP: Nieobs�ugiwany parametr"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP: Niepe�na transmisja"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP: Nieprawid�owy identyfikator danych"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP: Nieprawid�owy uchwyt obiektu"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP: Nieobs�ugiwane ustawienie urz�dzenia"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP: Nieprawid�owy kod formatu obiektu"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP: Brak miejsca"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP: Obiekt zabezpieczony przed zapisem"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP: Dane tylko do odczytu"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP: Brak dost�pu"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP: Brak miniaturki"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP: W�asny test nie powi�d� si�"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP: Cz�ciowe usuni�cie"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP: Dane niedost�pne"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP: Nieobs�ugiwana specyfikacja przez format"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP: Brak prawid�owych informacji o obiekcie"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP: Nieprawid�owy format kodu"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP: Nieznany kod producenta"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP: Robienie zdj�cia ju� zako�czone"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr "PTP: Urz�dzenie zaj�te"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP: Nieprawid�owy obiekt macierzysty"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP: Nieprawid�owy format ustawienia urz�dzenia"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP: Nieprawid�owa warto�� ustawienia urz�dzenia"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP: Nieprawid�owy parametr"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP: Sesja ju� otwarta"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP: Transakcja anulowana"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP: Nieobs�ugiwana specyfikacja celu"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP: Wymagana nazwa pliku EK"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP: Konflikt nazwy pliku EK"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP: Nieprawid�owa nazwa pliku EK"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP: B��d wej�cia/wyj�cia"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP: B��d: z�y parametr"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP: B��d protoko�u, oczekiwano danych"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP: B��d protoko�u, oczekiwano odpowiedzi"
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 ""
-"Sterownik PTP2\n"
-"(c)2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"Mi�ej zabawy!"
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Niestety ten aparat Canon nie obs�uguje funkcji Canon capture"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Niestety ten aparat Canon nie obs�uguje trybu Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "W��czanie trybu Canon Viewfinder nie powiod�o si�: %d"
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Pobieranie obrazu Canon Viewfinder nie powiod�o si�: %d"
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Wy��czanie trybu Canon Viewfinder nie powiod�o si�: %d"
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Niestety ten aparat nie obs�uguje zwyk�ego robienia zdj��"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 "Niestety ten aparat Canon nie obs�uguje funkcji Canon Captureinitiation"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon Capture nie powiod�o si�: %d"
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Niestety ten aparat nie obs�uguje zwyk�ego robienia zdj��"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr "Polecenie zdj�cia wykonane, ale nie odebrano potwierdzenia"
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Odebrano zdarzenie 0x%04x"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr "tylko odczyt"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr "odczyt i zapis"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3885,444 +3893,488 @@ msgstr ""
 "ID rozszerzenia producenta: 0x%08x\n"
 "Opis rozszerzenia producenta: %s\n"
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Format daty"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Format daty"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Rozdzielczo�� pliku"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Rozdzielczo�� pliku"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Przes�anie pliku do aparatu nie powiod�o si�."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Zdj�cia"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Capture nie powiod�o si�: %d"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Zdj�cia"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP: Niezdefiniowany b��d"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "nieznany (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Og�lna"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 #, fuzzy
 msgid "Read-Write"
 msgstr "odczyt i zapis"
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Gotowy"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Liczba zdj��: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Nieznany rodzaj pliku %i."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "nieoczekiwany typ danych %i"
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "R�czny"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr "Automatyczny One-push"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "�wiat�o dzienne"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "�wiat�o fluorescencyjne"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "�ar�wka wolframowa"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Pochmurno"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr "Cie�"
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Predefiniowany"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr "Podstawowy JPEG"
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr "Normalny JPEG"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr "Dobry JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr "NEF (Surowy)"
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr "NEF+BASIC"
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr "bardzo dobra"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr "automatyczny z redukcj� czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr "w��czony z redukcj� czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+msgid "Commander"
+msgstr "Commander"
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr "punkt"
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "�rodek"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 msgid "large"
 msgstr "du�y"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr "�redni 1"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr "�redni 2"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr "ma�y"
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr "Ustawienie fabryczne"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 msgid "Portrait"
 msgstr "Portret"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr "Pejza�"
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr "Sporty"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr "Nocny portret"
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr "Nocny pejza�"
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr "Pojedyncze zdj�cie"
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Najlepsza"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 #, fuzzy
 msgid "Timelapse"
 msgstr "Liczba w jednostce czasu"
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 msgid "Timer"
 msgstr "Samowyzwalacz"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr "Samowyzwalacz + zdalny"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr "Dynamiczny obszar"
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr "Pojedynczy obszar"
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr "Najbli�szy obiekt"
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Portret"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+msgid "Centre"
+msgstr "�rodek"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr "G�ra"
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr "D�"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr "Lewo"
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+msgid "Right"
+msgstr "Prawo"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr "Centralnie wa�ony"
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centralnie wa�ony"
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flesz"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flesz z redukcj� czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "zewn�trznie"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 msgid "Default"
 msgstr "Domy�lny"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4330,210 +4382,616 @@ msgstr "Domy�lny"
 msgid "Slow Sync"
 msgstr "Wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Synchronizacja tylnej migawki + wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Redukcja czerwonych oczu + wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Czer� i biel"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Blokada ogniskowej"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "1 min"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+#, fuzzy
+msgid "5 minutes"
+msgstr "5 min"
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "10 min"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+#, fuzzy
+msgid "30 minutes"
+msgstr "10 min"
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "15 min"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr "Vivid"
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Ostra"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+#, fuzzy
+msgid "Softer"
+msgstr "Mi�kka"
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "Katalog istnieje"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "W�asne"
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "�rednia"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "�rednia"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Kontrast"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "�rednia"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr "Du�a odleg�o��"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
-msgstr "�wiat�o fluorescencyjne H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "W�asne"
+#: camlibs/ptp2/library.c:3254
+#, fuzzy
+msgid "AF-C"
+msgstr "AC"
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr "Vivid"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
+msgstr "�wiat�o fluorescencyjne H"
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr "Niskie wyostrzenie"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr "Czer� i biel"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "BEZ flesza"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "tylko odczyt"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Tryb flesza"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Bracketing ekspozycji"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "wewn�trznie"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Brak karty"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 msgid "Camera Owner"
 msgstr "W�a�ciciel aparatu"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 msgid "Camera Model"
 msgstr "Model aparatu"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Wersja firmware'u: %8s"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 msgid "Camera Time"
 msgstr "Czas aparatu"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr "Tryb piszczyka"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 msgid "Image Comment"
 msgstr "Komentarz do obrazu"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr "Czas wy��czania LCD"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Czas automatycznego wy��czania pomiaru"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Ustawienia zdj�cia"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Pr�dko�� ISO"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr "Balans bieli"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr "Efekt fotograficzny"
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Tryb koloru"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr "Automatyczne ISO"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr "Redukcja szum�w przy d�ugiej ekspozycji"
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr "�wiat�o pomocnicze"
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Kompensacja ekspozycji"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr "Obszar rozja�nienia AF"
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 msgid "AF Beep Mode"
 msgstr "Tryb piszczyka AF"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 #, fuzzy
 msgid "F Number"
 msgstr "Liczba F"
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr "Ogniskowa"
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr "Czas ekspozycji"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr "Tryb efektu"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Tryb programu ekspozycji"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr "Tryb zdj�� nieruchomych"
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr "Tryb pomiaru ogniskowej"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr "Tryb pomiaru ekspozycji"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Przys�ona"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr "Punkt ogniskowania"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr "Pr�dko�� migawki"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr "Tryb pomiaru"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Odleg�o�� ogniskowej"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Obszar ogniska"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr "Blokada ekspozycji"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr "Sekwencyjne numerowanie plik�w"
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+msgid "Flash Sign"
+msgstr "Znak flesza"
+
+#: camlibs/ptp2/library.c:3646
+#, fuzzy
+msgid "Viewfinder Grid"
+msgstr "Tryb Viewfinder"
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+msgid "Image Review"
+msgstr "Ocenia zdj�cia"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Automatyczny obr�t obrazu"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Moc flesza"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Tryb ogniskowania"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr "Kompensacja ekspozycji flesza"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Automatyczny wyb�r w trybie bracket"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+#, fuzzy
+msgid "Bracket Order"
+msgstr "Kolejno�� w trybie bracket"
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr "Liczba serii"
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Automatyczne przesuni�cie balansu bieli"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla �wiat�a �ar�wki wolframowej"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla �wiat�a fluorescencyjnego"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla �wiat�a dziennego"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla flesza"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla pogody pochmurnej"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Przesuni�cie balansu bieli dla cienia"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Op�nienie samowyzwalacza"
+
+#: camlibs/ptp2/library.c:3664
+#, fuzzy
+msgid "Center Weight Area"
+msgstr "Obszar centralnie wa�ony"
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr "Pr�dko�� migawki z fleszem"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr "Zdalny limit czasu"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr "Wyostrzanie"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr "Kompensacja ton�w"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Konfiguracja"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+msgid "Hue Adjustment"
+msgstr "Regulacja barwy"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4541,217 +4999,222 @@ msgstr "Odleg�o�� ogniskowej"
 msgid "Camera Settings"
 msgstr "Ustawienia aparatu"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 msgid "Image Settings"
 msgstr "Ustawienia obrazu"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 msgid "Capture Settings"
 msgstr "Ustawienia zdj�cia"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 msgid "Number of values"
 msgstr "Liczba warto�ci"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr "Obs�ugiwane warto�ci"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr "Aktualna warto��"
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr "Inicjalizacja aparatu"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP jest zaimplementowane tylko dla aparat�w USB."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP jest zaimplementowane tylko dla aparat�w USB."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr "PTP: Niezdefiniowany b��d"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr "PTP: OK!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr "PTP: Og�lny b��d"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr "PTP: Sesja nie otwarta"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP: Nieprawid�owy identyfikator transakcji"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr "PTP: Nieobs�ugiwana operacja"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP: Nieobs�ugiwany parametr"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP: Niepe�na transmisja"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP: Nieprawid�owy identyfikator danych"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP: Nieprawid�owy uchwyt obiektu"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP: Nieobs�ugiwane ustawienie urz�dzenia"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP: Nieprawid�owy kod formatu obiektu"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr "PTP: Brak miejsca"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr "PTP: Obiekt zabezpieczony przed zapisem"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr "PTP: Dane tylko do odczytu"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr "PTP: Brak dost�pu"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP: Brak miniaturki"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr "PTP: W�asny test nie powi�d� si�"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr "PTP: Cz�ciowe usuni�cie"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 msgid "PTP: Store Not Available"
 msgstr "PTP: Dane niedost�pne"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP: Nieobs�ugiwana specyfikacja przez format"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr "PTP: Brak prawid�owych informacji o obiekcie"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr "PTP: Nieprawid�owy format kodu"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP: Nieznany kod producenta"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP: Robienie zdj�cia ju� zako�czone"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr "PTP: Urz�dzenie zaj�te"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP: Nieprawid�owy obiekt macierzysty"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP: Nieprawid�owy format ustawienia urz�dzenia"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP: Nieprawid�owa warto�� ustawienia urz�dzenia"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr "PTP: Nieprawid�owy parametr"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr "PTP: Sesja ju� otwarta"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 msgid "PTP: Transaction Canceled"
 msgstr "PTP: Transakcja anulowana"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP: Nieobs�ugiwana specyfikacja celu"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr "PTP: Wymagana nazwa pliku EK"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP: Konflikt nazwy pliku EK"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP: Nieprawid�owa nazwa pliku EK"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr "PTP: B��d wej�cia/wyj�cia"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr "PTP: B��d: z�y parametr"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP: B��d protoko�u, oczekiwano danych"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: B��d protoko�u, oczekiwano odpowiedzi"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr "Poziom baterii"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr "Tryb dzia�ania"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr "Ustawienie kompresji"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4760,722 +5223,628 @@ msgstr "Ustawienie kompresji"
 msgid "White Balance"
 msgstr "Balans bieli"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr "Wzmocnienie RGB"
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr "Liczba F"
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr "Odleg�o�� ogniskowej"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr "Tryb programu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr "Indeks ekspozycji (pr�dko�� filmu ISO)"
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr "Kompensacja odchylenia ekspozycji"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr "Data i czas"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr "Op�nienie przed zdj�ciem"
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Powi�kszenie cyfrowe"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr "Liczba serii"
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr "Odst�p serii"
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr "Liczba w jednostce czasu"
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr "Odst�p w jednostce czasu"
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr "URL do przesy�ania"
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr "Autor"
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr "Informacje o prawach autorskich"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr "Temperatura koloru"
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr "Format znacznika czasu"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr "Wyj�cie obrazu"
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr "Oszcz�dzanie energii"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr "J�zyk interfejsu u�ytkownika"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr "Tryb Viewfinder"
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Pr�dko�� robienia zdj�cia"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr "Pr�dko�� migawki"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr "Tryb rozmiaru/jako�ci"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr "Czas uniksowy"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Powi�kszenie cyfrowe"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr "Automatyczne przesuni�cie balansu bieli"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla �wiat�a �ar�wki wolframowej"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla �wiat�a fluorescencyjnego"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla �wiat�a dziennego"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla flesza"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla pogody pochmurnej"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr "Przesuni�cie balansu bieli dla cienia"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr "Temperatura kolor�w dla balansu bieli"
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr "Wyostrzanie"
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr "Kompensacja ton�w"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "Tryb koloru"
-
-#: camlibs/ptp2/ptp.c:2060
-msgid "Hue Adjustment"
-msgstr "Regulacja barwy"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr "Ogniskowa obiektywu (nie CPU)"
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr "Maksymalna jasno�� obiektywu (nie CPU)"
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr "PTP_DPC_NIKON_CSMMenuBankSelect"
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr "PTP_DPC_NIKON_MenuBankNameA"
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr "PTP_DPC_NIKON_MenuBankNameB"
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr "PTP_DPC_NIKON_MenuBankNameC"
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr "PTP_DPC_NIKON_MenuBankNameD"
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr "PTP_DPC_NIKON_A1AFCModePriority"
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr "PTP_DPC_NIKON_A2AFSModePriority"
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr "PTP_DPC_NIKON_A3GroupDynamicAF"
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr "PTP_DPC_NIKON_A4AFActivation"
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Obszar ogniska"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr "Pionowy AF w��czony"
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr "Automatyczne ISO"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr "Krok ISO"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 msgid "Exposure Step"
 msgstr "Krok ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr "Kompensacja ekspozycji (EV)"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr "Obszar centralnie wa�ony"
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr "Blokada ekspozycji"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 msgid "Focus Lock"
 msgstr "Blokada ogniskowej"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr "Czas automatycznego wy��czania pomiaru"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr "Op�nienie samowyzwalacza"
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr "Czas wy��czania LCD"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr "Pr�dko�� robienia zdj�cia"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr "Maksymalna liczba zdj��"
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr "PTP_DPC_NIKON_D3ExpDelayMode"
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr "Redukcja szum�w przy d�ugiej ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr "Sekwencyjne numerowanie plik�w"
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr "PTP_DPC_NIKON_D7Illumination"
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr "Pr�dko�� synchronizacji z fleszem"
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr "Pr�dko�� migawki z fleszem"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr "Flesz modeluj�cy"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Automatyczny wyb�r w trybie bracket"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr "Bracketing w trybie r�cznym"
 
-#: camlibs/ptp2/ptp.c:2144
-#, fuzzy
-msgid "Bracket Order"
-msgstr "Kolejno�� w trybie bracket"
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr "Automatyczny wyb�r w trybie bracket"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 msgid "Center Button Shooting Mode"
 msgstr "Tryb zdj�� z przyciskiem centrowania"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr "Tryb odtwarzania z przyciskiem centrowania"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr "Wielokrotny wyb�r"
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr "Odtwarzanie informacji o zdj�ciach"
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr "Przycisk przypisania funkcji"
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr "Konfiguracja tarcz polece�"
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 #, fuzzy
 msgid "Reverse Command Dial"
 msgstr "Odwrotna tarcza polece�"
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 msgid "Aperture Setting"
 msgstr "Ustawienie przys�ony"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr "Menu i odtwarzanie"
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr "Przyciski i tarcze"
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr "Nie zwolniono karty CF"
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Automatyczny obr�t obrazu"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 msgid "Exposure Bracketing"
 msgstr "Bracketing ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 msgid "Exposure Bracketing Distance"
 msgstr "Odleg�o�� przy bracketingu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 msgid "Exposure Bracketing Number"
 msgstr "Liczba zdj�� przy bracketingu ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 msgid "AF LCD Top Mode 2"
 msgstr "AF LCD Top Mode 2"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr "Aktywny sensor AF"
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 msgid "Exposure Meter"
 msgstr "Miernik ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 msgid "Exposure Aperture Lock"
 msgstr "Blokada przys�ony/ekspozycji"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr "Maksymalna liczba zdj��"
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 #, fuzzy
 msgid "AF Assist Lamp"
 msgstr "Lampa AF"
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr "Automatyczne ustawianie ISO P/A/DVP"
 
-#: camlibs/ptp2/ptp.c:2196
-msgid "Image Review"
-msgstr "Ocenia zdj�cia"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr "Wy�wietlanie siatki w trybie Viewfinder"
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Moc flesza"
-
-#: camlibs/ptp2/ptp.c:2206
-msgid "Flash Sign"
-msgstr "Znak flesza"
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr "Kompensacja ekspozycji flesza"
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr "Zdalny limit czasu"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 msgid "Image Comment String"
 msgstr "�a�cuch opisuj�cy obraz"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 msgid "Flash Open"
 msgstr "Flesz otwarty"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr "Flesz �adowany"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr "ID obiektywu"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr "Minimalna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr "Maksymalna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr "Maksymalna jasno�� przy minimalnej ogniskowej"
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr "Maksymalna jasno�� przy maksymalnej ogniskowej"
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 msgid "Low Light"
 msgstr "Niskie �wiat�o"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f krok�w"
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr "RAW"
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG podstawowy"
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "�wiat�o �arz�ce si�"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr "R�czna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Tryb flesza"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Macierz"
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr "Silny wiatr"
 
-#: camlibs/ptp2/ptp.c:2396
-msgid "Commander"
-msgstr "Commander"
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:2415
-msgid "Centre"
-msgstr "�rodek"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr "G�ra"
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr "D�"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr "Lewo"
-
-#: camlibs/ptp2/ptp.c:2419
-msgid "Right"
-msgstr "Prawo"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP: Niezdefiniowany b��d"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP: Niezdefiniowany b��d"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "nieznany (0x%02x)"
@@ -5725,7 +6094,7 @@ msgstr "Tryb nagrywania"
 msgid "Compression"
 msgstr "Kompresja"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Pr�dko�� %i nie jest obs�ugiwana!"
@@ -5818,6 +6187,12 @@ msgstr "Data i czas (GMT)"
 msgid "Aperature Settings"
 msgstr "Ustawienia przys�ony"
 
+#: 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
+msgid "Color Mode"
+msgstr "Tryb koloru"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6645,7 +7020,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (nieznany)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6655,7 +7030,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Nie uda�o si� zastosowa� ustawie� USB"
 
@@ -6872,13 +7247,6 @@ msgstr ""
 "Musteka.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Nieobs�ugiwany rodzaj portu: %d. Ten sterownik dzia�a tylko z aparatami "
-"USB.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7091,11 +7459,11 @@ msgstr ""
 "Prosz� wysy�a� raporty b��d�w i komentarze.\n"
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z jest tylko na USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7114,7 +7482,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Wczytywanie sterownik�w do aparat�w z '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Nie uda�o si� odnale�� �adnego sterownika dla '%s'"
@@ -7174,33 +7542,38 @@ msgstr "Ten aparat nie mo�e robi� zdj��."
 msgid "This camera can not capture previews."
 msgstr "Ten aparat nie mo�e robi� podgl�du zdj�cia."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Aparat nie obs�uguje pr�dko�ci %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "�cie�ka '%s' nie jest bezwzgl�dna."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Nie uda�o si� do��czy� folderu '%s', jako �e ten folder ju� istnieje."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Nie uda�o si� odnale�� folderu '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Folder '%s' nie zawiera folderu '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Nie uda�o si� do��czy� '%s' do folderu '%s' poniewa� ten plik ju� istnieje."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7209,62 +7582,62 @@ msgstr ""
 "Pr�bowano usun�� '%s' z folderu '%s', ale system plik�w nie obs�uguje "
 "usuwania plik�w."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "Nadal istniej� podkatalogi w folderze '%s', kt�ry pr�bowano usun��."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Nadal istniej� pliki w folderze '%s', kt�ry pr�bowano usun��."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "System plik�w nie obs�uguje przesy�ania plik�w do aparatu."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr "Folder '%s' zawiera tylko %i plik�w, a ��dano pliku o numerze %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Nie uda�o si� odnale�� pliku '%s' w folderze '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Nie uda�o si� odnale�� pliku '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "System plik�w nie obs�uguje pobierania plik�w"
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Nieznany rodzaj pliku %i."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "�ci�ganie '%s' z folderu '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "System plik�w nie obs�uguje pobierania informacji o plikach"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "System plik�w nie obs�uguje ustawiania informacji o plikach"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Atrybut�w tylko do odczytu, jak szeroko�� i wysoko��, nie mo�na zmieni�."
@@ -7322,6 +7695,29 @@ msgid "Unknown error"
 msgstr "Nieznany b��d"
 
 #~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr ""
+#~ "Sterownik PTP2\n"
+#~ "(c)2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Mi�ej zabawy!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Nie ma ni� opisuj�cego ten aparat."
+
+#~ msgid "No manual"
+#~ msgstr "Brak podr�cznika"
+
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Nieobs�ugiwany rodzaj portu: %d. Ten sterownik dzia�a tylko z aparatami "
+#~ "USB.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP jest zaimplementowane tylko dla aparat�w USB."
+
+#~ msgid ""
 #~ "Download program for Casio QV cameras. Originally written for gphoto-0.4. "
 #~ "Adapted for gphoto2 by Lutz Mueller <lutz@users.sf.net>."
 #~ msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 1543caa4b..c4f5bc62c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2005-06-25 22:58+0400\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -326,8 +326,8 @@ msgstr "Не найден домашний каталог."
 msgid "Could not create destination directory."
 msgstr "Не найден домашний каталог."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Описание драйвера фотоаппарата"
@@ -368,8 +368,8 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr ""
 
@@ -507,7 +507,7 @@ msgid "Communication error 1"
 msgstr ""
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
@@ -901,14 +901,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -921,7 +921,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -983,8 +983,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1088,7 +1088,7 @@ msgid "Problem reading image from flash"
 msgstr ""
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 #, fuzzy
 msgid "Out of memory"
 msgstr "Недостаточно памяти."
@@ -1132,19 +1132,19 @@ msgstr ""
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
@@ -1204,7 +1204,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 #, fuzzy
 msgid "Could not contact camera."
 msgstr "Невозможно сделать снимок."
@@ -1248,7 +1248,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr ""
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1335,17 +1335,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Невозможно задать папку."
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1555,21 +1555,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 #, fuzzy
 msgid "Capture"
 msgstr "Снять фильм"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1611,30 +1611,32 @@ 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr ""
 
@@ -1648,7 +1650,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1666,13 +1669,13 @@ 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1688,14 +1691,14 @@ msgstr ""
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2382,7 +2385,10 @@ 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2457,6 +2463,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2469,6 +2476,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2508,7 +2516,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2539,7 +2547,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2579,13 +2587,13 @@ msgstr ""
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, fuzzy, c-format
 msgid "Record"
@@ -2644,16 +2652,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:280
-#, fuzzy
-msgid "No manual"
-msgstr "Руководство пользователя фотоаппарата:"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2709,7 +2708,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2717,7 +2716,7 @@ msgid ""
 "Firmware Revision:\t%s\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2733,62 +2732,62 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Да"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Нет"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 #, fuzzy
 msgid "Fine"
 msgstr "Файл:\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2799,75 +2798,75 @@ msgid ""
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 #, fuzzy
 msgid "Idle"
 msgstr "удаление"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 #, fuzzy
 msgid "Ready"
 msgstr "чтение"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -2975,7 +2974,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr ""
 
@@ -3123,13 +3122,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr ""
 
@@ -3146,11 +3145,11 @@ msgstr ""
 msgid "Information"
 msgstr "Показать данные EXIF"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 #, fuzzy
 msgid "fine"
 msgstr "имя файла"
@@ -3159,21 +3158,21 @@ msgstr "имя файла"
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "вкл"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "выкл"
@@ -3269,245 +3268,256 @@ msgid ""
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:147
-msgid "PTP Undefined Error"
+#: camlibs/ptp2/library.c:109
+msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
 #: camlibs/ptp2/library.c:148
-msgid "PTP OK!"
+msgid "PTP Undefined Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:149
-msgid "PTP General Error"
+msgid "PTP OK!"
 msgstr ""
 
 #: camlibs/ptp2/library.c:150
-msgid "PTP Session Not Open"
+msgid "PTP General Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:151
-msgid "PTP Invalid Transaction ID"
+msgid "PTP Session Not Open"
 msgstr ""
 
 #: camlibs/ptp2/library.c:152
-msgid "PTP Operation Not Supported"
+msgid "PTP Invalid Transaction ID"
 msgstr ""
 
 #: camlibs/ptp2/library.c:153
-msgid "PTP Parameter Not Supported"
+msgid "PTP Operation Not Supported"
 msgstr ""
 
 #: camlibs/ptp2/library.c:154
-msgid "PTP Incomplete Transfer"
+msgid "PTP Parameter Not Supported"
 msgstr ""
 
 #: camlibs/ptp2/library.c:155
-msgid "PTP Invalid Storage ID"
+msgid "PTP Incomplete Transfer"
 msgstr ""
 
 #: camlibs/ptp2/library.c:156
-msgid "PTP Invalid Object Handle"
+msgid "PTP Invalid Storage ID"
 msgstr ""
 
 #: camlibs/ptp2/library.c:157
-msgid "PTP Device Prop Not Supported"
+msgid "PTP Invalid Object Handle"
 msgstr ""
 
 #: camlibs/ptp2/library.c:158
-msgid "PTP Invalid Object Format Code"
+msgid "PTP Device Prop Not Supported"
 msgstr ""
 
 #: camlibs/ptp2/library.c:159
-msgid "PTP Store Full"
+msgid "PTP Invalid Object Format Code"
 msgstr ""
 
 #: camlibs/ptp2/library.c:160
-msgid "PTP Object Write Protected"
+msgid "PTP Store Full"
 msgstr ""
 
 #: camlibs/ptp2/library.c:161
-msgid "PTP Store Read Only"
+msgid "PTP Object Write Protected"
 msgstr ""
 
 #: camlibs/ptp2/library.c:162
-msgid "PTP Access Denied"
+msgid "PTP Store Read Only"
 msgstr ""
 
 #: camlibs/ptp2/library.c:163
-msgid "PTP No Thumbnail Present"
+msgid "PTP Access Denied"
 msgstr ""
 
 #: camlibs/ptp2/library.c:164
-msgid "PTP Self Test Failed"
+msgid "PTP No Thumbnail Present"
 msgstr ""
 
 #: camlibs/ptp2/library.c:165
-msgid "PTP Partial Deletion"
+msgid "PTP Self Test Failed"
 msgstr ""
 
 #: camlibs/ptp2/library.c:166
+msgid "PTP Partial Deletion"
+msgstr ""
+
+#: camlibs/ptp2/library.c:167
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Нет ничего.\n"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Действие отменено."
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, fuzzy, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Снять фильм"
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 #, fuzzy
 msgid "readwrite"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3517,436 +3527,482 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Снять фильм"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Справка по командам"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, fuzzy, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr "Поддерживаемые фотоаппараты:\n"
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr "Показать список функций фотоаппарата"
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, fuzzy, c-format
 msgid "\tFile Download, "
 msgstr "  Скопировано: %s\n"
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, c-format
 msgid "File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, c-format
 msgid "Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Невозможно сделать снимок."
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, c-format
 msgid "Nikon Capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, fuzzy, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "Описание:"
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 "%s\n"
 "Недопустимый символ '%c'."
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 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:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "[команда]"
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 msgid "Center"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 msgid "large"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 #, fuzzy
 msgid "Sports"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Время: "
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Порт"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "да"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+msgid "Right"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 msgid "Flash off"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -3954,206 +4010,571 @@ msgstr "Удалить"
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+msgid "AE/AF Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+msgid "1 minute"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+msgid "10 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+msgid "6 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3175
+msgid "8 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3176
+msgid "10 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3177
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+msgid "1"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3189
+msgid "2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3190
+msgid "4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3191
+msgid "8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3192
+msgid "15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+msgid "15 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+msgid "Sharper"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "каталог:"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+msgid "Medium Low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+msgid "Medium high"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+msgid "Low contrast"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+msgid "Medium low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+msgid "AE & Flash"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "чтение"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "чтение"
+
+#: camlibs/ptp2/library.c:3321
+msgid "WB bracketing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Руководство пользователя фотоаппарата:"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "Укажите модель фотоаппарата"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "Руководство пользователя фотоаппарата:"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 msgid "Image Comment"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3588
+msgid "Meter Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Сделать снимок"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Укажите модель фотоаппарата"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 msgid "Auto Focus Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: 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:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 msgid "Exposure Program"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 #, fuzzy
 msgid "Still Capture Mode"
 msgstr "Снять фильм"
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+msgid "Focus Area Wrap"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+msgid "Flash Sign"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+msgid "Image Review"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3648
+msgid "Image Rotation Flag"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+msgid "Flash Mode Manual Power"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3651
+msgid "Auto Focus Area Power"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+msgid "Bracket Set"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+msgid "Auto Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3657
+msgid "Tungsten Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3658
+msgid "Flourescent Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3659
+msgid "Daylight Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3660
+msgid "Flash Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3661
+msgid "Cloudy Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3662
+msgid "Shade Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3663
+msgid "Selftimer Delay"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Настроить"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+msgid "Hue Adjustment"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4161,222 +4582,228 @@ msgstr ""
 msgid "Camera Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 msgid "Image Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Сделать снимок"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "Показать количество файлов"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 #, fuzzy
 msgid "Supported values"
 msgstr "Поддерживаемые фотоаппараты:\n"
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+#, fuzzy
+msgid "Metadata only supported for MTP devices."
+msgstr "Показать список поддерживаемых портов"
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 msgid "PTP: Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 msgid "PTP: Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 msgid "PTP: Parameter Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 msgid "PTP: Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 msgid "PTP: Store Full"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "Нет ничего.\n"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "Действие отменено."
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 msgid "Functional Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 msgid "Compression Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4385,710 +4812,617 @@ msgstr ""
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 msgid "Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 msgid "Digital Zoom Magnification"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2060
-msgid "Hue Adjustment"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-msgid "Focus Area Wrap"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 msgid "Exposure Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 msgid "Focus Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2140
-msgid "Bracket Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 msgid "Center Button Shooting Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 msgid "Aperture Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 msgid "Image Rotation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 msgid "Exposure Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 msgid "Exposure Bracketing Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 msgid "Exposure Bracketing Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 msgid "AF LCD Top Mode 2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 msgid "Exposure Meter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 msgid "Exposure Aperture Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 msgid "Autofocus Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-msgid "Image Review"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-msgid "Flash Mode Manual Power"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2206
-msgid "Flash Sign"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 msgid "Image Comment String"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 msgid "Flash Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 msgid "Low Light"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+msgid "Flash Lock"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "[команда]"
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "да"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-msgid "Right"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
@@ -5336,7 +5670,7 @@ msgstr ""
 msgid "Compression"
 msgstr ""
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr ""
@@ -5422,6 +5756,12 @@ msgstr ""
 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
+msgid "Color Mode"
+msgstr ""
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6137,14 +6477,14 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr ""
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 msgstr ""
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr ""
 
@@ -6302,11 +6642,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -6479,11 +6814,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr ""
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -6499,7 +6834,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, fuzzy, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Не найден домашний каталог."
@@ -6561,94 +6896,99 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Показать описание драйвера фотоаппарата"
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr "Невозможно задать папку."
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "В папке '%s' одна папка:"
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, fuzzy, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "В папке '%s' нет папок."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, fuzzy, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "В папке '%s' нет файлов."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "В папке '%s' одна папка:"
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr "Не найден домашний каталог."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -6706,6 +7046,10 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
+#, fuzzy
+#~ msgid "No manual"
+#~ msgstr "Руководство пользователя фотоаппарата:"
+
 #~ msgid "Number of files in folder '%s': %i\n"
 #~ msgstr "Количество файлов в папке '%s': %i\n"
 
@@ -7031,9 +7375,6 @@ msgstr ""
 #~ msgid "List supported camera models"
 #~ msgstr "Показать список поддерживаемых моделей"
 
-#~ msgid "List supported port devices"
-#~ msgstr "Показать список поддерживаемых портов"
-
 #~ msgid "Send file to stdout"
 #~ msgstr "Послать файл на стандартный вывод"
 
diff --git a/po/sl.po b/po/sl.po
index 8ebea69a4..8ff4764c2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2002-01-04 19:25+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Nastaviteve fotoaparata"
@@ -371,8 +371,8 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr ""
 
@@ -515,7 +515,7 @@ msgid "Communication error 1"
 msgstr ""
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
@@ -912,14 +912,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -932,7 +932,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -997,8 +997,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1100,7 +1100,7 @@ msgid "Problem reading image from flash"
 msgstr ""
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr ""
 
@@ -1145,19 +1145,19 @@ msgstr ""
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr ""
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 #, fuzzy
 msgid "Could not contact camera."
 msgstr "Nisem uspel slikati."
@@ -1269,7 +1269,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr ""
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1353,17 +1353,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Nisem uspel slikati."
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1574,21 +1574,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 #, fuzzy
 msgid "Capture"
 msgstr "Odpri sliko"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1630,30 +1630,32 @@ 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr ""
 
@@ -1667,7 +1669,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1685,13 +1688,13 @@ 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1707,14 +1710,14 @@ msgstr ""
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2405,7 +2408,10 @@ 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2480,6 +2486,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2492,6 +2499,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2531,7 +2539,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2564,7 +2572,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2605,13 +2613,13 @@ msgstr ""
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2670,15 +2678,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr ""
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2734,7 +2734,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2742,7 +2742,7 @@ msgid ""
 "Firmware Revision:\t%s\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2758,61 +2758,61 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Da"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Ne"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2823,73 +2823,73 @@ msgid ""
 "Lens Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -2998,7 +2998,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Pomanj�ujem sliko za 50%..."
@@ -3148,13 +3148,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 #, fuzzy
 msgid "Image Size"
 msgstr "Kazalo slik"
@@ -3172,11 +3172,11 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr ""
 
@@ -3184,21 +3184,21 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr ""
@@ -3297,249 +3297,260 @@ msgid ""
 "Power source: %s"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:147
-msgid "PTP Undefined Error"
+#: camlibs/ptp2/library.c:109
+msgid "You need to specify a folder starting with /store_xxxxxxxxx/"
 msgstr ""
 
 #: camlibs/ptp2/library.c:148
-msgid "PTP OK!"
+msgid "PTP Undefined Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:149
-msgid "PTP General Error"
+msgid "PTP OK!"
 msgstr ""
 
 #: camlibs/ptp2/library.c:150
-msgid "PTP Session Not Open"
+msgid "PTP General Error"
 msgstr ""
 
 #: camlibs/ptp2/library.c:151
-msgid "PTP Invalid Transaction ID"
+msgid "PTP Session Not Open"
 msgstr ""
 
 #: camlibs/ptp2/library.c:152
-msgid "PTP Operation Not Supported"
+msgid "PTP Invalid Transaction ID"
 msgstr ""
 
 #: camlibs/ptp2/library.c:153
+msgid "PTP Operation Not Supported"
+msgstr ""
+
+#: camlibs/ptp2/library.c:154
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ni na voljo"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:916
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 msgid "Unknown"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3549,433 +3560,478 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, c-format
 msgid "Display Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Pomanj�ujem sliko za 50%..."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 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:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+msgid "Commander"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Kazalo slik"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "Ponastavi"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+msgid "sRGB (portrait)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Odpri sliko"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+msgid "Bottom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "Vi�ina:"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 msgid "Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -3983,216 +4039,587 @@ msgstr ""
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "Barve"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+msgid "1 minute"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+msgid "10 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+msgid "6 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3175
+msgid "8 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3176
+msgid "10 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3177
+msgid "20 mm"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+msgid "1/15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+msgid "1"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3189
+msgid "2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3190
+msgid "4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3191
+msgid "8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3192
+msgid "15"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+msgid "15 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+msgid "Sharper"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+msgid "Direct Print"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+msgid "Medium Low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+msgid "Medium high"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+msgid "Low contrast"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+msgid "Medium low"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2901
-msgid "Fluorescent H"
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
+#: camlibs/ptp2/library.c:3265
+msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+msgid "AE & Flash"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3319
+msgid "AE only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Nstavitev barv"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Barve"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "�iva slika!"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "Model fotoaparata:"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "�iva slika!"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Obdr�i"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Nastavitev barv"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+msgid "LCD Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3588
+msgid "Meter Off Time"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "Barve"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+msgid "Auto ISO"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: 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:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Obdr�i"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Barve"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+msgid "Exposure Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "Nstavitev barv"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Kazalo slik"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Nstavitev barv"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+msgid "Flash Mode Manual Power"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Barve"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+msgid "Flash Exposure Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+msgid "Bracket Set"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+msgid "Auto Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3657
+msgid "Tungsten Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3658
+msgid "Flourescent Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3659
+msgid "Daylight Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3660
+msgid "Flash Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3661
+msgid "Cloudy Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3662
+msgid "Shade Whitebalance Bias"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3663
+msgid "Selftimer Delay"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+msgid "Flash Shutter Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+msgid "Remote Timeout"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+msgid "Sharpening"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+msgid "Tone Compensation"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Nastaviteve fotoaparata"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Nastavitev barv"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4201,229 +4628,234 @@ msgstr ""
 msgid "Camera Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "Nova slika je #%03i"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 msgid "PTP: Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 msgid "PTP: OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 msgid "PTP: General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 msgid "PTP: Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 msgid "PTP: Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 msgid "PTP: Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 msgid "PTP: Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 msgid "PTP: Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "Ni na voljo"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 msgid "PTP: Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 msgid "PTP: Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 msgid "PTP: Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 msgid "PTP: No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 msgid "PTP: Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 msgid "PTP: Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "Ni na voljo"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 msgid "PTP: Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 msgid "PTP: No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 msgid "PTP: Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 msgid "PTP: Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP: Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 msgid "PTP: Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP: Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 msgid "PTP: Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP: Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 msgid "PTP: Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP: Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP: EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 msgid "PTP: EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP: EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP: I/O error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 msgid "PTP: Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP: Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4432,731 +4864,634 @@ msgstr "Nstavitev barv"
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 msgid "Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 msgid "UI Language"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 msgid "ShutterSpeed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 msgid "Digital Zoom Magnification"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 msgid "Flourescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-msgid "Sharpening"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2056
-msgid "Tone Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2058 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
-#, fuzzy
-msgid "Color Mode"
-msgstr "Barve"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Nastavitev barv"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Barve"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-msgid "Auto ISO"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 msgid "ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-msgid "Exposure Lock"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2114
-msgid "LCD Off Time"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-msgid "Flash Shutter Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2140
-msgid "Bracket Set"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Kazalo slik"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-msgid "Flash Mode Manual Power"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "Nstavitev barv"
-
-#: camlibs/ptp2/ptp.c:2208
-msgid "Flash Exposure Compensation"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2210
-msgid "Remote Timeout"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Nastavitev barv"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 msgid "Flash Charged"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "Vi�ina:"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Nstavitev barv"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2396
-msgid "Commander"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Odpri sliko"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-msgid "Bottom"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "Vi�ina:"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
@@ -5412,7 +5747,7 @@ msgstr "Barve"
 msgid "Compression"
 msgstr ""
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, fuzzy, c-format
 msgid "Speed %i is not supported!"
 msgstr "Shranjevanje kazala �e ni podprto"
@@ -5519,6 +5854,13 @@ msgstr ""
 msgid "Aperature Settings"
 msgstr "Nstavitev barv"
 
+#: 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
+#, fuzzy
+msgid "Color Mode"
+msgstr "Barve"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 #, fuzzy
@@ -6252,14 +6594,14 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr ""
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 msgstr ""
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 #, fuzzy
 msgid "Could not apply USB settings"
 msgstr ""
@@ -6420,11 +6762,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -6596,11 +6933,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr ""
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -6616,7 +6953,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr ""
@@ -6681,102 +7018,107 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Shranjevanje kazala �e ni podprto"
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Prena�anje ustavljeno."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index b1f8f72a9..f894a9a7b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2003-01-09 08:13+0100\n"
 "Last-Translator: Stefan Bj�rnelund <stefanb@update.uu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -357,8 +357,8 @@ msgstr "Kunde inte skapa \\DCIM-katalogen."
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
@@ -395,8 +395,8 @@ msgstr "S�tt kamerans datum till datorns datum"
 msgid "Firmware revision (readonly)"
 msgstr "Fastvarurevision (skrivskyddad)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "Kraft (skrivskyddad)"
 
@@ -532,7 +532,7 @@ msgid "Communication error 1"
 msgstr "Kommunikationsfel 1"
 
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Ingen svar fr�n kamera"
 
@@ -935,14 +935,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -955,7 +955,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1026,8 +1026,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blixt"
@@ -1149,7 +1149,7 @@ msgid "Problem reading image from flash"
 msgstr "Problem med att l�sa bild fr�n flashminne"
 
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "Slut p� minne"
 
@@ -1192,19 +1192,19 @@ msgstr "Exponeringsm�tning"
 msgid "Automatic flash on capture"
 msgstr ""
 
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "Problem med att �ppna port"
 
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "Problem med att nollst�lla kamera"
 
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "Problem att s�tta kamerans kommunikationshastighet"
 
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "Ser ut som ett modem, inte en kamera"
 
@@ -1265,7 +1265,7 @@ msgstr ""
 msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "Kameran skickade bara %i byte(s), men vi beh�ver minst %i."
 
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "Kunde inte kontakta kameran."
 
@@ -1308,7 +1308,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kameran skickade ov�ntad byte 0x%02x."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Nerladdning..."
@@ -1400,17 +1400,17 @@ msgstr ""
 "v�nligen tillhandah�llen av Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "Kunde inte nollst�lla kameran.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1641,20 +1641,20 @@ msgid "High (good quality)"
 msgstr "H�g (god kvalit�)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "Foto"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1696,30 +1696,32 @@ msgstr "Exponerings kompensation"
 #: 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "Auto"
 
@@ -1733,7 +1735,8 @@ msgid "Force"
 msgstr "Tvinga"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ingen"
@@ -1750,13 +1753,13 @@ msgstr "R�da �gon reduktion"
 #: 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1772,14 +1775,14 @@ msgstr "P�"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2501,7 +2504,10 @@ msgstr "Sj�lvutl�sare (endast n�sta bild)"
 
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2577,6 +2583,7 @@ msgid "No answer from the camera."
 msgstr "Ingen svar fr�n kamera"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2589,6 +2596,7 @@ msgid "Medium"
 msgstr "Medium"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2632,7 +2640,7 @@ msgstr "Av"
 msgid "Day-lt"
 msgstr "Dagsljus"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -2666,7 +2674,7 @@ msgid "Black and White"
 msgstr "Svartvit"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -2708,13 +2716,13 @@ msgstr ""
 msgid "AC"
 msgstr ""
 
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "Spela upp"
 
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -2773,15 +2781,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "Det finns inget att summera f�r denna kamera."
-
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "Ingen manual"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -2841,7 +2841,7 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -2852,7 +2852,7 @@ msgstr ""
 "H�rdvaru-revision:\t%s\n"
 "Fastvaru-revision:\t%s\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -2879,61 +2879,61 @@ msgstr ""
 "Kort-ID:\t\t%d\n"
 "Blixtl�ge:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "Fj�rr"
 
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "Lokal"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "Ja"
 
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "Nej"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
 msgid "Standard"
 msgstr "Standard"
 
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "Automatisk\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "Alltid blixt\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "Aldrig blixt\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "Ogiltigt v�rde ( %d )\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -2950,73 +2950,73 @@ msgstr ""
 "Blixten laddas:\t\t%s\n"
 "Linsstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "Inte full"
 
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "Full"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "Upptagen"
 
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "Ledig"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "Laddar"
 
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "Klar"
 
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "Normal\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "Linsriktningen �verensst�mmer inte med blixtljuset\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "Linsen �r inte ansluten\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "Felaktigt v�rde f�r linsstatus %d\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "Kortstatus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "Skrivskyddad"
 
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "Ol�mpligt kort"
 
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "D�ligt v�rde f�r kort status %d"
 
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3138,7 +3138,7 @@ msgstr ""
 "Filstorleken �r %i bytes. Den st�rsta fil som kan laddas upp �r: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Uppladdning..."
 
@@ -3316,13 +3316,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "Bildkvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "Bildstorlek"
 
@@ -3338,11 +3338,11 @@ msgstr "Automatisk avst�ngning (minuter)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "fin"
 
@@ -3350,21 +3350,21 @@ msgstr "fin"
 msgid "superfine"
 msgstr "extrafin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "p�"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "av"
@@ -3477,250 +3477,260 @@ msgstr ""
 "Auto kraft av: %i minuter\n"
 "Kraftk�lla: %s"
 
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den beg�rda porttypen (%i) st�ds ej av denna drivrutin."
 
-#: camlibs/ptp2/library.c:147
+#: 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 odefinierat fel"
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP sessionen inte �ppen"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "PTP operationen st�ds ej"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter st�ds ej"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ofullst�ndig �verf�ring"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhet egenskap st�ds ej"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP �tkomst nekad"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen minibild tillg�nglig"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP sj�lvtest misslyckades"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP lagring inte tillg�nglig"
 
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation av format st�ds ej"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP ok�nd tillvekarkod"
 
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ogiltigt f�r�ndra objekt"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter v�rde"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP sessionen redan �ppen"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare st�ds ej"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "PTP EK filnamn kr�vs"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollfel, data f�r�ldrat"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollfel, svar f�rv�ntat"
 
-#: camlibs/ptp2/library.c:916
-#, fuzzy
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
+msgstr ""
 
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Din kamera st�djer inte �ndring av filnamn."
 
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Din kamera st�djer inte �ndring av filnamn."
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Din kamera st�djer inte �ndring av filnamn."
 
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Din kamera st�djer inte �ndring av filnamn."
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Din kamera st�djer inte �ndring av filnamn."
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "redo"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Unknown"
 msgstr "%i (ok�nd)"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3730,457 +3740,505 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Datumformat"
 
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Datumformat"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fil uppl�sning"
 
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fil uppl�sning"
 
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Laddar upp fil..."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ok�nd  (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generellt"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "Klar"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ok�nd filtyp %i."
 
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "FEL: ov�ntad pakettyp."
 
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 #, fuzzy
 msgid "Daylight"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
 msgid "Fluorescent"
 msgstr "Lysr�r"
 
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
 msgid "Tungsten"
 msgstr "Gl�dlampa"
 
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "Mulet"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "Portugiska"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "extrafin"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "Kommando ordnings fel."
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "Bild"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "B�st"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "Sj�lvutl�sare"
 
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Fj�rr"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "Kontrast-"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "Foto"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "Zoom"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "H�g"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "Blixt L�ge"
 
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "Blixt"
 
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "R�da-�gon Reduktion"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "R�da �gon reduktion"
 
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "externt"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4188,229 +4246,640 @@ msgstr "Dagsljus"
 msgid "Slow Sync"
 msgstr "L�ngsam Synk"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "R�da-�gon Reduktion"
 
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/library.c:2880
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
 #, fuzzy
-msgid "Long distance"
+msgid "AE/AF Lock"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
 #, fuzzy
-msgid "Automatic Macro"
-msgstr "Automatisk\n"
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
 #, fuzzy
-msgid "Fluorescent H"
-msgstr "Lysr�r"
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
 
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3184
+#, fuzzy
+msgid "1/15"
+msgstr "115200"
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "Laddar"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "Katalogen finns"
+
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Annan"
 
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "Medium"
+
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "Medium"
+
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "Kontrast-"
+
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "Medium"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3242
+#, fuzzy
+msgid "Long distance"
+msgstr "Fokusl�ge"
+
+#: camlibs/ptp2/library.c:3252
+#, fuzzy
+msgid "Automatic Macro"
+msgstr "Automatisk\n"
+
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3265
+#, fuzzy
+msgid "Fluorescent H"
+msgstr "Lysr�r"
+
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Laddar"
 
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "EJ Blixt"
+
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "redo"
+
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "Blixt L�ge"
+
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "Exponeringsm�tning"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internt"
 
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "Inget kort"
 
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Kamera OK.\n"
 
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Fastvaru-revision: %d.%d\n"
 
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera"
 
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-l�ge"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "Auto Av tid"
+
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "Auto Av tid"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "Bildinst�llningar"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO hastighet"
 
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "F�rgl�ge"
+
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Auto"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Blixt L�ge"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED-l�ge"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Inspelningsl�ge"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Punktm�tningsl�ge"
 
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Bl�ndare"
 
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fokuseringsfel."
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Punktm�tningsl�ge"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "Fokusl�ge"
+
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "Exponering"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "Blixtinst�llning"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "Bildstorlek"
+
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "Kamerainst�llningar"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "Blixt L�ge"
+
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "Fokusl�ge"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Exponeringskompensation"
+
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Auto, r�da-�gon reduktion"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "Sj�lvutl�sningstid"
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "Slutartid sekunder (0 auto)"
+
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "Datum & Tid"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "Laddar"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Exponeringskompensation"
+
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "Konfiguration"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "Bildjustering"
+
+#: camlibs/ptp2/library.c:3677 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
@@ -4418,265 +4887,270 @@ msgstr "Fokusl�ge"
 msgid "Camera Settings"
 msgstr "Kamerainst�llningar"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "Kamerainst�llningar"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Bildinst�llningar"
 
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4809
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "St�nger av kameran"
 
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP endast implementerat f�r USB kamror."
 
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP endast implementerat f�r USB kamror."
-
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 #, fuzzy
 msgid "PTP: Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 #, fuzzy
 msgid "PTP: OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 #, fuzzy
 msgid "PTP: General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 #, fuzzy
 msgid "PTP: Session Not Open"
 msgstr "PTP sessionen inte �ppen"
 
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "PTP operationen st�ds ej"
 
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP parameter st�ds ej"
 
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 #, fuzzy
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP ofullst�ndig �verf�ring"
 
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 #, fuzzy
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 #, fuzzy
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP enhet egenskap st�ds ej"
 
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 #, fuzzy
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 #, fuzzy
 msgid "PTP: Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 #, fuzzy
 msgid "PTP: Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 #, fuzzy
 msgid "PTP: Access Denied"
 msgstr "PTP �tkomst nekad"
 
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 #, fuzzy
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP ingen minibild tillg�nglig"
 
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 #, fuzzy
 msgid "PTP: Self Test Failed"
 msgstr "PTP sj�lvtest misslyckades"
 
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 #, fuzzy
 msgid "PTP: Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "PTP lagring inte tillg�nglig"
 
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 #, fuzzy
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP specifikation av format st�ds ej"
 
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 #, fuzzy
 msgid "PTP: No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 #, fuzzy
 msgid "PTP: Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 #, fuzzy
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP ok�nd tillvekarkod"
 
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 #, fuzzy
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 #, fuzzy
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP ogiltigt f�r�ndra objekt"
 
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 #, fuzzy
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 #, fuzzy
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter v�rde"
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 #, fuzzy
 msgid "PTP: Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 #, fuzzy
 msgid "PTP: Session Already Opened"
 msgstr "PTP sessionen redan �ppen"
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 #, fuzzy
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare st�ds ej"
 
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 #, fuzzy
 msgid "PTP: EK Filename Required"
 msgstr "PTP EK filnamn kr�vs"
 
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 #, fuzzy
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 #, fuzzy
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 #, fuzzy
 msgid "PTP: I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 #, fuzzy
 msgid "PTP: Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 #, fuzzy
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP protokollfel, data f�r�ldrat"
 
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 #, fuzzy
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP protokollfel, svar f�rv�ntat"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sBatteritid: %i\n"
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Operationsl�ge."
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Kompression"
 
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -4685,780 +5159,672 @@ msgstr "Kompression"
 msgid "White Balance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 #, fuzzy
 msgid "Date Time"
 msgstr "Datum & Tid"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Digital Zoom"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Datumformat"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Power Saving"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 #, fuzzy
 msgid "UI Language"
 msgstr "Spr�k"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Bildkvalitet"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "Digital Zoom"
 
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "Laddar"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "Exponeringskompensation"
-
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "F�rgl�ge"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "Bildjustering"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "Fokusl�ge"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "Auto"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO hastighet"
 
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "Exponering"
-
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Auto Av tid"
 
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Sj�lvutl�sningstid"
 
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "Auto Av tid"
-
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "Slutartid sekunder (0 auto)"
-
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Alltid blixt\n"
 
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "Auto, r�da-�gon reduktion"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Auto, r�da-�gon reduktion"
 
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Punktm�tningsl�ge"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Nuvarande l�ge: Uppspelningsl�ge\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Bildinst�llningar"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "Kamerainst�llningar"
 
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD-l�ge"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "Bildstorlek"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "Blixt L�ge"
-
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "Blixtinst�llning"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Exponeringskompensation"
-
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "Datum & Tid"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "Blixt L�ge"
 
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "CompactFlash kort"
 
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "Linsl�ge"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "H�g"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Bl�ndande"
 
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
 msgid "Red-eye Reduction"
 msgstr "R�da-�gon Reduktion"
 
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "Blixt L�ge"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "Kommando ordnings fel."
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "Foto"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "Zoom"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "H�g"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ok�nd  (0x%02x)"
@@ -5710,7 +6076,7 @@ msgstr "Inspelningsl�ge"
 msgid "Compression"
 msgstr "Kompression"
 
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "Hastighet %i st�ds ej!"
@@ -5820,6 +6186,12 @@ msgstr "Datum och Tid (GMT)"
 msgid "Aperature Settings"
 msgstr "Bildinst�llningar"
 
+#: 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
+msgid "Color Mode"
+msgstr "F�rgl�ge"
+
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -6672,7 +7044,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (ok�nd)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -6682,7 +7054,7 @@ msgstr ""
 "Vincent Sanders <vince@kyllikki.org>\n"
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "Kunde inte applicera USB inst�llningar"
 
@@ -6869,12 +7241,6 @@ msgstr ""
 "v�nligen tillhandah�llen av Mustek.\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -7052,11 +7418,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z �r USB enbart"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -7072,7 +7438,7 @@ msgstr ""
 msgid "Loading camera drivers from '%s'..."
 msgstr "Laddar kamera-drivrutiner fr�n '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Kunde inte finna n�gon drivrutin f�r '%s'"
@@ -7132,33 +7498,38 @@ msgstr "Denna kamera kan inte ta bilder."
 msgid "This camera can not capture previews."
 msgstr "Denna kamera kan inte ta f�rgranskningsbilder."
 
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "Kamera st�djer inte hastigheten %i."
+
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "S�kv�gen '%s' �r inte absolut."
 
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Kunde inte l�gga till mappen '%s' eftersom denna mapp redan existerar."
 
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Kunde inte hitta mapp '%s'"
 
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Mapp '%s' inneh�ller inte n�gon mapp '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Kunde inte l�gga till '%s' till mapp '%s' eftersom denna fil redan existerar."
 
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -7167,23 +7538,23 @@ msgstr ""
 "Du har f�rs�kt att radera '%s' fr�n mappen '%s', men filsystemet st�djer "
 "inte radering av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 "Det finns fortfarande undermappar i mappen '%s' som du f�rs�ker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Det finns fortfarande filer i mappen '%s' som du f�rs�ker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet st�djer inte uppladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -7191,40 +7562,40 @@ msgid ""
 msgstr ""
 "Mappen '%s' inneh�ller endast %i filer, men du beg�rde en fil med nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunde inte hitta filen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet st�djer inte nerladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ok�nd filtyp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Laddar ner '%s' fr�n mappen '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "Filsystemet har inget st�d f�r att h�mta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "Filsystemet har inget st�d f�r att s�tta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivskyddade filattribut som bredd och h�jd kan inte �ndras."
 
@@ -7281,6 +7652,27 @@ msgstr "Ok�nt kamerabiblioteksfel"
 msgid "Unknown error"
 msgstr "Ok�nt fel"
 
+#, fuzzy
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "Det finns inget att summera f�r denna kamera."
+
+#~ msgid "No manual"
+#~ msgstr "Ingen manual"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr ""
+#~ "Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
+
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP endast implementerat f�r USB kamror."
+
 #~ msgid "Could not follow the link '%s' (%m)."
 #~ msgstr "Kunde inte f�lja l�nken '%s' (%m)."
 
@@ -7492,9 +7884,6 @@ msgstr "Ok�nt fel"
 #~ msgid "57600"
 #~ msgstr "57600"
 
-#~ msgid "115200"
-#~ msgstr "115200"
-
 #~ msgid "VGA (640x480)"
 #~ msgstr "VGA (640x480)"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 30841f919..ed4bf34d3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-03-14 20:29+0100\n"
+"POT-Creation-Date: 2006-04-21 23:06+0200\n"
 "PO-Revision-Date: 2002-11-21 11:02+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -387,8 +387,8 @@ msgid "Could not create destination directory."
 msgstr "无法创建目标目录。"
 
 # camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
-#: camlibs/ptp2/library.c:3322
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3780
 msgid "Camera and Driver Configuration"
 msgstr "相机及驱动器配置"
 
@@ -435,8 +435,8 @@ msgid "Firmware revision (readonly)"
 msgstr "固件版本 (只读)"
 
 # camlibs/canon/library.c:863
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3298
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3727
+#: camlibs/ptp2/library.c:3756
 msgid "Power (readonly)"
 msgstr "电源 (只读)"
 
@@ -598,7 +598,7 @@ msgstr "通讯错误 1"
 # camlibs/canon/serial.c:1227 camlibs/canon/serial.c:1231
 # camlibs/dimera/dimera3500.c:970
 #: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
-#: camlibs/dimera/dimera3500.c:921
+#: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "相机无应答"
 
@@ -1027,14 +1027,14 @@ msgid ""
 "Theodore Kilgore <kilgota@auburn.edu>\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:105
+#: camlibs/digigr8/library.c:106
 #, c-format
 msgid ""
 "Your USB camera has an SQ905C chipset.\n"
 "The total number of pictures in it is %i\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:118
+#: camlibs/digigr8/library.c:119
 msgid ""
 "For cameras with SQ905C Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -1047,7 +1047,7 @@ msgid ""
 "is guaranteed to download as pure junk.\n"
 msgstr ""
 
-#: camlibs/digigr8/library.c:136
+#: camlibs/digigr8/library.c:137
 msgid ""
 "sq905C generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -1129,8 +1129,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:2324
-#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2489
+#: camlibs/ptp2/ptp.c:2502 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "闪光灯"
@@ -1274,7 +1274,7 @@ msgstr "从闪存读取图像出问题"
 # camlibs/dimera/dimera3500.c:684 camlibs/dimera/dimera3500.c:850
 # camlibs/dimera/dimera3500.c:918
 #: camlibs/dimera/dimera3500.c:550 camlibs/dimera/dimera3500.c:716
-#: camlibs/dimera/dimera3500.c:860
+#: camlibs/dimera/dimera3500.c:866
 msgid "Out of memory"
 msgstr "内存耗尽"
 
@@ -1325,22 +1325,22 @@ msgid "Automatic flash on capture"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:937
-#: camlibs/dimera/dimera3500.c:888
+#: camlibs/dimera/dimera3500.c:894
 msgid "Problem opening port"
 msgstr "打开端口出问题"
 
 # camlibs/dimera/dimera3500.c:947
-#: camlibs/dimera/dimera3500.c:898
+#: camlibs/dimera/dimera3500.c:904
 msgid "Problem resetting camera"
 msgstr "重置相机出问题"
 
 # camlibs/dimera/dimera3500.c:957
-#: camlibs/dimera/dimera3500.c:908
+#: camlibs/dimera/dimera3500.c:914
 msgid "Problem setting camera communication speed"
 msgstr "设置相机通讯速度出问题"
 
 # camlibs/dimera/dimera3500.c:976
-#: camlibs/dimera/dimera3500.c:927
+#: camlibs/dimera/dimera3500.c:933
 msgid "Looks like a modem, not a camera"
 msgstr "看起来象调制解调器，而不象相机"
 
@@ -1411,7 +1411,7 @@ msgid "The camera sent only %i byte(s), but we need at least %i."
 msgstr "相机只发送 %i 个字节，但我们至少需要 %i 个。"
 
 # camlibs/ricoh/library.c:242
-#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:551
+#: camlibs/fuji/fuji.c:126 camlibs/ricoh/library.c:559
 msgid "Could not contact camera."
 msgstr "无法检测到任何相机。"
 
@@ -1459,7 +1459,7 @@ msgstr "相机发送了意外的字节 0x%02x。"
 # camlibs/konica/lowlevel.c:382 camlibs/polaroid/pdc700.c:314
 # camlibs/sierra/library.c:989
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:720
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "正在下载..."
@@ -1557,17 +1557,17 @@ msgstr ""
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#: camlibs/gsmart300/library.c:207 camlibs/spca50x/library.c:579
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
 
 # libgphoto2/gphoto2-camera.c:662
-#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:628
+#: camlibs/gsmart300/library.c:224 camlibs/spca50x/library.c:636
 msgid "Could not reset camera.\n"
 msgstr "无法重置相机。\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:516
+#: camlibs/gsmart300/library.c:343 camlibs/spca50x/library.c:516
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1828,14 +1828,14 @@ msgstr "高 (普通质量)"
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3595
 msgid "Capture"
 msgstr "光圈"
 
 # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
-#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/ptp.c:2169 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "缩放"
@@ -1844,8 +1844,8 @@ msgstr "缩放"
 # camlibs/sierra/sierra.c:1254 camlibs/sierra/sierra.c:1450
 # camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
-#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2953
+#: camlibs/ptp2/library.c:3241 camlibs/ptp2/ptp.c:2536
 #: 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
@@ -1899,30 +1899,32 @@ 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:2552 camlibs/ptp2/library.c:2573
-#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
-#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
-#: camlibs/ptp2/ptp.c:2389 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 camlibs/sierra/nikon-desc.c:202
-#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
-#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
-#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
-#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
-#: camlibs/sierra/olympus-desc.c:394 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/ptp2/library.c:2797 camlibs/ptp2/library.c:2818
+#: camlibs/ptp2/library.c:2950 camlibs/ptp2/library.c:3130
+#: camlibs/ptp2/library.c:3218 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2498 camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2549 camlibs/ptp2/ptp.c:2590 camlibs/ptp2/ptp.c:2598
+#: 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
+#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
+#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
+#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
+#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
+#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
+#: 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
 msgid "Auto"
 msgstr "自动"
 
@@ -1940,7 +1942,8 @@ msgstr "强制"
 
 # frontends/command-line/actions.c:168
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
+#: camlibs/ptp2/library.c:1960 camlibs/ptp2/library.c:1964
+#: camlibs/ptp2/library.c:3224 camlibs/ptp2/ptp.c:2596
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "无"
@@ -1961,13 +1964,13 @@ 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:2276
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
-#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
-#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2441
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2455
+#: camlibs/ptp2/library.c:2548 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2562 camlibs/ptp2/library.c:2581
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2595
+#: camlibs/ptp2/library.c:3132 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2551 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
@@ -1991,14 +1994,14 @@ msgstr "开"
 #: 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:2277
-#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
-#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
-#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
-#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
-#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
-#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
-#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2442
+#: camlibs/ptp2/library.c:2443 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/library.c:2582
+#: camlibs/ptp2/library.c:2583 camlibs/ptp2/library.c:2599
+#: camlibs/ptp2/library.c:3131 camlibs/ptp2/library.c:3240
+#: camlibs/ptp2/library.c:3291 camlibs/ptp2/ptp.c:2447 camlibs/ptp2/ptp.c:2448
+#: camlibs/ptp2/ptp.c:2550 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
@@ -2836,7 +2839,10 @@ msgstr "自动定时 (仅用于下一张照片)"
 # camlibs/sierra/sierra.c:1668
 #: 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:405 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3219 camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3326 camlibs/ptp2/ptp.c:2581 camlibs/ptp2/ptp.c:2591
+#: camlibs/ptp2/ptp.c:2599 camlibs/ptp2/ptp.c:2606 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
@@ -2922,6 +2928,7 @@ msgstr "相机无应答"
 # camlibs/sierra/sierra.c:828 camlibs/sierra/sierra.c:835
 # camlibs/sierra/sierra.c:1152
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
+#: camlibs/ptp2/library.c:3220 camlibs/ptp2/ptp.c:2592
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2939,6 +2946,7 @@ msgstr "中"
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
+#: camlibs/ptp2/library.c:3223 camlibs/ptp2/ptp.c:2595
 #: 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
@@ -2995,7 +3003,7 @@ msgstr "关"
 msgid "Day-lt"
 msgstr "日光"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:2124
 msgid "Sharpness"
 msgstr ""
 
@@ -3039,7 +3047,7 @@ msgstr "黑白"
 # camlibs/sierra/sierra.c:858 camlibs/sierra/sierra.c:867
 # camlibs/sierra/sierra.c:1173
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ptp2/library.c:3024 camlibs/ptp2/library.c:3295
 #: 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
@@ -3085,14 +3093,14 @@ msgid "AC"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:361
 #, c-format
 msgid "Play"
 msgstr "播放"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
+#: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:301
 #: camlibs/sierra/nikon-desc.c:360
 #, c-format
 msgid "Record"
@@ -3151,23 +3159,7 @@ msgid ""
 "Thanks to use GPhoto2 and UNIX/Linux Operating systems.\n"
 msgstr ""
 
-#: camlibs/largan/lmini/largan.c:268
-msgid "There is nothing to summarize for this camera."
-msgstr "对这个相机来说没有概要。"
-
-# camlibs/konica/library.c:800 camlibs/konica/library.c:807
-# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
-# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
-# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
-# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
-# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
-# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
-# camlibs/sierra/sierra.c:1668
-#: camlibs/largan/lmini/largan.c:280
-msgid "No manual"
-msgstr "无手册"
-
-#: camlibs/largan/lmini/largan.c:288
+#: camlibs/largan/lmini/largan.c:228
 msgid ""
 "Largan driver\n"
 "Hubert Figuiere <hfiguiere@teaser.fr>\n"
@@ -3228,7 +3220,7 @@ msgid ""
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:272
-#: camlibs/minolta/dimagev/dimagev.c:270
+#: camlibs/minolta/dimagev/dimagev.c:265
 #, c-format
 msgid ""
 "Model:\t\t\tMinolta Dimage V (%s)\n"
@@ -3240,7 +3232,7 @@ msgstr ""
 "固件版本号：\t%s\n"
 
 # camlibs/minolta/dimagev/dimagev.c:287
-#: camlibs/minolta/dimagev/dimagev.c:285
+#: camlibs/minolta/dimagev/dimagev.c:280
 #, c-format
 msgid ""
 "Host Mode:\t\t%s\n"
@@ -3268,37 +3260,37 @@ msgstr ""
 "闪光灯模式：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
-#: camlibs/ptp2/ptp.c:2383
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2966
+#: camlibs/ptp2/ptp.c:2543
 msgid "Remote"
 msgstr "远程"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:297
+#: camlibs/minolta/dimagev/dimagev.c:292
 msgid "Local"
 msgstr "本地"
 
 # camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
 # camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
 # frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "Yes"
 msgstr "是"
 
 # camlibs/minolta/dimagev/dimagev.c:300 camlibs/minolta/dimagev/dimagev.c:302
 # camlibs/minolta/dimagev/dimagev.c:306 camlibs/minolta/dimagev/dimagev.c:309
 # frontends/command-line/gphoto2-cmd-config.c:372
-#: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
-#: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:2295
+#: 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:2449
 msgid "No"
 msgstr "否"
 
 # camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
 # camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
+#: 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
 msgid "Fine"
@@ -3308,7 +3300,7 @@ msgstr "精细"
 # camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
 # camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
 # camlibs/sierra/sierra.c:1680
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3022
 #: 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
@@ -3316,31 +3308,31 @@ msgid "Standard"
 msgstr "标准"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/minolta/dimagev/dimagev.c:321
+#: camlibs/minolta/dimagev/dimagev.c:316
 #, c-format
 msgid "Automatic\n"
 msgstr "自动\n"
 
 # camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/minolta/dimagev/dimagev.c:329
+#: camlibs/minolta/dimagev/dimagev.c:324
 #, c-format
 msgid "Force Flash\n"
 msgstr "强制闪光\n"
 
 # camlibs/minolta/dimagev/dimagev.c:339
-#: camlibs/minolta/dimagev/dimagev.c:337
+#: camlibs/minolta/dimagev/dimagev.c:332
 #, c-format
 msgid "Prohibit Flash\n"
 msgstr "禁止闪光\n"
 
 # camlibs/minolta/dimagev/dimagev.c:347
-#: camlibs/minolta/dimagev/dimagev.c:345
+#: camlibs/minolta/dimagev/dimagev.c:340
 #, c-format
 msgid "Invalid Value ( %d )\n"
 msgstr "非法值 ( %d )\n"
 
 # camlibs/minolta/dimagev/dimagev.c:361
-#: camlibs/minolta/dimagev/dimagev.c:359
+#: camlibs/minolta/dimagev/dimagev.c:354
 #, c-format
 msgid ""
 "Battery Level:\t\t%s\n"
@@ -3358,87 +3350,87 @@ msgstr ""
 "镜头状态：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:367
-#: camlibs/minolta/dimagev/dimagev.c:365
+#: camlibs/minolta/dimagev/dimagev.c:360
 msgid "Not Full"
 msgstr "未满"
 
 # camlibs/minolta/dimagev/dimagev.c:367 camlibs/minolta/dimagev/dimagev.c:410
-#: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2397
+#: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
+#: camlibs/ptp2/library.c:2727 camlibs/ptp2/ptp.c:2558
 #, c-format
 msgid "Full"
 msgstr "满"
 
 # camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Busy"
 msgstr "忙"
 
 # camlibs/minolta/dimagev/dimagev.c:370
-#: camlibs/minolta/dimagev/dimagev.c:368
+#: camlibs/minolta/dimagev/dimagev.c:363
 msgid "Idle"
 msgstr "闲"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Charging"
 msgstr "正在充电"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/minolta/dimagev/dimagev.c:369
+#: camlibs/minolta/dimagev/dimagev.c:364
 msgid "Ready"
 msgstr "就绪"
 
 # camlibs/minolta/dimagev/dimagev.c:382
-#: camlibs/minolta/dimagev/dimagev.c:380
+#: camlibs/minolta/dimagev/dimagev.c:375
 #, c-format
 msgid "Normal\n"
 msgstr "普通\n"
 
 # camlibs/minolta/dimagev/dimagev.c:385
-#: camlibs/minolta/dimagev/dimagev.c:383
+#: camlibs/minolta/dimagev/dimagev.c:378
 #, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr "镜头方向与闪光灯方向不匹配\n"
 
 # camlibs/minolta/dimagev/dimagev.c:388
-#: camlibs/minolta/dimagev/dimagev.c:386
+#: camlibs/minolta/dimagev/dimagev.c:381
 #, c-format
 msgid "Lens is not connected\n"
 msgstr "镜头未连接\n"
 
 # camlibs/minolta/dimagev/dimagev.c:391
-#: camlibs/minolta/dimagev/dimagev.c:389
+#: camlibs/minolta/dimagev/dimagev.c:384
 #, c-format
 msgid "Bad value for lens status %d\n"
 msgstr "错误的镜头状态值 %d\n"
 
 # camlibs/minolta/dimagev/dimagev.c:400
-#: camlibs/minolta/dimagev/dimagev.c:398
+#: camlibs/minolta/dimagev/dimagev.c:393
 #, c-format
 msgid "Card Status:\t\t"
 msgstr "卡状态：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:413
-#: camlibs/minolta/dimagev/dimagev.c:411
+#: camlibs/minolta/dimagev/dimagev.c:406
 #, c-format
 msgid "Write-protected"
 msgstr "写保护"
 
 # camlibs/minolta/dimagev/dimagev.c:416
-#: camlibs/minolta/dimagev/dimagev.c:414
+#: camlibs/minolta/dimagev/dimagev.c:409
 #, c-format
 msgid "Unsuitable card"
 msgstr "不适当的卡"
 
 # camlibs/minolta/dimagev/dimagev.c:419
-#: camlibs/minolta/dimagev/dimagev.c:417
+#: camlibs/minolta/dimagev/dimagev.c:412
 #, c-format
 msgid "Bade value for card status %d"
 msgstr "错误的卡状态值 %d"
 
 # camlibs/minolta/dimagev/dimagev.c:438
-#: camlibs/minolta/dimagev/dimagev.c:436
+#: camlibs/minolta/dimagev/dimagev.c:431
 #, c-format
 msgid ""
 "Minolta Dimage V Camera Library\n"
@@ -3570,7 +3562,7 @@ msgstr "文件大小为 %i 字节。可以上载的文件最大为：%i 字节�
 
 # camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:763 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "正在上载..."
 
@@ -3756,14 +3748,14 @@ msgid ""
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3601
+#: camlibs/ptp2/library.c:3602 camlibs/ptp2/ptp.c:2157
 msgid "Image Quality"
 msgstr "图像质量"
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3603
+#: camlibs/ptp2/library.c:3604 camlibs/ptp2/ptp.c:2104 camlibs/ptp2/ptp.c:2158
 msgid "Image Size"
 msgstr "图像大小"
 
@@ -3783,12 +3775,12 @@ msgid "Information"
 msgstr "信息"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2702
 msgid "normal"
 msgstr "普通"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2703
 msgid "fine"
 msgstr "精细"
 
@@ -3799,8 +3791,8 @@ msgstr "超精细"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/sierra/sierra.c:1368
 # camlibs/sierra/sierra.c:1382 camlibs/sierra/sierra.c:1617
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
-#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2712
+#: camlibs/ptp2/library.c:3302 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
@@ -3808,14 +3800,14 @@ msgstr "自动"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2713 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "开"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2711 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "关"
@@ -3942,287 +3934,296 @@ msgstr ""
 "电源来源：%s"
 
 # camlibs/polaroid/pdc700.c:1229
-#: camlibs/polaroid/pdc700.c:1229
+#: camlibs/polaroid/pdc700.c:1233
 #, c-format
 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/ptp/library.c:90
-#: camlibs/ptp2/library.c:147
+#: camlibs/ptp2/library.c:148
 msgid "PTP Undefined Error"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:91
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr "PTP OK！"
 
 # camlibs/ptp/library.c:92
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr "PTP 通用错误"
 
 # camlibs/ptp/library.c:93
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr "PTP 会话未打开"
 
 # camlibs/ptp/library.c:94
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr "非法的 PTP 传输 ID"
 
 # camlibs/ptp/library.c:95
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr "不支持的 PTP 操作"
 
 # camlibs/ptp/library.c:96
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:154
 msgid "PTP Parameter Not Supported"
 msgstr "不支持的 PTP 参数"
 
 # camlibs/ptp/library.c:97
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr "未完成的 PTP 传输"
 
 # camlibs/ptp/library.c:98
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr "非法的 PTP 存储 ID"
 
 # camlibs/ptp/library.c:99
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr "非法的 PTP 对象句柄"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/ptp/library.c:101
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr "非法的 PTP 对象格式代码"
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr "PTP 存储已满"
 
 # camlibs/ptp/library.c:103
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr "PTP 对象已写保护"
 
 # camlibs/ptp/library.c:104
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr "只读的 PTP 存储"
 
 # camlibs/ptp/library.c:105
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr "PTP 访问遭拒绝"
 
 # camlibs/ptp/library.c:106
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr "不存在 PTP 缩略图"
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr "PTP 自检失败"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr "PTP 部分删除"
 
 # camlibs/ptp/library.c:109
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:167
 msgid "PTP Store Not Available"
 msgstr "PTP 存储不可用"
 
 # camlibs/ptp/library.c:111
-#: camlibs/ptp2/library.c:168
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr "不支持的 PTP 格式规范"
 
 # camlibs/ptp/library.c:112
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr "没有合法的 PTP 对象信息"
 
 # camlibs/ptp/library.c:113
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr "非法的 PTP 代码格式"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr "未知的 PTP 厂家代码"
 
 # camlibs/ptp/library.c:116
-#: camlibs/ptp2/library.c:173
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr "PTP 捕获已终止"
 
 # camlibs/ptp/library.c:117
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:175
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP 设备总线"
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr "非法的 PTP 父对象"
 
 # camlibs/ptp/library.c:119
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr "非法的 PTP 设备属性格式"
 
 # camlibs/ptp/library.c:120
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr "非法的 PTP 设备属性值"
 
 # camlibs/ptp/library.c:121
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr "非法的 PTP 参数"
 
 # camlibs/ptp/library.c:122
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr "PTP 会话已打开"
 
 # camlibs/ptp/library.c:123
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:181
 msgid "PTP Transaction Canceled"
 msgstr "PTP 传输已取消"
 
 # camlibs/ptp/library.c:125
-#: camlibs/ptp2/library.c:182
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "不支持的 PTP 目标规范"
 
 # camlibs/ptp/library.c:126
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr "需要 PTP EK 文件名"
 
 # camlibs/ptp/library.c:127
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK 文件名冲突"
 
 # camlibs/ptp/library.c:128
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr "非法的 PTP EK 文件名"
 
 # camlibs/ptp/library.c:130
-#: camlibs/ptp2/library.c:187
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr "PTP I/O 错误"
 
 # camlibs/ptp/library.c:131
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr "PTP 错误：错误的参数"
 
 # camlibs/ptp/library.c:132
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr "PTP 协议错误，需要数据"
 
 # camlibs/ptp/library.c:133
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr "PTP 协议错误，需要响应"
 
-# camlibs/ptp/library.c:422
-#: camlibs/ptp2/library.c:916
-#, fuzzy
+#: camlibs/ptp2/library.c:947
 msgid ""
 "PTP2 driver\n"
-"(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\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 "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
+msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
+#: camlibs/ptp2/library.c:1023 camlibs/ptp2/library.c:1112
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "您的相机不支持文件改名。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1109
+#: camlibs/ptp2/library.c:1146
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:1114
+#: camlibs/ptp2/library.c:1151
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1119
+#: camlibs/ptp2/library.c:1156
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1129
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1231
+#: camlibs/ptp2/library.c:1269
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "您的相机不支持文件改名。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1292
+#: camlibs/ptp2/library.c:1355
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:1306
+#: camlibs/ptp2/library.c:1369
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1400
+#: camlibs/ptp2/library.c:1463
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "您的相机不支持文件改名。"
 
-#: camlibs/ptp2/library.c:1448
+#: camlibs/ptp2/library.c:1511
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1455
+#: camlibs/ptp2/library.c:1518
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "read only"
 msgstr "就绪"
 
-#: camlibs/ptp2/library.c:1548
+#: camlibs/ptp2/library.c:1681
 msgid "readwrite"
 msgstr ""
 
@@ -4234,13 +4235,13 @@ msgstr ""
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
-#: camlibs/ptp2/ptp.c:2420
+#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1684
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Unknown"
 msgstr "%i (未知)"
 
-#: camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/library.c:1812
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -4251,7 +4252,7 @@ msgid ""
 msgstr ""
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:1697
+#: camlibs/ptp2/library.c:1830
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4259,29 +4260,29 @@ msgid ""
 msgstr "日期格式"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:1711
+#: camlibs/ptp2/library.c:1844
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "日期格式"
 
-#: camlibs/ptp2/library.c:1727
+#: camlibs/ptp2/library.c:1860
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1743
+#: camlibs/ptp2/library.c:1876
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1760
+#: camlibs/ptp2/library.c:1893
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1764
+#: camlibs/ptp2/library.c:1897
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
@@ -4289,7 +4290,7 @@ msgstr ""
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/library.c:1767
+#: camlibs/ptp2/library.c:1900
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "文件分辨率"
@@ -4297,169 +4298,169 @@ msgstr "文件分辨率"
 # camlibs/konica/library.c:684 camlibs/konica/library.c:896
 # camlibs/sierra/sierra.c:786 camlibs/sierra/sierra.c:1117
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
-#: camlibs/ptp2/library.c:1769
+#: camlibs/ptp2/library.c:1902
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "文件分辨率"
 
 # camlibs/canon/serial.c:888
-#: camlibs/ptp2/library.c:1773
+#: camlibs/ptp2/library.c:1906
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "正在上载文件..."
 
-#: camlibs/ptp2/library.c:1775
+#: camlibs/ptp2/library.c:1908
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1780
+#: camlibs/ptp2/library.c:1913
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1782
+#: camlibs/ptp2/library.c:1915
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:1785
+#: camlibs/ptp2/library.c:1918
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:1787
+#: camlibs/ptp2/library.c:1920
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1926
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "光圈"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:1797
+#: camlibs/ptp2/library.c:1930
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:1799
+#: camlibs/ptp2/library.c:1932
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1811
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1826
+#: camlibs/ptp2/library.c:1959
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1830
+#: camlibs/ptp2/library.c:1963
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
-#: camlibs/ptp2/library.c:2887
+#: camlibs/ptp2/library.c:1969 camlibs/ptp2/library.c:1983
+#: camlibs/ptp2/library.c:3249
 #, fuzzy
 msgid "Undefined"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/library.c:1837
+#: camlibs/ptp2/library.c:1970
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1838
+#: camlibs/ptp2/library.c:1971
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1839
+#: camlibs/ptp2/library.c:1972
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1840
+#: camlibs/ptp2/library.c:1973
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
-#: camlibs/ptp2/library.c:1867
+#: camlibs/ptp2/library.c:1975 camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:2000
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "未知 (0x%02x)"
 
-#: camlibs/ptp2/library.c:1846
+#: camlibs/ptp2/library.c:1979
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/library.c:1851
+#: camlibs/ptp2/library.c:1984
 #, fuzzy
 msgid "Generic Flat"
 msgstr "普通"
 
-#: camlibs/ptp2/library.c:1852
+#: camlibs/ptp2/library.c:1985
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1853
+#: camlibs/ptp2/library.c:1986
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1992
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1863
+#: camlibs/ptp2/library.c:1996
 msgid "Read-Write"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:1864
+#: camlibs/ptp2/library.c:1997
 #, fuzzy
 msgid "Read-Only"
 msgstr "就绪"
 
-#: camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1998
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1871
+#: camlibs/ptp2/library.c:2004
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:2006
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1878
+#: camlibs/ptp2/library.c:2011
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:1883
+#: camlibs/ptp2/library.c:2016
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "图像数量：%d\n"
 
-#: camlibs/ptp2/library.c:1888
+#: camlibs/ptp2/library.c:2021
 #, c-format
 msgid ""
 "\n"
@@ -4467,15 +4468,16 @@ msgid ""
 msgstr ""
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
-#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2189 camlibs/ptp2/library.c:2215
+#: camlibs/ptp2/library.c:2262 camlibs/ptp2/library.c:2293
+#: camlibs/ptp2/library.c:2321
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "未知的文件类型 %i。"
 
 # camlibs/canon/serial.c:672
-#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
-#: camlibs/ptp2/library.c:2308
+#: camlibs/ptp2/library.c:2350 camlibs/ptp2/library.c:2367
+#: camlibs/ptp2/library.c:2473
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "错误：未预期的包类型。"
@@ -4488,28 +4490,29 @@ msgstr "错误：未预期的包类型。"
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
-#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2483 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2556
+#: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "无手册"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
+#: camlibs/ptp2/library.c:2484 camlibs/ptp2/library.c:3251
 #, fuzzy
 msgid "Automatic"
 msgstr "自动\n"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2320
+#: camlibs/ptp2/library.c:2485
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "自动\n"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
-#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2486 camlibs/ptp2/library.c:3261
+#: camlibs/ptp2/ptp.c:2501 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 #, fuzzy
 msgid "Daylight"
@@ -4517,8 +4520,8 @@ msgstr "日光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
-#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2487 camlibs/ptp2/library.c:3264
+#: camlibs/ptp2/ptp.c:2500 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
@@ -4527,7 +4530,7 @@ msgstr "荧光"
 
 # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
 # camlibs/sierra/sierra.c:1239
-#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
+#: camlibs/ptp2/library.c:2488 camlibs/ptp2/library.c:3263
 #: 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
@@ -4536,27 +4539,27 @@ msgstr "钨"
 
 # camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963
 # camlibs/sierra/sierra.c:1241
-#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
-#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2490 camlibs/ptp2/library.c:3262
+#: camlibs/ptp2/ptp.c:2503 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
 msgid "Cloudy"
 msgstr "多云"
 
-#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
+#: camlibs/ptp2/library.c:2491 camlibs/ptp2/ptp.c:2504
 msgid "Shade"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
+#: camlibs/ptp2/library.c:2492 camlibs/ptp2/ptp.c:2505
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "葡萄牙语"
 
-#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
+#: camlibs/ptp2/library.c:2500 camlibs/ptp2/ptp.c:2493
 msgid "JPEG Basic"
 msgstr ""
 
@@ -4568,81 +4571,91 @@ msgstr ""
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/library.c:2336
+#: camlibs/ptp2/library.c:2501
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "普通"
 
-#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
+#: camlibs/ptp2/library.c:2502 camlibs/ptp2/ptp.c:2495
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2338
+#: camlibs/ptp2/library.c:2503
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2339
+#: camlibs/ptp2/library.c:2504
 msgid "NEF+BASIC"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/library.c:2474
+#: camlibs/ptp2/library.c:2704
 #, fuzzy
 msgid "super fine"
 msgstr "超精细"
 
-#: camlibs/ptp2/library.c:2484
+#: camlibs/ptp2/library.c:2714
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2485
+#: camlibs/ptp2/library.c:2715
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2492
+#: camlibs/ptp2/library.c:2720
+msgid "iTTL"
+msgstr ""
+
+# camlibs/konica/konica.c:131
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2557
+#, fuzzy
+msgid "Commander"
+msgstr "命令顺序错误。"
+
+#: camlibs/ptp2/library.c:2737
 msgid "spot"
 msgstr ""
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:2551
+#: camlibs/ptp2/library.c:2796
 #, fuzzy
 msgid "Center"
 msgstr "光圈"
 
 # camlibs/polaroid/pdc700.c:999
-#: camlibs/ptp2/library.c:2558
+#: camlibs/ptp2/library.c:2803
 #, fuzzy
 msgid "large"
 msgstr "图像"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:2804
 #, fuzzy
 msgid "medium 1"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:2805
 #, fuzzy
 msgid "medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2561
+#: camlibs/ptp2/library.c:2806
 msgid "small"
 msgstr ""
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
+#: camlibs/ptp2/library.c:2813 camlibs/ptp2/library.c:3272
 #, fuzzy
 msgid "Factory Default"
 msgstr "日光"
 
-#: camlibs/ptp2/library.c:2702
+#: camlibs/ptp2/library.c:2947
 msgid "Creative"
 msgstr ""
 
@@ -4658,107 +4671,152 @@ msgstr ""
 # camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
 # camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
 # camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/ptp2/library.c:2703
+#: camlibs/ptp2/library.c:2948
 #, fuzzy
 msgid "Action"
 msgstr "自动"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
-#: camlibs/ptp2/ptp.c:2374
+#: camlibs/ptp2/library.c:2949 camlibs/ptp2/library.c:2951
+#: camlibs/ptp2/library.c:3211 camlibs/ptp2/ptp.c:2534 camlibs/ptp2/ptp.c:2586
 #, fuzzy
 msgid "Portrait"
 msgstr "对比度-"
 
-#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+#: camlibs/ptp2/library.c:2952 camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/ptp.c:2535 camlibs/ptp2/ptp.c:2587
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+#: camlibs/ptp2/library.c:2954 camlibs/ptp2/ptp.c:2537
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+#: camlibs/ptp2/library.c:2955 camlibs/ptp2/ptp.c:2539
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+#: camlibs/ptp2/library.c:2956 camlibs/ptp2/ptp.c:2538
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+#: camlibs/ptp2/library.c:2962 camlibs/ptp2/ptp.c:2540
 msgid "Single Shot"
 msgstr ""
 
 # camlibs/sierra/sierra.c:790 camlibs/sierra/sierra.c:799
 # camlibs/sierra/sierra.c:1127
-#: camlibs/ptp2/library.c:2718
+#: camlibs/ptp2/library.c:2963
 #, fuzzy
 msgid "Burst"
 msgstr "最佳"
 
-#: camlibs/ptp2/library.c:2719
+#: camlibs/ptp2/library.c:2964
 msgid "Timelapse"
 msgstr ""
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#: camlibs/ptp2/library.c:2965 camlibs/ptp2/ptp.c:2542
 #, fuzzy
 msgid "Timer"
 msgstr "自动定时"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#: camlibs/ptp2/library.c:2967 camlibs/ptp2/ptp.c:2544
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "远程"
 
-#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+#: camlibs/ptp2/library.c:2973 camlibs/ptp2/ptp.c:2511
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+#: camlibs/ptp2/library.c:2974 camlibs/ptp2/ptp.c:2512
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+#: camlibs/ptp2/library.c:2975 camlibs/ptp2/ptp.c:2513
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2736
+# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
+# camlibs/sierra/sierra.c:1220
+#: camlibs/ptp2/library.c:2981
+#, fuzzy
+msgid "sRGB (portrait)"
+msgstr "对比度-"
+
+#: camlibs/ptp2/library.c:2982
+msgid "AdobeRGB"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2983
+msgid "sRGB (nature)"
+msgstr ""
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/ptp2/library.c:2989 camlibs/ptp2/ptp.c:2576
+#, fuzzy
+msgid "Centre"
+msgstr "光圈"
+
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2577
+msgid "Top"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2578
+#, fuzzy
+msgid "Bottom"
+msgstr "缩放"
+
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2579
+msgid "Left"
+msgstr ""
+
+# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
+# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
+# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
+#: camlibs/ptp2/library.c:2993 camlibs/ptp2/ptp.c:2580
+#, fuzzy
+msgid "Right"
+msgstr "高"
+
+#: camlibs/ptp2/library.c:2999
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+#: camlibs/ptp2/library.c:3000 camlibs/ptp2/ptp.c:2526
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2738
+#: camlibs/ptp2/library.c:3001
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2739
+#: camlibs/ptp2/library.c:3002
 msgid "Center Spot"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2745
+#: camlibs/ptp2/library.c:3008
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "自动\n"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/library.c:2746
+#: camlibs/ptp2/library.c:3009
 #, fuzzy
 msgid "Flash off"
 msgstr "闪光灯模式"
 
 # camlibs/dimera/dimera3500.c:533 camlibs/konica/library.c:744
 # camlibs/konica/library.c:984
-#: camlibs/ptp2/library.c:2747
+#: camlibs/ptp2/library.c:3010
 #, fuzzy
 msgid "Fill flash"
 msgstr "闪光灯"
@@ -4766,25 +4824,25 @@ msgstr "闪光灯"
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3011
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "消红眼"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:3012
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "红眼闪光灯"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/library.c:2750
+#: camlibs/ptp2/library.c:3013
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#: camlibs/ptp2/library.c:3014 camlibs/ptp2/ptp.c:2506
 #, fuzzy
 msgid "Default"
 msgstr "日光"
@@ -4792,7 +4850,7 @@ msgstr "日光"
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/ptp2/library.c:3015 camlibs/ptp2/ptp.c:2509
 #: 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
@@ -4800,55 +4858,278 @@ msgstr "日光"
 msgid "Slow Sync"
 msgstr "慢同步"
 
-#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+#: camlibs/ptp2/library.c:3016 camlibs/ptp2/ptp.c:2510
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#: camlibs/ptp2/library.c:3017 camlibs/ptp2/ptp.c:2508
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "消红眼"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3023 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "黑白"
 
-#: camlibs/ptp2/library.c:2880
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/library.c:3138 camlibs/ptp2/ptp.c:2520
+#, fuzzy
+msgid "AE/AF Lock"
+msgstr "聚焦模式"
+
+#: camlibs/ptp2/library.c:3139 camlibs/ptp2/ptp.c:2522
+msgid "AE Lock only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3140
+msgid "AF Lock Only"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3141 camlibs/ptp2/ptp.c:2523
+msgid "AF Lock Hold"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3142 camlibs/ptp2/ptp.c:2524
+msgid "AF On"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3143
+msgid "Flash Level Lock"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3148 camlibs/ptp2/library.c:3168
+msgid "10 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3149 camlibs/ptp2/library.c:3169
+msgid "20 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3150 camlibs/ptp2/library.c:3198
+#, fuzzy
+msgid "1 minute"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3151 camlibs/ptp2/library.c:3199
+msgid "5 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3152 camlibs/ptp2/library.c:3200
+#, fuzzy
+msgid "10 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3157
+msgid "4 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3158
+msgid "6 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3159
+msgid "8 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3160
+msgid "16 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3161
+msgid "30 minutes"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3166
+msgid "2 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3167
+msgid "5 seconds"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3174
+#, fuzzy
+msgid "6 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3175
+#, fuzzy
+msgid "8 mm"
+msgstr "58 mm"
+
+#: camlibs/ptp2/library.c:3176
+#, fuzzy
+msgid "10 mm"
+msgstr "51 mm"
+
+#: camlibs/ptp2/library.c:3177
+#, fuzzy
+msgid "20 mm"
+msgstr "29 mm"
+
+#: camlibs/ptp2/library.c:3182
+msgid "1/60"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3183
+msgid "1/30"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:174
+#: camlibs/ptp2/library.c:3184
+#, fuzzy
+msgid "1/15"
+msgstr "115200"
+
+#: camlibs/ptp2/library.c:3185
+msgid "1/8"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3186
+msgid "1/4"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3187
+msgid "1/2"
+msgstr ""
+
+# camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
+#: camlibs/ptp2/library.c:3188
+#, fuzzy
+msgid "1"
+msgstr "1x"
+
+# camlibs/sierra/sierra.c:1362 camlibs/sierra/sierra.c:1370
+# camlibs/sierra/sierra.c:1605
+#: camlibs/ptp2/library.c:3189
+#, fuzzy
+msgid "2"
+msgstr "F2"
+
+# camlibs/sierra/sierra.c:1365 camlibs/sierra/sierra.c:1376
+# camlibs/sierra/sierra.c:1611
+#: camlibs/ptp2/library.c:3190
+#, fuzzy
+msgid "4"
+msgstr "F4"
+
+# camlibs/sierra/sierra.c:1367 camlibs/sierra/sierra.c:1380
+# camlibs/sierra/sierra.c:1615
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "8"
+msgstr "F8"
+
+#: camlibs/ptp2/library.c:3192
+#, fuzzy
+msgid "15"
+msgstr "1.5"
+
+#: camlibs/ptp2/library.c:3193
+msgid "30"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3201
+#, fuzzy
+msgid "15 minutes"
+msgstr "41 mm"
+
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/ptp.c:2582
+msgid "Vivid"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/ptp2/library.c:3208 camlibs/ptp2/ptp.c:2583
+#, fuzzy
+msgid "Sharper"
+msgstr "正在充电"
+
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2584
+msgid "Softer"
+msgstr ""
+
+# libgphoto2/gphoto2-result.c:49
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2585
+#, fuzzy
+msgid "Direct Print"
+msgstr "目录存在"
+
+# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
+# camlibs/sierra/sierra.c:1653
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/library.c:3235
+#: camlibs/ptp2/library.c:3266 camlibs/ptp2/ptp.c:2588 camlibs/ptp2/ptp.c:2604
+#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
+msgid "Custom"
+msgstr "定制"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/library.c:3221 camlibs/ptp2/ptp.c:2593
+#, fuzzy
+msgid "Medium Low"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/library.c:3222 camlibs/ptp2/library.c:3233
+#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2602
+#, fuzzy
+msgid "Medium high"
+msgstr "中"
+
+# camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
+# camlibs/sierra/sierra.c:1220
+#: camlibs/ptp2/library.c:3231 camlibs/ptp2/ptp.c:2600
+#, fuzzy
+msgid "Low contrast"
+msgstr "对比度-"
+
+# camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
+# camlibs/sierra/sierra.c:1154
+#: camlibs/ptp2/library.c:3232 camlibs/ptp2/ptp.c:2601
+#, fuzzy
+msgid "Medium low"
+msgstr "中"
+
+#: camlibs/ptp2/library.c:3234 camlibs/ptp2/ptp.c:2603
+msgid "High control"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3242
 #, fuzzy
 msgid "Long distance"
 msgstr "聚焦位置"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2890
+#: camlibs/ptp2/library.c:3252
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自动\n"
 
+#: camlibs/ptp2/library.c:3253
+msgid "AF-S"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3254
+msgid "AF-C"
+msgstr ""
+
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/library.c:2901
+#: camlibs/ptp2/library.c:3265
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "荧光"
 
-# camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
-# camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
-#: camlibs/sierra/sierra.c:1762
-msgid "Custom"
-msgstr "定制"
-
-#: camlibs/ptp2/library.c:2928
-msgid "Vivid"
-msgstr ""
-
 # camlibs/konica/library.c:800 camlibs/konica/library.c:807
 # camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
 # camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
@@ -4857,115 +5138,197 @@ msgstr ""
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/library.c:2929
+#: camlibs/ptp2/library.c:3293
 #, fuzzy
 msgid "Neutral"
 msgstr "普通"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:2930
+#: camlibs/ptp2/library.c:3294
 #, fuzzy
 msgid "Low sharpening"
 msgstr "正在充电"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/library.c:2932
+#: camlibs/ptp2/library.c:3296
 #, fuzzy
 msgid "Black & white"
 msgstr "黑白"
 
+# camlibs/dimera/dimera3500.c:533
+#: camlibs/ptp2/library.c:3318
+#, fuzzy
+msgid "AE & Flash"
+msgstr "无闪光灯"
+
+# camlibs/dimera/dimera3500.c:543
+#: camlibs/ptp2/library.c:3319
+#, fuzzy
+msgid "AE only"
+msgstr "就绪"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/library.c:3320
+#, fuzzy
+msgid "Flash only"
+msgstr "闪光灯模式"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/library.c:3321
+#, fuzzy
+msgid "WB bracketing"
+msgstr "曝光测定"
+
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2607
+msgid "Moderate"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3328 camlibs/ptp2/ptp.c:2608
+msgid "Enhanced"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3334
+msgid "MTR > Under"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3335
+msgid "Under > MTR"
+msgstr ""
+
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/library.c:3121
+#: camlibs/ptp2/library.c:3541
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
 # camlibs/kodak/dc240/library.c:618
-#: camlibs/ptp2/library.c:3122
+#: camlibs/ptp2/library.c:3542
 #, fuzzy
 msgid "Memory card"
 msgstr "无卡"
 
 # camlibs/canon/serial.c:1190
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
+#: camlibs/ptp2/library.c:3580 camlibs/ptp2/ptp.c:2173
 #, fuzzy
 msgid "Camera Owner"
 msgstr "相机就绪。\n"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
+#: camlibs/ptp2/library.c:3581 camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Camera Model"
 msgstr "%s相机型号：%s\n"
 
 # camlibs/stv0680/library.c:525
-#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
+#: camlibs/ptp2/library.c:3582 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Firmware Version"
 msgstr "固件版本：%d.%d\n"
 
 # camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
+#: camlibs/ptp2/library.c:3583 camlibs/ptp2/library.c:3584
 #, fuzzy
 msgid "Camera Time"
 msgstr "相机"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/library.c:3585 camlibs/ptp2/ptp.c:2144 camlibs/ptp2/ptp.c:2155
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3586
 #, fuzzy
 msgid "Image Comment"
 msgstr "图像调整"
 
-#: camlibs/ptp2/library.c:3169
+# camlibs/konica/library.c:670 camlibs/konica/library.c:879
+#: camlibs/ptp2/library.c:3587 camlibs/ptp2/ptp.c:2262
+#, fuzzy
+msgid "LCD Off Time"
+msgstr "自动关机时间"
+
+# camlibs/konica/library.c:670 camlibs/konica/library.c:879
+#: camlibs/ptp2/library.c:3588
+#, fuzzy
+msgid "Meter Off Time"
+msgstr "自动关机时间"
+
+#: camlibs/ptp2/library.c:3589 camlibs/ptp2/ptp.c:2340
+msgid "CSM Menu"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3592
 msgid "Fast Filesystem"
 msgstr ""
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#: camlibs/ptp2/library.c:3593 camlibs/ptp2/library.c:3594
 #, fuzzy
 msgid "Capture Target"
 msgstr "照片设置"
 
-#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
-#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/ptp2/library.c:3605 camlibs/ptp2/library.c:3628
+#: camlibs/ptp2/ptp.c:2165 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO 速度"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#: camlibs/ptp2/library.c:3606 camlibs/ptp2/library.c:3607
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "白平衡"
 
-#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/library.c:3608 camlibs/ptp2/ptp.c:2176
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
+# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
+#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2206
+#, fuzzy
+msgid "Color Model"
+msgstr "彩色模式"
+
+# camlibs/konica/library.c:749 camlibs/konica/library.c:765
+# camlibs/konica/library.c:780 camlibs/konica/library.c:783
+# camlibs/konica/library.c:993 camlibs/konica/library.c:1023
+# camlibs/sierra/sierra.c:787 camlibs/sierra/sierra.c:793
+# camlibs/sierra/sierra.c:827 camlibs/sierra/sierra.c:833
+# camlibs/sierra/sierra.c:886 camlibs/sierra/sierra.c:893
+# camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:954
+# camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1150
+# camlibs/sierra/sierra.c:1190 camlibs/sierra/sierra.c:1233
+# camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
+# camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
+# camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
+#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2242
+#, fuzzy
+msgid "Auto ISO"
+msgstr "自动"
+
+#: camlibs/ptp2/library.c:3615
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/library.c:3191
+#: camlibs/ptp2/library.c:3616
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/library.c:3619
+#: camlibs/ptp2/ptp.c:2177
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/ptp2/library.c:3620 camlibs/ptp2/ptp.c:2168 camlibs/ptp2/ptp.c:2250
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
@@ -4973,107 +5336,285 @@ msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
-#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
-#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/library.c:3622
+#: camlibs/ptp2/library.c:3635 camlibs/ptp2/ptp.c:2113 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/ptp.c:2284 camlibs/ptp2/ptp.c:2356 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "闪光灯模式"
 
-#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2354
 msgid "AF Area Illumination"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#: camlibs/ptp2/library.c:3624 camlibs/ptp2/ptp.c:2342
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3625
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:3626 camlibs/ptp2/ptp.c:2109
 msgid "Focal Length"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/ptp2/library.c:3627 camlibs/ptp2/ptp.c:2111
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "聚焦模式"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "Exposure Time"
 msgstr "闪光灯闪光时间"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
+#: camlibs/ptp2/library.c:3630 camlibs/ptp2/ptp.c:2126
 #, fuzzy
 msgid "Effect Mode"
 msgstr "录制模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3631
 #, fuzzy
 msgid "Exposure Program"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+#: camlibs/ptp2/library.c:3632 camlibs/ptp2/ptp.c:2122
 msgid "Still Capture Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2131
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "场景测量模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/library.c:3634 camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/ptp2/library.c:3636 camlibs/ptp2/ptp.c:2166
 #: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
 #: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "光圈"
 
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2163
 #, fuzzy
 msgid "Focusing Point"
 msgstr "聚焦错误。"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3638
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2161
 #, fuzzy
 msgid "Metering Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "AF Distance"
 msgstr "聚焦位置"
 
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/ptp.c:2238
+#, fuzzy
+msgid "Focus Area Wrap"
+msgstr "聚焦模式"
+
+# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/ptp.c:2254
+#, fuzzy
+msgid "Exposure Lock"
+msgstr "曝光"
+
+#: camlibs/ptp2/library.c:3643
+msgid "AE-L/AF-L Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2272
+msgid "File Number Sequencing"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:161
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2360
+#, fuzzy
+msgid "Flash Sign"
+msgstr "闪光灯设置"
+
+#: camlibs/ptp2/library.c:3646
+msgid "Viewfinder Grid"
+msgstr ""
+
+# camlibs/polaroid/pdc700.c:160
+#: camlibs/ptp2/library.c:3647 camlibs/ptp2/ptp.c:2350
+#, fuzzy
+msgid "Image Review"
+msgstr "图像大小"
+
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3648
+#, fuzzy
+msgid "Image Rotation Flag"
+msgstr "相机设置"
+
+#: camlibs/ptp2/library.c:3649
+msgid "Release without CF card"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/library.c:3650 camlibs/ptp2/ptp.c:2358
+#, fuzzy
+msgid "Flash Mode Manual Power"
+msgstr "闪光灯模式"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/library.c:3651
+#, fuzzy
+msgid "Auto Focus Area Power"
+msgstr "聚焦模式"
+
+#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2362
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "曝光补偿"
+
+# camlibs/konica/library.c:750 camlibs/konica/library.c:762
+#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2288
+#, fuzzy
+msgid "Bracket Set"
+msgstr "自动，消红眼"
+
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/ptp.c:2292
+msgid "Bracket Order"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2127
+msgid "Burst Number"
+msgstr ""
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3656
+#, fuzzy
+msgid "Auto Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3657
+#, fuzzy
+msgid "Tungsten Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3658
+#, fuzzy
+msgid "Flourescent Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3659
+#, fuzzy
+msgid "Daylight Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3660
+#, fuzzy
+msgid "Flash Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3661
+#, fuzzy
+msgid "Cloudy Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
+# camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
+#: camlibs/ptp2/library.c:3662
+#, fuzzy
+msgid "Shade Whitebalance Bias"
+msgstr "白平衡"
+
+# camlibs/konica/library.c:663 camlibs/konica/library.c:871
+#: camlibs/ptp2/library.c:3663
+#, fuzzy
+msgid "Selftimer Delay"
+msgstr "自动定时器时间"
+
+#: camlibs/ptp2/library.c:3664
+msgid "Center Weight Area"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2282
+#, fuzzy
+msgid "Flash Shutter Speed"
+msgstr "快门速度 (秒)"
+
+# camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2364
+#, fuzzy
+msgid "Remote Timeout"
+msgstr "日期和时间"
+
+#: camlibs/ptp2/library.c:3667 camlibs/ptp2/ptp.c:2336
+msgid "Optimize Image"
+msgstr ""
+
+# camlibs/minolta/dimagev/dimagev.c:371
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2202
+#, fuzzy
+msgid "Sharpening"
+msgstr "正在充电"
+
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2204
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "曝光补偿"
+
+# camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
+# camlibs/sierra/sierra.c:1353
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2338
+#, fuzzy
+msgid "Saturation"
+msgstr "配置"
+
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2208
+#, fuzzy
+msgid "Hue Adjustment"
+msgstr "图像调整"
+
+# camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
+#: camlibs/ptp2/library.c:3677 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
@@ -5082,316 +5623,320 @@ msgid "Camera Settings"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3678
 #, fuzzy
 msgid "Image Settings"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3679
 #, fuzzy
 msgid "Capture Settings"
 msgstr "照片设置"
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:3736
 #, fuzzy
 msgid "Number of values"
 msgstr "图像数量：%d\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3740
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3290
+#: camlibs/ptp2/library.c:3748
 msgid "Current value"
 msgstr ""
 
+#: camlibs/ptp2/library.c:4390 camlibs/ptp2/library.c:4394
+#, c-format
+msgid "File '%s/%s' does not exist."
+msgstr ""
+
+#: camlibs/ptp2/library.c:4400
+msgid "Metadata only supported for MTP devices."
+msgstr ""
+
 # camlibs/canon/library.c:176
-#: camlibs/ptp2/library.c:4116
+#: camlibs/ptp2/library.c:4809
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "关闭相机"
 
 # camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:4215
+#: camlibs/ptp2/library.c:4917
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
 msgstr "PTP 仅为 USB 相机实现。"
 
-# camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:4222
-msgid "PTP is implemented for USB cameras only."
-msgstr "PTP 仅为 USB 相机实现。"
-
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:1892
+#: camlibs/ptp2/ptp.c:2040
 #, fuzzy
 msgid "PTP: Undefined Error"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:91
-#: camlibs/ptp2/ptp.c:1893
+#: camlibs/ptp2/ptp.c:2041
 #, fuzzy
 msgid "PTP: OK!"
 msgstr "PTP OK！"
 
 # camlibs/ptp/library.c:92
-#: camlibs/ptp2/ptp.c:1894
+#: camlibs/ptp2/ptp.c:2042
 #, fuzzy
 msgid "PTP: General Error"
 msgstr "PTP 通用错误"
 
 # camlibs/ptp/library.c:93
-#: camlibs/ptp2/ptp.c:1895
+#: camlibs/ptp2/ptp.c:2043
 #, fuzzy
 msgid "PTP: Session Not Open"
 msgstr "PTP 会话未打开"
 
 # camlibs/ptp/library.c:94
-#: camlibs/ptp2/ptp.c:1896
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "非法的 PTP 传输 ID"
 
 # camlibs/ptp/library.c:95
-#: camlibs/ptp2/ptp.c:1897
+#: camlibs/ptp2/ptp.c:2045
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "不支持的 PTP 操作"
 
 # camlibs/ptp/library.c:96
-#: camlibs/ptp2/ptp.c:1898
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "不支持的 PTP 参数"
 
 # camlibs/ptp/library.c:97
-#: camlibs/ptp2/ptp.c:1899
+#: camlibs/ptp2/ptp.c:2047
 #, fuzzy
 msgid "PTP: Incomplete Transfer"
 msgstr "未完成的 PTP 传输"
 
 # camlibs/ptp/library.c:98
-#: camlibs/ptp2/ptp.c:1900
+#: camlibs/ptp2/ptp.c:2048
 #, fuzzy
 msgid "PTP: Invalid Storage ID"
 msgstr "非法的 PTP 存储 ID"
 
 # camlibs/ptp/library.c:99
-#: camlibs/ptp2/ptp.c:1901
+#: camlibs/ptp2/ptp.c:2049
 #, fuzzy
 msgid "PTP: Invalid Object Handle"
 msgstr "非法的 PTP 对象句柄"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/ptp.c:1902
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/ptp/library.c:101
-#: camlibs/ptp2/ptp.c:1903
+#: camlibs/ptp2/ptp.c:2051
 #, fuzzy
 msgid "PTP: Invalid Object Format Code"
 msgstr "非法的 PTP 对象格式代码"
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/ptp.c:1904
+#: camlibs/ptp2/ptp.c:2052
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "PTP 存储已满"
 
 # camlibs/ptp/library.c:103
-#: camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:2053
 #, fuzzy
 msgid "PTP: Object Write Protected"
 msgstr "PTP 对象已写保护"
 
 # camlibs/ptp/library.c:104
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2054
 #, fuzzy
 msgid "PTP: Store Read Only"
 msgstr "只读的 PTP 存储"
 
 # camlibs/ptp/library.c:105
-#: camlibs/ptp2/ptp.c:1907
+#: camlibs/ptp2/ptp.c:2055
 #, fuzzy
 msgid "PTP: Access Denied"
 msgstr "PTP 访问遭拒绝"
 
 # camlibs/ptp/library.c:106
-#: camlibs/ptp2/ptp.c:1908
+#: camlibs/ptp2/ptp.c:2056
 #, fuzzy
 msgid "PTP: No Thumbnail Present"
 msgstr "不存在 PTP 缩略图"
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/ptp.c:1909
+#: camlibs/ptp2/ptp.c:2057
 #, fuzzy
 msgid "PTP: Self Test Failed"
 msgstr "PTP 自检失败"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/ptp.c:1910
+#: camlibs/ptp2/ptp.c:2058
 #, fuzzy
 msgid "PTP: Partial Deletion"
 msgstr "PTP 部分删除"
 
 # camlibs/ptp/library.c:109
-#: camlibs/ptp2/ptp.c:1911
+#: camlibs/ptp2/ptp.c:2059
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "PTP 存储不可用"
 
 # camlibs/ptp/library.c:111
-#: camlibs/ptp2/ptp.c:1913
+#: camlibs/ptp2/ptp.c:2061
 #, fuzzy
 msgid "PTP: Specification By Format Unsupported"
 msgstr "不支持的 PTP 格式规范"
 
 # camlibs/ptp/library.c:112
-#: camlibs/ptp2/ptp.c:1914
+#: camlibs/ptp2/ptp.c:2062
 #, fuzzy
 msgid "PTP: No Valid Object Info"
 msgstr "没有合法的 PTP 对象信息"
 
 # camlibs/ptp/library.c:113
-#: camlibs/ptp2/ptp.c:1915
+#: camlibs/ptp2/ptp.c:2063
 #, fuzzy
 msgid "PTP: Invalid Code Format"
 msgstr "非法的 PTP 代码格式"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/ptp.c:1916
+#: camlibs/ptp2/ptp.c:2064
 #, fuzzy
 msgid "PTP: Unknown Vendor Code"
 msgstr "未知的 PTP 厂家代码"
 
 # camlibs/ptp/library.c:116
-#: camlibs/ptp2/ptp.c:1918
+#: camlibs/ptp2/ptp.c:2066
 #, fuzzy
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP 捕获已终止"
 
 # camlibs/ptp/library.c:117
-#: camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/ptp.c:2067
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP 设备总线"
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:2068
 #, fuzzy
 msgid "PTP: Invalid Parent Object"
 msgstr "非法的 PTP 父对象"
 
 # camlibs/ptp/library.c:119
-#: camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/ptp.c:2069
 #, fuzzy
 msgid "PTP: Invalid Device Prop Format"
 msgstr "非法的 PTP 设备属性格式"
 
 # camlibs/ptp/library.c:120
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:2070
 #, fuzzy
 msgid "PTP: Invalid Device Prop Value"
 msgstr "非法的 PTP 设备属性值"
 
 # camlibs/ptp/library.c:121
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:2071
 #, fuzzy
 msgid "PTP: Invalid Parameter"
 msgstr "非法的 PTP 参数"
 
 # camlibs/ptp/library.c:122
-#: camlibs/ptp2/ptp.c:1924
+#: camlibs/ptp2/ptp.c:2072
 #, fuzzy
 msgid "PTP: Session Already Opened"
 msgstr "PTP 会话已打开"
 
 # camlibs/ptp/library.c:123
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:2073
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "PTP 传输已取消"
 
 # camlibs/ptp/library.c:125
-#: camlibs/ptp2/ptp.c:1927
+#: camlibs/ptp2/ptp.c:2075
 #, fuzzy
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "不支持的 PTP 目标规范"
 
 # camlibs/ptp/library.c:126
-#: camlibs/ptp2/ptp.c:1928
+#: camlibs/ptp2/ptp.c:2076
 #, fuzzy
 msgid "PTP: EK Filename Required"
 msgstr "需要 PTP EK 文件名"
 
 # camlibs/ptp/library.c:127
-#: camlibs/ptp2/ptp.c:1929
+#: camlibs/ptp2/ptp.c:2077
 #, fuzzy
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP EK 文件名冲突"
 
 # camlibs/ptp/library.c:128
-#: camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/ptp.c:2078
 #, fuzzy
 msgid "PTP: EK Filename Invalid"
 msgstr "非法的 PTP EK 文件名"
 
 # camlibs/ptp/library.c:130
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:2080
 #, fuzzy
 msgid "PTP: I/O error"
 msgstr "PTP I/O 错误"
 
 # camlibs/ptp/library.c:131
-#: camlibs/ptp2/ptp.c:1933
+#: camlibs/ptp2/ptp.c:2081
 #, fuzzy
 msgid "PTP: Error: bad parameter"
 msgstr "PTP 错误：错误的参数"
 
 # camlibs/ptp/library.c:132
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:2082
 #, fuzzy
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP 协议错误，需要数据"
 
 # camlibs/ptp/library.c:133
-#: camlibs/ptp2/ptp.c:1935
+#: camlibs/ptp2/ptp.c:2083
 #, fuzzy
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP 协议错误，需要响应"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2101
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2102
 #, fuzzy
 msgid "Battery Level"
 msgstr "%s电池寿命：%i\n"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:2103
 #, fuzzy
 msgid "Functional Mode"
 msgstr "操作模式"
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:2105
 #, fuzzy
 msgid "Compression Setting"
 msgstr "压缩"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2106 camlibs/ptp2/ptp.c:2164
 #: 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
@@ -5400,651 +5945,536 @@ msgstr "压缩"
 msgid "White Balance"
 msgstr "白平衡"
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:2107
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:2108
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Focus Distance"
 msgstr "聚焦位置"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:1967
+#: camlibs/ptp2/ptp.c:2115
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/ptp.c:2117
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2119
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/ptp.c:1972
+#: camlibs/ptp2/ptp.c:2120
 #, fuzzy
 msgid "Date Time"
 msgstr "日期和时间"
 
-#: camlibs/ptp2/ptp.c:1973
+#: camlibs/ptp2/ptp.c:2121
 msgid "Pre-Capture Delay"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/ptp.c:2123
 #, fuzzy
 msgid "Contrast"
 msgstr "对比度-"
 
-#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:2125 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "数字缩放"
 
-#: camlibs/ptp2/ptp.c:1979
-msgid "Burst Number"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1980
+#: camlibs/ptp2/ptp.c:2128
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1981
+#: camlibs/ptp2/ptp.c:2129
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1982
+#: camlibs/ptp2/ptp.c:2130
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2132
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2133
 msgid "Artist"
 msgstr ""
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Copyright Info"
 msgstr "版权"
 
-#: camlibs/ptp2/ptp.c:1993
+#: camlibs/ptp2/ptp.c:2141
 msgid "Color Temperature"
 msgstr ""
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2143
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "日期格式"
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2145
 msgid "Video Out"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Power Saving"
 msgstr "无电源指示灯"
 
 # camlibs/konica/library.c:710 camlibs/konica/library.c:915
 # camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2147
 #, fuzzy
 msgid "UI Language"
 msgstr "语言"
 
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2156
 msgid "Viewfinder Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:2012
+#: camlibs/ptp2/ptp.c:2160
 #, fuzzy
 msgid "Shooting Mode"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:2019
+#: camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "快门速度 (秒)"
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/ptp2/ptp.c:2022
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "图像质量"
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2174
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2175
 #, fuzzy
 msgid "Digital Zoom Magnification"
 msgstr "数字缩放"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2038
+#: camlibs/ptp2/ptp.c:2186
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2040
+#: camlibs/ptp2/ptp.c:2188
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2042
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2044
+#: camlibs/ptp2/ptp.c:2192
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2046
+#: camlibs/ptp2/ptp.c:2194
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2048
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "白平衡"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptp.c:2050
+#: camlibs/ptp2/ptp.c:2198
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "白平衡"
 
-#: camlibs/ptp2/ptp.c:2052
+#: camlibs/ptp2/ptp.c:2200
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-# camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/ptp.c:2054
-#, fuzzy
-msgid "Sharpening"
-msgstr "正在充电"
-
-#: camlibs/ptp2/ptp.c:2056
-#, fuzzy
-msgid "Tone Compensation"
-msgstr "曝光补偿"
-
-# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
-# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/ptp2/ptp.c:2058 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
-msgid "Color Mode"
-msgstr "彩色模式"
-
-#: camlibs/ptp2/ptp.c:2060
-#, fuzzy
-msgid "Hue Adjustment"
-msgstr "图像调整"
-
-#: camlibs/ptp2/ptp.c:2062
+#: camlibs/ptp2/ptp.c:2210
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2064
+#: camlibs/ptp2/ptp.c:2212
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2066
+#: camlibs/ptp2/ptp.c:2214
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2068
+#: camlibs/ptp2/ptp.c:2216
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2070
+#: camlibs/ptp2/ptp.c:2218
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2072
+#: camlibs/ptp2/ptp.c:2220
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2074
+#: camlibs/ptp2/ptp.c:2222
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2076
+#: camlibs/ptp2/ptp.c:2224
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2078
+#: camlibs/ptp2/ptp.c:2226
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2080
+#: camlibs/ptp2/ptp.c:2228
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2082
+#: camlibs/ptp2/ptp.c:2230
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2084
+#: camlibs/ptp2/ptp.c:2232
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2086
+#: camlibs/ptp2/ptp.c:2234
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2088
+#: camlibs/ptp2/ptp.c:2236
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:2090
-#, fuzzy
-msgid "Focus Area Wrap"
-msgstr "聚焦模式"
-
-#: camlibs/ptp2/ptp.c:2092
+#: camlibs/ptp2/ptp.c:2240
 msgid "Vertical AF On"
 msgstr ""
 
-# camlibs/konica/library.c:749 camlibs/konica/library.c:765
-# camlibs/konica/library.c:780 camlibs/konica/library.c:783
-# camlibs/konica/library.c:993 camlibs/konica/library.c:1023
-# camlibs/sierra/sierra.c:787 camlibs/sierra/sierra.c:793
-# camlibs/sierra/sierra.c:827 camlibs/sierra/sierra.c:833
-# camlibs/sierra/sierra.c:886 camlibs/sierra/sierra.c:893
-# camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:954
-# camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1150
-# camlibs/sierra/sierra.c:1190 camlibs/sierra/sierra.c:1233
-# camlibs/sierra/sierra.c:1396 camlibs/sierra/sierra.c:1402
-# camlibs/sierra/sierra.c:1424 camlibs/sierra/sierra.c:1429
-# camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1649
-#: camlibs/ptp2/ptp.c:2094
-#, fuzzy
-msgid "Auto ISO"
-msgstr "自动"
-
-#: camlibs/ptp2/ptp.c:2096
+#: camlibs/ptp2/ptp.c:2244
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO 速度"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptp.c:2098
+#: camlibs/ptp2/ptp.c:2246
 #, fuzzy
 msgid "Exposure Step"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptp.c:2100
+#: camlibs/ptp2/ptp.c:2248
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:2104
+#: camlibs/ptp2/ptp.c:2252
 msgid "Centre Weight Area"
 msgstr ""
 
-# camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2106
-#, fuzzy
-msgid "Exposure Lock"
-msgstr "曝光"
-
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:2108
+#: camlibs/ptp2/ptp.c:2256
 #, fuzzy
 msgid "Focus Lock"
 msgstr "聚焦模式"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:2110
+#: camlibs/ptp2/ptp.c:2258
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/ptp2/ptp.c:2112
+#: camlibs/ptp2/ptp.c:2260
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "自动定时器时间"
 
-# camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/ptp.c:2114
-#, fuzzy
-msgid "LCD Off Time"
-msgstr "自动关机时间"
-
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:2116
+#: camlibs/ptp2/ptp.c:2264
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "快门速度 (秒)"
 
-#: camlibs/ptp2/ptp.c:2118
+#: camlibs/ptp2/ptp.c:2266
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2120
+#: camlibs/ptp2/ptp.c:2268
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2122
+#: camlibs/ptp2/ptp.c:2270
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "曝光补偿"
 
-#: camlibs/ptp2/ptp.c:2124
-msgid "File Number Sequencing"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2126
+#: camlibs/ptp2/ptp.c:2274
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2128
+#: camlibs/ptp2/ptp.c:2276
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2130
+#: camlibs/ptp2/ptp.c:2278
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2132
+#: camlibs/ptp2/ptp.c:2280
 msgid "Flash Sync. Speed"
 msgstr ""
 
-# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/ptp.c:2134
-#, fuzzy
-msgid "Flash Shutter Speed"
-msgstr "快门速度 (秒)"
-
 # camlibs/minolta/dimagev/dimagev.c:331
-#: camlibs/ptp2/ptp.c:2138
+#: camlibs/ptp2/ptp.c:2286
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "强制闪光\n"
 
-# camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:2140
-#, fuzzy
-msgid "Bracket Set"
-msgstr "自动，消红眼"
-
-#: camlibs/ptp2/ptp.c:2142
+#: camlibs/ptp2/ptp.c:2290
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2144
-msgid "Bracket Order"
-msgstr ""
-
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/ptp.c:2146
+#: camlibs/ptp2/ptp.c:2294
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "自动，消红眼"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptp.c:2148
+#: camlibs/ptp2/ptp.c:2296
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/ptp.c:2150
+#: camlibs/ptp2/ptp.c:2298
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "当前模式：回放模式\n"
 
-#: camlibs/ptp2/ptp.c:2152
+#: camlibs/ptp2/ptp.c:2300
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/ptp.c:2302
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/ptp.c:2304
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2158
+#: camlibs/ptp2/ptp.c:2306
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2160
+#: camlibs/ptp2/ptp.c:2308
 msgid "Reverse Command Dial"
 msgstr ""
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/ptp.c:2162
+#: camlibs/ptp2/ptp.c:2310
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "照片设置"
 
-#: camlibs/ptp2/ptp.c:2164
+#: camlibs/ptp2/ptp.c:2312
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2166
+#: camlibs/ptp2/ptp.c:2314
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2168
+#: camlibs/ptp2/ptp.c:2316
 msgid "No CF Card Release"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/ptp.c:2170
+#: camlibs/ptp2/ptp.c:2318
 #, fuzzy
 msgid "Image Rotation"
 msgstr "相机设置"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/ptp.c:2320
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2174
+#: camlibs/ptp2/ptp.c:2322
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/ptp.c:2324
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:2178
+#: camlibs/ptp2/ptp.c:2326
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD 模式"
 
-#: camlibs/ptp2/ptp.c:2180
+#: camlibs/ptp2/ptp.c:2328
 msgid "Active AF Sensor"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2182
+#: camlibs/ptp2/ptp.c:2330
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "曝光测定"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptp.c:2184
+#: camlibs/ptp2/ptp.c:2332
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "曝光测定"
 
-#: camlibs/ptp2/ptp.c:2186
+#: camlibs/ptp2/ptp.c:2334
 msgid "Maximum Shots"
 msgstr ""
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:2190
+#: camlibs/ptp2/ptp.c:2344
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "聚焦模式"
 
-#: camlibs/ptp2/ptp.c:2192
+#: camlibs/ptp2/ptp.c:2346
 msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2194
+#: camlibs/ptp2/ptp.c:2348
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-# camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/ptp.c:2196
-#, fuzzy
-msgid "Image Review"
-msgstr "图像大小"
-
-#: camlibs/ptp2/ptp.c:2198
+#: camlibs/ptp2/ptp.c:2352
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
-# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:2204
-#, fuzzy
-msgid "Flash Mode Manual Power"
-msgstr "闪光灯模式"
-
-# camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/ptp.c:2206
-#, fuzzy
-msgid "Flash Sign"
-msgstr "闪光灯设置"
-
-#: camlibs/ptp2/ptp.c:2208
-#, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "曝光补偿"
-
-# camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/ptp.c:2210
-#, fuzzy
-msgid "Remote Timeout"
-msgstr "日期和时间"
-
-#: camlibs/ptp2/ptp.c:2212
+#: camlibs/ptp2/ptp.c:2366
 #, fuzzy
 msgid "Image Comment String"
 msgstr "图像调整"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptp.c:2214
+#: camlibs/ptp2/ptp.c:2368
 #, fuzzy
 msgid "Flash Open"
 msgstr "闪光灯模式"
 
 # camlibs/kodak/dc120/dc120.c:31
-#: camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/ptp.c:2370
 #, fuzzy
 msgid "Flash Charged"
 msgstr "闪存卡"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/ptp.c:2372
 #, fuzzy
 msgid "Lens ID"
 msgstr "镜头模式"
 
-#: camlibs/ptp2/ptp.c:2220
+#: camlibs/ptp2/ptp.c:2374
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2222
+#: camlibs/ptp2/ptp.c:2376
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2224
+#: camlibs/ptp2/ptp.c:2378
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2226
+#: camlibs/ptp2/ptp.c:2380
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
 # camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/ptp.c:2228
+#: camlibs/ptp2/ptp.c:2382
 #, fuzzy
 msgid "Low Light"
 msgstr "高"
 
-#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
+#: camlibs/ptp2/ptp.c:2477 camlibs/ptp2/ptp.c:2478 camlibs/ptp2/ptp.c:2479
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2326
+#: camlibs/ptp2/ptp.c:2480
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2340
+#: camlibs/ptp2/ptp.c:2494
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2342
+#: camlibs/ptp2/ptp.c:2496
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2343
+#: camlibs/ptp2/ptp.c:2497
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2499 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
@@ -6052,7 +6482,7 @@ msgstr ""
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2507 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
@@ -6067,217 +6497,193 @@ msgstr "消红眼"
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/ptp2/ptp.c:2360
+#: camlibs/ptp2/ptp.c:2514
 #, fuzzy
 msgid "Manual Focus"
 msgstr "无手册"
 
-#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2521
+msgid "AF Lock only"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/ptp2/ptp.c:2525
+#, fuzzy
+msgid "Flash Lock"
+msgstr "闪光灯模式"
+
+#: camlibs/ptp2/ptp.c:2527 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2528 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/ptp.c:2541
 #, fuzzy
 msgid "Power Wind"
 msgstr "无电源指示灯"
 
-# camlibs/konica/konica.c:131
-#: camlibs/ptp2/ptp.c:2396
-#, fuzzy
-msgid "Commander"
-msgstr "命令顺序错误。"
-
-#: camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2404
+#: camlibs/ptp2/ptp.c:2565
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/ptp.c:2566
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2406
+#: camlibs/ptp2/ptp.c:2567
 msgid "15 mins"
 msgstr ""
 
-# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
-# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/ptp2/ptp.c:2415
-#, fuzzy
-msgid "Centre"
-msgstr "光圈"
-
-#: camlibs/ptp2/ptp.c:2416
-msgid "Top"
-msgstr ""
-
-# camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
-#: camlibs/ptp2/ptp.c:2417
-#, fuzzy
-msgid "Bottom"
-msgstr "缩放"
-
-#: camlibs/ptp2/ptp.c:2418
-msgid "Left"
-msgstr ""
-
-# camlibs/sierra/sierra.c:789 camlibs/sierra/sierra.c:797
-# camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
-# camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
-#: camlibs/ptp2/ptp.c:2419
-#, fuzzy
-msgid "Right"
-msgstr "高"
-
-#: camlibs/ptp2/ptp.c:2504
+#: camlibs/ptp2/ptp.c:2717
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2505
+#: camlibs/ptp2/ptp.c:2718
 msgid "WindowsImageFormat"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2506
+#: camlibs/ptp2/ptp.c:2719
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2509
+#: camlibs/ptp2/ptp.c:2722
 #, fuzzy
 msgid "Undefined Video"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2512
+#: camlibs/ptp2/ptp.c:2725
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:2513
+#: camlibs/ptp2/ptp.c:2726
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2514
+#: camlibs/ptp2/ptp.c:2727
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2515
+#: camlibs/ptp2/ptp.c:2728
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2516
+#: camlibs/ptp2/ptp.c:2729
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2730
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2518
+#: camlibs/ptp2/ptp.c:2731
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2519
+#: camlibs/ptp2/ptp.c:2732
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2520
+#: camlibs/ptp2/ptp.c:2733
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2521
+#: camlibs/ptp2/ptp.c:2734
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522
+#: camlibs/ptp2/ptp.c:2735
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2523
+#: camlibs/ptp2/ptp.c:2736
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2737
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2738
 msgid "PLS Playlist"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2526
+#: camlibs/ptp2/ptp.c:2739
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:2527
+#: camlibs/ptp2/ptp.c:2740
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2528
+#: camlibs/ptp2/ptp.c:2741
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2529
+#: camlibs/ptp2/ptp.c:2742
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2530
+#: camlibs/ptp2/ptp.c:2743
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2531
+#: camlibs/ptp2/ptp.c:2744
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2532
+#: camlibs/ptp2/ptp.c:2745
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2533
+#: camlibs/ptp2/ptp.c:2746
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2534
+#: camlibs/ptp2/ptp.c:2747
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2535
+#: camlibs/ptp2/ptp.c:2748
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2536
+#: camlibs/ptp2/ptp.c:2749
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2537
+#: camlibs/ptp2/ptp.c:2750
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/ptp.c:2751
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/ptp.c:2768
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/ptp.c:2781
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "未知 (0x%02x)"
@@ -6565,7 +6971,7 @@ msgid "Compression"
 msgstr "压缩"
 
 # camlibs/ricoh/library.c:252
-#: camlibs/ricoh/library.c:561
+#: camlibs/ricoh/library.c:569
 #, c-format
 msgid "Speed %i is not supported!"
 msgstr "不支持速度 %i！"
@@ -6677,6 +7083,14 @@ msgstr "日期和时间 (GMT)"
 msgid "Aperature Settings"
 msgstr "照片设置"
 
+# camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
+# camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
+#: 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
+msgid "Color Mode"
+msgstr "彩色模式"
+
 # camlibs/polaroid/pdc700.c:161
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
@@ -7677,7 +8091,7 @@ msgstr ""
 msgid "%lld (unknown)"
 msgstr "%lld (未知)"
 
-#: camlibs/sipix/blink.c:911
+#: camlibs/sipix/blink.c:872
 msgid ""
 "Sipix StyleCam Blink Driver\n"
 "Vincent Sanders <vince@kyllikki.org>\n"
@@ -7688,7 +8102,7 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 
 # camlibs/canon/usb.c:215
-#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#: camlibs/sipix/blink.c:993 camlibs/stv0674/stv0674.c:256
 msgid "Could not apply USB settings"
 msgstr "无法应用 USB 设置"
 
@@ -7882,11 +8296,6 @@ msgstr ""
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
-#: camlibs/spca50x/library.c:571
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
-
 #: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
@@ -8088,11 +8497,11 @@ msgid ""
 "Dominik Kuhlen <kinimod@users.sourceforge.net>\n"
 msgstr ""
 
-#: camlibs/sx330z/library.c:292
+#: camlibs/sx330z/library.c:297
 msgid "sx330z is USB only"
 msgstr "sx330z 只支持 USB"
 
-#: camlibs/toshiba/pdrm11/library.c:218
+#: camlibs/toshiba/pdrm11/library.c:120
 msgid ""
 "Toshiba\n"
 "David Hogue <david@jawa.gotdns.org>\n"
@@ -8110,7 +8519,7 @@ msgid "Loading camera drivers from '%s'..."
 msgstr "正在从“%s”装入相机驱动程序..."
 
 # libgphoto2/gphoto2-abilities-list.c:622
-#: libgphoto2/gphoto2-abilities-list.c:617
+#: libgphoto2/gphoto2-abilities-list.c:615
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "无法为“%s”找到任何驱动程序"
@@ -8183,38 +8592,44 @@ msgstr "该相机不能视频捕捉。"
 msgid "This camera can not capture previews."
 msgstr "该相机不能预览视频捕捉。"
 
+# libgphoto2/gphoto2-camera.c:850
+#: libgphoto2/gphoto2-camera.c:1018
+#, fuzzy
+msgid "This camera does not support event handling."
+msgstr "该相机不支持速度 %i。"
+
 # libgphoto2/gphoto2-filesys.c:214
-#: libgphoto2/gphoto2-filesys.c:279
+#: libgphoto2/gphoto2-filesys.c:280
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "路径“%s”不是绝对路径。"
 
 # libgphoto2/gphoto2-filesys.c:335
-#: libgphoto2/gphoto2-filesys.c:411
+#: libgphoto2/gphoto2-filesys.c:416
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "文件夹“%s”已存在，无法附加。"
 
 # libgphoto2/gphoto2-filesys.c:514
-#: libgphoto2/gphoto2-filesys.c:591
+#: libgphoto2/gphoto2-filesys.c:596
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "无法找到文件夹“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:531
-#: libgphoto2/gphoto2-filesys.c:608
+#: libgphoto2/gphoto2-filesys.c:613
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "文件夹“%s”不含有文件夹“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:594
-#: libgphoto2/gphoto2-filesys.c:672
+#: libgphoto2/gphoto2-filesys.c:677
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr "由于“%s”已存在，所以无法将其附加到文件夹“%s”中。"
 
 # libgphoto2/gphoto2-filesys.c:970
-#: libgphoto2/gphoto2-filesys.c:1050
+#: libgphoto2/gphoto2-filesys.c:1059
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -8222,25 +8637,25 @@ msgid ""
 msgstr "您试图从文件夹“%2$s”中删除“%1$s”，但文件系统不支持删除文件。"
 
 # libgphoto2/gphoto2-filesys.c:1077
-#: libgphoto2/gphoto2-filesys.c:1153
+#: libgphoto2/gphoto2-filesys.c:1162
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有子文件夹。"
 
 # libgphoto2/gphoto2-filesys.c:1071
-#: libgphoto2/gphoto2-filesys.c:1160
+#: libgphoto2/gphoto2-filesys.c:1169
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有文件。"
 
 # libgphoto2/gphoto2-filesys.c:1117
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1211
 msgid "The filesystem does not support upload of files."
 msgstr "文件系统不支持上载文件。"
 
 # libgphoto2/gphoto2-filesys.c:1158
-#: libgphoto2/gphoto2-filesys.c:1243
+#: libgphoto2/gphoto2-filesys.c:1252
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -8248,47 +8663,47 @@ msgid ""
 msgstr "文件夹“%s”只含有 %i 个文件，但您请求编号为 %i 的文件。"
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: libgphoto2/gphoto2-filesys.c:1288
+#: libgphoto2/gphoto2-filesys.c:1297
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # libgphoto2/gphoto2-filesys.c:1282
-#: libgphoto2/gphoto2-filesys.c:1375
+#: libgphoto2/gphoto2-filesys.c:1384
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "无法找到文件“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:1407
-#: libgphoto2/gphoto2-filesys.c:1500
+#: libgphoto2/gphoto2-filesys.c:1509
 msgid "The filesystem doesn't support getting files"
 msgstr "文件系统不支持获取文件"
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
-#: libgphoto2/gphoto2-filesys.c:2147
+#: libgphoto2/gphoto2-filesys.c:1549 libgphoto2/gphoto2-filesys.c:2048
+#: libgphoto2/gphoto2-filesys.c:2207
 #, c-format
 msgid "Unknown file type %i."
 msgstr "未知的文件类型 %i。"
 
 # libgphoto2/gphoto2-filesys.c:1446
-#: libgphoto2/gphoto2-filesys.c:1539
+#: libgphoto2/gphoto2-filesys.c:1553
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "正在从文件夹“%2$s”下载“%1$s”..."
 
 # libgphoto2/gphoto2-filesys.c:1656
-#: libgphoto2/gphoto2-filesys.c:1749
+#: libgphoto2/gphoto2-filesys.c:1802
 msgid "The filesystem doesn't support getting file information"
 msgstr "文件系统不支持获取文件信息"
 
 # libgphoto2/gphoto2-filesys.c:1867
-#: libgphoto2/gphoto2-filesys.c:2250
+#: libgphoto2/gphoto2-filesys.c:2310
 msgid "The filesystem doesn't support setting file information"
 msgstr "文件系统不支持设置文件信息"
 
 # libgphoto2/gphoto2-filesys.c:1890
-#: libgphoto2/gphoto2-filesys.c:2273
+#: libgphoto2/gphoto2-filesys.c:2333
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "无法改变像宽度和高度这样的只读文件属性。"
 
@@ -8357,6 +8772,36 @@ msgstr "未知的相机库错误"
 msgid "Unknown error"
 msgstr "未知的错误"
 
+# camlibs/ptp/library.c:422
+#, fuzzy
+#~ msgid ""
+#~ "PTP2 driver\n"
+#~ "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Enjoy!"
+#~ msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
+
+#~ msgid "There is nothing to summarize for this camera."
+#~ msgstr "对这个相机来说没有概要。"
+
+# camlibs/konica/library.c:800 camlibs/konica/library.c:807
+# camlibs/minolta/dimagev/dimagev.c:407 camlibs/sierra/sierra.c:856
+# camlibs/sierra/sierra.c:863 camlibs/sierra/sierra.c:917
+# camlibs/sierra/sierra.c:924 camlibs/sierra/sierra.c:979
+# camlibs/sierra/sierra.c:985 camlibs/sierra/sierra.c:1169
+# camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
+# camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
+# camlibs/sierra/sierra.c:1668
+#~ msgid "No manual"
+#~ msgstr "无手册"
+
+#, fuzzy
+#~ msgid "Unsupported port type: %d. This driver only works with USBcameras.\n"
+#~ msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
+
+# camlibs/ptp/library.c:918
+#~ msgid "PTP is implemented for USB cameras only."
+#~ msgstr "PTP 仅为 USB 相机实现。"
+
 # camlibs/directory/directory.c:201
 #~ msgid "Could not follow the link '%s' (%m)."
 #~ msgstr "无法跟随连接“%s”(%m)。"
@@ -8576,10 +9021,6 @@ msgstr "未知的错误"
 #~ msgid "57600"
 #~ msgstr "57600"
 
-# camlibs/polaroid/pdc700.c:174
-#~ msgid "115200"
-#~ msgstr "115200"
-
 # camlibs/polaroid/pdc700.c:175
 #~ msgid "VGA (640x480)"
 #~ msgstr "VGA (640x480)"