update-po

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

15 files changed, 12014 insertions, 8397 deletions

diff --git a/po/da.po b/po/da.po
index a993cc115..c9b411a80 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -94,26 +94,26 @@ msgstr ""
 "Implementeret ved brug af dokumenter\n"
 "fundet på nettet. Tilladelse givet af Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Kunne ikke oprette katalog %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunne ikke fjerne katalog %s."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "Fejl ved låsning af nøgler."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*UKENDT*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -122,7 +122,7 @@ msgstr ""
 "canon_int_capture_image: initiering af canon_usb_list_all_dirs() fejlede med "
 "status %li"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -131,17 +131,17 @@ msgstr ""
 "canon_int_capture_image: afsluttende canon_usb_list_all_dirs() fejlede med "
 "status %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Navnet '%s' (%li tegn) for langt, der må højst bruges 30 tegn."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Det er ikke tilladt at bruge små bogstaver i %s."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -149,7 +149,7 @@ msgstr ""
 "canon_int_list_directory: FEJL: begyndelsesbesked er for kort (%i < minimum %"
 "i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -157,28 +157,28 @@ msgstr ""
 "canon_int_list_directory: Nåede ende af pakke under undersøgelse af den "
 "første katalogindgang"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: stødte på afkortet katalogindgang"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Fil beskyttet."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Kunne ikke danne JPEG miniature fra data: Ingen start/slut"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Kunne ikke danne JPEG miniature fra data: Data er ikke JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL parameter \"%s\" i %s ved linje %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -205,7 +205,93 @@ msgstr ""
 "advarsel: CRC ikke kontrolleret (add len %d, value 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Smugkig-miniature"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Billede"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Auto-fokuseringstilstand"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Autofokusfejl."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Auto-fokuseringstilstand"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Manuel fokusering"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr "Rå"
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -237,49 +323,49 @@ msgstr ""
 "Hvis du oplever mange seriel-overførselsfejl, prøv at holde din computer\n"
 " så ledig som muligt (f.eks. ingen diskaktivitet)\n"
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera ikke tilgængeligt: %s"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Slukker kameraet"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Fejl under eksponering af billede"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kunne ikke finde disknavn: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Ingen begrundelse tilgængelig"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Kunne ikke finde diskinformation: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Intern fejl #1 i get_file_func() (%s linje %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Kunne ikke finde nogen lydfil til %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s er en filtype, for hvilken der ikke er miniaturer til rådighed"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -290,35 +376,35 @@ msgstr ""
 "  %11s byte total\n"
 "  %11s byte til rådighed"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "Strømforsyning"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "på batteri"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "strøm O.k."
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "mangler strøm"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "ikke tilgængelig: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (vært tid %s%i sekunder)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -345,7 +431,7 @@ msgstr ""
 "\n"
 "Tid: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -367,25 +453,25 @@ msgstr ""
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Fejl ved sletning af fil"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Fejl, tilknyttet miniaturefil slettet"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Højere overførselshastighed end 57600 bps er ikke understøttet i dette kamera"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Kunne ikke hente ram-kort drevbogstav"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -393,131 +479,262 @@ msgstr ""
 "Kunne ikke oplægge, intet frit mappenavn til rådighed!\n"
 "999CANON katalognavn eksisterer, og et AUT_9999.JPG billede findes."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Kunne ikke oprette \\DCIM katalog."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Kunne ikke oprette mål-katalog."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguration af kamera og driver"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Kameramodel (skrivebeskyttet)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Ejernavn"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Forud-optageforsinkelse"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO hastighed"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Lukkerhastighed"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Blændeåbning"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Opløsning"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Fokuseringstilstand"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Dato og tid (skrivebeskyttet)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Fejl"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Ikke tilgængelig"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Sæt kameradato til PC-dato"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Firmware revision (skrivebeskyttet)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Strøm (skrivebeskyttet)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Driver"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Vis alle filer"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Behold filnavn ved oplægning"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Kamera ikke tilgængeligt"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Ejernavn ændret"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "Kunne ikke ændre ejernavn"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Ejernavn ændret"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "Kunne ikke ændre ejernavn"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Lukkerhastighed"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "Kunne ikke ændre ejernavn"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Blændeåbningsindstilling"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Blændeåbningsindstilling"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "Kunne ikke ændre ejernavn"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Opløsningsomskifter"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Kunne ikke oprette kataloget."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Fokuseringstilstand"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "Kunne ikke ændre ejernavn"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "Indstil tid"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "Kunne ikke indstille tid"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ikke understøttet port type anført %i = 0x%x. Initialisering umulig."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Batteri tømt, kamera slukket."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "FEJL: uventet meddelelse"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "FEJL: besked overløb."
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "FEJL: ude af rækkefølge."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "FEJL: uventet pakketype."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "FEJL: beskedformat fejl."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "FEJL: uventet besked 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Oplægger fil..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Henter fil..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -525,152 +742,152 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue fejlede ved hentning af "
 "katalogindgange"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 "canon_serial_get_dirents: Begyndelseskatalogindgang for kort (kun %i byte)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Kunne ikke allokere %i byte af hukommelsen"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Kunne ikke læse flere katalogindgange"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Modtog afkortet katalogindgang"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: For mange katalogindgange, det må køre i sløjfe."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Kunne ikke genskabe katalogindgangsstørrelse til %"
 "i byte"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Fejl under ændring af hastighed."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Nulstiller protokol"
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Kamera O.k.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Søger efter kamera ..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Prøver at kontakte kameraet..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Kommunikationsfejl 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Intet svar fra kamera"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Svar ikke genkendt"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Fandt et \"%s\" også kendt som \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Ukendt model \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Forkert EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Kommunikationsfejl 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Kommunikationsfejl 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Ændrer hastighed... vent..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Fejl under ændring af hastighed"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "Fejl under venten på ACK under initialisering, prøver igen"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Fejl under venten på ACK under initialisering"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Forbundet til kamera"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FEJL: fatal fejltilstand opdaget, kan ikke fortsætte"
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FEJL: %d er for stor"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Henter miniature..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "IKKE GENKENDT"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Kunne ikke etablere første kontakt med kameraet"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Kameraet var allerede aktivt"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Kameraet blev vækket"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr "Ukendt (en eller anden form for fejl)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Initieringssvar '%c' fra kamera blev ikke genkendt"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -679,7 +896,7 @@ msgstr ""
 "Trin 2 i initialiseringen fejlede: \"%s\" ved læsning af %i) Kameraet er "
 "ikke driftsklart"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -688,7 +905,7 @@ msgstr ""
 "Trin 2 i initialiseringen fejlede! (returnerede %i byte, forventede %i) "
 "Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -696,7 +913,7 @@ msgstr ""
 "Trin 3 i initialiseringen fejlede: \"%s\" ved læsning af %i Kameraet er ikke "
 "driftsklart"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -705,7 +922,7 @@ msgstr ""
 "Trin 3 i initialiseringen fejlede: (returnerede %i byte, forventede %i) "
 "Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -714,28 +931,28 @@ msgstr ""
 "Trin 3 i initialiseringen fejlede: \"%s\" ved læsning af %i Kameraet er ikke "
 "driftsklart"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Trin 4 fejlede: \"%s\" ved læsning af %i Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "Trin 4 fejlede! (returnerede %i, forventede %i) Kameraet er ikke driftsklart"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr "Kameraet er ikke klart, flere 'Identificering af kamera' fejlede: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kameraet er ikke klart, get_battery fejlede: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -744,18 +961,18 @@ msgstr ""
 "canon_usb_lock_keys: Modtog uventet længde fra \"lock keys\" funktionen (%i "
 "byte, forventet %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr "canon_usb_lock_keys: Modtog uventet længde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr "canon_usb_unlock_keys: Modtog uventet længde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -763,7 +980,7 @@ msgid ""
 msgstr ""
 "canon_usb_get_body_id: Modtog uventet datalængde (%i byte, forventet %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -772,7 +989,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: afbrudt-læsning fejlede efter %i forsøg, %"
 "6.3f sekunder \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -781,7 +998,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: afbrudt-læsning fejlede efter %i forsøg, "
 "\"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -789,7 +1006,7 @@ msgstr ""
 "canon_usb_capture_dialogue: forkert længde 0x%04x for miniaturernes "
 "pakkestørrelse"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -797,57 +1014,62 @@ msgstr ""
 "canon_usb_capture_dialogue: forkert længde 0x%04x for fuldt billedes "
 "pakkestørrelse"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr "canon_usb_capture_dialogue: andet afbrudt-læsning ude af sammenhæng"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: første afbrudt-læsning ude af sammenhæng"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: andet afbrudt-læsning ude af sammenhæng"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr "canon_usb_capture_dialogue: fotografisk fejl signaleret, kode = 0x%08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: tredie EOS afbrudt-læsning ude af sammenhæng"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: fjerde EOS afbrudt-læsning ude af sammenhæng"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: pakkeindhold for stort, kan ikke passes ind i buffer (%i "
 "> %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 "canon_usb_dialogue: forventede 0x%x byte, men kameraet rapporterer 0x%x"
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Modtager data..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Løb tør for hukommelse: %d byte nødvendigt."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fejlede"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -856,22 +1078,22 @@ msgstr ""
 "Advarsel i canon_usb_set_file_attributes: canon_usb_dialogue returnerede "
 "fejlstatus 0x%08x fra kameraet"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunne ikke læse fra fil\"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Ikke mere hukommelse: %ld byte nødvendigt."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Filoplægning mislykkedes."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -879,7 +1101,7 @@ msgstr ""
 "Filen var for stor. Du er nok nødt til at slukke og tænde for dit kamera, "
 "før du kan oplægge flere filer til det."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -888,7 +1110,7 @@ msgstr ""
 "canon_usb_get_dirents: Kunne ikke passe pakkeindholdet ind i buffer, "
 "'%.96s' (afkortet) for lang."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -897,7 +1119,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue fejlede under hentning af "
 "katalogindgange, returnerede %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -906,7 +1128,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Kunne ikke passe pakkeindholdet ind i buffer, "
 "'%.96s' (afkortet) for lang."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -915,12 +1137,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue fejlede under hentning af "
 "katalogindgange, returnerede %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Fandt et '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Navnet \"%s\" fra kameraet, passer ikke med noget kendt kamera"
@@ -1124,8 +1346,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blitz"
@@ -1305,49 +1527,49 @@ msgstr "Problem ved indstilling af kameraets kommunikationshastighed"
 msgid "Looks like a modem, not a camera"
 msgstr "Ligner et modem, og ikke et kamera"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Lister filer i '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Lister mapper i '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Kunne ikke finde information om '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Kunne ikke hente informationer om '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Kunne ikke ændre tid for filen '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kunne ikke åbne '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Katalog-gennemsøgning \"kamera\" lader dig indekserne fotografier på din "
 "harddisk."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Kataloggennemsøgningsmåde - skrevet af Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "Kunne ikke slette filen '%s' i mappen '%s' (fejlkode %i: %m)."
@@ -1410,7 +1632,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Hjemhenter..."
@@ -1766,20 +1988,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:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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
@@ -1821,11 +2043,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1860,8 +2082,8 @@ msgid "Force"
 msgstr "Gennemtving"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ingen"
@@ -1878,13 +2100,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1900,14 +2122,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2513,13 +2735,6 @@ msgstr "Automatisk sluk tid"
 msgid "Slide Show Interval"
 msgstr "Diasshow interval"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Opløsning"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2631,10 +2846,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2710,7 +2925,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2723,7 +2938,7 @@ msgid "Medium"
 msgstr "Mellem"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2792,7 +3007,7 @@ msgid "Black and White"
 msgstr "Sort/hvid"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3035,8 +3250,8 @@ msgstr ""
 "Kort ID:\t\t%d\n"
 "Blitztilstand:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Fjern"
 
@@ -3046,13 +3261,13 @@ msgstr "Lokal"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Ja"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nej"
 
@@ -3062,7 +3277,7 @@ msgstr "Nej"
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3111,7 +3326,7 @@ msgid "Not Full"
 msgstr "Ikke fuld"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Fuld"
@@ -3294,7 +3509,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:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Oplægger..."
 
@@ -3491,13 +3706,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:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Billede kvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Billede størrelse"
 
@@ -3513,11 +3728,11 @@ msgstr "Automatisk sluk efter (minutter)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fin"
 
@@ -3525,21 +3740,21 @@ msgstr "fin"
 msgid "superfine"
 msgstr "superfin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "slukket"
@@ -3822,7 +4037,7 @@ msgstr "PTP protokol fejl, data forventet"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokol fejl, svar forventet"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3836,71 +4051,66 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Beklager, dit Canon kamera understøtter ikke Canon-optagning"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "Canon tillad-søger fejlede: %d"
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Canon hent-søgerbillede fejlede: %d"
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Canon slå-søger-fra fejlede: %d"
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Beklager, dit kamera understøtter ikke almen optagning"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 "Beklager, dit Canon kamera understøtter ikke Canon optagningsinitiering"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Beklager, dit kamera understøtter ikke almen optagning"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Optagekommando afsluttet, men modtog ingen bekræftelse"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Modtog hændelse 0x%04x"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "læse/skrive"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3915,488 +4125,488 @@ msgstr ""
 "Fremstiller udvidelses ID: 0x%08x\n"
 "Fremstiller udvidelsesbeskrivelse: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Datoformat"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Datoformat"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Filopløsning"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Filopløsning"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Filoplægning mislykkedes."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Optag"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Optag"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ukendt (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generel"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "læse/skrive"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Klar"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Antal billeder: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ukendt filtype %i."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "uventet datatype %i"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr "En-knaps automatik"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr "Skygge"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Forvalgt"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr "JPEG basis"
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr "JPEG normal"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr "JPEG fin"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr "NEF (rå)"
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr "NEF+basis"
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr "superfin"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr "automatisk rødøje"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr "rødøje til"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr "Fjernbetjener"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr "spot"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "center"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr "stor"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr "middel 1"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr "middel 2"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr "lille"
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr "Fabriksstandard"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr "Portræt"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr "Landskab"
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr "Nat-portræt"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr "Nat-landskab"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr "Enkelt-skud"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Bedst"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 #, fuzzy
 msgid "Timelapse"
 msgstr "Tidsforkortelses antal"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr "Timer"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr "Timer + Fjernbetjening"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr "Dynamisk område"
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr "Enkelt område"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr "Nærmeste emne"
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Portræt"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 msgid "Centre"
 msgstr "Centrum"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr "Top"
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr "Bund"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr "Venstre"
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr "Højre"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr "Centervægtet"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centervægtet"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Blitz"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Rødøjereduktion"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Rødøje blitz"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "eksternt"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr "Standard"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4404,610 +4614,604 @@ msgstr "Standard"
 msgid "Slow Sync"
 msgstr "Langsom synkronisering"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Bagestegardin synkronisering + langsom synkronisering"
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Rødøjereduktion + langsom synkronisering"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Sort/hvid"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Afstandslås"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "1 min."
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 #, fuzzy
 msgid "5 minutes"
 msgstr "5 min."
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 min."
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 #, fuzzy
 msgid "30 minutes"
 msgstr "10 min."
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 min."
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr "Skarp"
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Skarp"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Blødt"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Kataloget eksisterer"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Mellem"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Mellem"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Mellem"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr "Lang afstand"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatisk"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "AC"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr "Fluorescerende H"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr "Lav skarphed"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr "Sort/hvid"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "Ingen blitz"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Eksponeringssammenstilling"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internt"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Intet kort"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "Kameraejer"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Kameramodel"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmware revision: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Kameratid"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "Bippetilstand"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr "Billedkommentar"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr "LCD slukket tid"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Automatisk måler slukket tid"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Optageindstillinger"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO hastighed"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr "Hvidbalance"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "Fotoeffekt"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Farvetilstand"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr "Automatisk ISO"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr "Lang eksponerings støjreduktion"
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Auto-fokuseringstilstand"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "Hjælpelys"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr "AF område belysning"
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr "AF bippetilstand"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr "Blænde-tal"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Brændvidde"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokuseringstilstand"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Eksponeringstid"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "Effekttilstand"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 msgid "Exposure Program"
 msgstr "Eksponeringsprogram"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "Stilbilledeoptagetilstand"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "Afstandsinstillingstilstand"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "Eksponerings-målingstilstand"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Blændeåbning"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "Fokuseringspunkt"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr "Lukkerhastighed"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "Målingstilstand"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Fokuseringsafstand"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 msgid "Focus Area Wrap"
 msgstr "Nulstilling af fokuseringsområde"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr "Eksponeringslås"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr "Sæt filnumre i rækkefølge"
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr "Blitzsymbol"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Søgertilstand"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr "Billedgennemsyn"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Billedrotation"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr "Blitztilstand manuel-strøm"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Auto-fokuseringstilstand"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr "Blitzeksponeringskompensation"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr "Sammensat sæt"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr "Sammensat orden"
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "Serie antal"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Automatisk hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Wolfram hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Fluorescerende hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Dagslys hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Blitz hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Skyet hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Skygget hvidbalance korrektion"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Selvudløser forsinkelse"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Centervægt område"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr "Blitz lukkerhastighed"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr "Fjernbetjent tidsudløb"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr "Gør skarpere"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr "Tone kompensation"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Konfiguration"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr "Farvetonejustering"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5015,40 +5219,40 @@ msgstr "Farvetonejustering"
 msgid "Camera Settings"
 msgstr "Kameraindstillinger"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr "Billedindstillinger"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Optageindstillinger"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Antal værdier"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Understøttede værdier"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Nuværende værdi"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Initialisation af kamera"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5582,218 +5786,255 @@ msgstr "Maks. blændeåbning ved max. fokuslængde"
 msgid "Low Light"
 msgstr "Low-Light"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Eksponeringstid"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr "Rå"
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr "Rå + JPEG basis"
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Hvidglødende"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Rødøjereduktion"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr "Manuel fokusering"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Blitz-tilstand"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr "Motordrev"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr "1 min."
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr "5 min."
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr "10 min."
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr "15 min."
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 #, fuzzy
 msgid "Firmware"
 msgstr "Firmware revision: %8s"
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP ikke defineret fejl"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Ikkedefineret PTP egenskab"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ukendt (0x%02x)"
diff --git a/po/de.po b/po/de.po
index 446ee9716..5a8197ee8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+0200\n"
 "PO-Revision-Date: 2006-04-23 11:43+0200\n"
 "Last-Translator: Marcus Meissner <marcus@jet.franken.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -95,26 +95,26 @@ msgstr ""
 "Implementiert mit Hilfe von Dokumenten\n"
 "aus dem Web. Mit Erlaubnis von Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Konnte Verzeichnis »%s« nicht anlegen."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Konnte Verzeichnis »%s« nicht löschen."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "könnte Tasten nicht sperren."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*UNBEKANNT*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -123,7 +123,7 @@ msgstr ""
 "canon_int_capture_image: erste canon_usb_list_all_dirs() fehlgeschlagen mit "
 "status %li"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -132,24 +132,24 @@ msgstr ""
 "canon_int_capture_image: finalletzte canon_usb_list_all_dirs() "
 "fehlgeschlagen mit status %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "Name »%s« (%li Zeichen) ist zu lang, maximal 30 Zeichen erlaubt."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Kleingeschriebene Buchstaben sind in %s nicht erlaubt."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_directory: ERROR: erste Meldung zu kurz (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -157,29 +157,29 @@ msgstr ""
 "canon_int_list_directory: Ende des Pakets erreicht als erstes "
 "Verzeichniselement untersucht wurde"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: verkürzte Verzeichniselemente gefunden"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Datei geschützt."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Könnte JPEG Vorschaubild von Daten nicht ausziehen: keine Anfang/Ende"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Könnte JPEG Vorschaubild von Daten nicht ausziehen: Daten sind nicht JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "NULL Parameter \"%s\" in %s, Zeile %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -204,7 +204,93 @@ msgstr ""
 "Warnung: CRC nicht verglichen (Länge %d, Wert 0x%04x) "
 "##########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Vorschau Modus"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Bild"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Autofokus Modus"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Autofokus Fehler."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Autofokus Modus"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Manueller Fokus"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr "RAW"
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -235,49 +321,49 @@ msgstr ""
 "Wenn viele serielle Transmissionsfehler auftreten, probieren sie den Rechner "
 "so idle wie möglich zu haben (z.B. keine Plattenaktivität)\n"
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera nicht verfügbar: %s"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Schalte Kamera aus"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Fehler beim Aufnehmen des Bildes"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Konnte Plattennamen nicht holen: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Kein Grund verfügbar"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Konnte Platteninfo nicht holen: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Interne Fehler nr.1 in get_file_func() (%s Zeile %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Keine Tondatei für »%s« konnte gefunden werden."
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s ist ein Filetyp für den keine Preview angeboten wird"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -288,35 +374,35 @@ msgstr ""
 "  %11s bytes gesamt\n"
 "  %11s bytes verfügbar"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "Netzadapter "
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "mit Batterie "
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "Energieversorgung OK"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "Energieversorgung nicht OK"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "nicht verfügbar: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (Zeit am PC %s%i Sekunden)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +429,7 @@ msgstr ""
 "\n"
 "Zeit: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -364,25 +450,25 @@ msgstr ""
 "Weitere Verbesserungen von:Holger Klemm\n"
 "Stephen H. Westin"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Fehler beim Löschen der Datei"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Fehler beim Löschen des zugehörigen Vorschaubildes"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Raten über 57600 sind mit dieser Kamera nicht für das Hochladen unterstützt"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Konnte keinen Laufwerksbuchstaben für das Flash-Laufwerk bekommen"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -391,133 +477,264 @@ msgstr ""
 "Der Verzeichnisname 999CANON existiert und enthält eine Datei namens "
 "AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Konnte Verzeichnis \\\\DCIM nicht anlegen."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Konnte Zielverzeichnis nicht anlegen."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- und Treiber-Konfiguration"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Kameramodell (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Eigentümername"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Aufnahmeverzögerung"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO-Geschwindigkeit"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Belichtungszeit"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Blende"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Auflösung"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Fokusmodus"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Datum und Zeit (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Fehler"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Setze Kameradatum auf das Datum des PCs"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Firmware-Revision (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Energie (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Treiber"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Liste alle Dateien"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Dateinamen beim Hochladen beibehalten"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Kamera nicht verfügbar"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Eigentümername geändert"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "Konnte Eigentümernamen nicht ändern"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Eigentümername geändert"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "Konnte Eigentümernamen nicht ändern"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Belichtungszeit"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "Konnte Eigentümernamen nicht ändern"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Blendeneinstellung"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Blendeneinstellung"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "Konnte Eigentümernamen nicht ändern"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Auflösungsumschaltung"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Konnte Verzeichnis nicht anlegen."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Fokusmodus"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "Konnte Eigentümernamen nicht ändern"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "Zeit gesetzt"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "Konnte Zeit nicht setzen"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Nichtunterstützter Port-Typ %i = 0x%x angegeben. Initialisierung nicht "
 "möglich."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Batterie leer, Kamera aus."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "Fehler: unerwartete Meldung"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "Fehler: Meldungsüberlauf"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "Fehler: aus der Reihe."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "Fehler: unerwarteter Pakettyp."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "Fehler: Meldungsformatfehler."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "Fehler: unerwartete Meldung2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Lade Bild hoch..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Hole Datei..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -525,7 +742,7 @@ msgstr ""
 "\"canon_serial_get_dirents: canon_serial_dialogue könnte Verzeichniselemente "
 "nicht holen \""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -533,147 +750,147 @@ msgstr ""
 "canon_serial_get_dirents: Anfangend Verzeichniselementepaket zu kurz (nur %i "
 "bytes)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Könnte nicht %i bytes Speicherplatz holen"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Könnte keine Verzeichniselemente noch lesen"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Verkurzte Verzeichniselemente erhalten"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: Zu viele Verzeichniselemente, wir müssen in einem "
 "Teufelskreis geraten sein."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Könnte Größe des Verzeichniselementspuffers nicht "
 "auf %i bytes verändern"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Fehler beim Ändern der Datenrate."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Setze Protokoll zurück..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Kamera OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Suche nach Kamera ..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Versuche, Kamera zu kontaktieren..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Kommunikationsfehler 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Keine Antwort von Kamera"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Nicht erkannte Antwort"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Erkannte eine »%s« alias »%s«"
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Unbekanntes Modell »%s«"
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Fehlerhafter EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Kommunikationsfehler 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Kommunikationsfehler 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Ändere Datenrate... Warte..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Fehler beim Ändern der Datenrate"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 "Fehler beim Warten auf ACK, während die Initialisierung erneut versucht wird"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Fehler beim Warten auf ACK während der Initialisierung"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Mit Kamera verbunden"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "FEHLER: eine Fatalfehler würde empfindet, kann nicht weitermachen"
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "FEHLER: %d ist zu groß"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Hole Vorschaubild..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "UNBEKANNT"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Konnte Kamera nicht anfänglich kontaktieren."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Kamera war schon aktiv"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Kamera wurde aufgeweckt"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr "Unbekannte Antwort (Kamerafehler)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Erste Kameraantwort %c/ unerwartet"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -682,7 +899,7 @@ msgstr ""
 "Stufe nr.2 der Kamerainitialisierung fehlgeschlagen: »%s« beim Lesen von %i) "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -691,7 +908,7 @@ msgstr ""
 "Stufe nr.2 der Kamerainitialisierung fehlgeschlagen! (%i erhalten, %i "
 "erwartet) Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -699,7 +916,7 @@ msgstr ""
 "Stufe nr.3 der Kamerainitialisierung fehlgeschlagen: »%s« beim Lesen von %i "
 "Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -708,7 +925,7 @@ msgstr ""
 "Stufe nr.3 von Kamerainitialisierung fehlgeschlagen! (%i erhalten, %i "
 "erwartet) Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -717,31 +934,31 @@ msgstr ""
 "Stufe nr.3 von Kamerainitialisierung fehlgeschlagen: %s beim Schreiben von %"
 "i. Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Stufe nr.4 fehlgeschlagen: %s beim Lesen von %i. Kamera funktioniert nicht"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "Stufe nr.4 fehlgeschlagen! (%i erhalten, %i erwartet) Kamera funktioniert "
 "nicht"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera nicht bereit, mehrere »Identify camera«-Anfragen fehlgeschlagen: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera nicht bereit, get_battery-Anfrage fehlgeschlagen: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -750,20 +967,20 @@ msgstr ""
 "canon_usb_lock_keys: Unerwartete Länge von »lock_keys« erhalten (%i "
 "erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Unerwartete Länge erhalten (%i erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: Unerwartete Länge erhalten (%i erhalten, %i erwartet)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -772,7 +989,7 @@ msgstr ""
 "canon_usb_get_body_id: Unerwartete Datenlänge erhalten (%i erhalten, %i "
 "erwartet)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -781,7 +998,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: lesen von Interrupt Pipe fehlgeschlagen nach %"
 "i Versuchen, %6.3f Sekunden %s»  «"
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -790,28 +1007,33 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: lesen vom Interruptrohr fehlgeschlagen nach %"
 "i versuchen, »%s«"
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 "canon_usb_capture_dialogue: Falsche Paketlänge 0x%04x füer Vorschaubildslänge"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr "canon_usb_capture_dialogue: Falsche Paketlänge 0x%04x für Bildslänge"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr "canon_usb_capture_dialogue: zweite Interruptspaket außer Reihenfolge"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: erste Interruptspaket außer Reihenfolge"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: zweite Interruptspaket außer Reihenfolge"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -819,40 +1041,40 @@ msgstr ""
 "canon_usb_capture_dialogue: Aufnahme photographisch fehlgeschlagen, code=0x%"
 "08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: dritte EOS Interruptspaket außer Reihenfolge"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: zweite EOS Interruptspaket außer Reihenfolge"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr "canon_usb_dialogue: Nutzlast zu groß, passt nicht in Puffer (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr "canon_usb_dialogue: 0x%x Byte erwartet, aber Kamera berichtet 0x%x"
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Empfange Daten..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Speicherplatz fehlt: %d bytes benötigt."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fehlgeschlagen"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -861,22 +1083,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue gibt Status 0x%08x von der "
 "Kamera zurück"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Konnte Daten vom Datei »%s« nicht holen"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Speicherplatz fehlt: %ld bytes benötigt."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Bildhochladung fehlgeschlagen."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -884,7 +1106,7 @@ msgstr ""
 "Datei war zu groß. Möglicherweise müssen Sie ihre Kamera aus- und wieder "
 "einschalten, um weitere Dateien hochzuladen."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -892,7 +1114,7 @@ msgid ""
 msgstr ""
 "canon_usb_get_dirents: Nutzlast passt nicht in Puffer, '%.96s' (verkurzt)"
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -901,7 +1123,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue könnte keine "
 "Verzeichniselemente holen, status %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -910,7 +1132,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Nutzlast passt nicht in Puffer, »%.96s« (verkurtzt) "
 "zu lang."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -919,12 +1141,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue könnte keine "
 "Verzeichniselemente holen, status %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Erkannte eine »%s«."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Name »%s« passt mit keinem bekanntes Modell"
@@ -1120,8 +1342,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blitz"
@@ -1301,48 +1523,48 @@ msgstr "Problem beim Setzen der Kameradatenrate"
 msgid "Looks like a modem, not a camera"
 msgstr "Sieht wie ein Modem aus, nicht wie eine Kamera"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Liste Dateien in »%s«..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Liste Verzeichnisse in »%s«..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Konnte keine Informationen über »%s« bekommen (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Konnte keine Informationen über »%s« in »%s« bekommen (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Konnte die Zeit von Datei »%s« in »%s« nicht ändern (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Konnte »%s« nicht öffnen."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Der \"Kamera\" Verzeichnismodus erlaubt es Ihnen, \n"
 "Bilder auf der Festplatte zu indexieren."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Verzeichnis-Modus - geschrieben von Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "Konnte die Datei »%s« in Ordner »%s« nicht löschen (Fehler: %i:-%m)."
@@ -1405,7 +1627,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kamera hat unerwartetes Byte 0x%02x geschickt."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Lade herunter..."
@@ -1759,20 +1981,20 @@ msgid "High (good quality)"
 msgstr "Hoch (gute Qualität)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 msgid "Capture"
 msgstr "Aufnahme"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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
@@ -1814,11 +2036,11 @@ msgstr "Belichtungskompensation"
 #: 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1853,8 +2075,8 @@ msgid "Force"
 msgstr "Immer"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Keine"
@@ -1871,13 +2093,13 @@ msgstr "Rote-Augen-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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1893,14 +2115,14 @@ msgstr "An"
 #: 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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2510,13 +2732,6 @@ msgstr "Zeit für automatische Abschaltung"
 msgid "Slide Show Interval"
 msgstr "Diashow-Intervall"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Auflösung"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2628,10 +2843,10 @@ msgstr "Selbstauslöser (nur nächstes 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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2706,7 +2921,7 @@ msgid "No answer from the camera."
 msgstr "Keine Antwort von der Kamera."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2719,7 +2934,7 @@ msgid "Medium"
 msgstr "Mittel"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2788,7 +3003,7 @@ msgid "Black and White"
 msgstr "schwarz/weiß"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3036,8 +3251,8 @@ msgstr ""
 "Karten-ID:\t\t%d\n"
 "Blitzmodus:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Entfernt"
 
@@ -3047,13 +3262,13 @@ msgstr "Lokal"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Ja"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nein"
 
@@ -3063,7 +3278,7 @@ msgstr "Nein"
 msgid "Fine"
 msgstr "Fein"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3112,7 +3327,7 @@ msgid "Not Full"
 msgstr "Nicht voll"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Voll"
@@ -3295,7 +3510,7 @@ msgstr ""
 "Dateigröße ist %ld bytes. Größtmögliche Datei für das Hochladen ist %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Lade Bild hoch..."
 
@@ -3491,13 +3706,13 @@ msgstr ""
 "Jenoptik JD350e durch Michael Trawny <trawny99@users.sourceforge.net>. "
 "Bugfixes von Marcus Meißner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Bildqualität"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Bildgröße"
 
@@ -3513,11 +3728,11 @@ msgstr "Autom. Abschaltung (in Minuten)"
 msgid "Information"
 msgstr "Informationen"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fein"
 
@@ -3525,21 +3740,21 @@ msgstr "fein"
 msgid "superfine"
 msgstr "superfein"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "an"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "aus"
@@ -3825,7 +4040,7 @@ msgstr "PTP- Protokollfehler: Daten erwartet"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP-Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3850,69 +4065,64 @@ msgstr ""
 "\n"
 "Viel Spaß!"
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Diese Canon Kamera unterstützt nicht den Canon Aufnahme Modus"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Diese Kamera unterstützt nicht den Canon Viewfinder Modus"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "Anschalten des Viewfinder fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Holen des Viewfinder Bildes fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Abschalten des Viewfinders fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Diese Kamera unterstützt keine Nikon spezifische Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Diese Kamera unterstützt keinen Canon Aufnahmestart"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon Aufnahme fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Diese Kamera unterstützt keine Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Aufnahme abgeschlossen, aber keine Bestätigung erhalten"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Ereignis 0x%04x erhalten"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "schreibgeschützt"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "schreibbar"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3927,7 +4137,7 @@ msgstr ""
 "Händler Kennung: 0x%08x\n"
 "Händler Beschreibung: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, c-format
 msgid ""
 "\n"
@@ -3936,22 +4146,22 @@ msgstr ""
 "\n"
 "Aufnahmeformate: "
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, c-format
 msgid "Display Formats: "
 msgstr "Anzeigeformate: "
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr "Unterstützte MTP Object Properties:\n"
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr "PTP Fehler %04x beim Abfragen"
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
@@ -3960,67 +4170,67 @@ msgstr ""
 "\n"
 "Fähigkeiten des Geräts:\n"
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr "\tDateien Download, "
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, c-format
 msgid "File Deletion, "
 msgstr "Löschen von Dateien, "
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, c-format
 msgid "No File Deletion, "
 msgstr "kein Löschen von Dateien, "
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, c-format
 msgid "File Upload\n"
 msgstr "Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr "kein Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr "\tGenerische Bild Aufnahme, "
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr "\tKeine Aufnahme von Bildern, "
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, c-format
 msgid "Open Capture, "
 msgstr "Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr "keine Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Aufnahme\n"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, c-format
 msgid "Nikon Capture\n"
 msgstr "Nikon Aufnahme\n"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr "Kein Vendor spezifischer Aufnahmemodus\n"
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
@@ -4029,98 +4239,98 @@ msgstr ""
 "\n"
 "Informationen über Speichermedium:\n"
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tBeschreibung des Speichergeräts: %s\n"
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tLabel des Speichergerätes: %s\n"
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr "Eingebautes ROM"
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr "Entfernbares ROM"
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr "Eingebauter Speicher"
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr "Entfernbarer Speicher (Karte)"
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Unbekannt: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tSpeichertyp: %s\n"
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 msgid "Generic Flat"
 msgstr "Generisch flacher Modus"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr "Generisch hierarchischer Modus"
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Standard Digital Kamera Layout (DCIM)"
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTyp des Dateisystems: %s\n"
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr "Lesen und Schreiben"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 msgid "Read-Only"
 msgstr "nur Lesen"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr "Nur Lesen und Löschen"
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tZugriffsmöglichkeiten: %s\n"
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaximale Kapazität: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\t Freier Platz (Bytes): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tFreier Speicher (Bilder): %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
@@ -4129,278 +4339,278 @@ msgstr ""
 "\n"
 "Properties des Geräts:\n"
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, c-format
 msgid "Unknown value %04x"
 msgstr "Unbekannter Wert %04x"
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "unerwarteter Datentyp %i"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuell"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr "Vollautomatik"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr "Tageslicht"
 
-#: camlibs/ptp2/library.c:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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 "Kunstlicht - Fluoreszenzlampe"
 
-#: camlibs/ptp2/library.c:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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 "Kunstlicht - Glühlampe"
 
-#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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 "Wolkig"
 
-#: camlibs/ptp2/library.c:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr "Schatten"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr "JPEG Basic"
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr "JPEG Normal"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr "JPEG Fein"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr "NEF + BASIC"
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr "superfein"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr "Automatische Anti-Rotaugen"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr "Anti-Rotaugen"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr "iTTL"
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr "Commander"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr "Punkt"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 msgid "Center"
 msgstr "Zentrum"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr "groß"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr "mittel 1"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr "mittel 2"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr "klein"
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr "Werkseinstellung"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr "Kreativ"
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 msgid "Action"
 msgstr "Aktion"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr "Portrait"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr "Landschaft"
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr "Nachtportrait"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr "Nachtlandschaft"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr "Einzelbild"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 msgid "Burst"
 msgstr "Mehrbild"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr "Zeitraffer"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr "Selbstauslöser"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr "Selbstauslöser + Entfernt"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr "Dynamischer Bereich"
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr "Einzelbereich"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr "Nächstes Subjekt"
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 msgid "sRGB (portrait)"
 msgstr "sRGB (Portrait optimiert)"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr "sRGB (Natur optimiert)"
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 msgid "Centre"
 msgstr "Zentrum"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr "Oben"
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr "Unten"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr "Links"
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr "Rechts"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr "Mehrpunkt"
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr "Zentral Punkt"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 msgid "Automatic Flash"
 msgstr "Automatischer Blitz"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 msgid "Flash off"
 msgstr "Blitz aus"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 msgid "Fill flash"
 msgstr "Auffüll Blitz"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 msgid "Red-eye automatic"
 msgstr "automatische Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 msgid "Red-eye fill"
 msgstr "Rote-Augen-Blitz Füllmodus"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 msgid "External sync"
 msgstr "Externer Sync"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr "Standard"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4408,568 +4618,562 @@ msgstr "Standard"
 msgid "Slow Sync"
 msgstr "Langsamer Sync"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Hinterer Vorhang Sync+Langsamer Sync"
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Rote-Augen-Vermeidung + Langsamer Sync"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Schwarz & Weiß"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 msgid "AE/AF Lock"
 msgstr "AE/AF Lock"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr "nur AE Lock"
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr "Nur AF Lock"
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr "AF Lock halten"
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr "AF an"
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr "Blitzstärke Lock"
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr "10 Sekunden"
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr "20 Sekunden"
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 #, fuzzy
 msgid "5 minutes"
 msgstr "5 Minuten"
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 Minuten"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr "4 Sekunden"
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr "6 Sekunden"
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr "8 Sekunden"
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr "16 Sekunden"
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr "2 Sekunden"
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr "5 Sekunden"
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 msgid "6 mm"
 msgstr "6 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 msgid "8 mm"
 msgstr "8 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 msgid "10 mm"
 msgstr "10 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 msgid "20 mm"
 msgstr "20 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr "1/60"
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr "1/30"
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr "1/15"
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr "1/8"
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr "1/4"
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr "1/2"
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 msgid "1"
 msgstr "1"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 msgid "2"
 msgstr "2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 msgid "4"
 msgstr "4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 msgid "8"
 msgstr "8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 msgid "15"
 msgstr "15"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr "30"
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr "Lebhaft"
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 msgid "Sharper"
 msgstr "Schärfer"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr "Weicher"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 msgid "Direct Print"
 msgstr "Direkt Druck"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 msgid "Medium Low"
 msgstr "Mittel Niedrig"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 msgid "Medium high"
 msgstr "Mittel Hoch"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 msgid "Low contrast"
 msgstr "Niedriger Kontrast"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 msgid "Medium low"
 msgstr "Mittel niedrig"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr "Hoch kontrolliert"
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr "Weite Entfernung"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 msgid "Automatic Macro"
 msgstr "Automatischer Makro"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr "AF-S"
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr "AF-C"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr "Fluoreszenz H"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr "Neutral"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr "Wenig Schärfe"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr "Schwarz und Weiss"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 msgid "AE & Flash"
 msgstr "AE & Blitz"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 msgid "AE only"
 msgstr "nur AE"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 msgid "Flash only"
 msgstr "nur Blitz"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 msgid "WB bracketing"
 msgstr "Weißabgleichabstufung"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr "Mittel"
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr "Erweitert"
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr "MTR > Unter"
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr "Unter > MTR"
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 msgid "Internal RAM"
 msgstr "interner Speicher"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 msgid "Memory card"
 msgstr "Speicherkarte"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "Kamerabesitzer"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Kameramodell"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 msgid "Firmware Version"
 msgstr "Firmware Revision"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Kamerazeit"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "Signalton Modus"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr "Bild Kommentar"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr "Zeit für automatische Abschaltung des LCD"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 msgid "Meter Off Time"
 msgstr "Sensorabschaltzeit"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr "CSM Menü"
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr "Schnelles Dateisystem"
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 msgid "Capture Target"
 msgstr "Aufnahmeziel"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO-Geschwindigkeit"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr "Weißabgleich"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "Foto Effekt"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 msgid "Color Model"
 msgstr "Farbmodell"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr "Auto ISO"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr "Rauschunterdrückung bei Langzeit Aufnahme"
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 msgid "Auto Focus Mode"
 msgstr "Autofokusmodus"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "Autofokus Hilfslicht"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Belichtungskompensation"
 
-#: camlibs/ptp2/library.c:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Blitzmodus"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr "AF Bereich Aufhellung"
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr "AF Signalton Modus"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr "F Nummer"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Fokus Tiefe"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokusmodus"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Belichtungszeit"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "Effektmodus"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 msgid "Exposure Program"
 msgstr "Belichtungs Programm"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "Bildaufnahme Modus"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "Entfernungs Messungs Modus"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "Belichtungsmessmodus"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Blende"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "Fokuspunkt"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr "Belichtungszeit"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "Spotmessung"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 msgid "AF Distance"
 msgstr "Autofokus Entfernung"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 msgid "Focus Area Wrap"
 msgstr "Fokus Bereich Wraparound"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr "Belichtungs Lock"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr "AE-L/AF-L Modus"
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr "Bildnummer Zählung"
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr "Blitzzeichen"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr "Gitterlinien im Sucher"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr "BIldvorschau"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 msgid "Image Rotation Flag"
 msgstr "Rotationsmarkierung"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr "Auslösen ohne CF Karte"
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr "Blitzmodus mit manuelle Energie"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Autofokusbereich"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Belichtungskompensation"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr "Abstufungsbereich"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr "Abstufungsrichtung"
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "Bildzahl im Burstmodus"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 msgid "Auto Whitebalance Bias"
 msgstr "Automatische Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 msgid "Tungsten Whitebalance Bias"
 msgstr "Tungsten Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 msgid "Flourescent Whitebalance Bias"
 msgstr "Floureszierend Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 msgid "Daylight Whitebalance Bias"
 msgstr "Tageslicht Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 msgid "Flash Whitebalance Bias"
 msgstr "Blitz Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 msgid "Cloudy Whitebalance Bias"
 msgstr "Wolkig Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 msgid "Shade Whitebalance Bias"
 msgstr "Schattig Weißabgleich Abweichung"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 msgid "Selftimer Delay"
 msgstr "Selbstauslöserzeit"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr "Mittelpunkt/Gewichtet Bereich"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr "Blitz Belichtungszeit"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr "Fernsteuerungsabschaltzeit"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr "Bild Optimierung"
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr "Schärfen"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr "Ton Anpassung"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr "Farbton Anpassung"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4977,40 +5181,40 @@ msgstr "Farbton Anpassung"
 msgid "Camera Settings"
 msgstr "Kameraeinstellungen"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr "Bildeinstellungen"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Aufnahme Einstellungen"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Anzahl der Werte"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Unterstützte Werte"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Aktueller Wert"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Datei »%s/%s« existiert nicht"
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr "Der Metadaten Dateityp ist nur für MTP Geräte unterstützt."
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Initialisiere Kamera"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5544,212 +5748,253 @@ msgstr "Maximale Blende bei maximaler Brennweite"
 msgid "Low Light"
 msgstr "Wenig Licht"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Belichtungszeit"
+
+#: camlibs/ptp2/ptp.c:2435
+#, fuzzy
+msgid "Device Certificate"
+msgstr ""
+"\n"
+"Fähigkeiten des Geräts:\n"
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+#, fuzzy
+msgid "Volume Level"
+msgstr "\tLabel des Speichergerätes: %s\n"
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f Schritte"
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr "JPEG Normal"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr "RAW"
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Basic"
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Kunstlicht - Glühlampe"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr "Manueller Fokus"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr "nur AF Lock"
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 msgid "Flash Lock"
 msgstr "Blitz Lock"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrix"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr "Schnellaufzug"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr "1 Minute"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr "5 Minuten"
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr "10 Minuten"
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr "15 Minuten"
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr "Firmware"
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr "Windows Bild Format"
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 msgid "Undefined Audio"
 msgstr "Undefiniertes Audioformat"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 msgid "Undefined Video"
 msgstr "Undefiniertes Videoformat"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 msgid "Undefined Collection"
 msgstr "Undefinierte Sammlung"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr "Abstraktes Multimedia Album"
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr "Abstraktes Bild Album"
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr "Abstraktes Musik Album"
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr "Abstraktes Video Album"
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr "Astrakte Audio Video Playlist"
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr "Abstrakte Addressen Gruppe"
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr "Abstrakter Nachrichten Ordner"
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr "Abstrakte Produktion mit Kapiteln"
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr "WPL Playlist"
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr "M3U Playlist"
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr "MPL Playlist"
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr "ASX Playlist"
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr "PLS Playlist"
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 msgid "UndefinedDocument"
 msgstr "Undefiniertes Dokument"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr "Abstraktes Dokument"
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr "Undefinierte Nachricht"
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr "Abstrakte Nachricht"
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr "Undefinierter Addresseintrag"
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr "Abstrakter Adresseintrag"
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr "vCard2"
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr "vCard3"
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr "Undefinierte Kalendereintrag"
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr "Abstrakter Kalendereintrag"
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr "vCalendar1"
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr "vCalendar2"
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr "Undefiniertes Windows Executable"
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr "M3U"
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, c-format
 msgid "Unknown(%04x)"
 msgstr "Unbekannt (%04x)"
diff --git a/po/es.po b/po/es.po
index 229002fd7..92d48b030 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -82,26 +82,26 @@ msgstr ""
 "Implementado utilizando documentos encontrados\n"
 "en la web. Permiso concedido por Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "No se ha podido crear el directorio %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "No se ha podido eliminar el directorio %s."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "ha fallado el bloqueo de teclas."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*DESCONOCIDO*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -110,7 +110,7 @@ msgstr ""
 "canon_int_capture_image: la llamada inicial a canon_usb_list_all_dirs() ha "
 "fallado con el estado %i"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -119,26 +119,26 @@ msgstr ""
 "canon_int_capture_image: la llamada final a canon_usb_list_all_dirs() ha "
 "fallado con estado %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "El nombre «%s» (%i caracteres) es demasiado largo (%i caracteres), el máximo "
 "permitido es de 30 caracteres."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, fuzzy, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERROR: mensaje inicial demasiado corto (%i < mínimo %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -147,33 +147,33 @@ msgstr ""
 "canon_int_list_dir: Se ha llegado al final del paquete mientras se examinaba "
 "la primera entrada de directorio"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 "canon_int_list_dir: se ha encontrado una entrada de directorio truncada"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Fichero protegido."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "No se ha podido extraer la miniatura JPEG de los datos: No hay comienzo/fin"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "No se ha podido extraer la miniatura JPEG de los datos: Los datos no están "
 "en JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parámetro NULL \"%s\" en %s línea %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -200,7 +200,93 @@ msgstr ""
 "advertencia: CRC no comprobada (añada longitud %d, valor 0x%04x) "
 "############\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Previsualizar la miniatura"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Imagen"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Modo del enfoque"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Error de autofocus."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Modo del enfoque"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Manual"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -217,49 +303,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Cámara no disponible"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Apagando la cámara"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Error al capturar imagen"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "No se puede obtener el nombre del disco: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Razón desconocida"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "No se puede obtener información del disco: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "error interno #1 en get_file_func() (%s línea %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "No se ha podido encontrar ningún fichero de audio para %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s es un tipo de fichero para el que no se proporcionan miniaturas"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -270,35 +356,35 @@ msgstr ""
 "  %11s bytes en total\n"
 "  %11s bytes disponibles"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "Transformador de CA"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "con baterías"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "energía OK"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "energía no-OK"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "no disponible: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (hora de la máquina %s%i segundos)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +411,7 @@ msgstr ""
 "\n"
 "Hora: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -346,24 +432,24 @@ msgstr ""
 "Añadidos para el modelo A5 por Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Error al borrar el fichero"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Error al borrar la miniatura asociada"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Esta cámara no soporta recibir a velocidades superiores a 57600"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "No se puede obtener la letra del disco Flash"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -371,133 +457,264 @@ msgstr ""
 "No se puede enviar, no hay disponible ninguna carpeta libre\n"
 "Existe la carpeta 999CANON y contiene una imagen AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "No se puede crear el directorio \\DCIM."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "No se puede crear el directorio de destino."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Configuración del controlador y de la cámara"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Cámara"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Modelo de cámara (sólo lectura)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Nombre del propietario"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "Velocidad ISO"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+#, fuzzy
+msgid "Unknown"
+msgstr "Error desconocido"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Velocidad del obturador (en segundos)"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Apertura"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Resolución"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Modo del enfoque"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Fecha y hora (sólo lectura)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Error"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Configurar la fecha de la cámara con la de la computadora"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Revisión del firmware (sólo lectura)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Energía (sólo lectura)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Controlador"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Lista de todos los ficheros"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Mantener el nombre de fichero al enviar"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Cámara no disponible"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Se ha cambiado el nombre del propietario"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "no se ha podido cambiar el nombre del propietario"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Se ha cambiado el nombre del propietario"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "no se ha podido cambiar el nombre del propietario"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Velocidad del obturador (en segundos)"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "no se ha podido cambiar el nombre del propietario"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Opciones de apertura"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Opciones de apertura"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "no se ha podido cambiar el nombre del propietario"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Interruptor de selección de la resolución"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "No se ha podido crear el directorio."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Modo del enfoque"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "no se ha podido cambiar el nombre del propietario"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "hora configurada"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "no se ha podido configurar la hora"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Proporcionado tipo de puerto no soportado %i = 0x%x. Inicialización "
 "imposible."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Se ha agotado la batería, cámara apagada."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "ERROR: mensaje inesperado"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "ERROR: exceso de mensajes"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "ERROR: fuera de secuencia."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "ERROR: tipo de paquete inesperado."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "ERROR: formato erróneo del mensaje."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "ERROR: mensaje2 inesperado."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Enviando fichero..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Obteniendo fichero..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -505,7 +722,7 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue ha fallado al obtener las "
 "entradas de directorio"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -513,150 +730,150 @@ msgstr ""
 "canon_serial_get_dirents: Paquete inicial de entradas de directorio "
 "demasiado corto (sólo %i bytes)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: No se han podido asignar %i bytes de memoria"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: Fallo al leer otra entrada de directorio"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 "canon_serial_get_dirents: Se ha recibido una entrada de directorio truncada"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: Demasiadas entradas de directorio, se debe de "
 "estar en un bucle."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: No se ha podido redimensionar el búfer de entradas "
 "de directorio a %i bytes"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Error al cambiar la velocidad."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Reinicializando el protocolo..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Cámara OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Buscando la cámara..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Intentando contactar con la cámara..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Error de comunicación 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "No hay respuesta de la cámara"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Respuesta no reconocida"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Se ha detectado una \"%s\" también conocida como \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modelo desconocido \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Fin de la transmisión (EOT) no válido"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Error de comunicación 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Error de comunicación 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Cambiando la velocidad... espere..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Error al cambiar la velocidad"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 "Error esperando acuse de recibo (ACK) durante el reintento de inicialización"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Error esperando acuse de recibo (ACK) durante la inicialización"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Conectado a la cámara"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "ERROR: se ha detectado una condición de error fatal, no se puede continuar "
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERROR: %d es demasiado grande"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Obteniendo miniaturas..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "NO RECONOCIDO"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "No se puede establecer contacto inicial con la cámara"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "La cámara ya estaba activa"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Se ha activado la cámara"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Desconocido (algún tipo de error))"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Respuesta inicial de lacámara %c/'%s' no reconocida)"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -665,7 +882,7 @@ msgstr ""
 "El paso 3 de la inicialización ha fallado. (ha devuelto %i, se esperaba %i) "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -674,7 +891,7 @@ msgstr ""
 "El paso 3 de la inicialización ha fallado. (ha devuelto %i, se esperaba %i) "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -682,7 +899,7 @@ msgstr ""
 "El paso 3 de la inicialización ha fallado. (ha devuelto %i, se esperaba %i) "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -691,7 +908,7 @@ msgstr ""
 "El paso 3 de la inicialización ha fallado. (ha devuelto %i, se esperaba %i) "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -700,31 +917,31 @@ msgstr ""
 "El paso 3 de la inicialización ha fallado. (ha devuelto %i, se esperaba %i) "
 "Cámara no operativa"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "El paso 4.1 ha fallado. (ha devuelto %i, se esperaba %i) Cámara no operativa"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, fuzzy, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "El paso 4.1 ha fallado. (ha devuelto %i, se esperaba %i) Cámara no operativa"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "La cámara no está preparada, han fallado varios intentos de petición de "
 "identificación de la cámara: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "La cámara no está preparada, get_battery ha fallado: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -733,14 +950,14 @@ msgstr ""
 "canon_usb_lock_keys: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -748,7 +965,7 @@ msgstr ""
 "canon_usb_unlock_keys: cantidad de datos devueltos inesperada (%i bytes, se "
 "esperaba %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -757,7 +974,7 @@ msgstr ""
 "canon_usb_lock_keys: Se ha devuelto una cantidad de datos no esperada (%i "
 "bytes, se esperaba %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, fuzzy, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -766,7 +983,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: la lectura de interrupción ha fallado después "
 "de %i intentos, \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -775,7 +992,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: la lectura de interrupción ha fallado "
 "después de %i intentos, \"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -783,7 +1000,7 @@ msgstr ""
 "canon_usb_capture_dialogue: longitud errónea 0x%04x del paquete de tamaño de "
 "la miniatura"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -791,19 +1008,26 @@ msgstr ""
 "canon_usb_capture_dialogue: longitud errónea 0x%04x del paquete de tamaño de "
 "la imagen completa"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+"canon_usb_capture_dialogue: segunda lectura de interrupción fuera de "
+"secuencia"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: primera lectura de interrupción fuera de "
 "secuencia"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: segunda lectura de interrupción fuera de "
 "secuencia"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -811,41 +1035,41 @@ msgstr ""
 "canon_usb_capture_dialogue: se ha señalado un fallo fotográfico, código = 0x%"
 "08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: tercera interrupción EOS leída fuera de secuencia"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: cuarta interrupción EOS leída fuera de secuencia"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: carga demasiado grande, no cabrá en el búfer (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Recibiendo datos..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Fuera de memoria: %d bytes necesarios."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue ha fallado"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -854,22 +1078,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue ha devuelto el estado de "
 "error 0x%08x de la cámara"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "No se puede leer desde el fichero \"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, fuzzy, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Fuera de memoria: %d bytes necesarios."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "El envío de fichero ha fallado."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -877,7 +1101,7 @@ msgstr ""
 "El fichero era demasiado grande. Puede tener que apagar su cámara y volver a "
 "encenderla antes de enviar más ficheros."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -886,7 +1110,7 @@ msgstr ""
 "canon_usb_get_dirents: la carga no cabe en el búfer, '%.96s' (truncado) es "
 "demasiado largo."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -895,7 +1119,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue ha fallado al obtener "
 "entradas de directorio, ha devuelto %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -904,7 +1128,7 @@ msgstr ""
 "canon_usb_list_all_dirs: la carga no cabe en el búfer, '%.96s' (truncado) es "
 "demasiado largo."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -913,12 +1137,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue ha fallado al obtener "
 "entradas de directorio, ha devuelto %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Se ha detectado una '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "El nombre \"%s\" de la cámara no coincide con ninguna cámara conocida"
@@ -1108,8 +1332,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1289,49 +1513,49 @@ msgstr "Problema al configurar la velocidad de comunicación de la cámara"
 msgid "Looks like a modem, not a camera"
 msgstr "Parece un módem, no una cámara"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listando los ficheros que hay en '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listado de las carpetas que hay en '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "No se puede obtener información acerca de '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "No se puede obtener información acerca de '%s' en '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "No se puede cambiar la fecha del fichero '%s' en '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "No se puede abrir '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "La \"cámara\" 'Examinar el directorio' le permite indexar las fotos que hay "
 "en su disco duro."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Modo Examinar el directorio - escrito por Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1396,7 +1620,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Descargando..."
@@ -1733,20 +1957,20 @@ msgid "High (good quality)"
 msgstr "Alta (buena calidad)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2012,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1827,8 +2051,8 @@ msgid "Force"
 msgstr "Forzar"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ninguno"
@@ -1845,13 +2069,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1867,14 +2091,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2475,13 +2699,6 @@ msgstr "Hora de apagado automático"
 msgid "Slide Show Interval"
 msgstr "Intervalo del carrusel"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Resolución"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2593,10 +2810,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2672,7 +2889,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2685,7 +2902,7 @@ msgid "Medium"
 msgstr "Media"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2754,7 +2971,7 @@ msgid "Black and White"
 msgstr "Blanco y negro"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2980,8 +3197,8 @@ msgstr ""
 "Identificador de tarjeta:\t\t%d\n"
 "Modo del flash:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Remota"
 
@@ -2991,13 +3208,13 @@ msgstr "Local"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Sí"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "No"
 
@@ -3007,7 +3224,7 @@ msgstr "No"
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3056,7 +3273,7 @@ msgid "Not Full"
 msgstr "No llena"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Llena"
@@ -3240,7 +3457,7 @@ msgstr ""
 "de: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Enviando..."
 
@@ -3439,13 +3656,13 @@ msgstr ""
 "sourceforge.net>. Corrección de errores por Marcus Meissner <marcus@jet."
 "franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Calidad de imagen"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Tamaño de la imagen"
 
@@ -3461,11 +3678,11 @@ msgstr "Apagado automático (en minutos)"
 msgid "Information"
 msgstr "Información"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fina"
 
@@ -3473,21 +3690,21 @@ msgstr "fina"
 msgid "superfine"
 msgstr "superfina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automática"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "inactiva"
@@ -3773,7 +3990,7 @@ msgstr "PTP. Error de protocolo, se esperaban datos"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP. Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3787,76 +4004,70 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, 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:1181
+#: camlibs/ptp2/library.c:1188
 #, 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, 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:1384
+#: camlibs/ptp2/library.c:1391
 #, 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:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, 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:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "preparada"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-#, fuzzy
-msgid "Unknown"
-msgstr "Error desconocido"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3871,511 +4082,511 @@ msgstr ""
 "ID extensión del fabricante: 0x%08x\n"
 "Descripción extensión del fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Resolución del fichero"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Resolución del fichero"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "El envío de fichero ha fallado."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "desconocido (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "General"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Preparada"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Cantidad de imágenes: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Tipo de fichero %i desconocido."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "ERROR: tipo de paquete inesperado."
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manual"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "Automática\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automática\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 #, fuzzy
 msgid "Shade"
 msgstr "Nítida"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Preconfigurado"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "superfina"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 #, fuzzy
 msgid "auto red eye"
 msgstr "Anti ojos rojos"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 #, fuzzy
 msgid "on red eye"
 msgstr "Anti ojos rojos"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "Error en el orden de los mandatos."
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 #, fuzzy
 msgid "spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Imagen"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "Luz natural"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Automática"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 #, fuzzy
 msgid "Sports"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 #, fuzzy
 msgid "Single Shot"
 msgstr "Única"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Mejor"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Temporizador"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Remota"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 #, fuzzy
 msgid "Single Area"
 msgstr "Única"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "Ampliación"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Suave"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automática\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Reducción de ojos rojos"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flash anti ojos rojos"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "externamente"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Luz natural"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4383,644 +4594,638 @@ msgstr "Luz natural"
 msgid "Slow Sync"
 msgstr "Sincronización lenta"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Reducción de ojos rojos"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Blanco y Negro"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1,5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Nítida"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Suave"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "El directorio existe"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Personalizada"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "Posición del foco"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automática\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "CA"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluorescente"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Cargando"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "Blanco y Negro"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "SIN Flash"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "preparada"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Medida de la exposición"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internamente"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Sin tarjeta"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Cámara OK.\n"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sModelo de la cámara: %s\n"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Revisión del firmware: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Cámara"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Modo de la lente"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Hora de apagado automático"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Opciones de apertura"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Velocidad ISO"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Modo de color"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Automática"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Modo de la lente"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Tiempo de exposición de la lámpara"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Modo de grabación"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Tiempo de exposición de la lámpara"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Modo de medición de punto"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Medida de la exposición"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Apertura"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Error de enfoque."
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Velocidad del obturador (en segundos)"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Modo de medición de punto"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Posición del foco"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exposición"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Configuración del flash"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Tamaño de la imagen"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Opciones de la cámara"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Modo del enfoque"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automática, reducción de ojos rojos"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Balance de blancos"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Hora del temporizador"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Centrado en el medio"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Fecha y hora"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "Cargando"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Compensación de la exposición"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Configuración"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Ajuste de la imagen"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5028,42 +5233,42 @@ msgstr "Ajuste de la imagen"
 msgid "Camera Settings"
 msgstr "Opciones de la cámara"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Opciones de la cámara"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Opciones de apertura"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Cantidad de valores"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Valores soportados"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Valor actual"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Inicializando la cámara"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5647,221 +5852,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "Suave"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Tiempo de exposición de la lámpara"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Reducción de ojos rojos"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Manual"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matriz"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "SIN indicador de energía"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Error no definido de PTP"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "desconocido (0x%02x)"
diff --git a/po/eu.po b/po/eu.po
index 9dac00a09..e7315b44e 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -90,26 +90,26 @@ msgstr ""
 "Sarean topatutako dokumentuak erabiliz\n"
 "inplementatua. Baimena Vision-ek emana."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Ezin izan da %s direktorioa sortu."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Ezin izan da %s direktorioa kendu."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "blokeo-teklek huts egin dute."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*EZEZAGUNA*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -118,7 +118,7 @@ msgstr ""
 "canon_int_capture_image: hasierako canon_usb_list_all_dirs()-ek huts egin du "
 "%i egoerarekin"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -127,25 +127,25 @@ msgstr ""
 "canon_int_capture_image: amaierako canon_usb_list_all_dirs()-ek huts egin du "
 "%i egoerarekin"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "'%s' izena (%i karaktere) luzeegia da gehienez 30 karaktere izan ditzakete."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "%s-(e)n letra minuskulan ez dira onartzen."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, fuzzy, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERROREA: hasierako mezua laburregia da (%i < minimoa %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -154,31 +154,31 @@ msgstr ""
 "canon_int_list_dir: Paketearen amaierara heldu da direktorioaren 1. sarrera "
 "aztertzen"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: direktorioko sarrera trunkatua aurkitu da"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Fitxategia babestuta."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "Ezin izan da JPEG koadro txikia atera datuetatik: ez dago hasierarik/"
 "amaierarik"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Ezin izan da datuen JPEG koadro txikia atera: Datuak ez dira JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "\"%s\" NULL parametroa %s(e)ko %i lerroan "
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -204,7 +204,93 @@ msgstr ""
 "kontuz: CRC ez da egiaztatu (gehitu %d luzera, 0x%04x balioa) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Aurreikusi koadro txikia"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Irudia"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Fokuaren modua"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Autofokusaren errorea."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Fokuaren modua"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Eskuzkoa"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -221,49 +307,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kamera ez dago erabilgarri"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Kamera itzaltzen"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Errorea irudia kapturatzean"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Ezin izan da diskoaren izena eskuratu: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Ez da arrazoirik ezagutzen"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Ezin izan da diskoaren informazioa eskuratu: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Barne-errorea #1 get_file_func()-en (%s, %i lerroa)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Ezin izan da audio-fitxategirik aurkitu %s-(e)ntzat"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s fitxategi-motarako ez dago koadro txikirik"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -274,35 +360,35 @@ msgstr ""
 "  %11s byte guztira\n"
 "  %11s byte erabilgarri"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "AC moldagailua"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "bateriarekin"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "energia ondo"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "energia gaizki"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "ez dago erabilgarri: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (ostalariaren denbora %s%i segundo)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +415,7 @@ msgstr ""
 "\n"
 "Ordua: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -350,25 +436,25 @@ msgstr ""
 "A5erako gehikuntzak: Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Errorea fitxategia ezabatzean"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Errorea asoziatutako koadro txikia ezabatzean"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "57600 baino abiadura handiagoak ez dira onartzen kamera honetan kargatzeko"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Ezin izan da flash unitatearen letra lortu"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -376,132 +462,263 @@ msgstr ""
 "Ezin izan da kargatu, karpeta-izenik ez dago erabilgarri!\n"
 "999CANON karpeta-izena badago eta AUT_9999.JPG argazkia du barruan."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Ezin izan da \\DCIM direktorioa sortu."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Ezin izan da helburuko direktorioa sortu."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Kameraren eta kontrolatzailearen konfigurazioa"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Kamera-modeloa (irakurtzeko soilik)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Jabearen izena"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Aurre-kapturaren atzerapena"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO abiadura"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Irekiera"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Bereizmena"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Fokuaren modua"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Data eta ordua (irakurtzeko soilik)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Errorea"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Ez dago erabilgarri"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Ezarri PCko data kameran"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Firmwarearen berrikuspena (irakurtzeko soilik)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Energia (irakurtzeko soilik)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Kontrolatzailea"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Fitxategi guztien zerrenda"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Mantendu fitxategi-izena kargatzean"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Kamera ez dago erabilgarri"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Jabearen izena aldatu da"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "ezin izan da jabearen izena aldatu"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Jabearen izena aldatu da"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "ezin izan da jabearen izena aldatu"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Obturadorearen abiadura"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "ezin izan da jabearen izena aldatu"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Irekiduraren ezarpenak"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "ezin izan da jabearen izena aldatu"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Bereizmena hautatzeko etengailua"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Ezin izan da direktorioa sortu."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Fokuaren modua"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "ezin izan da jabearen izena aldatu"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "ordua ezarrita"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "ezin izan da ordua ezarri"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Onartzen ez den %i = 0x%x motako ataka adierazi duzu. Ezin da abiarazi."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Bateria agortu da, kamera itzali egingo da."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "ERROREA: espero ez zen mezua"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "ERROREA: mezu gehiegi"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "ERROREA: sekuentziatik kanpo."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "ERROREA: espero ez zen pakete-mota."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "ERROREA: mezu-formatu okerra."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "ERROREA: espero ez zen mezua2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Fitxategia kargatzen..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Fitxategia eskuratzen..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -509,7 +726,7 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -517,151 +734,151 @@ msgstr ""
 "canon_serial_get_dirents: direktorio-sarreren hasierako paketea txikiegia da"
 "(%i byte bakarrik)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: ezin izan dira memoriako %i byte esleitu"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: ezin izan da direktorioaren beste sarrera bat "
 "irakurri"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: direktorio-sarrera trunkatua jaso da"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: direktorio-sarrera gehiegi, begizta batean egongo "
 "gara."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: ezin izan da direktorioaren sarreraren bufferra %i "
 "byteko tamainan jarri"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Errorea abiadura aldatzean."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Protokoloa berrezartzen..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Kamera ondo dago.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Kamera bila..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Kamera kontaktatzen saiatzen..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Komunikazio-errorea 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Kamerak ez du erantzuten"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Erantzun ezezaguna"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "\"%s\" detektatu da, \"%s\" izenez ere ezagutzen dena"
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modelo ezezaguna \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Transmisio-amaiera (EOT) okerra"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Komunikazio-errorea 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Komunikazio-errorea 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Abiadura aldatzen... itxaron..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Errorea abiadura aldatzean"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 "Errorea gertatu da berrabiarazi bitartean hartu-agiriaren (ACK) zain dagoela"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Errorea abiarazi bitartean hartu-agiriaren (ACK) zain dagoela"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Kamerara konektatuta"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "ERROREA: errore larriaren baldintza bat detektatu da, ezin da jarraitu "
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERROREA: %d handiegia da"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Koadro txikia eskuratzen..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "EZ DA EZAGUTZEN"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Ezin izan da hasierako kontaktua egin kamerarekin"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Kamera lehendik aktibatuta zegoen"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Kamera aktibatuta zegoen"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Ezezaguna (errore-motaren bat))"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Kameraren hasierako erantzuna %c/'%s' ezezaguna)"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -670,7 +887,7 @@ msgstr ""
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -679,7 +896,7 @@ msgstr ""
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -687,7 +904,7 @@ msgstr ""
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -696,7 +913,7 @@ msgstr ""
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -705,31 +922,31 @@ msgstr ""
 "Abiarazteko 3. urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera "
 "ez dabil"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "4.1 urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera ez dabil"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, fuzzy, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "4.1 urratsak huts egin du! (%i itzuli du, %i espero zen) Kamera ez dabil"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera ez dago prest, kamera identifikatzeko hainbat eskaerek huts egin "
 "dute: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera ez dago prest, get_battery-k huts egin du: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -738,14 +955,14 @@ msgstr ""
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -753,7 +970,7 @@ msgstr ""
 "canon_usb_unlock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -762,7 +979,7 @@ msgstr ""
 "canon_usb_lock_keys: espero ez zen data-kopurua itzuli da (%i byte, %i "
 "espero ziren)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, fuzzy, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -771,7 +988,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: etenaldi-irakurketak huts egin du %i "
 "saiakeren ondoren, \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -780,7 +997,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: etenaldi-irakurketak huts egin du %i "
 "saiakeren ondoren, \"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -788,7 +1005,7 @@ msgstr ""
 "canon_usb_capture_dialogue: 0x%04x luzera faltsua koadro txikiaren tamainako "
 "paketerako"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -796,60 +1013,66 @@ msgstr ""
 "canon_usb_capture_dialogue: 0x%04x luzera faltsua irudi osoaren tamainako "
 "paketerako"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+"canon_usb_capture_dialogue: bigarren etenaldi-irakurketa sekuentziatik kanpo"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: lehen etenaldi-irakurketa sekuentziatik kanpo"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: bigarren etenaldi-irakurketa sekuentziatik kanpo"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 "canon_usb_capture_dialogue: argazki-hutsegitea adierazi da, kodea = 0x%08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: hirugarren EOS etenaldi-irakurketa sekuentziatik "
 "kanpo"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: laugarren EOS etenaldi-irakurketa sekuentziatik "
 "kanpo"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: karga handiegia da, ez da bufferrean kabituko (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Datuak jasotzen..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Memoriarik ez: %d byte behar dira."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue-ek huts egin du"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -858,22 +1081,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue-k kameraren 0x%08x errore-"
 "egoera itzuli du"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Ezin izan da \"%s\" fitxategitik irakurri"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Memoriarik ez: %ld byte behar dira."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -881,7 +1104,7 @@ msgstr ""
 "Fitxategia handiegia zen. Agian kamera itzali eta berriro piztu beharko duzu "
 "fitxategi gehiago kargatu baino lehen."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -890,7 +1113,7 @@ msgstr ""
 "canon_usb_get_dirents: karga ez da bufferrean kabitzen, '%.96s' (trunkatua) "
 "handiegia da."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -899,7 +1122,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu, %i itzuli du"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -908,7 +1131,7 @@ msgstr ""
 "canon_usb_list_all_dirs: karga ez da bufferrean kabitzen, "
 "'%.96s' (trunkatua) handiegia da."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -917,12 +1140,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue-k ezin izan ditu "
 "direktorioaren sarrerak hartu, %i itzuli du"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' detektatu da."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Kameraren \"%s\" izena ez dator bat ezagutzen diren kamerekin"
@@ -1119,8 +1342,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flasha"
@@ -1300,49 +1523,49 @@ msgstr "Arazoa kameraren komunikazio-abiadura ezartzean"
 msgid "Looks like a modem, not a camera"
 msgstr "Modema dirudi, ez kamera"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "'%s'(e)ko fitxategien zerrenda..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "'%s'(e)ko karpeten zerrenda..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Ezin izan da '%s'(e)ri buruzko informazioa lortu (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Ezin izan da '%s'(e)ri buruzko informazioa lortu '%s'(e)tik (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Ezin izan da '%s' fitxategiaren data aldatu '%s'(e)n (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Ezin izan da '%s' ireki."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Arakatu direktorioa \"kameraren\" bidez, argazkiak disko gogorrean indexa "
 "ditzakezu."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Direktorioa arakatzeko modua - Scott Fritzinger-ek idatzia, <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1407,7 +1630,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Deskargatzen..."
@@ -1746,20 +1969,20 @@ msgid "High (good quality)"
 msgstr "Handia (kalitate ona)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2024,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1840,8 +2063,8 @@ msgid "Force"
 msgstr "Behartu"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Bat ere ez"
@@ -1858,13 +2081,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1880,14 +2103,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2490,13 +2713,6 @@ msgstr "Automatikoki itzaltzeko ordua"
 msgid "Slide Show Interval"
 msgstr "Diapositiba-erakusketaren tartea"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Bereizmena"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2608,10 +2824,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2687,7 +2903,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2700,7 +2916,7 @@ msgid "Medium"
 msgstr "Tartekoa"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2769,7 +2985,7 @@ msgid "Black and White"
 msgstr "Zuri-beltza"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3014,8 +3230,8 @@ msgstr ""
 "Txartelaren IDa:\t\t%d\n"
 "Flash-modua:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Urrunekoa"
 
@@ -3025,13 +3241,13 @@ msgstr "Lokala"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Bai"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Ez"
 
@@ -3041,7 +3257,7 @@ msgstr "Ez"
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3090,7 +3306,7 @@ msgid "Not Full"
 msgstr "Ez dago beteta"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Beteta"
@@ -3274,7 +3490,7 @@ msgstr ""
 "tamaina hau da: %i byte."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Kargatzen..."
 
@@ -3473,13 +3689,13 @@ msgstr ""
 "sourceforge.net> egina. Akats-konponketak Marcus Meissner-ek <marcus@jet."
 "franken.de> eginak."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Irudiaren kalitatea"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Irudiaren tamaina"
 
@@ -3495,11 +3711,11 @@ msgstr "Automatikoki itzaltzea (minutuak)"
 msgid "Information"
 msgstr "Informazioa"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normala"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fina"
 
@@ -3507,21 +3723,21 @@ msgstr "fina"
 msgid "superfine"
 msgstr "oso fina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatikoa"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "desaktibatuta"
@@ -3807,7 +4023,7 @@ msgstr "PTP Protokolo-errorea, datuak espero ziren"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Protokolo-errorea, erantzuna espero zen"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3821,73 +4037,68 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Kaptura komandoa osatuta, baina ez da berrespenik jaso"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "0x%04x gertaera jaso da"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3902,512 +4113,512 @@ msgstr ""
 "Fabrikatzailearen luzapenaren IDa: 0x%08x\n"
 "Fabrikatzailearen luzapenaren deskribapena: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Prest"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Irudi-kopurua: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "%i fitxategi-mota ezezaguna."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "ustegabeko %i datu mota"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 #, fuzzy
 msgid "Shade"
 msgstr "Garbia"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Aurrez ezarria"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normala"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "oso fina"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 #, fuzzy
 msgid "auto red eye"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 #, fuzzy
 msgid "on red eye"
 msgstr "Begi gorrien kontrakoa"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "Komando-ordenan errorea."
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 #, fuzzy
 msgid "spot"
 msgstr "Puntua"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Irudia"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 #, fuzzy
 msgid "Sports"
 msgstr "Puntua"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 #, fuzzy
 msgid "Single Shot"
 msgstr "Soila"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Onena"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 #, fuzzy
 msgid "Timelapse"
 msgstr "Denbora-hutsune zenbakia"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Tenporizadorea"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Urrunekoa"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 #, fuzzy
 msgid "Single Area"
 msgstr "Soila"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "Zooma"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Argia"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flasha"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Begi gorrien kontrako flasha"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "kanpotik"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Argi naturala"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4415,633 +4626,627 @@ msgstr "Argi naturala"
 msgid "Slow Sync"
 msgstr "Sinkronizazio motela"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Zuri-beltza"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Garbia"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Suabea"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Direktorioa badago"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontrastea"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Tartekoa"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikoa\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "AC"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszentea"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "Normala"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "Zuri-beltza"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "Flashik GABE"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Esposizioa neurtzea"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "barnetik"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Txartelik ez"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "Kameraren jabea"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Kamera-modeloa"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmwarearen berrikuspena: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Kamera-denbora"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Automatikoki itzaltzeko ordua"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO abiadura"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "Argazki efektua"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Kolorearen modua"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Automatikoa"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "Argi-laguntza"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Soinu-seinalea"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 #, fuzzy
 msgid "F Number"
 msgstr "F-zenbakia"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Foku-luzera"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Esposizio-denbora"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "Efektu-modua"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Esposizio-programa modua"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "Kaptura modua"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "Fokua neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "Esposizioa neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Irekiera"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "Fokatze-puntua"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "Neurtzeko modua"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Esposizioa"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Flasharen konfigurazioa"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Aurreikustaile modua"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Irudiaren tamaina"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Fokuaren modua"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatikoa, begi gorriak gutxitzea"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "Jarraitasun zenbakia"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Zuri-balantzea"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Tenporizadore automatikoaren ordua"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Erdian zentratuta"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Obturadorearen abiadura"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Data eta ordua"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "Kargatzen"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Esposizio-konpentsazioa"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Konfigurazioa"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Irudia doitzea"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5049,41 +5254,41 @@ msgstr "Irudia doitzea"
 msgid "Camera Settings"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Kameraren ezarpenak"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Kapturatze-ezarpenak"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Balio-kopurua"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Onartutako balioak"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Uneko balioa"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Kamera hasieratzen"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5659,221 +5864,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "Argia"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Esposizio-denbora"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Goria"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Begi gorriak gutxitzea"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Eskuzkoa"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Flasharen modua"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrizea"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Puntua"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "Energia aurreztea"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Definitu gabeko errorea"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP definitu gabeko propietatea"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ezezaguna (0x%02x)"
diff --git a/po/fr.po b/po/fr.po
index 3cb519515..0b91c634f 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -82,26 +82,26 @@ msgstr ""
 "Mis en oeuvre en utilisant des documents trouvés sur\n"
 "le web. Permission accordée par Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Impossible de créer le dossier %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Impossible de supprimer le dossier %s."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "Clefs de blocage manquées."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*INCONNU*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -110,7 +110,7 @@ msgstr ""
 "canon_int_capture_image: appel initial à canon_usb_list_all_dirs() en erreur "
 "avec un état %i"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -119,26 +119,26 @@ msgstr ""
 "canon_int_capture_image: appel final à canon_usb_list_all_dirs() en erreur "
 "avec un état %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Le nom '%s' (%i caractères) est trop long (%i car.), seuls 30 caractères "
 "sont permis."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, fuzzy, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERREUR: message initial trop court (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -146,31 +146,31 @@ msgid ""
 msgstr ""
 "canon_int_list_dir: fin du paquet atteinte en examinant la première entrée"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: rencontre d'une entrée de répertoire tronquée"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Fichier protégé en écriture."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Impossible d'extraire la vignette JPEG des données: pas de début/fin"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Impossible d'extraire la vignette JPEG des données: les données ne sont pas "
 "en JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Paramètre NULL \"%s\" dans %s ligne %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -197,7 +197,93 @@ msgstr ""
 "Attention: CRC non vérifié (ajout longueur %d, valeur 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Imagette de prévision"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Image"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Mode focus"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Erreur d'autofocus."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Mode focus"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Manuel"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -214,49 +300,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Appareil non disponible"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Extinction de l'appareil"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Erreur lors de la capture de l'image"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Ne peut obtenir le nom du disque : %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Raison inconnue"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Ne peut obtenir d'information sur le disque : %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Erreur interne #1 dans get_file_func() (%s ligne %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Impossible de trouver un fichier audio pour %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s est un type de fichier pour lequel il n'est pas proposé de vignette"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -267,35 +353,35 @@ msgstr ""
 "  %11s octets au total\n"
 "  %11s octets disponibles"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "Transformateur"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "sur piles"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "énergie OK"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "énergie NOK"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "Indisponible : %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (heure du PC %s%i secondes)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +408,7 @@ msgstr ""
 "\n"
 "Heure : %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -343,26 +429,26 @@ msgstr ""
 "Ajouts pour le modèle A5 par Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Erreur à l'effacement du fichier"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Erreur à l'effacement de la vignette associée"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Les vitesses supérieures à 57600 ne sont pas gérées pour télécharger vers "
 "l'appareil"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Ne peut obtenir la lettre du disque flash"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -370,131 +456,262 @@ msgstr ""
 "Impossible de télécharger, pas de répertoire libre !\n"
 "Le répertoire 999CANON existe et contient déjà une image AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Impossible de créer le dossier \\DCIM."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 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:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Configuration de l'appareil et du pilote"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Appareil"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Modèle de l'appareil (lecture seule)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Nom du propriétaire"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "Vitesse ISO"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+#, fuzzy
+msgid "Unknown"
+msgstr "Erreur inconnue"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Vitesse de l'obturateur (en secondes)"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Ouverture"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Résolution"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Mode focus"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Date et heure (lecture seule)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Erreur"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Indisponible"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Mettre l'appareil à la date du PC"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Révision de microcode (lecture seule)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Énergie (lecture seule)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Pilote"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Liste de tous les fichiers"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Conserver le nom du fichier lors du chargement"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Appareil non disponible"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Le nom du propriétaire a changé"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "ne peut changer le nom du propriétaire"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Le nom du propriétaire a changé"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "ne peut changer le nom du propriétaire"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Vitesse de l'obturateur (en secondes)"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "ne peut changer le nom du propriétaire"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Réglages de l'image"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Réglages de l'image"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "ne peut changer le nom du propriétaire"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Interrupteur de choix de la résolution"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Impossible de créer le répertoire."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Mode focus"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "ne peut changer le nom du propriétaire"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "heure mise à jour"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "ne peut mettre à l'heure"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Port de type non géré, reçu %i = 0x%x. Initialisation impossible."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Batteries à plat, extinction de l'appareil."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "ERREUR : message inattendu"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "ERREUR : message écrasé"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "ERREUR : séquence erronée."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "ERREUR : paquet de type inattendu."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "ERREUR : erreur sur le format du message."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "ERREUR : message inattendu2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Téléchargement du fichier..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Récupération du fichier..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -502,7 +719,7 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue n'a pas réussi à obtenir les "
 "entrées du répertoire"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -510,148 +727,148 @@ msgstr ""
 "canon_serial_get_dirents: paquet dirent initial trop petit (seulement %i "
 "octets)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: impossible d'allouer %i octets de mémoire"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: impossible de lire une autre entrée répertoire"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: entrée répertoire tronquée reçue"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: trop d'entrées, nous devons boucler."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: impossible de modifier la taille du buffer dirent "
 "à %i octets"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Erreur au changement de vitesse."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Réinitialisation du protocole..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Appareil OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Recherche de l'appareil..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Essai de contact de l'appareil..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Erreur de communication 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Pas de réponse de l'appareil"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Réponse non reconnue"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Détection d'un \"%s\" alias \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modèle inconnu \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Mauvaise fin de transfert"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Erreur de communication 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Erreur de communication 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Changement de vitesse... Attendez..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Erreur au changement de vitesse"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "Erreur à l'attente de l'accusé de réception à la réinitialisation"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Erreur à l'attente de l'accusé de réception à l'initialisation"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Connecté à l'appareil photo."
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 "ERREUR: une condition d'erreur fatale a été détectée, impossible de "
 "continuer "
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERREUR: %d est trop gros"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Récupération de la vignette..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "NON RECONNU"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Impossible de se connecter à l'appareil."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Appareil déjà actif"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Appareil réveillé"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Inconnu (une sorte d'erreur))"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Réponse initiale de l'appareil  %c/'%s' non reconnue)"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -660,7 +877,7 @@ msgstr ""
 "Passage n°3 de l'initialisation en erreur ! (retourné %i, attendu %i) "
 "Appareil non opérationnel."
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -669,7 +886,7 @@ msgstr ""
 "Passage n°3 de l'initialisation en erreur ! (retourné %i, attendu %i) "
 "Appareil non opérationnel."
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -677,7 +894,7 @@ msgstr ""
 "Passage n°3 de l'initialisation en erreur ! (retourné %i, attendu %i) "
 "Appareil non opérationnel."
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -686,7 +903,7 @@ msgstr ""
 "Passage n°3 de l'initialisation en erreur ! (retourné %i, attendu %i) "
 "Appareil non opérationnel."
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -695,33 +912,33 @@ msgstr ""
 "Passage n°3 de l'initialisation en erreur ! (retourné %i, attendu %i) "
 "Appareil non opérationnel."
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Passage n°4.1 en erreur ! (retourné %i, attendu %i) Appareil non opérationnel"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, fuzzy, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "Passage n°4.1 en erreur ! (retourné %i, attendu %i) Appareil non opérationnel"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Appareil pas prêt, les requêtes d'identification de l'appareil ont échoué : %"
 "s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "Appareil pas prêt, les requêtes d'identification de l'appareil ont échoué : %"
 "s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -730,14 +947,14 @@ msgstr ""
 "canon_usb_lock_keys: somme de donnée renvoyée inattendue (%i octets, "
 "attendus %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: somme de donnée renvoyée inattendue (%i octets, "
 "attendus %i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -745,7 +962,7 @@ msgstr ""
 "canon_usb_unlock_keys: somme de données renvoyée inattendue (%i octets, "
 "attendus %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -754,7 +971,7 @@ msgstr ""
 "canon_usb_lock_keys: somme de donnée renvoyée inattendue (%i octets, "
 "attendus %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, fuzzy, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -762,7 +979,7 @@ msgid ""
 msgstr ""
 "canon_usb_poll_interrupt_pipe: lecture interrompue après %i essais, \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -771,7 +988,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: lecture interrompue après %i essais, \"%s"
 "\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -779,7 +996,7 @@ msgstr ""
 "canon_usb_capture_dialogue: longueur anormale de 0x%04x pour la taille de "
 "paquet de vignette"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -787,61 +1004,67 @@ msgstr ""
 "canon_usb_capture_dialogue: longueur anormale de 0x%04x pour la taille du "
 "paquet de l'image complète"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+"canon_usb_capture_dialogue: seconde lecture de l'interruption désynchronisée"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: première lecture de l'interruption désynchronisée"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: seconde lecture de l'interruption désynchronisée"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 "canon_usb_capture_dialogue: problème photographique signalé, code = 0x%08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: troisième lecture de l'interruption EOS "
 "désynchronisée"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: quatrième lecture de l'interruption EOS "
 "désynchronisée"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: charge trop élevée, ne tiendra pas dans le buffer (%i > %"
 "i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Réception des données..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Manque de mémoire: %d octets nécessaires."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue raté"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -850,22 +1073,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue renvoie un état d'erreur 0x"
 "%08x de l'appareil"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Impossible de lire le fichier \"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, fuzzy, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Manque de mémoire: %d octets nécessaires."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Envoi du fichier raté."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -873,7 +1096,7 @@ msgstr ""
 "Fichier trop grand. Il est possible que vous ayez besoin d'eteindre puis de "
 "rallumer l'appareil avant de charger d'autres fichiers."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -882,7 +1105,7 @@ msgstr ""
 "canon_usb_get_dirents: Impossible de faire tenir la charge dans le buffer, "
 "'%.96s' (tronqué) trop long."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -891,7 +1114,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue n'a pu récupérer les "
 "répertoires, renvoyé %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -900,7 +1123,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Impossible de faire tenir la charge dans le buffer, "
 "'%.96s' (tronqué) trop long."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -909,12 +1132,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue n'a pu récupérer les "
 "répertoires, renvoyé %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Détection du '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Nom \"%s\" de l'appareil ne correspond à aucun appareil connu"
@@ -1103,8 +1326,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1286,48 +1509,48 @@ msgstr ""
 msgid "Looks like a modem, not a camera"
 msgstr "Ça ressemble à un modem, pas à un appareil photo"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listage des fichiers de '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listage des dossiers de '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Impossible de trouver l'information au sujet de '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Impossible de trouver l'information '%s' dans '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Impossible de modifier l'heure du fichier '%s' in '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Impossible d'ouvrir '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Le pseudo appareil 'Directory Browse' vous permet d'indexer les photos\n"
 "sur votre disque."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Mode Directory Browse - écrit par Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1389,7 +1612,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Téléchargement..."
@@ -1724,20 +1947,20 @@ msgid "High (good quality)"
 msgstr "Haute (qualité correcte)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2002,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1818,8 +2041,8 @@ msgid "Force"
 msgstr "Forcer"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Aucune"
@@ -1836,13 +2059,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1858,14 +2081,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2466,13 +2689,6 @@ msgstr "Heure d'extinction automatique"
 msgid "Slide Show Interval"
 msgstr "Intervalle du projecteur de diapositives"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Résolution"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2584,10 +2800,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2665,7 +2881,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2678,7 +2894,7 @@ msgid "Medium"
 msgstr "Moyenne"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2747,7 +2963,7 @@ msgid "Black and White"
 msgstr "Noir & Blanc"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2974,8 +3190,8 @@ msgstr ""
 "Identifiant de carte :\t\t%d\n"
 "Mode de flash:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Distante"
 
@@ -2985,13 +3201,13 @@ msgstr "Locale"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Oui"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Non"
 
@@ -3001,7 +3217,7 @@ msgstr "Non"
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3050,7 +3266,7 @@ msgid "Not Full"
 msgstr "Non pleine"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Pleine"
@@ -3234,7 +3450,7 @@ msgstr ""
 "de : %i octets."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Téléchargement du fichier..."
 
@@ -3434,13 +3650,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:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Qualité de l'image"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Taille de l'image"
 
@@ -3456,11 +3672,11 @@ msgstr "Auto-extinction (en minutes)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fine"
 
@@ -3468,21 +3684,21 @@ msgstr "fine"
 msgid "superfine"
 msgstr "très fine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatique"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "désactivé"
@@ -3768,7 +3984,7 @@ msgstr "PTP Erreur de protocole, données attendues"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Erreur de protocole, réponse attendue"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3782,76 +3998,70 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, 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:1181
+#: camlibs/ptp2/library.c:1188
 #, 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, 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:1384
+#: camlibs/ptp2/library.c:1391
 #, 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:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, 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:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "prêt"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-#, fuzzy
-msgid "Unknown"
-msgstr "Erreur inconnue"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3866,511 +4076,511 @@ msgstr ""
 "ID étendue du vendeur : 0x%08x\n"
 "Description étendue du vendeur : %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Résolution du fichier"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Résolution du fichier"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Envoi du fichier raté."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Erreur non définie"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "inconnu (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Général"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Prêt"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Nombre de fichiers : %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Type de fichier %i inconnu."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "ERREUR : paquet de type inattendu."
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 #, fuzzy
 msgid "Shade"
 msgstr "Dur"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Pré-configuré"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "très fine"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 #, fuzzy
 msgid "auto red eye"
 msgstr "Anti yeux rouges"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 #, fuzzy
 msgid "on red eye"
 msgstr "Anti yeux rouges"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "Erreur d'ordre de commandes. "
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 #, fuzzy
 msgid "spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Image"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "Lumière naturelle"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Automatique"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 #, fuzzy
 msgid "Sports"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 #, fuzzy
 msgid "Single Shot"
 msgstr "Unique"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Meilleure"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Retardateur"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Distante"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 #, fuzzy
 msgid "Single Area"
 msgstr "Unique"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "Zoom"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Lumière"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Poids centré"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Poids centré"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Réduction des yeux rouges"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flash anti-yeux rouges"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "externe"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Lumière naturelle"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4378,644 +4588,638 @@ msgstr "Lumière naturelle"
 msgid "Slow Sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Réduction des yeux rouges"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "noir & blanc"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1,5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Dur"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Doux"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Le dossier existe"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Contraste-"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Moyenne"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatique\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "Secteur"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluorescent"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "En cours de chargement"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "noir & blanc"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "PAS de flash"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "prêt"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "interne"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Pas de carte"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Appareil OK.\n"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sModèle de l'appareil : %s\n"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Révision de microcode : %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Appareil"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Mode de l'objectif"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Ajustement de l'image"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Heure d'extinction automatique"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Heure d'extinction automatique"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Réglages de l'image"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Vitesse ISO"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Mode couleur"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Automatique"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Mode de l'objectif"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Temps d'exposition de la lampe"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Enregistrement"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Temps d'exposition de la lampe"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Mode macro"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Ouverture"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Erreur de convergence."
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Mode macro"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exposition"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Réglage du flash"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Taille de l'image"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Réglages de l'appareil"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatique, réduction des yeux rouges"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Heure du retardateur"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Poids centré"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Date & heure"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "En cours de chargement"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Configuration"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Ajustement de l'image"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5023,42 +5227,42 @@ msgstr "Ajustement de l'image"
 msgid "Camera Settings"
 msgstr "Réglages de l'appareil"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Réglages de l'appareil"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Réglages de l'image"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Nombre de valeurs"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Valeurs gérées"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Valeur actuelle"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Initialisation de l'appareil photo"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5642,221 +5846,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "Lumière"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Temps d'exposition de la lampe"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescent"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Réduction des yeux rouges"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Manuel"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "Pas d'indicateur de mise sous tension"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Erreur non définie"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Erreur non définie"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP Erreur non définie"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP Erreur non définie"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "inconnu (0x%02x)"
diff --git a/po/hu.po b/po/hu.po
index 9ded7b20c..e273d65e3 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -77,85 +77,85 @@ msgstr ""
 "A weben talált dokumentáció alapján\n"
 "készült. A Vision engedélyével."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "A(z) '%s' név (%i karakter) túl hosszú (%i karakter), legfeljebb 30 "
 "karaktert lehet használni."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Védett fájl."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -178,7 +178,93 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Az előnézeti kép mérete: %d\n"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Kép"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Fókuszálási mód"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Autofókuszálási hiba."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Fókuszálási mód"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Nincs kézikönyv"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -195,49 +281,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Hiba képrögzítéskor"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "A hiba oka nem ismert"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -248,35 +334,35 @@ msgstr ""
 "  %11s bájt összesen\n"
 "  %11s bájt szabad"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "AC adapterről"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "akkumulátorról"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "energiaszint: megfelelő"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "energiaszint: nem megfelelő"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "nem érhető el: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (a számítógép ideje %s%i másodperc)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +389,7 @@ msgstr ""
 "\n"
 "Idő: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -324,26 +410,26 @@ msgstr ""
 "A5-kiegészítések: Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Hiba történt a fájl törlésekor"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Nem sikerült törölni a társított előnézeti képet"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "57600-nál magasabb sebességet nem lehet használni ennél a kameránál "
 "feltöltéshez"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Nem sikerült lekérdezni a Flash meghajtó betűjelét"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 #, fuzzy
 msgid ""
 "Could not upload, no free folder name available!\n"
@@ -352,459 +438,594 @@ msgstr ""
 "A feltöltés nem sikerült, nincs szabad könyvtárnév.\n"
 "A 999CANON könyvtár létezik, és található benne egy AUT 9999.JPG nevű kép."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 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:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "A kamera és a meghajtóprogram beállításai"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "A kamera típusa (csak olvasható)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "A tulajdonos neve"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO-sebesség"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+#, fuzzy
+msgid "Unknown"
+msgstr "Ismeretlen hiba"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Zársebesség (s)"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Apertúra"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Felbontás"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Fókuszálási mód"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Dátum és idő (csak olvasható)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Hiba"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Nem áll rendelkezésre"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "A kamera dátumának beállítása a számítógép dátumára"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "A firmware revíziószáma (csak olvasható)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Energia (csak olvasható)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Meghajtó"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Az összes fájl kilistázása"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "A fájlnév megőrzése feltöltéskor"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "A tulajdonos neve megváltozott"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "A tulajdonos neve megváltozott"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Zársebesség (s)"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Az apertúra beállításai"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Az apertúra beállításai"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Felbontáskapcsoló"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Fókuszálási mód"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "az idő beállítva"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "az idő beállítása nem sikerült"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Nem támogatott porttípus (%i = 0x%x) van megadva. Nem lehet inicializálni a "
 "kamerát."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Az akkumulátor lemerült, a kamera kikapcsolt."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "HIBA: nem várt üzenet"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "HIBA: üzenettúlfutás"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "HIBA: nem megfelelő sorrend"
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "HIBA: nem várt csomagtípus"
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "HIBA: hibás üzenetformátum"
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "HIBA: nem várt üzenet2"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Fájl letöltése..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "A sebesség megváltoztatása nem sikerült."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "A protokoll alapállapotba hozása..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "A kamera OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Kamera keresése..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Kapcsolatfelvétel a kamerával..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Kommunikációs hiba (1)"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "A kamera nem válaszolt"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Nem felismerhető válasz"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, fuzzy, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Detektálva: '%s'."
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, fuzzy, c-format
 msgid "Unknown model \"%s\""
 msgstr "Ismeretlen típus"
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Hibás EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Kommunikációs hiba (2)"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Kommunikációs hiba (3)"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Sebességváltás...egy kis türelmet kérek..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "A sebesség megváltoztatása nem sikerült"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 #, fuzzy
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 "A reinicializálás során hiba történt az ACK jelre való várakozás közben"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Nem jött ACK válasz az inicializálás közben"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Létrejött a kapcsolat a kamerával"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Előnézeti képek letöltése..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Nem sikerült felvenni a kapcsolatot a kamerával."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Ismeretlen hiba a kamerakezelő programkönyvtárban"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "A kamera nem áll készen, több kameraazonosítási kísérlet nem sikerült: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "A kamera nem áll készen, több kameraazonosítási kísérlet nem sikerült: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Adatok fogadása..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 #, fuzzy
 msgid "File upload failed."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -812,40 +1033,40 @@ msgstr ""
 "A fájl túl nagy. A következő feltöltési kísérlet előtt érdemes ki- és "
 "bekapcsolni a kamerát."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detektálva: '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -1033,8 +1254,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Vaku"
@@ -1216,48 +1437,48 @@ msgstr "Nem sikerült beállítani a kamera átviteli sebességét"
 msgid "Looks like a modem, not a camera"
 msgstr "Az eszköz modemnek tűnik, nem kamerának"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "A fájlok kilistázása itt: '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "A könyvtárak listázása itt: '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Nem sikerült információt lekérdezni erről: '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Nem sikerült információt lekérdezni erről: '%s' itt: '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Nem sikerült módosítani a(z) '%s' fájl idejét itt: '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "'%s' megnyitása nem sikerült."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "A \"camera\" böngészése lehetővé teszi a képek indexelését a merevlemezen."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Könyvtárböngészési mód - készítette: Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1319,7 +1540,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Letöltés..."
@@ -1652,20 +1873,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:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1928,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1746,8 +1967,8 @@ msgid "Force"
 msgstr "Kényszerítés"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Nincs"
@@ -1764,13 +1985,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1786,14 +2007,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2393,13 +2614,6 @@ msgstr "Automatikus lekapcsolási idő"
 msgid "Slide Show Interval"
 msgstr "Diavetítési időköz"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Felbontás"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2511,10 +2725,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2590,7 +2804,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2603,7 +2817,7 @@ msgid "Medium"
 msgstr "Közepes"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2681,7 +2895,7 @@ msgid "Black and White"
 msgstr "Fekete-fehér"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2886,8 +3100,8 @@ msgstr ""
 "Kártyaazonosító:\t\t%d\n"
 "Vakuzási mód:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "távoli"
 
@@ -2897,13 +3111,13 @@ msgstr "helyi"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Igen"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nem"
 
@@ -2913,7 +3127,7 @@ msgstr "Nem"
 msgid "Fine"
 msgstr "Finom"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2962,7 +3176,7 @@ msgid "Not Full"
 msgstr "Nincs tele"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Tele"
@@ -3144,7 +3358,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:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -3323,13 +3537,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Képminőség"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Képméret"
 
@@ -3345,11 +3559,11 @@ msgstr "Automatikus kikapcsolás (perc)"
 msgid "Information"
 msgstr "Információ"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normál"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "finom"
 
@@ -3357,21 +3571,21 @@ msgstr "finom"
 msgid "superfine"
 msgstr "nagyon finom"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "automatikus"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "ki"
@@ -3654,7 +3868,7 @@ msgstr "PTP protokollhiba, nem érkezett adat"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3668,76 +3882,70 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, 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:1181
+#: camlibs/ptp2/library.c:1188
 #, 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, 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:1384
+#: camlibs/ptp2/library.c:1391
 #, 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:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, 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:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "kész"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-#, fuzzy
-msgid "Unknown"
-msgstr "Ismeretlen hiba"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3747,505 +3955,505 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fájl feltöltése..."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "�ltalános"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Kész"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Ismeretlen fájltípus: %i."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "HIBA: nem várt csomagtípus"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "portugál"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normál"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "nagyon finom"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "Hibás parancssorrend."
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Kép"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Automatikus"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Legjobb"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Saját időzítő"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "távoli"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "Nagyítás"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Magas"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Vaku"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Vörösszem-vaku"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "külső"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Égbolt"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4253,640 +4461,634 @@ msgstr "Égbolt"
 msgid "Slow Sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 #, fuzzy
 msgid "1/15"
 msgstr "115200"
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1,5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Töltés"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "A könyvtár már létezik"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "egyéni"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Közepes"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatikus\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Fluoreszkáló"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "Normál"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Töltés"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "Fekete-fehér"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "NINCS vaku"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "kész"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "belső"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Nincs kártya"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "A kamera OK.\n"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Firmware-revízió: %d.%d\n"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Automatikus lekapcsolási idő"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Színmód"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Automatikus"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: 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:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Apertúra"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fókuszálási hiba."
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exponálás"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "A vaku beállításai"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Képméret"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatikus, vörösszemeffektus-csökkentés"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "A saját időzítő ideje"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Zársebesség (s)"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "Töltés"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Beállítások"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Képkiigazítás"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4894,44 +5096,44 @@ msgstr "Képkiigazítás"
 msgid "Camera Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5553,221 +5755,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "Magas"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Az izzó exponálási ideje"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Fehéren izzó"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "ismeretlen (0x%02x)"
diff --git a/po/it.po b/po/it.po
index 595370e00..84ed4195e 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -90,26 +90,26 @@ msgstr ""
 "Implementato usando documenti trovati\n"
 "in rete. Permesso ottenuto da Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Impossibile creare la directory %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Impossibile rimuovere la directory \"%s\"."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*SCONOSCIUTO*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -118,7 +118,7 @@ msgstr ""
 "canon_int_capture_image: canon_usb_list_all_dirs() iniziale fallito con "
 "stato %li"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -127,19 +127,19 @@ msgstr ""
 "canon_int_capture_image: canon_usb_list_all_dirs() finale fallito con stato %"
 "i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Il nome \"%s\" (%li caratteri) è troppo lungo, può avere 30 caratteri al "
 "massimo."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Non sono permesse lettere minuscole in %s."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -147,7 +147,7 @@ msgstr ""
 "canon_int_list_directory: ERRORE: messaggio initial troppo corto (%i < "
 "minimo %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -155,28 +155,28 @@ msgstr ""
 "canon_int_list_directory: fine del pacchetto raggiunta durante l'analisi "
 "della prima voce di directory"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: incontrata una voce di directory troncata"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "File protetto."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Impossibile estrarre miniatura JPEG dai dati: inizio/fine mancante"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Impossibile estrarre miniatura JPEG dai dati: i dati non sono JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parametro \"%s\" NULL in %s riga %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -199,7 +199,93 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Anteprima miniatura"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Immagine"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Modalità autofocus."
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Errore di autofocus."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Modalità autofocus."
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Messa a fuoco manuale"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr "RAW"
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -216,49 +302,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Fotocamera non disponibile: %s"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Spegnimento fotocamera"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Errore durante la cattura dell'immagine"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Impossibile leggere il nome del disco: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Nessun motivo disponibile"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Impossibile leggere le informazioni sul disco: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Errore interno #1 in get_file_func() (%s riga %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Nessun file audio è stato trovato per %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s è un tipo di file per cui non è fornita una miniatura"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -269,35 +355,35 @@ msgstr ""
 "  %11s byte totali\n"
 "  %11s byte disponibili"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "adattatore AC"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "non disponibile: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -313,7 +399,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -335,26 +421,26 @@ msgstr ""
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Errore durante l'eliminazione del file"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Errore durante l'eliminazione della miniatura associata"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Velocità maggiori di 57600 non sono gestite durante il caricamento su questa "
 "fotocamera"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr ""
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -362,133 +448,263 @@ msgstr ""
 "Impossibile fare il caricamento, nessun nome di cartella disponibile!\n"
 "La cartella 999CANON esiste e contiene un'immagine AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Impossibile creare la directory \\DCIM."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Impossibile creare la directory di destinazione."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Configurazione fotocamera e driver"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Fotocamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Modello fotocamera (solo lettura)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Nome proprietario"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "Velocità ISO"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Velocità otturatore"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Apertura"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Risoluzione"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Modalità messa a fuoco"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Data e ora (solo lettura)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Errore"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Non disponibile"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Imposta la data della fotocamera alla data del PC"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Revisione del firmware (solo lettura)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Alimentazione (solo lettura)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Driver"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Elenca tutti i file"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Mantieni il nome di file al caricamento"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Fotocamera non disponibile"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Nome del proprietario cambiato"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "impossibile cambiare il nome del proprietario"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Nome del proprietario cambiato"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "impossibile cambiare il nome del proprietario"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Velocità otturatore"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "impossibile cambiare il nome del proprietario"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Impostazione dell'apertura"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Impostazione dell'apertura"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "impossibile cambiare il nome del proprietario"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Risoluzione"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Impossibile creare la directory."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Modalità messa a fuoco"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "impossibile cambiare il nome del proprietario"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "orario impostato"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "impossibile impostare l'orario"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Tipo di porta %i = 0x%x non gestito. Initializzazione impossibile."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Batteria esaurita, fotocamera spenta."
 
 # FIXME UPSTREAM: missing final '.'
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "ERRORE: messaggio inatteso."
 
 # FIXME UPSTREAM: missing final '.'
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "ERROR: message troppo lungo."
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "ERRORE: fuori sequenza."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "ERRORE: tipo di pacchetto inatteso."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "ERRORE: errore di formato del messaggio."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "ERRORE: messaggio inatteso 2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Caricamento del file in corso..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Lettura del file in corso..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -496,153 +712,153 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue non è riuscito a recuperare "
 "le voci di directory"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: impossibile allocare %i byte di memoria"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: impossibile leggere un'altra voce di directory"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: ricevuta voce di directory troncata"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: troppe voci di directory, ci deve essere un ciclo."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Errore durante il cambiamento di velocità."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Reimpostazione del protocollo in corso..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Fotocamera OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Ricerca della fotocamera..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Tentativo di contattare la fotocamera in corso..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Errore di comunicazione 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Nessuna risposta dalla fotocamera"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Risposta non riconosciuta"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Rilevata una \"%s\" ovvero \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Modello \"%s\" sconosciuto"
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "EOT non valido"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Errore di comunicazione 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Errore di comunicazione 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Cambiamento velocità in corso... attendere..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Errore durante il cambiamento di velocità"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 "Errore nell'attesa di ACK durate un altro tentativo di inizializzazione"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Errore nell'attesa di ACK durate l'inizializzazione"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Connesso alla fotocamera"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "ERRORE: rilevata condizione di errore fatale, impossibile continuare "
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ERRORE: %d è troppo grande"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Lettura miniatura..."
 
 # FIXME: femminile?
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "NON RICONOSCIUTO"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Impossibile stabilire un contatto iniziale con la fotocamera"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "La fotocamera era già attiva"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "La fotocamera è stata risvegliata"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr "Sconosciuto (qualche tipo di errore)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Risposta iniziale '%c' della fotocamera non riconosciuta"
 
 # FIXME UPSTREAM
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -651,7 +867,7 @@ msgstr ""
 "Passo #2 dell'inizializzazione non riuscito: \"%s\" durante la lettura di %"
 "i. Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -660,7 +876,7 @@ msgstr ""
 "Passo #2 dell'inizializzazione non riuscito! (restituiti %i byte, attesi %i) "
 "Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -668,7 +884,7 @@ msgstr ""
 "Passo #3 dell'inizializzazione non riuscito: \"%s\" durante la lettura di %"
 "i. Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -677,7 +893,7 @@ msgstr ""
 "Passo #3 dell'inizializzazione non riuscito! (restituito %i, atteso %i) "
 "Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -686,31 +902,31 @@ msgstr ""
 "Passo #3 dell'inizializzazione non riuscito: \"%s\" durante la scrittura di %"
 "i. Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Passo #4 non riuscito: \"%s\" durante la lettura di %i. Fotocamera non "
 "operativa"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "Passo #4 non riuscito! (restituito %i, atteso %i) Fotocamera non operativa"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Fotocamera non pronta, molte richieste \"Identify camera\" non riuscite: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Fotocamera non pronta, get_battery non riuscito: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -719,20 +935,20 @@ msgstr ""
 "canon_usb_lock_keys: restituita lunghezza inattesa dalla funzione \"lock keys"
 "\" (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: restituita lunghezza inattesa (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_unlock_keys: restituita lunghezza inattesa (%i byte, attesi %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -741,7 +957,7 @@ msgstr ""
 "canon_usb_get_body_id: restituita lunghezza dei dati inattesa (%i byte, "
 "attesi %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -750,7 +966,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: lettura dell'interrupt fallita dopo %i "
 "tentativi, %6.3f secondi \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -759,64 +975,69 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: lettura dell'interrupt fallita dopo %i "
 "tentativi, \"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr "canon_usb_capture_dialogue: secondo interrupt letto fuori sequenza"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: primo interrupt letto fuori sequenza"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: secondo interrupt letto fuori sequenza"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: terzo interrupt EOS letto fuori sequenza"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: quarto interrupt EOS letto fuori sequenza"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr "canon_usb_dialogue: attesi 0x%x byte, ma la fotocamera riporta 0x%x"
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Ricezione dati in corso..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Memoria esaurita: %d byte necessari."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue non riuscito"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -825,35 +1046,35 @@ msgstr ""
 "Avvertimento in canon_usb_set_file_attributes: canon_usb_dialogue ha "
 "restituito lo stato di errore 0x%08x dalla fotocamera"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Impossibile leggere dal file \"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Memoria esaurita: %ld byte necessari."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Caricamento del file non riuscito."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -862,14 +1083,14 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue non è riuscito a recuperare "
 "le voci di directory, restituito %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -878,12 +1099,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue non è riuscito a recuperare "
 "le voci di directory, restituito %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Individuata una \"%s\"."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -1071,8 +1292,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flash"
@@ -1234,46 +1455,46 @@ msgstr ""
 msgid "Looks like a modem, not a camera"
 msgstr "Sembra un modem, non una fotocamera"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Elencazione dei file in \"%s\"..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Elencazione delle cartelle in \"%s\"..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Impossibile ottenere le informazioni su \"%s\" (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Impossibile ottenere informazioni su \"%s\" in \"%s\" (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Impossibile cambiare l'orario del file \"%s\" in \"%s\" (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Impossibile aprire \"%s\"."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1335,7 +1556,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Scaricamento in corso..."
@@ -1661,20 +1882,20 @@ msgid "High (good quality)"
 msgstr "Alta (buona qualità)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1937,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1755,8 +1976,8 @@ msgid "Force"
 msgstr "Forza"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Nessuno"
@@ -1773,13 +1994,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1795,14 +2016,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2392,13 +2613,6 @@ msgstr "Tempo di spegnimento automatico"
 msgid "Slide Show Interval"
 msgstr "Intervallo presentazione"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Risoluzione"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2510,10 +2724,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2590,7 +2804,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2603,7 +2817,7 @@ msgid "Medium"
 msgstr "Media"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2672,7 +2886,7 @@ msgid "Black and White"
 msgstr "Bianco e nero"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2880,8 +3094,8 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Remoto"
 
@@ -2891,13 +3105,13 @@ msgstr "Locale"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Sì"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "No"
 
@@ -2907,7 +3121,7 @@ msgstr "No"
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2950,7 +3164,7 @@ msgid "Not Full"
 msgstr "Non piena"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Piena"
@@ -3135,7 +3349,7 @@ msgstr ""
 "possibile da caricare è %i byte."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Caricamento in corso..."
 
@@ -3308,13 +3522,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Qualità immagine"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Dimensioni immagine"
 
@@ -3330,11 +3544,11 @@ msgstr "Spegnimento automatico (minuti)"
 msgid "Information"
 msgstr "Informazioni"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normale"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fine"
 
@@ -3342,21 +3556,21 @@ msgstr "fine"
 msgid "superfine"
 msgstr "superfine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "spento"
@@ -3622,7 +3836,7 @@ msgstr "PTP Errore di protocollo, dati attesi"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Errore di protocollo, risposta attesa"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3636,70 +3850,65 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Questa fotocamera Canon non gestisce la cattura Canon"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Questa fotocamera Canon non gestisce Canon Captureinitiation"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Comando di cattura completato, ma nessuna conferma ricevuta"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Ricevuto evento 0x%04x"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "solo lettura"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3714,486 +3923,486 @@ msgstr ""
 "Estensione ID vendor: 0x%08x\n"
 "Descrizione estensione vendor: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Formato data"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Formato data"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Risoluzione file"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Risoluzione file"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Caricamento del file non riuscito."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Cattura"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Cattura"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "sconosciuto (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generale"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Pronta"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Numero di immagini: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Tipo di file %i sconosciuto."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "tipo di dati %i inatteso"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Manuale"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr "Ombra"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr "JPEG Base"
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr "JPEG Fine"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr "NEF+BASIC"
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr "super fine"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr "auto occhi rossi"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr "acceso occhi rossi"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr "spot"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "centro"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr "largo"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr "medio 1"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr "medio 2"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr "piccolo"
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr "Predefinito"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr "Ritratto"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr "Paesaggio"
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr "Sport"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr "Ritratto notturno"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr "Paesaggio notturno"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Migliore"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Ritratto"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 msgid "Centre"
 msgstr "Centro"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr "Alto"
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr "Basso"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr "Sinistra"
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr "Destra"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "esternamente"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr "Predefinito"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4201,605 +4410,599 @@ msgstr "Predefinito"
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Bianco e nero"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 msgid "AE/AF Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "1 min"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 #, fuzzy
 msgid "5 minutes"
 msgstr "5 min"
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 min"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 #, fuzzy
 msgid "30 minutes"
 msgstr "10 min"
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 min"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr "Vivo"
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Ombra"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Spot"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "La directory esiste"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Contrasto"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Media"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr "Lunga distanza"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatico"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "AC"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr "Fluorescente H"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr "Neutro"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr "Bianco e nero"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "Flash"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "solo lettura"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 msgid "WB bracketing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internamente"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Nessuna scheda"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "Proprietario fotocamera"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Modello fotocamera"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Revisione del firmware: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Orario fotocamera"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr "Commento all'immagine"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Tempo di spegnimento automatico"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Impostazioni di cattura"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Velocità ISO"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr "Bilanciamento bianco"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Modello fotocamera"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr "Auto ISO"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Modalità autofocus."
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Lunghezza focale"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Modalità messa a fuoco"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Tempo di esposizione"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 msgid "Exposure Program"
 msgstr "Programma di esposizione"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Apertura"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr "Velocità otturatore"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Distanza messa a fuoco"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 msgid "Focus Area Wrap"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Rotazione immagine"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Modalità autofocus."
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 msgid "Flourescent Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Bilanciamento del bianco"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Configurazione"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr "Aggiustamento tonalità"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4807,40 +5010,40 @@ msgstr "Aggiustamento tonalità"
 msgid "Camera Settings"
 msgstr "Impostazioni fotocamera"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr "Impostazioni immagine"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Impostazioni di cattura"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Numero di valori"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Valori gestiti"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Valore corrente"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Inizializzazione fotocamera"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5373,218 +5576,255 @@ msgstr "Massima apertura alla distanza focale massima"
 msgid "Low Light"
 msgstr "Luce bassa"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Tempo di esposizione"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f stop"
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr "JPEG Normale"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr "RAW"
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG Base"
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Riduzione occhi rossi"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr "Messa a fuoco manuale"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Modo flash"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Matrice"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 #, fuzzy
 msgid "Firmware"
 msgstr "Firmware: %d.%d\n"
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP Errore non definito"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Proprietà PTP non definita"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "sconosciuto (0x%02x)"
diff --git a/po/ja.po b/po/ja.po
index 3ef3c64be..be9c55d39 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -88,26 +88,26 @@ msgstr ""
 "WEB 上�実装済��使用方法�ドキュメント\n"
 "��り��。Vision �承諾済�。"
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "ディレクトリ %s を生�����ん���。"
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "ディレクトリ %s を削除����ん���。"
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "キー�ロック�失敗����。"
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*�明*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -116,7 +116,7 @@ msgstr ""
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() ��期化�失敗���"
 "� (ステータス %i)"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -125,23 +125,23 @@ msgstr ""
 "canon_int_capture_image: 関数 canon_usb_list_all_dirs() �終了処��失敗��"
 "�� (ステータス %i)"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "�� '%s' (%i 個�文字) �長���� 最大 30 文字��有効��。"
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "%s ��文字��り��。"
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, fuzzy, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr "canon_int_list_dir: ERROR: �期メッセージ�短���� (%i < 最�値 %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 #, fuzzy
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
@@ -149,32 +149,32 @@ msgid ""
 msgstr ""
 "canon_int_list_dir: 最�� dirent を調査�る際�パケット�終端�到�����"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 #, fuzzy
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_dir: 切り��られ�ディレクトリ�������"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "ファイル��護�れ����。"
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 "データ�ら JPEG サム�イル�展開����ん���: 開始/終端��り��ん"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "データ�ら JPEG サム�イル�展開����ん���: データ� JFIF ���り��"
 "ã‚“"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "%3$i 行� %2$s ��るパラメータ \"%1$s\" � NULL ��"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -200,7 +200,93 @@ msgstr ""
 "警告: CRC ��ェック�れ����ん (サイズ %d, 値 0x%04x �追加) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "サム�イル�プレビュー"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "画�"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "フォーカス・モード"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "自動フォーカス�エラー��。"
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "フォーカス・モード"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "�り扱�説明書"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -217,49 +303,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "カメラ�無効��"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "カメラを OFF ����"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "画��キャプ�ャ中�エラー"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "ディスク�を�得����ん���: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "使用����由"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "ディスク情報を�得����ん���: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "関数 get_file_func() �内部エラー #1 (%2$i 行� %1$s)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "%s �オーディオ・ファイル�見��り��ん���"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "サム�イル����ファイル %s �指定�れ���"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -270,35 +356,35 @@ msgstr ""
 "  �計 %11s �イト\n"
 "  %11s �イト有効"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "AC アダプタ"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "�ッテリ容�"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "電� ○"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "電� ×"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "使用��: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (host 時間 %s%i 秒)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +411,7 @@ msgstr ""
 "\n"
 "時刻: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -346,24 +432,24 @@ msgstr ""
 "A5 追加� Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "ファイル�削除中�エラー"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "共有サム�イル�削除中�エラー"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "��カメラ�スピード 57600 以上�アップロード�る�������ん"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "フラッシュドライブを�得����ん���"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -371,132 +457,263 @@ msgstr ""
 "アップロード����ん���。使�れ����フォルダ���り��ん�\n"
 "フォルダ 999CANON �既�存在���り�画� AUT_9999.JPG ���中��り��。"
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "\\DCIM ディレクトリを作�����ん���"
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "対象��るディレクトリを作�����ん���"
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "カメラ�ドライ��設定"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "カメラ"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "カメラ�型� (読��り��)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "所有者���"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "キャプ�ャ��れ"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO スピード"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "�明"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "シャッター速度"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "絞り"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "解�度"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "フォーカス・モード"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "日付�時刻 (読��り��)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "エラー"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "使用��"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "カメラ�日付を PC �日付�セット���"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "ファームウェア�リビジョン (読��り��)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "電� (読��り��)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "ドライ�"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "全ファイル�一覧"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "アップロード時�ファイル�を���る"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "カメラ�無効��"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "所有者�変更�れ���"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "所有者���を変更����ん���"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "所有者�変更�れ���"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "所有者���を変更����ん���"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "シャッター速度"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "所有者���を変更����ん���"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "外観�設定"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "外観�設定"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "所有者���を変更����ん���"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "解�度切替��り"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "フォルダを生�����ん���。"
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "フォーカス・モード"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "所有者���を変更����ん���"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "時刻�セット"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "時刻をセット����ん���"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "未サ�ート��ート�種類 %i = 0x%x �指定�れ���。�期化����ん。"
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "�ッテリ�消耗����。カメラを OFF ����。"
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "エラー: 予期���メッセージ"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "エラー: メッセージ�オー�ーラン"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "エラー: シーケンスを越����。"
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "エラー: 予期���パケット�種類��。"
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "エラー: メッセージ書��エラー��。"
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "エラー: 予期���メッセージ 2 ��。"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "ファイル�アップロード中..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "ファイル��得中..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -504,153 +721,153 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue �ディレクトリを�得����"
 "ん���"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 "canon_serial_get_dirents: dirent ��期パケット�短���� (%i �イト��)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: %i �イト�メモリを確�����ん���"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: 別�ディレクトリを読�込���ん���"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: 切り��られ�ディレクトリを���り���"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: dirent �多���� (ループ��るを得����)"
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: dirent ��ッファ・サイズを %i �イト�変更����"
 "ん���"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "スピード変更�エラー�発生����。"
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "プロトコル��設定..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "カメラ� OK ��。\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "カメラ�検出中..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "カメラ�通信中..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "通信エラー 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "カメラ�ら�応��り��ん"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "�識�����応��"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "\"%s\" (\"%s\") を検出����。"
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "�明�型� \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "���� EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "通信エラー 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "通信エラー 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "スピード�変更中... 少々�待�下��..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "スピード変更�エラー"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "��期化中� ACK 待��エラー"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "�期化中� ACK 待��エラー"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "カメラ�接続済�"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "エラー: 致命的�エラーを検出����。続行����ん。"
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "エラー: %d �大�����"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "サム�イル��得中..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "�識�れ����ん"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "カメラ��期接続を確立����ん���"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "カメラ�既�アクティブ��"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "カメラ�起動�れ���"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "�明�エラー (詳細�明)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "カメラ��期応答 %c/'%s' を�識����ん"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -659,7 +876,7 @@ msgstr ""
 "ステップ #3 ��期化�失敗���� (返り値 %i, 期待値 %i)。カメラを�作���"
 "�ん�"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, fuzzy, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -668,7 +885,7 @@ msgstr ""
 "ステップ #3 ��期化�失敗���� (返り値 %i, 期待値 %i)。カメラを�作���"
 "�ん�"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -676,7 +893,7 @@ msgstr ""
 "ステップ #3 ��期化�失敗���� (返り値 %i, 期待値 %i)。カメラを�作���"
 "�ん�"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -685,7 +902,7 @@ msgstr ""
 "ステップ #3 ��期化�失敗���� (返り値 %i, 期待値 %i)。カメラを�作���"
 "�ん�"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, fuzzy, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -694,30 +911,30 @@ msgstr ""
 "ステップ #3 ��期化�失敗���� (返り値 %i, 期待値 %i)。カメラを�作���"
 "�ん�"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, fuzzy, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "ステップ #4.1 �失敗���� (返り値 %i, 期待値 %i)。カメラを�作����ん�"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, fuzzy, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "ステップ #4.1 �失敗���� (返り値 %i, 期待値 %i)。カメラを�作����ん�"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "カメラ�準備�������ん。複数回 \"カメラ情報\" �求�失敗����: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "カメラ�準備�������ん (get_battery �失敗): %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, fuzzy, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -726,14 +943,14 @@ msgstr ""
 "canon_usb_lock_keys: 期待�����サイズ�データを���り��� (%i �イ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, fuzzy, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: 期待�����サイズ�データを���り��� (%i �イ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, fuzzy, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -741,7 +958,7 @@ msgstr ""
 "canon_usb_unlock_keys: 期待�����サイズ�データを���り��� (%i �イ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, fuzzy, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -750,7 +967,7 @@ msgstr ""
 "canon_usb_lock_keys: 期待�����サイズ�データを���り��� (%i �イ"
 "ト, 期待値 %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, fuzzy, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -759,7 +976,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: %i 回試行�����割り込��失敗���� (\"%"
 "s\")"
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -768,7 +985,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: %i 回試行�����割り込��失敗���� "
 "(\"%s\")"
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -776,24 +993,30 @@ msgstr ""
 "canon_usb_capture_dialogue: サム�イル�パケット・サイズ������� (0x%"
 "04x)"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 "canon_usb_capture_dialogue: 画�パケット��計サイズ������� (0x%04x)"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+"canon_usb_capture_dialogue: シーケンス�外�二回目�割り込��発生����"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンス�外�一回目�割り込��発生����"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンス�外�二回目�割り込��発生����"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -801,43 +1024,43 @@ msgstr ""
 "canon_usb_capture_dialogue: 写真�シグナル�信�失敗���� (コード = 0x%"
 "08x)"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンス�外�三回目�割り込��発生���� "
 "(EOS)"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: シーケンス��外�四回目�割り込��発生���� "
 "(EOS)"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: サイズ�大�����。�ッファ��り込���ん (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "データ��信中..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "メモリ�足り��ん: %d �イト必���。"
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue �失敗����"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, fuzzy, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -846,22 +1069,22 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue �エラー・ステータス 0x%"
 "08x を���り���"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "ファイル \"%s\" を読�込���ん���"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "メモリ�足り��ん: %ld �イト必���"
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "ファイル�アップロード�失敗����"
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -869,7 +1092,7 @@ msgstr ""
 "ファイル�大�����。�使��カメラ�電�を OFF ����ファイルをアップ"
 "ロード�る��戻��下��。"
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -878,7 +1101,7 @@ msgstr ""
 "canon_usb_get_dirents: �ッファ�読�込���ん。切り���サイズ '%.96s' �"
 "大�����。"
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -887,7 +1110,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue �ディレクトリ��得�失敗��"
 "�� (返り値 %i)"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -896,7 +1119,7 @@ msgstr ""
 "canon_usb_list_all_dirs: �ッファ�読�込���ん。切り���サイズ '%.96s' "
 "�大�����。"
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -905,12 +1128,12 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue �ディレクトリ��得�失敗�"
 "��� (返り値 %i)"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' を検出����。"
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "カメラ��� \"%s\" �既存�カメラ��一致���ん"
@@ -1106,8 +1329,8 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:399 camlibs/dimera/dimera3500.c:785
 #: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:425
 #: camlibs/konica/library.c:778 camlibs/konica/library.c:1019
-#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "フラッシュ�り"
@@ -1286,46 +1509,46 @@ msgstr "カメラ�通信速度�設定中��題�発生����"
 msgid "Looks like a modem, not a camera"
 msgstr "カメラ�����モデム�よ���"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "'%s' ��るファイル一覧を作�中..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "'%s' ��るフォルダ一覧�作�中..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "'%s' (%m) �情報を�得����ん���。"
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "'%s' ('%s' �中��る) (%m) �情報を�得����ん���。"
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "ファイル '%s' ('%s' �中��る) (%m) �時刻を変更����ん���。"
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "'%s' を開���ん���。"
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "ディレクトリ�照 \"camera\" �コンピュータ上�写真�目録を作����。"
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "ディレクトリ�照モード - Scott Fritzinger <scottf@unr.edu> ���供。"
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1395,7 +1618,7 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "カメラ�予期����イト 0x%02x を�信������。"
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "ダウンロード中..."
@@ -1733,20 +1956,20 @@ msgid "High (good quality)"
 msgstr "高 (普通��質)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 msgid "Capture"
 msgstr "キャプ�ャ"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "ズーム"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2011,11 @@ msgstr "露出度"
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1827,8 +2050,8 @@ msgid "Force"
 msgstr "強制発光"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "��"
@@ -1845,13 +2068,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1867,14 +2090,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2476,13 +2699,6 @@ msgstr "自動 OFF 時間"
 msgid "Slide Show Interval"
 msgstr "スライドショー�表示間隔"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "解�度"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2594,10 +2810,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2672,7 +2888,7 @@ msgid "No answer from the camera."
 msgstr "カメラ�ら応答��り��ん"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2685,7 +2901,7 @@ msgid "Medium"
 msgstr "中"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2754,7 +2970,7 @@ msgid "Black and White"
 msgstr "モノクロ"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2997,8 +3213,8 @@ msgstr ""
 "カードID:\t\t%d\n"
 "フラッシュモード:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "リモート"
 
@@ -3008,13 +3224,13 @@ msgstr "ローカル"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "��"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "���"
 
@@ -3024,7 +3240,7 @@ msgstr "���"
 msgid "Fine"
 msgstr "ファイン"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3073,7 +3289,7 @@ msgid "Not Full"
 msgstr "使用中"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "フル充電"
@@ -3256,7 +3472,7 @@ msgstr ""
 "ファイルサイズ� %ld �イト��。アップロード�能�サイズ� %i �イト��。"
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -3454,13 +3670,13 @@ msgstr ""
 "Michael Trawny <trawny99@users.sourceforge.net> �担当����。�グ修正� "
 "Marcus Meissner <marcus@jet.franken.de> �担当����。"
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "画���質"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "画�サイズ"
 
@@ -3476,11 +3692,11 @@ msgstr "自動パワーオフ (分後)"
 msgid "Information"
 msgstr "情報"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "標準"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "ファイン"
 
@@ -3488,21 +3704,21 @@ msgstr "ファイン"
 msgid "superfine"
 msgstr "スーパーファイン"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "自動"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "OFF"
@@ -3786,7 +4002,7 @@ msgstr "PTP プロトコル・エラー (期待値: データ)"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3800,79 +4016,74 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 "����ん��使��カメラ�汎用キャプ�ャ機能をサ�ート���り��ん。"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 "����ん��使��カメラ�汎用キャプ�ャ機能をサ�ート���り��ん。"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 "����ん��使��カメラ�汎用キャプ�ャ機能をサ�ート���り��ん。"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 "����ん��使��カメラ�汎用キャプ�ャ機能をサ�ート���り��ん。"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 "����ん��使��カメラ�汎用キャプ�ャ機能をサ�ート���り��ん。"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 "キャプ�ャ・コマンド�完了������確�イベント����り��ん���"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "�信��イベント 0x%04x"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "読�込���"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "読�書�"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "�明"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3887,513 +4098,513 @@ msgstr ""
 "ベンダ�拡張 ID: 0x%08x\n"
 "ベンダ�拡張情報: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "データ形�"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "データ形�"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "ファイル�解�度"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "ファイル�解�度"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "ファイル�アップロード�失敗����"
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "キャプ�ャ"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "キャプ�ャ"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "キャプ�ャ"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP ��明�エラー"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "�明 (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "全般"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "読�書�"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "準備 OK"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "写真�数: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "�明�ファイル形� %i ��。"
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "予期���データ種 %i"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "�り扱�説明書"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 #, fuzzy
 msgid "Shade"
 msgstr "シャープ"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "プリセット"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "スーパーファイン"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 #, fuzzy
 msgid "auto red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 #, fuzzy
 msgid "on red eye"
 msgstr "赤目対策"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "コマンド�実行順�エラー��。"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 #, fuzzy
 msgid "spot"
 msgstr "ス�ット"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "キャプ�ャ"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "画�"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "自動"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 #, fuzzy
 msgid "Sports"
 msgstr "ス�ット"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 #, fuzzy
 msgid "Single Shot"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "ベスト"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 #, fuzzy
 msgid "Timelapse"
 msgstr "低速度撮影数"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "セルフタイマ"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "リモート"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 #, fuzzy
 msgid "Single Area"
 msgstr "シングル"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "キャプ�ャ"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "ズーム"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "光�"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 #, fuzzy
 msgid "Center Weighted"
 msgstr "中央部�点"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "中央部�点"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "フラッシュ�り"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "赤目軽減フラッシュ"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "屋外"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4401,634 +4612,628 @@ msgstr "屋外"
 msgid "Slow Sync"
 msgstr "スローシンクロ"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "x1"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "シャープ"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "ソフト"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "ディレクトリ�存在���"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "カスタム"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "コントラスト"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "フォーカス��離"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自動\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "電�"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "�光�"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "標準"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "モノクロ"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "フラッシュ��"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "読�込���"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "露出補正"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "カード��り��ん"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "カメラ�所有者"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "カメラ�型�"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "ファームウェア�リビジョン: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "カメラ�時刻"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "画��調整"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "自動 OFF 時間"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "キャプ�ャ�設定"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO スピード"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "写真�効果"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "カラーモード"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "自動"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "補助光"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "ビープ・モード"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 #, fuzzy
 msgid "F Number"
 msgstr "F-番�"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "フォーカス�長�"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "露出時間"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "効果モード"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "露出プログラム・モード"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "キャプ�ャ・モード"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "フォーカス測光モード"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "露出補正モード"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "絞り"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "フォーカス�焦点"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "測光モード"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "フォーカス��離"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "露出"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "フラッシュ�設定"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "ビューファインダーモード"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "画�サイズ"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "カメラ�設定"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "フォーカス・モード"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "自動, Red-Eye 減少"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "�ースト数"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "ホワイト�ランス"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "セルフタイマー�時間"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "中央部�点"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "シャッター速度"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "日付�時間"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "充電中"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "露出度"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "設定"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "画��調整"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5036,41 +5241,41 @@ msgstr "画��調整"
 msgid "Camera Settings"
 msgstr "カメラ�設定"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "カメラ�設定"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "キャプ�ャ�設定"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "値�数"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "サ�ート���る値"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "�在�値"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "カメラ��期化中..."
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5647,221 +5852,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "光�"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "露出時間"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "白熱�"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "赤目軽減発光"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "�り扱�説明書"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "フラッシュモード"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "マトリックス"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "ス�ット"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "パワー・セーブ"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP ��明�エラー"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP ��明�エラー"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP 未定義�プロパティ"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP 未定義�プロパティ"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "�明 (0x%02x)"
diff --git a/po/nb.po b/po/nb.po
index 8a5e1c082..f136a8c0e 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -64,87 +64,87 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -167,7 +167,91 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+msgid "Thumbnail"
+msgstr ""
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Bildeindeks"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Farger"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Farger"
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Farger"
+
+#: camlibs/canon/library.c:168
+msgid "Manual focus"
+msgstr ""
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -184,55 +268,55 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr ""
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 #, fuzzy
 msgid "Error capturing image"
 msgstr "Åpne bilde"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, fuzzy, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kunne ikke hente forhåndsvisning"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 #, fuzzy
 msgid "No reason available"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, fuzzy, c-format
 msgid "Could not get disk info: %s"
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -240,35 +324,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +368,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -297,529 +381,661 @@ msgid ""
 " Stephen H. Westin"
 msgstr ""
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Kunne ikke hente #%i"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
 msgstr ""
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Kamerakonfigurasjon"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 #, fuzzy
 msgid "Camera"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Kamera modell:"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+msgid "ISO speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr ""
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+msgid "Shutter speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr ""
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr ""
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Farger"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 #, fuzzy
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr ""
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+msgid "ISO speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1788
+msgid "Could not change ISO speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+msgid "Shutter speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "Kunne ikke hente #%i"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Fargeinnstillinger"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr ""
+"Kunne ikke åpne:\n"
+"%s"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+msgid "Resolution changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr ""
+"Kunne ikke åpne:\n"
+"%s"
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Farger"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "Kunne ikke hente forhåndsvisning"
+
+#: camlibs/canon/library.c:1969
 #, fuzzy
 msgid "time set"
 msgstr "Nullstill"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 #, fuzzy
 msgid "could not set time"
 msgstr "Kunne ikke lagre #%i"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr ""
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 #, fuzzy
 msgid "ERROR: unexpected message"
 msgstr "FEIL: Kunne ikke slette bilde.\n"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr ""
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 #, fuzzy
 msgid "ERROR: out of sequence."
 msgstr "FEIL: kunne ikke lagre bilde.\n"
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr ""
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr ""
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 #, fuzzy
 msgid "ERROR: unexpected message2."
 msgstr "FEIL: Kunne ikke slette bilde.\n"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 #, fuzzy
 msgid "Uploading file..."
 msgstr "Skalerer bilde med 50%..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 #, fuzzy
 msgid "Getting file..."
 msgstr "Henter indeks..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr ""
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr ""
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr ""
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr ""
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr ""
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr ""
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr ""
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr ""
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr ""
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 #, fuzzy
 msgid "Getting thumbnail..."
 msgstr "Henter miniatyr %i..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Kunne ikke ta bilde."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr ""
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 #, fuzzy
 msgid "File upload failed."
 msgstr "Skalerer bilde med 50%..."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -997,8 +1213,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1161,53 +1377,53 @@ msgstr ""
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr ""
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr ""
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, fuzzy, c-format
 msgid "Could not open '%s'."
 msgstr ""
 "Kunne ikke åpne:\n"
 "%s"
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 #, fuzzy
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Copyright © 1998-2000 Scott Fritzinger <scottf@unr.edu>\n"
 "\n"
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1269,7 +1485,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1574,21 +1790,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 #, 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1846,11 @@ msgstr ""
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1669,8 +1885,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1688,13 +1904,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1710,14 +1926,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2289,13 +2505,6 @@ msgstr ""
 msgid "Slide Show Interval"
 msgstr ""
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr ""
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2408,10 +2617,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2486,7 +2695,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2499,7 +2708,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2572,7 +2781,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2758,8 +2967,8 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr ""
 
@@ -2769,13 +2978,13 @@ msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Ja"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nei"
 
@@ -2785,7 +2994,7 @@ msgstr "Nei"
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2828,7 +3037,7 @@ msgid "Not Full"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr ""
@@ -2998,7 +3207,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Skalerer bilde med 50%..."
@@ -3148,13 +3357,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 #, fuzzy
 msgid "Image Size"
 msgstr "Bildeindeks"
@@ -3172,11 +3381,11 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr ""
 
@@ -3184,21 +3393,21 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr ""
@@ -3468,7 +3677,7 @@ msgstr ""
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3482,74 +3691,69 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Lagring av indeks er ikke støttet ennå"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Lagring av indeks er ikke støttet ennå"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Lagring av indeks er ikke støttet ennå"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Lagring av indeks er ikke støttet ennå"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3559,478 +3763,478 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, c-format
 msgid "Display Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Skalerer bilde med 50%..."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Åpne bilde"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Åpne bilde"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Åpne bilde"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Åpne bilde"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Bildeindeks"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Nullstill"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 msgid "sRGB (portrait)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Åpne bilde"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Høyde:"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4038,587 +4242,581 @@ msgstr ""
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 msgid "1 minute"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 msgid "10 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 msgid "8 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 msgid "20 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 msgid "1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 msgid "2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 msgid "4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 msgid "8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 msgid "15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 msgid "15 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 msgid "Sharper"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 msgid "Direct Print"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 msgid "Medium Low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 msgid "Medium high"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 msgid "Low contrast"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 msgid "Medium low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 msgid "AE only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "Kamera modell:"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Behold"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Fargejustering"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 msgid "Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Behold"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Bildeindeks"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Farger"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 msgid "Auto Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 msgid "Tungsten Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 msgid "Flourescent Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 msgid "Daylight Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 msgid "Flash Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 msgid "Cloudy Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 msgid "Shade Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Kamerakonfigurasjon"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Fargejustering"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4627,43 +4825,43 @@ msgstr "Fargejustering"
 msgid "Camera Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "Nytt bilde er #%03i"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5220,213 +5418,250 @@ msgstr ""
 msgid "Low Light"
 msgstr "Høyde:"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Kamera i sanntid!"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index efdfb846a..2ca8c3737 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -89,26 +89,26 @@ msgstr ""
 "Zaimplementowano z u¿yciem dokumentacji\n"
 "dostêpnej na WWW za zgod± Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Nie uda³o siê utworzyæ katalogu %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Nie uda³o siê usun±æ katalogu %s."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "zablokowanie klawiszy nie powiod³o siê."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*NIEZNANY*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, fuzzy, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -117,7 +117,7 @@ msgstr ""
 "canon_int_capture_image: pocz±tkowe canon_usb_list_all_dirs() nie powiod³o "
 "siê ze stanem %i"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -126,19 +126,19 @@ msgstr ""
 "canon_int_capture_image: koñcowe canon_usb_list_all_dirs() nie powiod³o siê "
 "ze stanem %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Nazwa '%s' (%li znaków) jest zbyt d³uga, dozwolone jest maksymalnie 30 "
 "znaków."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Ma³e litery w %s nie s± dopuszczalne."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -146,7 +146,7 @@ msgstr ""
 "canon_int_list_directory: B£¡D: pocz±tkowy komunikat zbyt krótki (%i < "
 "minimum %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -154,28 +154,28 @@ msgstr ""
 "canon_int_list_directory: Osi±gniêto koniec pakietu przed sprawdzeniem "
 "pierwszego dirent"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: napotkano uciêty wpis katalogu"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Plik zabezpieczony."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Nie uda³o siê wyci±gn±æ miniaturki JPEG z danych: Brak pocz±tku/koñca"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "Nie uda³o siê wyci±gn±æ miniaturki JPEG z danych: Dane nie s± JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "Parametr NULL \"%s\" w %s w linii %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -202,7 +202,93 @@ msgstr ""
 "uwaga: nie sprawdzono CRC (dodaæ d³ugo¶æ %d, warto¶æ 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Podgl±d miniaturki"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Obraz"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Tryb ogniskowania"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "B³±d autofocusu."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Tryb ogniskowania"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Rêczna ogniskowa"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr "RAW"
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -232,49 +318,49 @@ msgstr ""
 "57600. Je¶li bêdzie wystêpowaæ du¿o b³êdów transmisji szeregowej, nale¿y\n"
 "spróbowaæ mo¿liwie najmniej obci±¿aæ komputer (bez pracy dysku).\n"
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Aparat niedostêpny: %s"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Wy³±czanie aparatu"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "B³±d podczas pobierania obrazu"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Nie uda³o siê uzyskaæ nazwy dysku: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Przyczyna niedostêpna"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Nie uda³o siê uzyskaæ informacji o dysku: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "B³±d wewnêtrzny #1 w get_file_func() (%s w linii %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Nie znaleziono pliku z d¼wiêkiem dla %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s to rodzaj pliku dla którego nie zapewniono miniaturki"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -285,35 +371,35 @@ msgstr ""
 "  %11s bajtów w sumie\n"
 "  %11s bajtów dostêpnych"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "zasilacz AC"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "na baterii"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "zasilanie w porz±dku"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "zasilanie nieprawid³owe"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "niedostêpne: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (czas hosta %s%i sekund)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +426,7 @@ msgstr ""
 "\n"
 "Czas: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -363,26 +449,26 @@ msgstr ""
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "B³±d podczas usuwania pliku"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "B³±d podczas usuwania powi±zanego pliku miniaturki"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Prêdko¶ci wiêksze ni¿ 57600 nie s± obs³ugiwane przy wczytywaniu danych do "
 "tego aparatu"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Nie uda³o siê uzyskaæ litery dysku flash"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -390,132 +476,263 @@ msgstr ""
 "Nie uda³o siê przes³aæ danych do aparatu - brak wolnych nazw folderów!\n"
 "Istnieje nazwa folderu 999CANON i zawiera obrazek AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Nie uda³o siê utworzyæ katalogu \\DCIM."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Nie uda³o siê utworzyæ katalogu docelowego."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguracja aparatu i sterownika"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Aparat"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Model aparatu (tylko do odczytu)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Nazwa w³a¶ciciela"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Opó¼nienie przed zdjêciem"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "Prêdko¶æ ISO"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Prêdko¶æ migawki"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Przys³ona"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Rozdzielczo¶æ"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Tryb ogniskowania"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Data i czas (tylko do odczytu)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "B³±d"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Niedostêpne"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Ustawienie daty aparatu na datê PC"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Wersja firmware'u (tylko do odczytu)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Zasilanie (tylko do odczytu)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Sterownik"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Wypisanie listy wszystkich plików"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Zachowywanie nazwy pliku przy przesy³aniu do aparatu"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Aparat niedostêpny"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Nazwa w³a¶ciciela zmieniona"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "nie uda³o siê zmieniæ nazwy w³a¶ciciela"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Nazwa w³a¶ciciela zmieniona"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "nie uda³o siê zmieniæ nazwy w³a¶ciciela"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Prêdko¶æ migawki"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "nie uda³o siê zmieniæ nazwy w³a¶ciciela"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Ustawienie przys³ony"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Ustawienie przys³ony"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "nie uda³o siê zmieniæ nazwy w³a¶ciciela"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Prze³±cznik rozdzielczo¶ci"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Nie uda³o siê utworzyæ katalogu."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Tryb ogniskowania"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "nie uda³o siê zmieniæ nazwy w³a¶ciciela"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "czas ustawiony"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "nie uda³o siê ustawiæ czasu"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 "Podano nieobs³ugiwany rodzaj portu %i = 0x%x. Inicjalizacja niemo¿liwa."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Bateria wyczerpana, aparat wy³±czony."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "B£¡D: nieoczekiwany komunikat"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "B£¡D: przepe³nienie komunikatu"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "B£¡D: utrata kolejno¶ci."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "B£¡D: nieoczekiwany rodzaj pakietu."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "B£¡D: b³±d formatu komunikatu."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "B£¡D: nieoczekiwany komunikat2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Przesy³anie pliku do aparatu..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Pobieranie pliku..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -523,7 +740,7 @@ msgstr ""
 "canon_serial_get_dirents: w canon_serial_dialogue nie uda³o siê pobraæ "
 "wpisów katalogu"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -531,145 +748,145 @@ msgstr ""
 "canon_serial_get_dirents: Pocz±tkowy pakiet dirent zbyt krótki (tylko %i "
 "bajtów)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: Nie uda³o siê przydzieliæ %i bajtów pamiêci"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 "canon_serial_get_dirents: Nie uda³o siê odczytaæ kolejnego wpisu katalogu"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: Odebrano uciêty wpis katalogu"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr "canon_serial_get_dirents: Zbyt du¿o wpisów dirent, musi byæ pêtla."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: Nie uda³o siê zmieniæ rozmiaru bufora dirent na %i "
 "bajtów"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "B³±d podczas zmiany prêdko¶ci."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Resetowanie protoko³u..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Aparat w porz±dku.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Szukanie aparatu..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Próba kontaktu z aparatem..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "B³±d komunikacji 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Brak odpowiedzi od aparatu"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Nierozpoznana odpowied¼"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Wykryto \"%s\" czyli \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "Nieznany model \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Z³y EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "B³±d komunikacji 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "B³±d komunikacji 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Zmiana prêdko¶ci... oczekiwanie..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "B³±d podczas zmiany prêdko¶ci"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "B³±d podczas oczekiwania na ACK przy ponawianiu inicjalizacji"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "B³±d podczas oczekiwania na ACK przy inicjalizacji"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Po³±czono z aparatem"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "B£¡D: wykryto b³±d krytyczny, nie mo¿na kontynuowaæ"
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "B£¡D: %d to za du¿o"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Pobieranie miniaturki..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "NIE ROZPOZNANO"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "Nie uda³o siê ustanowiæ pocz±tkowego po³±czenia z aparatem"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Aparat ju¿ by³ aktywny"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Aparat zosta³ obudzony"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr "Nieznany (jaki¶ rodzaj b³êdu)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "Nierozpoznana pocz±tkowa odpowied¼ aparatu '%c'"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -678,7 +895,7 @@ msgstr ""
 "Krok #2 inicjalizacji nie powiód³ siê: \"%s\" przy odczycie %i. Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -687,7 +904,7 @@ msgstr ""
 "Krok #2 inicjalizacji nie powiód³ siê! (zwrócono %i bajtów, oczekiwano %i). "
 "Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
@@ -695,7 +912,7 @@ msgstr ""
 "Krok #3 inicjalizacji nie powiód³ siê: \"%s\" przy odczycie %i. Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -704,7 +921,7 @@ msgstr ""
 "Krok #3 inicjalizacji nie powiód³ siê! (zwrócono %i bajtów, oczekiwano %i). "
 "Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -713,30 +930,30 @@ msgstr ""
 "Krok #3 inicjalizacji nie powiód³ siê: \"%s\" przy zapisie %i. Aparat "
 "niefunkcjonalny"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 "Krok #4 nie powiód³ siê: \"%s\" przy odczycie %i. Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 "Krok #4 nie powiód³ siê (zwrócono %i, oczekiwano %i). Aparat niefunkcjonalny"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Aparat nie gotowy, wielokrotne ¿±dania 'Identify camera' nie powiod³y siê: %s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Aparat nie gotowy, get_battery nie powiod³o siê: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -745,14 +962,14 @@ msgstr ""
 "canon_usb_lock_keys: Nieoczekiwana d³ugo¶æ zwrócona z funkcji \"lock keys"
 "\" (%i bajtów, oczekiwano %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Zwrócona nieoczekiwana d³ugo¶æ (%i bajtów, oczekiwano %"
 "i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -760,7 +977,7 @@ msgstr ""
 "canon_usb_unlock_keys: Zwrócona nieoczekiwana d³ugo¶æ (%i bajtów, oczekiwano "
 "%i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -769,7 +986,7 @@ msgstr ""
 "canon_usb_get_body_id: Zwrócona nieoczekiwana d³ugo¶æ danych (%i bajtów, "
 "oczekiwano %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -778,7 +995,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: odczyt z przerwania nie powiód³ siê po %i "
 "próbach, %6.3f sek \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -787,7 +1004,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: odczyt z przerwania nie powiód³ siê po %i "
 "próbach, \"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -795,7 +1012,7 @@ msgstr ""
 "canon_usb_capture_dialogue: b³êdna d³ugo¶æ 0x%04x dla pakietu rozmiaru "
 "miniaturki"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -803,56 +1020,61 @@ msgstr ""
 "canon_usb_capture_dialogue: b³êdna d³ugo¶æ 0x%04x dla pakietu rozmiaru "
 "pe³nego obrazu"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr "canon_usb_capture_dialogue: drugi odczyt z przerwania spoza kolejno¶ci"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: pierwszy odczyt z przerwania spoza kolejno¶ci"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: drugi odczyt z przerwania spoza kolejno¶ci"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr "canon_usb_capture_dialogue: zg³oszono b³±d fotograficzny, kod = 0x%08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: trzeci odczyt z przerwania EOS spoza kolejno¶ci"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: czwarty odczyt z przerwania EOS spoza kolejno¶ci"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: dane zbyt du¿e, nie zmieszcz± siê do bufora (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr "canon_usb_dialogue: oczekiwano 0x%x bajtów, ale aparat zg³asza 0x%x"
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Odbieranie danych..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Brak pamiêci: potrzeba %d bajtów."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue nie powiod³o siê"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -861,22 +1083,22 @@ msgstr ""
 "Ostrze¿enie w canon_usb_set_file_attributes: canon_usb_dialogue zwróci³o "
 "status b³êdu 0x%08x z aparatu"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Nie uda³o siê odczytaæ z pliku \"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Brak pamiêci: potrzeba %ld bajtów."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Przes³anie pliku do aparatu nie powiod³o siê."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -884,7 +1106,7 @@ msgstr ""
 "Plik by³ zbyt du¿y. Mo¿e zaj¶æ potrzeba wy³±czenia i w³±czenia aparatu przed "
 "przesy³aniem kolejnych plików."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -893,7 +1115,7 @@ msgstr ""
 "canon_usb_get_dirents: Nie uda³o siê zmie¶ciæ danych do bufora, "
 "'%.96s' (obciête) zbyt d³ugie."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -902,7 +1124,7 @@ msgstr ""
 "canon_usb_get_dirents: w canon_usb_long_dialogue nie powiod³o siê pobranie "
 "wpisów katalogu, zwrócono %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -911,7 +1133,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Nie uda³o siê zmie¶ciæ danych do bufora, "
 "'%.96s' (obciête) zbyt d³ugie."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -920,12 +1142,12 @@ msgstr ""
 "canon_usb_list_all_dirs: w canon_usb_long_dialogue nie powiod³o siê pobranie "
 "wpisów katalogu, zwrócono %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Wykryto '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Nazwa \"%s\" z aparatu nie pasuje do ¿adnego znanego aparatu"
@@ -1117,8 +1339,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Flesz"
@@ -1297,48 +1519,48 @@ msgstr "Problem przy ustawianiu prêdko¶ci komunikacji z aparatem"
 msgid "Looks like a modem, not a camera"
 msgstr "Wygl±da jak modem, a nie aparat"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Pobieranie listy plików w '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Pobieranie listy folderów w '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Nie uda³o siê uzyskaæ informacji o '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Nie uda³o siê uzyskaæ informacji o '%s' w '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Nie uda³o siê zmieniæ czasu pliku '%s' w '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Nie uda³o siê otworzyæ '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Przegl±danie katalogu \"aparat\" pozwala indeksowaæ zdjêcia na twardym dysku."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Tryb przegl±dania katalogu - napisa³ Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "Nie uda³o siê usun±æ pliku '%s' w folderze '%s' (kod b³êdu %i: %m)."
@@ -1402,7 +1624,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "¦ci±ganie..."
@@ -1747,20 +1969,20 @@ msgid "High (good quality)"
 msgstr "Wysoka (dobra jako¶æ)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2024,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1841,8 +2063,8 @@ msgid "Force"
 msgstr "Wymuszenie"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Brak"
@@ -1859,13 +2081,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1881,14 +2103,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2491,13 +2713,6 @@ msgstr "Czas automatycznego wy³±czania"
 msgid "Slide Show Interval"
 msgstr "Odstêp miêdzy pokazywanymi slajdami"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Rozdzielczo¶æ"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2609,10 +2824,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2687,7 +2902,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2700,7 +2915,7 @@ msgid "Medium"
 msgstr "¦rednia"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2769,7 +2984,7 @@ msgid "Black and White"
 msgstr "Czarno-bia³y"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3011,8 +3226,8 @@ msgstr ""
 "ID karty:                      %d\n"
 "Tryb flesza:                   "
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Zdalny"
 
@@ -3022,13 +3237,13 @@ msgstr "Lokalny"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Tak"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nie"
 
@@ -3038,7 +3253,7 @@ msgstr "Nie"
 msgid "Fine"
 msgstr "Dobra"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3087,7 +3302,7 @@ msgid "Not Full"
 msgstr "Niepe³ne"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Pe³ne"
@@ -3271,7 +3486,7 @@ msgstr ""
 "siê przes³aæ to %i bajtów."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Przesy³anie..."
 
@@ -3467,13 +3682,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:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Jako¶æ obrazu"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Rozmiar obrazu"
 
@@ -3489,11 +3704,11 @@ msgstr "Automatyczne wy³±czanie (w minutach)"
 msgid "Information"
 msgstr "Informacje"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normalna"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "dobra"
 
@@ -3501,21 +3716,21 @@ msgstr "dobra"
 msgid "superfine"
 msgstr "bardzo dobra"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "wy³±czono"
@@ -3800,7 +4015,7 @@ msgstr "PTP: B³±d protoko³u, oczekiwano danych"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP: B³±d protoko³u, oczekiwano odpowiedzi"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3814,71 +4029,66 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 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:1181
+#: camlibs/ptp2/library.c:1188
 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "W³±czanie trybu Canon Viewfinder nie powiod³o siê: %d"
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Pobieranie obrazu Canon Viewfinder nie powiod³o siê: %d"
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Wy³±czanie trybu Canon Viewfinder nie powiod³o siê: %d"
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, 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:1384
+#: camlibs/ptp2/library.c:1391
 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:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Canon Capture nie powiod³o siê: %d"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Niestety ten aparat nie obs³uguje zwyk³ego robienia zdjêæ"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Polecenie zdjêcia wykonane, ale nie odebrano potwierdzenia"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Odebrano zdarzenie 0x%04x"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "tylko odczyt"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "odczyt i zapis"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3893,488 +4103,488 @@ msgstr ""
 "ID rozszerzenia producenta: 0x%08x\n"
 "Opis rozszerzenia producenta: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Format daty"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Format daty"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Rozdzielczo¶æ pliku"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Rozdzielczo¶æ pliku"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Przes³anie pliku do aparatu nie powiod³o siê."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Zdjêcia"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Capture nie powiod³o siê: %d"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Zdjêcia"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP: Niezdefiniowany b³±d"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "nieznany (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Ogólna"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "odczyt i zapis"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Gotowy"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Liczba zdjêæ: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Nieznany rodzaj pliku %i."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "nieoczekiwany typ danych %i"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Rêczny"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr "Automatyczny One-push"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr "Cieñ"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Predefiniowany"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr "Podstawowy JPEG"
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr "Normalny JPEG"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr "Dobry JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr "NEF (Surowy)"
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr "NEF+BASIC"
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr "bardzo dobra"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr "automatyczny z redukcj± czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr "w³±czony z redukcj± czerwonych oczu"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr "Commander"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr "punkt"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "¶rodek"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr "du¿y"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr "¶redni 1"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr "¶redni 2"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr "ma³y"
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr "Ustawienie fabryczne"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr "Portret"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr "Pejza¿"
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr "Sporty"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr "Nocny portret"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr "Nocny pejza¿"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr "Pojedyncze zdjêcie"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Najlepsza"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 #, fuzzy
 msgid "Timelapse"
 msgstr "Liczba w jednostce czasu"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr "Samowyzwalacz"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr "Samowyzwalacz + zdalny"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr "Dynamiczny obszar"
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr "Pojedynczy obszar"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr "Najbli¿szy obiekt"
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Portret"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 msgid "Centre"
 msgstr "¦rodek"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr "Góra"
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr "Dó³"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr "Lewo"
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr "Prawo"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr "Centralnie wa¿ony"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Centralnie wa¿ony"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flesz"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Flesz z redukcj± czerwonych oczu"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "zewnêtrznie"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr "Domy¶lny"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4382,616 +4592,610 @@ msgstr "Domy¶lny"
 msgid "Slow Sync"
 msgstr "Wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Synchronizacja tylnej migawki + wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Redukcja czerwonych oczu + wolna synchronizacja"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Czerñ i biel"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Blokada ogniskowej"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "1 min"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 #, fuzzy
 msgid "5 minutes"
 msgstr "5 min"
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 min"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 #, fuzzy
 msgid "30 minutes"
 msgstr "10 min"
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 min"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr "Vivid"
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Ostra"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "Miêkka"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Katalog istnieje"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "W³asne"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "¦rednia"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "¦rednia"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "¦rednia"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr "Du¿a odleg³o¶æ"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatyczny"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "AC"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr "¦wiat³o fluorescencyjne H"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr "Niskie wyostrzenie"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr "Czerñ i biel"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "BEZ flesza"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "tylko odczyt"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Bracketing ekspozycji"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "wewnêtrznie"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Brak karty"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "W³a¶ciciel aparatu"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Model aparatu"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Wersja firmware'u: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Czas aparatu"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "Tryb piszczyka"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr "Komentarz do obrazu"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr "Czas wy³±czania LCD"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Czas automatycznego wy³±czania pomiaru"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Ustawienia zdjêcia"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Prêdko¶æ ISO"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr "Balans bieli"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "Efekt fotograficzny"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Tryb koloru"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr "Automatyczne ISO"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr "Redukcja szumów przy d³ugiej ekspozycji"
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "¦wiat³o pomocnicze"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr "Obszar rozja¶nienia AF"
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr "Tryb piszczyka AF"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 #, fuzzy
 msgid "F Number"
 msgstr "Liczba F"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Ogniskowa"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Czas ekspozycji"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "Tryb efektu"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Tryb programu ekspozycji"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "Tryb zdjêæ nieruchomych"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "Tryb pomiaru ogniskowej"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "Tryb pomiaru ekspozycji"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Przys³ona"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "Punkt ogniskowania"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr "Prêdko¶æ migawki"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "Tryb pomiaru"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Odleg³o¶æ ogniskowej"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Obszar ogniska"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr "Blokada ekspozycji"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr "Sekwencyjne numerowanie plików"
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr "Znak flesza"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Tryb Viewfinder"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr "Ocenia zdjêcia"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Automatyczny obrót obrazu"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Moc flesza"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Tryb ogniskowania"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr "Kompensacja ekspozycji flesza"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Automatyczny wybór w trybie bracket"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 #, fuzzy
 msgid "Bracket Order"
 msgstr "Kolejno¶æ w trybie bracket"
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "Liczba serii"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Automatyczne przesuniêcie balansu bieli"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla ¶wiat³a ¿arówki wolframowej"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla ¶wiat³a fluorescencyjnego"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla ¶wiat³a dziennego"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla flesza"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla pogody pochmurnej"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Przesuniêcie balansu bieli dla cienia"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Opó¼nienie samowyzwalacza"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "Obszar centralnie wa¿ony"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr "Prêdko¶æ migawki z fleszem"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr "Zdalny limit czasu"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr "Wyostrzanie"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr "Kompensacja tonów"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Konfiguracja"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr "Regulacja barwy"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4999,40 +5203,40 @@ msgstr "Regulacja barwy"
 msgid "Camera Settings"
 msgstr "Ustawienia aparatu"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr "Ustawienia obrazu"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Ustawienia zdjêcia"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Liczba warto¶ci"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Obs³ugiwane warto¶ci"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Aktualna warto¶æ"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Inicjalizacja aparatu"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5570,217 +5774,254 @@ msgstr "Maksymalna jasno¶æ przy maksymalnej ogniskowej"
 msgid "Low Light"
 msgstr "Niskie ¶wiat³o"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Czas ekspozycji"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f kroków"
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr "JPEG Norm"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr "RAW"
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr "RAW + JPEG podstawowy"
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "¦wiat³o ¿arz±ce siê"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Redukcja czerwonych oczu"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr "Rêczna ogniskowa"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Tryb flesza"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Macierz"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr "Silny wiatr"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr "1 min"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr "5 min"
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr "10 min"
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr "15 min"
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP: Niezdefiniowany b³±d"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP: Niezdefiniowany b³±d"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "Niezdefiniowana opcja PTP"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "nieznany (0x%02x)"
diff --git a/po/ru.po b/po/ru.po
index 1da6746e2..8b12d1705 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -67,83 +67,83 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "�евозможно перейти в локальный каталог '%s'."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "�е найден домашний каталог."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -166,7 +166,88 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Миниатюра:\n"
+
+#: camlibs/canon/library.c:92
+msgid "Full Image"
+msgstr ""
+
+#: camlibs/canon/library.c:165
+msgid "Auto focus: one-shot"
+msgstr ""
+
+#: camlibs/canon/library.c:166
+msgid "Auto focus: AI servo"
+msgstr ""
+
+#: camlibs/canon/library.c:167
+msgid "Auto focus: AI focus"
+msgstr ""
+
+#: camlibs/canon/library.c:168
+msgid "Manual focus"
+msgstr ""
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -183,51 +264,51 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Руковод�тво пользовател� фотоаппарата:"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr ""
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 #, fuzzy
 msgid "Error capturing image"
 msgstr "Сделать �нимок"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, fuzzy, c-format
 msgid "Could not get disk name: %s"
 msgstr "�евозможно извлечь �нимок"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 #, fuzzy
 msgid "No reason available"
 msgstr "�ет ничего.\n"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, fuzzy, c-format
 msgid "Could not get disk info: %s"
 msgstr "�евозможно извлечь �нимок"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr ""
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -235,35 +316,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "�ет ничего.\n"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +360,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -292,522 +373,652 @@ msgid ""
 " Stephen H. Westin"
 msgstr ""
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "�евозможно задать папку."
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
 msgstr ""
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 #, fuzzy
 msgid "Could not create \\DCIM directory."
 msgstr "�е найден домашний каталог."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 #, fuzzy
 msgid "Could not create destination directory."
 msgstr "�е найден домашний каталог."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Опи�ание драйвера фотоаппарата"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 #, fuzzy
 msgid "Camera"
 msgstr "им�"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Опи�ание драйвера фотоаппарата"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Сделать звукозапи�ь"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "�коро�ть"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr ""
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "�коро�ть"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr ""
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr ""
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+msgid "Focus mode"
+msgstr ""
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 #, fuzzy
 msgid "Unavailable"
 msgstr "�ет ничего.\n"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 #, fuzzy
 msgid "Camera unavailable"
 msgstr "Руковод�тво пользовател� фотоаппарата:"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+msgid "ISO speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "�евозможно проче�ть данные EXIF"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+msgid "Shutter speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "�евозможно задать папку."
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Сделать �нимок"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Сделать �нимок"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "�е найден домашний каталог."
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+msgid "Resolution changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "�е найден домашний каталог."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+msgid "Focus mode changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "�евозможно извлечь �нимок"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr ""
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 #, fuzzy
 msgid "could not set time"
 msgstr "�евозможно извлечь �нимок"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr ""
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr ""
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr ""
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr ""
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr ""
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr ""
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr ""
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr ""
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr ""
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr ""
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr ""
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr ""
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr ""
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr ""
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr ""
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr ""
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr ""
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 #, fuzzy
 msgid "Camera was woken up"
 msgstr "Руковод�тво пользовател� фотоаппарата:"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr ""
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -983,8 +1194,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1148,46 +1359,46 @@ msgstr ""
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, fuzzy, c-format
 msgid "Listing files in '%s'..."
 msgstr "Показать �пи�ок файлов внутри папки"
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, fuzzy, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Показать �пи�ок папок внутри папки"
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "�евозможно задать на�тройки"
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr ""
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, fuzzy, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "�евозможно перейти в локальный каталог '%s'."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, fuzzy, c-format
 msgid "Could not open '%s'."
 msgstr "�евозможно �делать �нимок."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1248,7 +1459,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1555,21 +1766,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 #, 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1822,11 @@ msgstr ""
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1650,8 +1861,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1669,13 +1880,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1691,14 +1902,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2267,13 +2478,6 @@ msgstr ""
 msgid "Slide Show Interval"
 msgstr ""
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr ""
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2385,10 +2589,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2463,7 +2667,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2476,7 +2680,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2547,7 +2751,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2732,8 +2936,8 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr ""
 
@@ -2743,13 +2947,13 @@ msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Да"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "�ет"
 
@@ -2760,7 +2964,7 @@ msgstr "�ет"
 msgid "Fine"
 msgstr "Файл:\n"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2803,7 +3007,7 @@ msgid "Not Full"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr ""
@@ -2974,7 +3178,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr ""
 
@@ -3122,13 +3326,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr ""
 
@@ -3145,11 +3349,11 @@ msgstr ""
 msgid "Information"
 msgstr "Показать данные EXIF"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 #, fuzzy
 msgid "fine"
 msgstr "им� файла"
@@ -3158,21 +3362,21 @@ msgstr "им� файла"
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "выкл"
@@ -3439,7 +3643,7 @@ msgstr ""
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3453,71 +3657,66 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, fuzzy, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Сн�ть фильм"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 #, fuzzy
 msgid "readwrite"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3527,482 +3726,482 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Сн�ть фильм"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Справка по командам"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, fuzzy, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr "Поддерживаемые фотоаппараты:\n"
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr "Показать �пи�ок функций фотоаппарата"
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, fuzzy, c-format
 msgid "\tFile Download, "
 msgstr "  Скопировано: %s\n"
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, c-format
 msgid "File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, c-format
 msgid "Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "�евозможно �делать �нимок."
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, c-format
 msgid "Nikon Capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, fuzzy, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "Опи�ание:"
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 "%s\n"
 "�едопу�тимый �имвол '%c'."
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "[команда]"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 msgid "Center"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 #, fuzzy
 msgid "Sports"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 msgid "Burst"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Врем�: "
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Порт"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "да"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 msgid "Flash off"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4010,571 +4209,565 @@ msgstr "Удалить"
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 msgid "AE/AF Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 msgid "1 minute"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 msgid "10 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 msgid "8 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 msgid "20 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 msgid "1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 msgid "2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 msgid "4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 msgid "8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 msgid "15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 msgid "15 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 msgid "Sharper"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "каталог:"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 msgid "Medium Low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 msgid "Medium high"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 msgid "Low contrast"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 msgid "Medium low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "чтение"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 msgid "WB bracketing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Руковод�тво пользовател� фотоаппарата:"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "Укажите модель фотоаппарата"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Руковод�тво пользовател� фотоаппарата:"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 msgid "Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Сделать �нимок"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Укажите модель фотоаппарата"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 msgid "Auto Focus Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 msgid "Exposure Program"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 #, fuzzy
 msgid "Still Capture Mode"
 msgstr "Сн�ть фильм"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 msgid "Focus Area Wrap"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 msgid "Image Rotation Flag"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 msgid "Auto Focus Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 msgid "Auto Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 msgid "Tungsten Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 msgid "Flourescent Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 msgid "Daylight Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 msgid "Flash Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 msgid "Cloudy Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 msgid "Shade Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "�а�троить"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4582,44 +4775,44 @@ msgstr ""
 msgid "Camera Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Сделать �нимок"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "Показать количе�тво файлов"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 #, fuzzy
 msgid "Supported values"
 msgstr "Поддерживаемые фотоаппараты:\n"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 #, fuzzy
 msgid "Metadata only supported for MTP devices."
 msgstr "Показать �пи�ок поддерживаемых портов"
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5153,212 +5346,251 @@ msgstr ""
 msgid "Low Light"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Руковод�тво пользовател� фотоаппарата:"
+
+#: camlibs/ptp2/ptp.c:2435
+#, fuzzy
+msgid "Device Certificate"
+msgstr "Показать �пи�ок функций фотоаппарата"
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+#, fuzzy
+msgid "Device Icon"
+msgstr "�айдено у�трой�тв: %i\n"
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 msgid "Flash Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
@@ -7040,9 +7272,6 @@ msgstr ""
 #~ msgid "  Size:       %li byte(s)\n"
 #~ msgstr "  Размер:     %li байт(ов)\n"
 
-#~ msgid "Could not parse EXIF data."
-#~ msgstr "�евозможно проче�ть данные EXIF"
-
 #~ msgid "EXIF tags:"
 #~ msgstr "Метки EXIF:"
 
@@ -7064,9 +7293,6 @@ msgstr ""
 #~ msgid "\t\"%s\"\n"
 #~ msgstr "\t\"%s\"\n"
 
-#~ msgid "Devices found: %i\n"
-#~ msgstr "�айдено у�трой�тв: %i\n"
-
 #~ msgid ""
 #~ "Path                             Description\n"
 #~ "--------------------------------------------------------------\n"
@@ -7401,9 +7627,6 @@ msgstr ""
 #~ msgid "Capture a quick preview"
 #~ msgstr "Сделать пробный �нимок"
 
-#~ msgid "Capture an audio clip"
-#~ msgstr "Сделать звукозапи�ь"
-
 #~ msgid "Show info"
 #~ msgstr "Показать �ведени�"
 
diff --git a/po/sl.po b/po/sl.po
index 7c6682148..a8562add7 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -64,87 +64,87 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -167,7 +167,91 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+msgid "Thumbnail"
+msgstr ""
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Kazalo slik"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Barve"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Barve"
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Barve"
+
+#: camlibs/canon/library.c:168
+msgid "Manual focus"
+msgstr ""
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -184,55 +268,55 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr ""
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 #, fuzzy
 msgid "Error capturing image"
 msgstr "Odpri sliko"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, fuzzy, c-format
 msgid "Could not get disk name: %s"
 msgstr "Ne morem dobiti vzorca"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 #, fuzzy
 msgid "No reason available"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, fuzzy, c-format
 msgid "Could not get disk info: %s"
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -240,35 +324,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +368,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -297,529 +381,661 @@ msgid ""
 " Stephen H. Westin"
 msgstr ""
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Ne morem dobiti #%i"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
 msgstr ""
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Nastaviteve fotoaparata"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 #, fuzzy
 msgid "Camera"
 msgstr "®iva slika!"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Model fotoaparata:"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+msgid "ISO speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr ""
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+msgid "Shutter speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr ""
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr ""
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Barve"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 #, fuzzy
 msgid "Unavailable"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr ""
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+msgid "ISO speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1788
+msgid "Could not change ISO speed"
+msgstr ""
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+msgid "Shutter speed changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "Ne morem dobiti #%i"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Nstavitev barv"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Nstavitev barv"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr ""
+"Ne morem odpreti:\n"
+" %s"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+msgid "Resolution changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr ""
+"Ne morem odpreti:\n"
+" %s"
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Barve"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "Ne morem dobiti vzorca"
+
+#: camlibs/canon/library.c:1969
 #, fuzzy
 msgid "time set"
 msgstr "Ponastavi"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 #, fuzzy
 msgid "could not set time"
 msgstr "Ne morem shraniti #%i"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr ""
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 #, fuzzy
 msgid "ERROR: unexpected message"
 msgstr "NAPAKA: Ne morem zbrisati slike.\n"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr ""
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 #, fuzzy
 msgid "ERROR: out of sequence."
 msgstr "NAPAKA: ne morem shraniti slike.\n"
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr ""
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr ""
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 #, fuzzy
 msgid "ERROR: unexpected message2."
 msgstr "NAPAKA: Ne morem zbrisati slike.\n"
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 #, fuzzy
 msgid "Uploading file..."
 msgstr "Pomanj¹ujem sliko za 50%..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 #, fuzzy
 msgid "Getting file..."
 msgstr "Dobivam kazalo..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr ""
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr ""
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr ""
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr ""
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr ""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr ""
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr ""
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr ""
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr ""
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr ""
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr ""
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr ""
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr ""
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 #, fuzzy
 msgid "Getting thumbnail..."
 msgstr "Dobivam vzorec %i..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Nisem uspel slikati."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr ""
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 #, fuzzy
 msgid "File upload failed."
 msgstr "Pomanj¹ujem sliko za 50%..."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr ""
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -997,8 +1213,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1161,53 +1377,53 @@ msgstr ""
 msgid "Looks like a modem, not a camera"
 msgstr ""
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr ""
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, fuzzy, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr ""
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr ""
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, fuzzy, c-format
 msgid "Could not open '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 #, fuzzy
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr ""
 "Avtorske pravice pridr¾ane © 1998-2000 Scott Fritzinger <scottf@unr.edu>\n"
 "\n"
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr ""
@@ -1269,7 +1485,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 #, fuzzy
 msgid "Downloading..."
@@ -1574,21 +1790,21 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 #, 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1846,11 @@ msgstr ""
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1669,8 +1885,8 @@ msgid "Force"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 #, fuzzy
 msgid "None"
@@ -1688,13 +1904,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1710,14 +1926,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2289,13 +2505,6 @@ msgstr ""
 msgid "Slide Show Interval"
 msgstr ""
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr ""
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2408,10 +2617,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2486,7 +2695,7 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2499,7 +2708,7 @@ msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2572,7 +2781,7 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2758,8 +2967,8 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr ""
 
@@ -2769,13 +2978,13 @@ msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Da"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Ne"
 
@@ -2785,7 +2994,7 @@ msgstr "Ne"
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2828,7 +3037,7 @@ msgid "Not Full"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr ""
@@ -2998,7 +3207,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Pomanj¹ujem sliko za 50%..."
@@ -3148,13 +3357,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 #, fuzzy
 msgid "Image Size"
 msgstr "Kazalo slik"
@@ -3172,11 +3381,11 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr ""
 
@@ -3184,21 +3393,21 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr ""
@@ -3469,7 +3678,7 @@ msgstr ""
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3483,74 +3692,69 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Shranjevanje kazala ¹e ni podprto"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Shranjevanje kazala ¹e ni podprto"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Shranjevanje kazala ¹e ni podprto"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Shranjevanje kazala ¹e ni podprto"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Shranjevanje kazala ¹e ni podprto"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3560,478 +3764,478 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, c-format
 msgid "Display Formats: "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, c-format
 msgid "File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, c-format
 msgid "No File Deletion, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Pomanj¹ujem sliko za 50%..."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 msgid "Undefined"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 msgid "Generic Flat"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 msgid "Read-Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, c-format
 msgid "Unknown value %04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Kazalo slik"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 msgid "Action"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Ponastavi"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 msgid "sRGB (portrait)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Odpri sliko"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Vi¹ina:"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 msgid "Automatic Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 msgid "Fill flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 msgid "Red-eye automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 msgid "Red-eye fill"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 msgid "External sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4039,587 +4243,581 @@ msgstr ""
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 msgid "1 minute"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 msgid "10 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 msgid "6 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 msgid "8 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 msgid "10 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 msgid "20 mm"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 msgid "1"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 msgid "2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 msgid "4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 msgid "8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 msgid "15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 msgid "15 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 msgid "Sharper"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 msgid "Direct Print"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 msgid "Medium Low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 msgid "Medium high"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 msgid "Low contrast"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 msgid "Medium low"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 msgid "Automatic Macro"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 msgid "AE & Flash"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 msgid "AE only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 msgid "Internal RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 msgid "Memory card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "®iva slika!"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "Model fotoaparata:"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 msgid "Firmware Version"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "®iva slika!"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Obdr¾i"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Nastavitev barv"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 msgid "Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Obdr¾i"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 msgid "AF Distance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Kazalo slik"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Barve"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 msgid "Auto Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 msgid "Tungsten Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 msgid "Flourescent Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 msgid "Daylight Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 msgid "Flash Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 msgid "Cloudy Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 msgid "Shade Whitebalance Bias"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 msgid "Selftimer Delay"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Nastaviteve fotoaparata"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Nastavitev barv"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4628,43 +4826,43 @@ msgstr "Nastavitev barv"
 msgid "Camera Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "Nova slika je #%03i"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5221,213 +5419,250 @@ msgstr ""
 msgid "Low Light"
 msgstr "Vi¹ina:"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "®iva slika!"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 msgid "Undefined Audio"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 msgid "Undefined Video"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 msgid "Undefined Collection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 msgid "UndefinedDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, c-format
 msgid "Unknown(%04x)"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b4fe48cca..2549a82ca 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -78,84 +78,84 @@ msgstr ""
 "Implementerat med hjälp av dokument från\n"
 "nätet. Med tillstånd från Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Namnet '%s' (%i tecken) är för långt (%i tecken), maximalt 30 tecken tillåts."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Filen skyddad."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -178,7 +178,93 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Minibildstorlek: %d\n"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Bild"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Fokusläge"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Autofokus fel."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Fokusläge"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Ingen manual"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -195,49 +281,49 @@ msgid ""
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Kameran ej tillgänglig"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Stänger av kameran"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Fel vid fotografering"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Kunde inte få tag på disk namn: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Ingen anledning tillgänglig"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Kunde inte få tag på disk info: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -248,35 +334,35 @@ msgstr ""
 "  %11s bytes totalt\n"
 "  %11s bytes tillgängliga"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "Nätadapter"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "på batteri"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "kraft OK"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "kraft dålig"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "ej tillgänglig: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (värdtid %s%i sekunder)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +389,7 @@ msgstr ""
 "\n"
 "Tid: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -324,24 +410,24 @@ msgstr ""
 "A5-tillägg av Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Fel vid filradering"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Fel vid radering av associerad minibild till fil"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Kameran stöder inte hastigheter överstigande 57600 vid uppladdning."
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "Kunde inte få tag på flash-enhetens enhetsbokstav"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -349,456 +435,591 @@ msgstr ""
 "Kunde inte ladda upp, inget ledigt mappnamn tillgängligt!\n"
 "Mappnamnet 999CANON existerar och har en bild AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Kameramodell (skrivskyddad)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Ägarnamn"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO hastighet"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+#, fuzzy
+msgid "Unknown"
+msgstr "%i (okänd)"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Slutartid sekunder (0 auto)"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Bländare"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Upplösning"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Fokusläge"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Datum och Tid (skrivskyddad)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Fel"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "Otillgänglig"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "Sätt kamerans datum till datorns datum"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Fastvarurevision (skrivskyddad)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Kraft (skrivskyddad)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Drivrutin"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Lista alla filer"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Behåll filnamnet vid uppladdning"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Kameran ej tillgänglig"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Ägarnamnet ändrat"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "kunde inte ändra ägarnamnet"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Ägarnamnet ändrat"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "kunde inte ändra ägarnamnet"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Slutartid sekunder (0 auto)"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "kunde inte ändra ägarnamnet"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Bildinställningar"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Bildinställningar"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "kunde inte ändra ägarnamnet"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Upplösnings byte"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "Kunde inte skapa \\DCIM-katalogen."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Fokusläge"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "kunde inte ändra ägarnamnet"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "tiden inställd"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "kunde inte ställa in tiden"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ej stödd port typ %i = 0x%x given. Initialisering omöjlig."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "Batteriet slut, kameran avstängd."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "FEL: oväntat medelande"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "FEL: medelande överkört"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "FEL: ej i sekvens."
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "FEL: oväntad pakettyp."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "FEL: formatfel i medelande"
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "FEL: oväntat medelande2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Laddar upp fil..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Hämtar fil..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Fel vid ändring av hastighet."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Nollställer protokoll..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Kamera OK.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Söker efter kamera ..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Försöker kontakta kamera..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Kommunikationsfel 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "Ingen svar från kamera"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "Ej igenkänd respons"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, fuzzy, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Detekterade ett '%s'."
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, fuzzy, c-format
 msgid "Unknown model \"%s\""
 msgstr "Okänd modell"
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "Dålig EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Kommunikationsfel 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Kommunikationsfel 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Ändrar hastighet... vänta..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Fel vid ändring av hastighet"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 #, fuzzy
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "Fel väntande ACK under initialisering, försöker igen "
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Fel väntande ACK under initialisering"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Ansluten till kamera"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Hämtar minibild..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Kunde inte kontakta kameran."
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Okänt kamerabiblioteksfel"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera ej redo, flera 'Identifiera kamera'-förfrågningar misslyckades: %s\""
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "Kamera ej redo, flera 'Identifiera kamera'-förfrågningar misslyckades: %s\""
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Tar emot data..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunde inte få tag på disk info: %s"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 #, fuzzy
 msgid "File upload failed."
 msgstr "Laddar upp fil..."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -806,40 +1027,40 @@ msgstr ""
 "Filen var för stor. Du kan behöva stänga av kameran och slå på den ingen "
 "innan du kan ladda upp mer filer."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detekterade ett '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -1026,8 +1247,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blixt"
@@ -1208,47 +1429,47 @@ msgstr "Problem att sätta kamerans kommunikationshastighet"
 msgid "Looks like a modem, not a camera"
 msgstr "Ser ut som ett modem, inte en kamera"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listar filer i '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listar mappar i '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "Kunde inte hämta information om '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "Kunde inte hämta information om '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Kunde inte ändra tiden på fil '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kunde inte öppna '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Katalogbläddring \"camera\" låter dig indexera bilderna på din hårddisk."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Katalogbläddring - skrivet av Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "Kunde inte radera filen '%s' i mappen '%s' (felkod %i: %m)."
@@ -1308,7 +1529,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Nerladdning..."
@@ -1641,20 +1862,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:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +1917,11 @@ 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:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1735,8 +1956,8 @@ msgid "Force"
 msgstr "Tvinga"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ingen"
@@ -1753,13 +1974,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1775,14 +1996,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2386,13 +2607,6 @@ msgstr "Auto Av tid"
 msgid "Slide Show Interval"
 msgstr "Bildspelsintervall"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Upplösning"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2504,10 +2718,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2583,7 +2797,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2596,7 +2810,7 @@ msgid "Medium"
 msgstr "Medium"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2674,7 +2888,7 @@ msgid "Black and White"
 msgstr "Svartvit"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -2879,8 +3093,8 @@ msgstr ""
 "Kort-ID:\t\t%d\n"
 "Blixtläge:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "Fjärr"
 
@@ -2890,13 +3104,13 @@ msgstr "Lokal"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Ja"
 
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "Nej"
 
@@ -2906,7 +3120,7 @@ msgstr "Nej"
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -2955,7 +3169,7 @@ msgid "Not Full"
 msgstr "Inte full"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Full"
@@ -3138,7 +3352,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:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Uppladdning..."
 
@@ -3316,13 +3530,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Bildkvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Bildstorlek"
 
@@ -3338,11 +3552,11 @@ msgstr "Automatisk avstängning (minuter)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "fin"
 
@@ -3350,21 +3564,21 @@ msgstr "fin"
 msgid "superfine"
 msgstr "extrafin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "av"
@@ -3647,7 +3861,7 @@ msgstr "PTP protokollfel, data föråldrat"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollfel, svar förväntat"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3661,76 +3875,70 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, 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:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "redo"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-#, fuzzy
-msgid "Unknown"
-msgstr "%i (okänd)"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3740,505 +3948,505 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Datumformat"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Datumformat"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fil upplösning"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fil upplösning"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Laddar upp fil..."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "okänd  (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Generellt"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Klar"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "Okänd filtyp %i."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "FEL: oväntad pakettyp."
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "Portugiska"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "extrafin"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "Kommando ordnings fel."
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "Bild"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "Bäst"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "Självutlösare"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "Fjärr"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "Zoom"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "Hög"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Blixt"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Röda-Ögon Reduktion"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Röda ögon reduktion"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "externt"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4246,640 +4454,634 @@ msgstr "Dagsljus"
 msgid "Slow Sync"
 msgstr "Långsam Synk"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, fuzzy
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Röda-Ögon Reduktion"
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 #, fuzzy
 msgid "1/15"
 msgstr "115200"
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Laddar"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Katalogen finns"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Annan"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Lysrör"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Laddar"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "EJ Blixt"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "redo"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "internt"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "Inget kort"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Kamera OK.\n"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Fastvaru-revision: %d.%d\n"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-läge"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Auto Av tid"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "Auto Av tid"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Bildinställningar"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO hastighet"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Färgläge"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Auto"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED-läge"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Inspelningsläge"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Bländare"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fokuseringsfel."
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exponering"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Blixtinställning"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "Bildstorlek"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "Flash Mode Manual Power"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "Auto, röda-ögon reduktion"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Självutlösningstid"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Datum & Tid"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "Laddar"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "Konfiguration"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -4887,44 +5089,44 @@ msgstr "Bildjustering"
 msgid "Camera Settings"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Bildinställningar"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "Stänger av kameran"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5546,221 +5748,258 @@ msgstr ""
 msgid "Low Light"
 msgstr "Hög"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Exponering med bollslutare"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Bländande"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Röda-Ögon Reduktion"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "okänd  (0x%02x)"
diff --git a/po/uk.po b/po/uk.po
index e42d20c6a..daf71b9dc 100644
--- a/po/uk.po
+++ b/po/uk.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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+0200\n"
 "PO-Revision-Date: 2006-04-07 12:45+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -90,26 +90,26 @@ msgstr ""
 "Реалізовано викори�товуючи документацію з\n"
 "Інтернет за згодою Vision."
 
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, c-format
 msgid "Could not create directory %s."
 msgstr "�е вдаєть�� �творити каталог %s."
 
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "�е вдаєть�� видалити каталог %s."
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr "помилка блокуванн� клавіш."
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr "*�евідомо*"
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -118,7 +118,7 @@ msgstr ""
 "canon_int_capture_image: перша функці� canon_usb_list_all_dirs() завершила�ь "
 "помилкою з кодом %li"
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -127,18 +127,18 @@ msgstr ""
 "canon_int_capture_image: о�танн� функці� canon_usb_list_all_dirs() "
 "завершила�ь помилкою з кодом %i"
 
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "�адто довга назва '%s' (%li �имволів), допу�каєть�� мак�имум 30 �имволів."
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Символи нижнього регі�тру у %s недопу�кають��."
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
@@ -146,7 +146,7 @@ msgstr ""
 "canon_int_list_directory: ERROR: початкове повідомленн� надто коротке (%i < "
 "мінімум %i)"
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
@@ -154,28 +154,28 @@ msgstr ""
 "canon_int_list_directory: До��гнуто кінець пакету при аналізі першого "
 "елементу каталогу"
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr "canon_int_list_directory: обрізано запи� каталогу"
 
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "Файл захищений."
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "�е вдаєть�� отримати мініатюру JPEG: від�утній початок/кінець"
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr "�е вдаєть�� отримати мініатюру JPEG: дані не у форматі JFIF"
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr "параметр NULL \"%s\" у %s р�док %i"
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -202,7 +202,93 @@ msgstr ""
 "попередженн�: CRC не перевірено (+ довжина %d, значенн� 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "Попередній перегл�д мініатюр"
+
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "Зображенн�"
+
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "Режим автофоку�у"
+
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "Помилка автофоку�у."
+
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+msgstr "Режим автофоку�у"
+
+#: camlibs/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "Ручний фоку�"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr "RAW"
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -234,49 +320,49 @@ msgstr ""
 "�пробуйте\n"
 " зменшити активні�ть комп'ютера (наприклад, ди�кову активні�ть)\n"
 
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, c-format
 msgid "Camera unavailable: %s"
 msgstr "Фотоапарат недо�тупний: %s"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "Вимиканн� фотоапарату"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "Помилка отриманн� знімку"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "�е вдаєть�� отримати назву ди�ка: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "Причина невідома"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "�е вдаєть�� отримати інформацію про ди�к: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Внутрішн� помилка 1 у get_file_func() (%s р�док %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "�е знайдено звуковий файл дл� %s "
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s має тип файлу, дл� �кого мініатюри не �творюють��"
 
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -287,35 +373,35 @@ msgstr ""
 "  %11s в�ього байтів\n"
 "  %11s до�тупно байтів"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "блок живленн�"
 
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "акумул�тор"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "нормальне живленн�"
 
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "збій живленн�"
 
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "немає даних: %s"
 
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (ча� комп'ютера %s%i �екунд)"
 
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -342,7 +428,7 @@ msgstr ""
 "\n"
 "Ча�: %s\n"
 
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 msgid ""
 "Canon PowerShot series driver by\n"
 " Wolfgang G. Reissnegger,\n"
@@ -364,26 +450,26 @@ msgstr ""
 " Holger Klemm\n"
 " Stephen H. Westin"
 
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "Помилка видаленн� файлу \"%s\": %s"
 
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "Помилка видаленн� пов'�заного файлу мініатюри"
 
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Швидко�ті, що перевищують 57600 не підтримують�� при завантаженні у цей "
 "фотоапарат"
 
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "�е вдало�ь отримати букву при�трою карти пам'�ті"
 
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -391,131 +477,262 @@ msgstr ""
 "�е вдаєть�� вивантажити, немає вільної назви теки!\n"
 "Тека з назвою 999CANON вже і�нує та мі�тить зображенн� AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "�е вдаєть�� �творити каталог \\DCIM"
 
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "�е вдаєть�� �творити цільовий каталог."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "�алаштовуванн� фотоапарату та драйвера"
 
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Фотоапарат"
 
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "Модель фотоапарата (лише дл� читанн�)"
 
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "Ім'� вла�ника"
 
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+#, fuzzy
+msgid "Capture size class"
+msgstr "Затримка перед знімком"
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "Швидкі�ть ISO"
+
+#: camlibs/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+msgid "Unknown"
+msgstr "�евідомо"
+
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "Швидкі�ть затвору"
+
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+msgstr "Діафрагма"
+
+#: camlibs/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "Роздільна здатні�ть"
+
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "Режим фоку�у"
+
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "Дата й ча� (лише дл� читанн�)"
 
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "Помилка"
 
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "�емає даних"
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "В�тановити дату у фотоапараті з комп'ютера"
 
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "Вер�і� прошивки (лише дл� читанн�)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "Живленн� (лише дл� читанн�)"
 
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "Драйвер"
 
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "Перелік у�іх файлів"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "Зберігати назву файла при вивантаженні"
 
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "Фотоапарат недо�тупний"
 
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "Ім'� вла�ника змінено"
 
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "не вдаєть�� змінити ім'� вла�ника"
 
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "Ім'� вла�ника змінено"
+
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "не вдаєть�� змінити ім'� вла�ника"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "Швидкі�ть затвору"
+
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "не вдаєть�� змінити ім'� вла�ника"
+
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "Параметри діафрагми"
+
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "Параметри діафрагми"
+
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "не вдаєть�� змінити ім'� вла�ника"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "Перемиканн� роздільної здатно�ті"
+
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "�е вдаєть�� �творити каталог."
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "Режим фоку�у"
+
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "не вдаєть�� змінити ім'� вла�ника"
+
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "ча� в�тановлено"
 
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "не вдаєть�� в�тановити ча�"
 
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Вказано непідтримуваний тип порта %i = 0x%x. Ініціалізаці� неможлива."
 
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "�кумул�тор розр�джений, фотоапарат вимкнений."
 
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "ПОМИЛК�: не�подіване повідомленн�"
 
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "ПОМИЛК�: накладка повідомлень"
 
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "ПОМИЛК�: порушенн� чергово�ті"
 
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "ПОМИЛК�: неочікуваний тип пакету."
 
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "ПОМИЛК�: неправильний формат повідомленн�."
 
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "ПОМИЛК�: неочікуване повідомденн�2."
 
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "Вивантаженн� файлу..."
 
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "Отриманн� файлу"
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
@@ -523,7 +740,7 @@ msgstr ""
 "canon_serial_get_dirents: canon_serial_dialogue не вдаєть�� отримати "
 "елементи каталогу"
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
@@ -531,146 +748,146 @@ msgstr ""
 "canon_serial_get_dirents: внутрішній пакет елементу каталогу надто короткий "
 "(лише %i байтів)"
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr "canon_serial_get_dirents: �е вдаєть�� виділити %i байтів пам'�ті"
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr "canon_serial_get_dirents: не вдаєть�� прочитати інший запи� каталогу"
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr "canon_serial_get_dirents: отримано обрізаний елемент каталогу"
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 "canon_serial_get_dirents: надто багато елементів каталогу, треба проходити "
 "циклом."
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 "canon_serial_get_dirents: �е вдаєть�� змінити розмір буферу елементів "
 "каталогу на %i байтів"
 
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "Помилка зміни швидко�ті."
 
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "Скиданн� протоколу..."
 
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "Фотоапарат Г�Р�ЗД.\n"
 
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "Пошук фотоапарата ..."
 
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "Спроба зв'�зати�ь з фотоапаратом..."
 
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 msgstr "Помилка зв'�зку 1"
 
-#: camlibs/canon/serial.c:1350 camlibs/canon/serial.c:1354
+#: camlibs/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "�емає відповіді від фотоапарату"
 
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "�е розпізнана відповідь"
 
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "Ви�влено \"%s\" або \"%s\""
 
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, c-format
 msgid "Unknown model \"%s\""
 msgstr "�евідома модель \"%s\""
 
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "�еправильний EOT"
 
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "Помилка зв'�зку 2"
 
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "Помилка зв'�зку 3"
 
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "Зміна швидко�ті ... зачекайте..."
 
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "Помилка зміни швидко�ті"
 
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "Помилка очікуванн� �игналу ACK при повторній ініціалізації"
 
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "Помилка очікуванн� ACK при ініціалізації"
 
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "Фотоапарат підключений"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr "ПОМИЛК�: критична помилка. Продовжувати неможливо"
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr "ПОМИЛК�: %d надто великий"
 
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "Отриманн� мініатюри..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr "�Е РОЗПІЗ���О"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 msgid "Could not establish initial contact with camera"
 msgstr "�е вдаєть�� в�тановити з'єднанн� з фотоапаратом"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr "Фотоапарат вже активний"
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr "Фотоапарат виведений з режиму �ну"
 
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 msgid "Unknown (some kind of error)"
 msgstr "�евідомо (�ка�ь помилка)"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "�ерозпізнана відповідь фотоапарату '%c'"
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
@@ -678,7 +895,7 @@ msgid ""
 msgstr ""
 "Помилка кроку ініціалізації 2: \"%s\" при читанні %i) Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
@@ -687,14 +904,14 @@ msgstr ""
 "Помилка кроку ініціалізації 2! (отримано %i байтів, очікувало�ь %i) "
 "Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 "Помилка кроку ініціалізації 3: \"%s\" при читанні %i) Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
@@ -703,7 +920,7 @@ msgstr ""
 "Помилка кроку ініціалізації 3! (отримано %i байтів, очікувало�ь %i) "
 "Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
@@ -711,29 +928,29 @@ msgid ""
 msgstr ""
 "Помилка кроку ініціалізації 3: \"%s\" при запи�і %i) Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr "Помилка кроку 4: \"%s\" при читанні %i. Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr "Помилка кроку 4! (отримано %i, очікувало�ь %i). Фотоапарат не працює"
 
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Фотоапарат неготовий, чи�ленні помилки на запит 'Ідентифікаці� фотоапарату': "
 "%s"
 
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Фотоапарат не готовий, помилка get_battery: %s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
@@ -742,14 +959,14 @@ msgstr ""
 "canon_usb_lock_keys: �еочікувана довжина результату функції \"блокувати "
 "клавіші\" (%i байтів, очікувало�ь %i)"
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 "canon_usb_lock_keys: Результат неочікуваної довжини (%i байтів, очікувало�ь %"
 "i)"
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
@@ -757,7 +974,7 @@ msgstr ""
 "canon_usb_unlock_keys: Результат неочікуваної довжини (%i байтів, "
 "очікувало�ь %i)"
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
@@ -766,7 +983,7 @@ msgstr ""
 "canon_usb_get_body_id: Результат неочікуваної довжини (%i байтів, "
 "очікувало�ь %i)"
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
@@ -775,7 +992,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: читанн� перервано пі�л� %i �проб, %6.3f "
 "�екунд \"%s\""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -783,14 +1000,14 @@ msgid ""
 msgstr ""
 "canon_usb_poll_interrupt_multiple: читанн� перервано пі�л� %i �проб, \"%s\""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 "canon_usb_capture_dialogue: неправильна довжина 0x%04x пакету мініатюри"
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -798,59 +1015,65 @@ msgstr ""
 "canon_usb_capture_dialogue: неправильна довжина 0x%04x розміру пакету "
 "зображенн�"
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+#, fuzzy
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+"canon_usb_capture_dialogue: друге перериванні читанн� поза по�лідовні�тю"
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: перше перериванн� читанн� поза по�лідовні�тю"
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: друге перериванні читанн� поза по�лідовні�тю"
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr "canon_usb_capture_dialogue: помилка фотоапарату, код = 0x%08x"
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: третє перериванн� читанн� EOS поза по�лідовні�тю"
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: четверте перериванн� EOS поза по�лідовні�тю"
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: об'єкт надто великий, не уміщаєть�� у буфері (%i > %i)"
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 "canon_usb_dialogue: очікувало�ь 0x%x байтів, але фотоапарат повідомив про 0x%"
 "x"
 
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "Отриманн� даних ..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Скінчила�ь пам'�ть: потрібно %d байтів."
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: помилка canon_usb_dialogue"
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -859,22 +1082,22 @@ msgstr ""
 "Попередженн� canon_usb_set_file_attributes: у canon_usb_dialogue помилка "
 "�тату�у фотоапарату 0x%08x"
 
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "�е вдаєть�� прочитати файл \"%s\""
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Скінчила�ь пам'�ть: потрібно %ld байтів."
 
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 msgid "File upload failed."
 msgstr "Помилка вивантаженн� файлу."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -882,7 +1105,7 @@ msgstr ""
 "Файл надто великий. Перш ніж вивантажувати інші файли �лід вимкнути "
 "фотоапарат та увімкнути знову."
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -891,7 +1114,7 @@ msgstr ""
 "canon_usb_get_dirents: �е вдаєть�� розмі�тити файл у буфер, "
 "'%.96s' (обрізано) надто довгий."
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -900,7 +1123,7 @@ msgstr ""
 "canon_usb_get_dirents: не вдаєть�� отримати елементи каталогц "
 "canon_usb_long_dialogue, отримано %i"
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -909,7 +1132,7 @@ msgstr ""
 "canon_usb_list_all_dirs: пакет не уміщаєть�� у буфер, '%.96s' (обрізано) "
 "надто довгий."
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -918,12 +1141,12 @@ msgstr ""
 "canon_usb_list_all_dirs: помилка отриманн� елементів каталогу "
 "canon_usb_long_dialogue, отримано %i"
 
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Ви�влено '%s'."
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "�азва \"%s\" з фотоапарату не відповідає відомому фотоапарату"
@@ -1129,8 +1352,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Спалах"
@@ -1310,47 +1533,47 @@ msgstr "Помилка в�тановленн� швидко�ті обміну
 msgid "Looks like a modem, not a camera"
 msgstr "Схоже, що це модем, а не фотоапарат"
 
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Створенн� переліку файлів у '%s'..."
 
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Отриманн� �пи�ку тек у '%s'..."
 
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "�е вдаєть�� отримати інформацію про '%s' (%m)."
 
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "�е вдаєть�� отримати інформацію про '%s' у '%s' (%m)."
 
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "�е вдаєть�� змінити ча� файлу '%s' у '%s' (%m)."
 
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "�е вдаєть�� відкрити '%s'."
 
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "При перегл�ді каталогу \"camera\" виводить�� �пи�ок фотографій на ди�ку."
 
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Режим перегл�ду каталогу - Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "�е вдаєть�� видалити файл '%s' у теці '%s' (код помилки %i: %m)."
@@ -1413,7 +1636,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Завантаженн�..."
@@ -1769,20 +1992,20 @@ msgid "High (good quality)"
 msgstr "Ви�оке (добра �кі�ть)"
 
 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:3624
+#: camlibs/ptp2/library.c:3631
 msgid "Capture"
 msgstr "Зйомка"
 
 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Ма�штаб"
 
 #: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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
@@ -1824,11 +2047,11 @@ msgstr "Компен�аці� ек�позиції"
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1863,8 +2086,8 @@ msgid "Force"
 msgstr "Приму�ово"
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "�емає"
@@ -1881,13 +2104,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1903,14 +2126,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2517,13 +2740,6 @@ msgstr "Ча� автовимиканн�"
 msgid "Slide Show Interval"
 msgstr "Інтервал між �лайдами"
 
-#: camlibs/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "Роздільна здатні�ть"
-
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
 #: camlibs/konica/library.c:937
 msgid "Low (576 x 436)"
@@ -2635,10 +2851,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2712,7 +2928,7 @@ msgid "No answer from the camera."
 msgstr "�емає відповіді від фотоапарату."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/ptp2/library.c:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2725,7 +2941,7 @@ msgid "Medium"
 msgstr "Середн�"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/ptp2/library.c:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -2794,7 +3010,7 @@ msgid "Black and White"
 msgstr "Чорно-білий"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3036,8 +3252,8 @@ msgstr ""
 "ID карти:\t\t%d\n"
 "Режим �палаху:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "�втономний"
 
@@ -3047,13 +3263,13 @@ msgstr "Локальний"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "Так"
 
 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295
 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302
-#: camlibs/ptp2/ptp.c:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "�і"
 
@@ -3063,7 +3279,7 @@ msgstr "�і"
 msgid "Fine"
 msgstr "Вдо�коналений"
 
-#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3112,7 +3328,7 @@ msgid "Not Full"
 msgstr "�еповний"
 
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "Повний"
@@ -3296,7 +3512,7 @@ msgstr ""
 "%i байт."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ptp2/library.c:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Завантаженн�..."
 
@@ -3494,13 +3710,13 @@ msgstr ""
 "дл� Jenoptik JD350e виконав Michael Trawny <trawny99@users.sourceforge.net>. "
 "Виправленн� помилок - Marcus Meissner <marcus@jet.franken.de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "Які�ть зображенн�"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "Розмір зображенн�"
 
@@ -3516,11 +3732,11 @@ msgstr "�втоматичне вимиканн� (хвилин)"
 msgid "Information"
 msgstr "Інформаці�"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "звичайна"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "ви�ока"
 
@@ -3528,21 +3744,21 @@ msgstr "ви�ока"
 msgid "superfine"
 msgstr "до�ить ви�ока"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "авто"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "вимк"
@@ -3827,7 +4043,7 @@ msgstr "Помилка протоколу PTP, очікували�ь дані"
 msgid "PTP Protocol error, response expected"
 msgstr "Помилку протоколу PTP, очікувала�ь відповідь"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3841,70 +4057,65 @@ msgid ""
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Ваш фотоапарат Canon не підтримує режим захопленн� Canon"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Ваш фотоапарат Canon не підтримує режим видошукача Canon"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "�е вдаєть�� увімкнути видошукача Canon: %d"
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "�е вдаєть�� отримати зображенн� видошукача Canon: %d"
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Помилка вимиканн� видошукача Canon: %d"
 
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Ваш фотоапарат не підтримує загальне захопленн�"
 
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Збереженн� покажчика ще не підтримуєть��"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr "Помилка захопленн� Canon: %d"
 
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Ваш фотоапарат не підтримує загальне захопленн�"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr "Команду захопленн� виконано, але підтвердженн� не отримано"
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr "Отримано подію 0x%04x"
 
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 msgid "read only"
 msgstr "лише дл� читанн�"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr "читанн� та запи�"
 
-#: camlibs/ptp2/library.c:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-msgid "Unknown"
-msgstr "�евідомо"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3919,488 +4130,488 @@ msgstr ""
 "ID фірмового доповненн�: 0x%08x\n"
 "Опи� фірмового доповненн�: %s\n"
 
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Формат дати"
 
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Формат дати"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Роздільна здатні�ть"
 
-#: camlibs/ptp2/library.c:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Роздільна здатні�ть"
 
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Помилка вивантаженн� файлу."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Зйомка"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1955
+#: camlibs/ptp2/library.c:1962
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Помилка захопленн� Canon: %d"
 
-#: camlibs/ptp2/library.c:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Зйомка"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "�евідома помилка PTP"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "невідомо (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Загальне"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 #, fuzzy
 msgid "Read-Write"
 msgstr "читанн� та запи�"
 
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "Готовий"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Кількі�ть зображень: %d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "�евідомий тип файлу %i."
 
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "не�подіваний тип даних %i"
 
-#: camlibs/ptp2/library.c:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Ручний"
 
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 msgid "Automatic"
 msgstr "�втоматично"
 
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 msgid "One-push Automatic"
 msgstr "�втомат у один дотик"
 
-#: camlibs/ptp2/library.c:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 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:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr "Різко"
 
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr "Базовий JPEG"
 
-#: camlibs/ptp2/library.c:2530
+#: camlibs/ptp2/library.c:2537
 msgid "JPEG Normal"
 msgstr "Звичайний JPEG"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 msgid "JPEG Fine"
 msgstr "Покращений JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr "NEF (Raw)"
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr "NEF+Б�ЗОВИЙ"
 
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 msgid "super fine"
 msgstr "найкраща �кі�ть"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr "авто проти червоних очей"
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr "проти червоних очей"
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 msgid "Commander"
 msgstr "Командувач"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 msgid "spot"
 msgstr "точка"
 
-#: camlibs/ptp2/library.c:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "центр"
 
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 msgid "large"
 msgstr "великий"
 
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 msgid "medium 1"
 msgstr "�ередовище 1"
 
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 msgid "medium 2"
 msgstr "�ередовище 2"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr "малий"
 
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 msgid "Factory Default"
 msgstr "Завод�ькі параметри"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "�вто"
 
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 msgid "Portrait"
 msgstr "Книжкова"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr "�льбомна"
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr "Спорт"
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr "�ічна альбомна"
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr "�ічна книжкова"
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr "Знімок екрану"
 
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "�айкраще"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 #, fuzzy
 msgid "Timelapse"
 msgstr "Кількі�ть проміжків ча�у"
 
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 msgid "Timer"
 msgstr "Таймер"
 
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 msgid "Timer + Remote"
 msgstr "Таймер + віддалене керуванн�"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr "Динамічна обла�ть"
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr "Одиночна обла�ть"
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr "�айближча тема"
 
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "Книжкова"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 msgid "sRGB (nature)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 msgid "Centre"
 msgstr "По-центру"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr "Згори"
 
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 msgid "Bottom"
 msgstr "Знизу"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 msgid "Left"
 msgstr "Зліва"
 
-#: camlibs/ptp2/library.c:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 msgid "Right"
 msgstr "Справа"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr "Центрально-зважений"
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 #, fuzzy
 msgid "Center Spot"
 msgstr "Центрально-зважений"
 
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, fuzzy
 msgid "Automatic Flash"
 msgstr "�втоматично"
 
-#: camlibs/ptp2/library.c:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "Режим �палаху"
 
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "Спалах"
 
-#: camlibs/ptp2/library.c:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "Запобіганн� червоним очам"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "Запобіганн� червоним очам"
 
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "зовні"
 
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 msgid "Default"
 msgstr "Типово"
 
-#: camlibs/ptp2/library.c:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4408,610 +4619,604 @@ msgstr "Типово"
 msgid "Slow Sync"
 msgstr "Уповільнена �инхр."
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr "Задній фронт �инхр. + уповільнена �инхр."
 
-#: camlibs/ptp2/library.c:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 msgid "Red-eye Reduction + Slow Sync"
 msgstr "Запобіганн� червоним очам + уповільнена �инхр."
 
-#: camlibs/ptp2/library.c:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 msgstr "Чорно-білий"
 
-#: camlibs/ptp2/library.c:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "Блокуванн� фоку�у"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "1 хвилина"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 #, fuzzy
 msgid "5 minutes"
 msgstr "5 хвилин"
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "10 хвилин"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 #, fuzzy
 msgid "30 minutes"
 msgstr "10 хвилин"
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 msgid "1/15"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "15 хвилин"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr "Жвавий"
 
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "Різко"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 #, fuzzy
 msgid "Softer"
 msgstr "М'�ко"
 
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "Каталог і�нує"
 
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Інший"
 
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "Середн�"
 
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "Середн�"
 
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "Контра�тні�ть"
 
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "Середн�"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 msgid "Long distance"
 msgstr "Велика від�тань"
 
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "�втоматично"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 #, fuzzy
 msgid "AF-C"
 msgstr "Блок живленн�"
 
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 msgid "Fluorescent H"
 msgstr "Флуоре�центний H"
 
-#: camlibs/ptp2/library.c:3322
+#: camlibs/ptp2/library.c:3329
 msgid "Neutral"
 msgstr "�ейтральний"
 
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 msgid "Low sharpening"
 msgstr "�изька різкі�ть"
 
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 msgid "Black & white"
 msgstr "Чорно-білий"
 
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "БЕЗ �палаху"
 
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, fuzzy
 msgid "AE only"
 msgstr "лише дл� читанн�"
 
-#: camlibs/ptp2/library.c:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "Пам'�ть Flash"
 
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "Дужка ек�позиції"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "в�ередині"
 
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "�емає карти пам'�ті"
 
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 msgid "Camera Owner"
 msgstr "Вла�ник фотоапарату"
 
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 msgid "Camera Model"
 msgstr "Модель фотоапарату"
 
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "Вер�і� прошивки: %8s"
 
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 msgid "Camera Time"
 msgstr "Ча� фотоапарату"
 
-#: camlibs/ptp2/library.c:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 msgid "Beep Mode"
 msgstr "Режим �игналу"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 msgid "Image Comment"
 msgstr "Коментар до зображенн�"
 
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 msgid "LCD Off Time"
 msgstr "Ча� вимиканн� LCD"
 
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "�втоматичний лічильник ча�у у вимкненому �тані"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "Параметри зйомки"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "Швидкі�ть ISO"
 
-#: camlibs/ptp2/library.c:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 msgid "WhiteBalance"
 msgstr "Балан� білого"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr "Фотоефект"
 
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "Режим кольору"
 
-#: camlibs/ptp2/library.c:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 msgid "Auto ISO"
 msgstr "�втоматично визначати ISO"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 msgid "Long Exp Noise Reduction"
 msgstr "Зменшенн� шумів при довгій ек�позиції"
 
-#: camlibs/ptp2/library.c:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "Режим автофоку�у"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr "Допоміжне �вітло"
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: 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:3650 camlibs/ptp2/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "Режим �палаху"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 msgid "AF Area Illumination"
 msgstr "Обла�ть о�вітленн� AF"
 
-#: camlibs/ptp2/library.c:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 msgid "AF Beep Mode"
 msgstr "Режим звукового �игналу AF"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr "Чи�ло F"
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 msgid "Focal Length"
 msgstr "Фоку�на від�тань"
 
-#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
 msgid "Focus Mode"
 msgstr "Режим фоку�у"
 
-#: camlibs/ptp2/library.c:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 msgid "Exposure Time"
 msgstr "Ча� ек�позиції"
 
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 msgid "Effect Mode"
 msgstr "Режим ефектів"
 
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 msgid "Exposure Program"
 msgstr "Програма ек�позиції"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr "Тихий режим зйомки"
 
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 msgid "Focus Metering Mode"
 msgstr "Режим виміру фоку�у"
 
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 msgid "Exposure Metering Mode"
 msgstr "Режим виміру ек�позиції"
 
-#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "Діафрагма"
-
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 msgid "Focusing Point"
 msgstr "Точка фоку�уванн�"
 
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 msgid "Shutter Speed"
 msgstr "Швидкі�ть затвору"
 
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 msgid "Metering Mode"
 msgstr "Балан� білого"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, fuzzy
 msgid "AF Distance"
 msgstr "Фоку�на від�тань"
 
-#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 msgid "Focus Area Wrap"
 msgstr "Обла�ть фоку�у"
 
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 msgid "Exposure Lock"
 msgstr "Блокуванн� ек�позиції"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr "Впор�дкуванн� номерів файлів"
 
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 msgid "Flash Sign"
 msgstr "Знак �палаху"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 #, fuzzy
 msgid "Viewfinder Grid"
 msgstr "Режим видошукача"
 
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 msgid "Image Review"
 msgstr "Огл�д зображенн�"
 
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "Обертанн� зображенн�"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 msgid "Release without CF card"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 msgid "Flash Mode Manual Power"
 msgstr "Ручне в�тановленн� потужно�ті �палаху"
 
-#: camlibs/ptp2/library.c:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "Режим автофоку�у"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 msgid "Flash Exposure Compensation"
 msgstr "Компен�аці� витримки �палаху"
 
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 msgid "Bracket Set"
 msgstr "В�тановлено дужку"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr "Пор�док дужок"
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 msgid "Burst Number"
 msgstr "Кількі�ть �палахів"
 
-#: camlibs/ptp2/library.c:3685
+#: camlibs/ptp2/library.c:3692
 #, fuzzy
 msgid "Auto Whitebalance Bias"
 msgstr "�втоматичний балан� білого"
 
-#: camlibs/ptp2/library.c:3686
+#: camlibs/ptp2/library.c:3693
 #, fuzzy
 msgid "Tungsten Whitebalance Bias"
 msgstr "Вольфрамовий балан� білого"
 
-#: camlibs/ptp2/library.c:3687
+#: camlibs/ptp2/library.c:3694
 #, fuzzy
 msgid "Flourescent Whitebalance Bias"
 msgstr "Флуоре�центний балан� білого"
 
-#: camlibs/ptp2/library.c:3688
+#: camlibs/ptp2/library.c:3695
 #, fuzzy
 msgid "Daylight Whitebalance Bias"
 msgstr "Балан� білого денного �вітла"
 
-#: camlibs/ptp2/library.c:3689
+#: camlibs/ptp2/library.c:3696
 #, fuzzy
 msgid "Flash Whitebalance Bias"
 msgstr "Балан� білого �палаху"
 
-#: camlibs/ptp2/library.c:3690
+#: camlibs/ptp2/library.c:3697
 #, fuzzy
 msgid "Cloudy Whitebalance Bias"
 msgstr "Туманний балан� білого"
 
-#: camlibs/ptp2/library.c:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "Тіни�тий балан� білого"
 
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "Затримка вла�ного таймера"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 #, fuzzy
 msgid "Center Weight Area"
 msgstr "обла�ть центру ма�"
 
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 msgid "Flash Shutter Speed"
 msgstr "Швидкі�ть затвору при �палаху"
 
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 msgid "Remote Timeout"
 msgstr "Віддалений таймаут"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 msgid "Sharpening"
 msgstr "Підвищенн� різко�ті"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 msgid "Tone Compensation"
 msgstr "Компен�аці� тону"
 
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "�алаштовуванн�"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 msgid "Hue Adjustment"
 msgstr "Корегуванн� відтінку"
 
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5019,40 +5224,40 @@ msgstr "Корегуванн� відтінку"
 msgid "Camera Settings"
 msgstr "Параметри фотоапарату"
 
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 msgid "Image Settings"
 msgstr "Параметри зображенн�"
 
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 msgid "Capture Settings"
 msgstr "Параметри зйомки"
 
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 msgid "Number of values"
 msgstr "Кількі�ть значень"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr "Підтримувані значенн�"
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr "Поточне значенн�"
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 msgid "Initializing Camera"
 msgstr "Ініціалізаці� фотоапарату"
 
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -5586,218 +5791,255 @@ msgstr "МакÑ�. діафрагма при макÑ�. фокуÑ�ній відÑ�Ñ
 msgid "Low Light"
 msgstr "Слабе �вітло"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "Ча� ек�позиції"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr "%.1f зупинок"
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr "%.0f mm"
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 msgid "JPEG Norm"
 msgstr "Звичайний JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr "RAW"
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr "RAW + о�новний JPEG"
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr "Лампа накалюванн�"
 
-#: camlibs/ptp2/ptp.c:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Запобіганн� червоним очам"
 
-#: camlibs/ptp2/ptp.c:2559
+#: camlibs/ptp2/ptp.c:2583
 msgid "Manual Focus"
 msgstr "Ручний фоку�"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 msgid "AF Lock only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "Блокуванн� фоку�у"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr "Матриц�"
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr "Точечний"
 
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 msgid "Power Wind"
 msgstr "Потужний вітер"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 msgid "1 min"
 msgstr "1 хвилина"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr "5 хвилин"
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr "10 хвилин"
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr "15 хвилин"
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 #, fuzzy
 msgid "Firmware"
 msgstr "Вер�і� прошивки: %d.%d\n"
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "�евідома помилка PTP"
 
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "�евідома помилка PTP"
 
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "�евизначена вла�тиві�ть PTP"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "�евизначена вла�тиві�ть PTP"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "невідомо (0x%02x)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cb9d8ae05..4a6ab92bc 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-05-29 00:08+0200\n"
+"POT-Creation-Date: 2006-06-19 21:32+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"
@@ -79,34 +79,34 @@ msgstr ""
 " 授�。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:604
+#: camlibs/canon/canon.c:612
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:607
+#: camlibs/canon/canon.c:615
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/canon.c:1173 camlibs/canon/canon.c:1554
+#: camlibs/canon/usb.c:538
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
+#: camlibs/canon/canon.c:1276 camlibs/canon/canon.c:1277
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1216
+#: camlibs/canon/canon.c:1457
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1354
+#: camlibs/canon/canon.c:1592
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -114,51 +114,51 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/canon.c:651
-#: camlibs/canon/canon.c:1461
+#: camlibs/canon/canon.c:2211
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr "�称“%s�(%i 个字符)太长(%i 个字符)，最多�许 30 个字符。"
 
-#: camlibs/canon/canon.c:1878
+#: camlibs/canon/canon.c:2629
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2058
+#: camlibs/canon/canon.c:2809
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2080
+#: camlibs/canon/canon.c:2831
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2165
+#: camlibs/canon/canon.c:2916
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
 # camlibs/canon/canon.c:1490
-#: camlibs/canon/canon.c:2526
+#: camlibs/canon/canon.c:3277
 msgid "File protected."
 msgstr "文件已�到�护。"
 
-#: camlibs/canon/canon.c:2618
+#: camlibs/canon/canon.c:3369
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2705
+#: camlibs/canon/canon.c:3456
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
+#: camlibs/canon/canon.h:157 camlibs/canon/canon.h:171
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:359
+#: camlibs/canon/canon.h:546
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -181,7 +181,108 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:90 camlibs/canon/library.c:1423
+msgid "Compatibility mode"
+msgstr ""
+
+# camlibs/stv0680/library.c:590
+#: camlibs/canon/library.c:91
+#, fuzzy
+msgid "Thumbnail"
+msgstr "缩略图大�：%d\n"
+
+# camlibs/polaroid/pdc700.c:999
+#: camlibs/canon/library.c:92
+#, fuzzy
+msgid "Full Image"
+msgstr "图�"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/canon/library.c:165
+#, fuzzy
+msgid "Auto focus: one-shot"
+msgstr "�焦模�"
+
+# camlibs/konica/konica.c:107
+#: camlibs/canon/library.c:166
+#, fuzzy
+msgid "Auto focus: AI servo"
+msgstr "自动�焦错误。"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/canon/library.c:167
+#, fuzzy
+msgid "Auto focus: AI focus"
+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/canon/library.c:168
+#, fuzzy
+msgid "Manual focus"
+msgstr "无手册"
+
+#: camlibs/canon/library.c:173 camlibs/ptp2/ptp.c:2565
+msgid "RAW"
+msgstr ""
+
+#: camlibs/canon/library.c:175
+msgid "Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:177
+msgid "Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:179
+msgid "Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:181
+msgid "Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:183
+msgid "Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:185
+msgid "Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:187
+msgid "RAW + Small Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:189
+msgid "RAW + Small Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:191
+msgid "RAW + Medium Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:193
+msgid "RAW + Medium Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:195
+msgid "RAW + Large Normal JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:197
+msgid "RAW + Large Fine JPEG"
+msgstr ""
+
+#: camlibs/canon/library.c:240
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
@@ -200,56 +301,56 @@ msgstr ""
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/canon/library.c:254
+#: camlibs/canon/library.c:369
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "相机��用"
 
 # camlibs/canon/library.c:176
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:389
 msgid "Switching Camera Off"
 msgstr "关闭相机"
 
 # camlibs/canon/library.c:232
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:448 camlibs/canon/library.c:485
 msgid "Error capturing image"
 msgstr "�获图�出错"
 
 # camlibs/canon/library.c:267
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:541
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "无法获��盘�：%s"
 
 # camlibs/canon/library.c:268
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:542
 msgid "No reason available"
 msgstr "�知缘由"
 
 # camlibs/canon/library.c:275
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:549
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "无法获��盘信�：%s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:613
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:636
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "在文件夹“%2$s�中无法找到文件“%1$s�。"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:684 camlibs/canon/library.c:722
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
 # camlibs/canon/library.c:568
-#: camlibs/canon/library.c:776
+#: camlibs/canon/library.c:895
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -262,42 +363,42 @@ msgstr ""
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "AC adapter"
 msgstr "交��压器"
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
-#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:903 camlibs/canon/library.c:909
+#: camlibs/canon/library.c:1649 camlibs/canon/library.c:1655
 msgid "on battery"
 msgstr "使用电池"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power OK"
 msgstr "电力充足"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
+#: camlibs/canon/library.c:905 camlibs/canon/library.c:1651
 msgid "power bad"
 msgstr "电力�足"
 
 # camlibs/canon/library.c:586
-#: camlibs/canon/library.c:794
+#: camlibs/canon/library.c:913
 #, c-format
 msgid "not available: %s"
 msgstr "��用：%s"
 
 # camlibs/canon/library.c:598
-#: camlibs/canon/library.c:820
+#: camlibs/canon/library.c:939
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (主机时间 %s%i 秒)"
 
 # camlibs/canon/library.c:608
-#: camlibs/canon/library.c:830
+#: camlibs/canon/library.c:949
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +426,7 @@ msgstr ""
 "时间：%s\n"
 
 # camlibs/canon/library.c:625
-#: camlibs/canon/library.c:847
+#: camlibs/canon/library.c:966
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
@@ -347,28 +448,28 @@ msgstr ""
 "Holger Klemm 添加\n"
 
 # camlibs/canon/library.c:664
-#: camlibs/canon/library.c:890
+#: camlibs/canon/library.c:1009
 msgid "Error deleting file"
 msgstr "删除文件出错"
 
 # camlibs/canon/library.c:680
-#: camlibs/canon/library.c:906
+#: camlibs/canon/library.c:1025
 msgid "Error deleting associated thumbnail file"
 msgstr "删除相关缩略图文件出错"
 
 # camlibs/canon/library.c:713
-#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
+#: camlibs/canon/library.c:1155 camlibs/canon/library.c:1285
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "该相机�支�高于 57600 的速度的上载"
 
 # camlibs/canon/library.c:730
-#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
+#: camlibs/canon/library.c:1172 camlibs/canon/library.c:1302
 msgid "Could not get flash drive letter"
 msgstr "无法获�闪存驱动字符"
 
 # camlibs/canon/library.c:754
-#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
+#: camlibs/canon/library.c:1216 camlibs/canon/library.c:1325
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -377,486 +478,649 @@ msgstr ""
 "已有 999 个佳能文件夹�称存在而且�个文件夹中都有照片 AUT_9999.JPG。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
+#: camlibs/canon/library.c:1238 camlibs/canon/library.c:1345
 msgid "Could not create \\DCIM directory."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:780
-#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
+#: camlibs/canon/library.c:1244 camlibs/canon/library.c:1351
 msgid "Could not create destination directory."
 msgstr "无法创建目标目录。"
 
 # camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3718
-#: camlibs/ptp2/library.c:3809
+#: camlibs/canon/library.c:1388 camlibs/ptp2/library.c:3725
+#: camlibs/ptp2/library.c:3816
 msgid "Camera and Driver Configuration"
 msgstr "相机�驱动器�置"
 
 # camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1391 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "相机"
 
 # camlibs/canon/library.c:811
-#: camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:1395
 msgid "Camera Model (readonly)"
 msgstr "相机型� (�读)"
 
 # camlibs/canon/library.c:815 camlibs/canon/library.c:885
-#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
+#: camlibs/canon/library.c:1400 camlibs/canon/library.c:1704
 msgid "Owner name"
 msgstr "所有者姓�"
 
+#: camlibs/canon/library.c:1406 camlibs/canon/library.c:1717
+msgid "Capture size class"
+msgstr ""
+
+#: camlibs/canon/library.c:1440 camlibs/canon/library.c:1744
+#: camlibs/canon/library.c:1759
+#, fuzzy
+msgid "ISO speed"
+msgstr "ISO 速度"
+
+# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
+# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
+# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
+# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
+# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
+# 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/canon/library.c:1466 camlibs/canon/library.c:1467
+#: camlibs/canon/library.c:1500 camlibs/canon/library.c:1501
+#: camlibs/canon/library.c:1534 camlibs/canon/library.c:1535
+#: camlibs/canon/library.c:1573 camlibs/canon/library.c:1574
+#: camlibs/canon/library.c:1607 camlibs/canon/library.c:1608
+#: camlibs/ptp2/library.c:1718 camlibs/ptp2/library.c:1720
+#: camlibs/ptp2/ptp.c:2679
+#, fuzzy
+msgid "Unknown"
+msgstr "%i (未知)"
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/canon/library.c:1474 camlibs/canon/library.c:1741
+#: camlibs/canon/library.c:1799
+#, fuzzy
+msgid "Shutter speed"
+msgstr "快门速度 (秒)"
+
+# camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
+# camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
+#: camlibs/canon/library.c:1508 camlibs/canon/library.c:1747
+#: camlibs/canon/library.c:1839 camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/ptp.c:2211 camlibs/sierra/sierra.c:934
+#: camlibs/sierra/sierra.c:1255 camlibs/sierra/sierra.c:1470
+#: camlibs/sierra/sierra.c:1711
+msgid "Aperture"
+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/canon/library.c:1542 camlibs/canon/library.c:1750
+#: camlibs/canon/library.c:1879 camlibs/konica/library.c:718
+#: camlibs/konica/library.c:932 camlibs/konica/qm150.c:777
+#: camlibs/ricoh/library.c:495 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1577
+#: camlibs/sierra/sierra.c:1786
+msgid "Resolution"
+msgstr "分辨率"
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/canon/library.c:1581 camlibs/canon/library.c:1753
+#: camlibs/canon/library.c:1919
+#, fuzzy
+msgid "Focus mode"
+msgstr "�焦模�"
+
 # camlibs/canon/library.c:822 camlibs/canon/library.c:826
 # camlibs/canon/library.c:831
-#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1618
 msgid "Date and Time (readonly)"
 msgstr "日期和时间 (�读)"
 
 # camlibs/canon/library.c:827
-#: camlibs/canon/library.c:1284
+#: camlibs/canon/library.c:1625
 msgid "Error"
 msgstr "错误"
 
 # camlibs/canon/library.c:832 camlibs/canon/library.c:859
-#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1628 camlibs/canon/library.c:1657
 msgid "Unavailable"
 msgstr "��用"
 
 # camlibs/canon/library.c:836 camlibs/canon/library.c:898
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1632 camlibs/canon/library.c:1962
 msgid "Set camera date to PC date"
 msgstr "将相机日期设置为 PC 日期"
 
 # camlibs/canon/library.c:839
-#: camlibs/canon/library.c:1296
+#: camlibs/canon/library.c:1636
 msgid "Firmware revision (readonly)"
 msgstr "固件版本 (�读)"
 
 # camlibs/canon/library.c:863
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3756
-#: camlibs/ptp2/library.c:3785
+#: camlibs/canon/library.c:1661 camlibs/ptp2/library.c:3763
+#: camlibs/ptp2/library.c:3792
 msgid "Power (readonly)"
 msgstr "电� (�读)"
 
 # camlibs/canon/library.c:867
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:1666
 msgid "Driver"
 msgstr "驱动器"
 
 # camlibs/canon/library.c:870 camlibs/canon/library.c:912
-#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
+#: camlibs/canon/library.c:1670 camlibs/canon/library.c:1976
 msgid "List all files"
 msgstr "列出所有文件"
 
-#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
+#: camlibs/canon/library.c:1676 camlibs/canon/library.c:1985
 msgid "Keep filename on upload"
 msgstr "上传时��文件�"
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1708 camlibs/canon/library.c:1763
+#: camlibs/canon/library.c:1803 camlibs/canon/library.c:1843
+#: camlibs/canon/library.c:1883 camlibs/canon/library.c:1923
+#: camlibs/canon/library.c:1966
 msgid "Camera unavailable"
 msgstr "相机��用"
 
 # camlibs/canon/library.c:892
-#: camlibs/canon/library.c:1356
+#: camlibs/canon/library.c:1711
 msgid "Owner name changed"
 msgstr "所有者姓�已改�"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:1358
+#: camlibs/canon/library.c:1713
 msgid "could not change owner name"
 msgstr "无法改�所有者姓�"
 
+#: camlibs/canon/library.c:1725
+msgid "Capture size class changed"
+msgstr ""
+
+#: camlibs/canon/library.c:1732
+msgid "Invalid capture size class setting"
+msgstr ""
+
+#: camlibs/canon/library.c:1783
+msgid "Invalid ISO speed setting"
+msgstr ""
+
+# camlibs/canon/library.c:892
+#: camlibs/canon/library.c:1786
+#, fuzzy
+msgid "ISO speed changed"
+msgstr "所有者姓�已改�"
+
+# camlibs/canon/library.c:894
+#: camlibs/canon/library.c:1788
+#, fuzzy
+msgid "Could not change ISO speed"
+msgstr "无法改�所有者姓�"
+
+#: camlibs/canon/library.c:1823
+msgid "Invalid shutter speed setting"
+msgstr ""
+
+# camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
+#: camlibs/canon/library.c:1826
+#, fuzzy
+msgid "Shutter speed changed"
+msgstr "快门速度 (秒)"
+
+# camlibs/canon/library.c:894
+#: camlibs/canon/library.c:1828
+#, fuzzy
+msgid "Could not change shutter speed"
+msgstr "无法改�所有者姓�"
+
+# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
+#: camlibs/canon/library.c:1863
+#, fuzzy
+msgid "Invalid aperture setting"
+msgstr "照片设置"
+
+# camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
+#: camlibs/canon/library.c:1866
+#, fuzzy
+msgid "Aperture changed"
+msgstr "照片设置"
+
+# camlibs/canon/library.c:894
+#: camlibs/canon/library.c:1868
+#, fuzzy
+msgid "Could not change aperture"
+msgstr "无法改�所有者姓�"
+
+#: camlibs/canon/library.c:1902
+msgid "Invalid resolution setting"
+msgstr ""
+
+# camlibs/dimera/dimera3500.c:537
+#: camlibs/canon/library.c:1906
+#, fuzzy
+msgid "Resolution changed"
+msgstr "分辨率切�"
+
+# camlibs/canon/library.c:774
+#: camlibs/canon/library.c:1908
+#, fuzzy
+msgid "Could not change resolution"
+msgstr "无法创建目录 \\DCIM。"
+
+#: camlibs/canon/library.c:1943
+msgid "Invalid focus mode setting"
+msgstr ""
+
+# camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
+# camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
+#: camlibs/canon/library.c:1946
+#, fuzzy
+msgid "Focus mode changed"
+msgstr "�焦模�"
+
+# camlibs/canon/library.c:894
+#: camlibs/canon/library.c:1948
+#, fuzzy
+msgid "Could not change focus mode"
+msgstr "无法改�所有者姓�"
+
 # camlibs/canon/library.c:905
-#: camlibs/canon/library.c:1369
+#: camlibs/canon/library.c:1969
 msgid "time set"
 msgstr "时间设置"
 
 # camlibs/canon/library.c:907
-#: camlibs/canon/library.c:1371
+#: camlibs/canon/library.c:1971
 msgid "could not set time"
 msgstr "无法设置时间"
 
 # camlibs/canon/library.c:1107
-#: camlibs/canon/library.c:1589
+#: camlibs/canon/library.c:2189
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "给出未知端�类型 %i = 0x%x。��能�始化。"
 
 # camlibs/canon/serial.c:625 camlibs/canon/serial.c:690
-#: camlibs/canon/serial.c:699 camlibs/canon/serial.c:764
+#: camlibs/canon/serial.c:701 camlibs/canon/serial.c:766
 msgid "Battery exhausted, camera off."
 msgstr "电池没电，关闭相机。"
 
 # camlibs/canon/serial.c:628
-#: camlibs/canon/serial.c:702
+#: camlibs/canon/serial.c:704
 msgid "ERROR: unexpected message"
 msgstr "错误：未预期的消�"
 
 # camlibs/canon/serial.c:638
-#: camlibs/canon/serial.c:712
+#: camlibs/canon/serial.c:714
 msgid "ERROR: message overrun"
 msgstr "错误：过多的消�"
 
 # camlibs/canon/serial.c:667
-#: camlibs/canon/serial.c:741
+#: camlibs/canon/serial.c:743
 msgid "ERROR: out of sequence."
 msgstr "错误：顺�错误。"
 
 # camlibs/canon/serial.c:672
-#: camlibs/canon/serial.c:746
+#: camlibs/canon/serial.c:748
 msgid "ERROR: unexpected packet type."
 msgstr "错误：未预期的包类型。"
 
 # camlibs/canon/serial.c:682
-#: camlibs/canon/serial.c:756
+#: camlibs/canon/serial.c:758
 msgid "ERROR: message format error."
 msgstr "错误：消�格�错误。"
 
 # camlibs/canon/serial.c:694
-#: camlibs/canon/serial.c:768
+#: camlibs/canon/serial.c:770
 msgid "ERROR: unexpected message2."
 msgstr "错误：未预期的消�2。"
 
 # camlibs/canon/serial.c:888
-#: camlibs/canon/serial.c:982
+#: camlibs/canon/serial.c:985
 msgid "Uploading file..."
 msgstr "正在上载文件..."
 
 # camlibs/canon/serial.c:946 camlibs/digita/digita.c:256
-#: camlibs/canon/serial.c:1053 camlibs/digita/digita.c:258
+#: camlibs/canon/serial.c:1056 camlibs/digita/digita.c:258
 msgid "Getting file..."
 msgstr "正在获�文件..."
 
-#: camlibs/canon/serial.c:1123
+#: camlibs/canon/serial.c:1126
 msgid ""
 "canon_serial_get_dirents: canon_serial_dialogue failed to fetch directory "
 "entries"
 msgstr ""
 
-#: camlibs/canon/serial.c:1131
+#: camlibs/canon/serial.c:1134
 #, c-format
 msgid ""
 "canon_serial_get_dirents: Initial dirent packet too short (only %i bytes)"
 msgstr ""
 
-#: camlibs/canon/serial.c:1151
+#: camlibs/canon/serial.c:1154
 #, c-format
 msgid "canon_serial_get_dirents: Could not allocate %i bytes of memory"
 msgstr ""
 
-#: camlibs/canon/serial.c:1171
+#: camlibs/canon/serial.c:1174
 msgid "canon_serial_get_dirents: Failed to read another directory entry"
 msgstr ""
 
-#: camlibs/canon/serial.c:1189
+#: camlibs/canon/serial.c:1192
 msgid "canon_serial_get_dirents: Truncated directory entry received"
 msgstr ""
 
-#: camlibs/canon/serial.c:1216
+#: camlibs/canon/serial.c:1220
 msgid "canon_serial_get_dirents: Too many dirents, we must be looping."
 msgstr ""
 
-#: camlibs/canon/serial.c:1226
+#: camlibs/canon/serial.c:1230
 #, c-format
 msgid "canon_serial_get_dirents: Could not resize dirent buffer to %i bytes"
 msgstr ""
 
 # camlibs/canon/serial.c:1172
-#: camlibs/canon/serial.c:1295
+#: camlibs/canon/serial.c:1299
 msgid "Error changing speed."
 msgstr "改�速度出错。"
 
 # camlibs/canon/serial.c:1181
-#: camlibs/canon/serial.c:1304
+#: camlibs/canon/serial.c:1308
 msgid "Resetting protocol..."
 msgstr "正在�置�议..."
 
 # camlibs/canon/serial.c:1190
-#: camlibs/canon/serial.c:1313
+#: camlibs/canon/serial.c:1317
 msgid "Camera OK.\n"
 msgstr "相机就绪。\n"
 
 # camlibs/canon/serial.c:1203
-#: camlibs/canon/serial.c:1326
+#: camlibs/canon/serial.c:1330
 msgid "Looking for camera ..."
 msgstr "正在寻找相机..."
 
 # camlibs/canon/serial.c:1213
-#: camlibs/canon/serial.c:1336
+#: camlibs/canon/serial.c:1340
 msgid "Trying to contact camera..."
 msgstr "正试图与相机�络..."
 
 # camlibs/canon/serial.c:1217
-#: camlibs/canon/serial.c:1340
+#: camlibs/canon/serial.c:1344
 msgid "Communication error 1"
 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/canon/serial.c:1354 camlibs/canon/serial.c:1358
 #: camlibs/dimera/dimera3500.c:927
 msgid "No response from camera"
 msgstr "相机无应答"
 
 # camlibs/canon/serial.c:1235
-#: camlibs/canon/serial.c:1358
+#: camlibs/canon/serial.c:1362
 msgid "Unrecognized response"
 msgstr "��识别的应答"
 
 # camlibs/canon/usb.c:871
-#: camlibs/canon/serial.c:1378
+#: camlibs/canon/serial.c:1382
 #, fuzzy, c-format
 msgid "Detected a \"%s\" aka \"%s\""
 msgstr "已监测到一个“%s�。"
 
 # libgphoto2/gphoto2-result.c:46
-#: camlibs/canon/serial.c:1386
+#: camlibs/canon/serial.c:1390
 #, fuzzy, c-format
 msgid "Unknown model \"%s\""
 msgstr "未知型�"
 
 # camlibs/canon/serial.c:1278
-#: camlibs/canon/serial.c:1407
+#: camlibs/canon/serial.c:1411
 msgid "Bad EOT"
 msgstr "错误的 EOT"
 
 # camlibs/canon/serial.c:1284
-#: camlibs/canon/serial.c:1413
+#: camlibs/canon/serial.c:1417
 msgid "Communication error 2"
 msgstr "通讯错误 2"
 
 # camlibs/canon/serial.c:1307
-#: camlibs/canon/serial.c:1436
+#: camlibs/canon/serial.c:1440
 msgid "Communication error 3"
 msgstr "通讯错误 3"
 
 # camlibs/canon/serial.c:1311
-#: camlibs/canon/serial.c:1440
+#: camlibs/canon/serial.c:1444
 msgid "Changing speed... wait..."
 msgstr "正在改�速度... 请等待..."
 
 # camlibs/canon/serial.c:1316
-#: camlibs/canon/serial.c:1445
+#: camlibs/canon/serial.c:1449
 msgid "Error changing speed"
 msgstr "改�速度出错"
 
 # camlibs/canon/serial.c:1328
-#: camlibs/canon/serial.c:1456
+#: camlibs/canon/serial.c:1460
 #, fuzzy
 msgid "Error waiting for ACK during initialization retrying"
 msgstr "�始化�试中等待 ACK 时出错"
 
 # camlibs/canon/serial.c:1334
-#: camlibs/canon/serial.c:1462
+#: camlibs/canon/serial.c:1466
 msgid "Error waiting ACK during initialization"
 msgstr "�始化中等待 ACK 时出错"
 
 # camlibs/canon/serial.c:1338
-#: camlibs/canon/serial.c:1466
+#: camlibs/canon/serial.c:1470
 msgid "Connected to camera"
 msgstr "已连接到相机"
 
-#: camlibs/canon/serial.c:1504
+#: camlibs/canon/serial.c:1508
 msgid "ERROR: a fatal error condition was detected, can't continue "
 msgstr ""
 
-#: camlibs/canon/serial.c:1520
+#: camlibs/canon/serial.c:1524
 #, c-format
 msgid "ERROR: %d is too big"
 msgstr ""
 
 # camlibs/canon/serial.c:1400
-#: camlibs/canon/serial.c:1530
+#: camlibs/canon/serial.c:1534
 msgid "Getting thumbnail..."
 msgstr "正在获�缩略图..."
 
-#: camlibs/canon/usb.c:202
+#: camlibs/canon/usb.c:211
 msgid "NOT RECOGNIZED"
 msgstr ""
 
 # camlibs/ricoh/library.c:242
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:226
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "无法检测到任何相机。"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:232
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:226
+#: camlibs/canon/usb.c:235
 msgid "Camera was woken up"
 msgstr ""
 
 # libgphoto2/gphoto2-result.c:76
-#: camlibs/canon/usb.c:231
+#: camlibs/canon/usb.c:240
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "未知的相机库错误"
 
-#: camlibs/canon/usb.c:232
+#: camlibs/canon/usb.c:241
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:247
+#: camlibs/canon/usb.c:256
 #, c-format
 msgid ""
 "Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:253
+#: camlibs/canon/usb.c:262
 #, c-format
 msgid ""
 "Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
 "not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:272
+#: camlibs/canon/usb.c:281
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on read of %i Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:279 camlibs/canon/usb.c:306
+#: camlibs/canon/usb.c:288 camlibs/canon/usb.c:315
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:299
+#: camlibs/canon/usb.c:308
 #, c-format
 msgid ""
 "Step #3 of initialization failed: \"%s\" on write of %i Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
+#: camlibs/canon/usb.c:346 camlibs/canon/usb.c:387
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
+#: camlibs/canon/usb.c:353 camlibs/canon/usb.c:394
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
 # camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:467
+#: camlibs/canon/usb.c:491
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr "相机未就绪，多个“鉴别相机�请求�失败：%s"
 
 # camlibs/canon/usb.c:240
-#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
+#: camlibs/canon/usb.c:529 camlibs/canon/usb.c:545
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "相机未就绪，多个“鉴别相机�请求�失败：%s"
 
-#: camlibs/canon/usb.c:585
+#: camlibs/canon/usb.c:609
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
+#: camlibs/canon/usb.c:631 camlibs/canon/usb.c:657 camlibs/canon/usb.c:697
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
+#: camlibs/canon/usb.c:740 camlibs/canon/usb.c:756
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
+#: camlibs/canon/usb.c:811 camlibs/canon/usb.c:829
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:859
+#: camlibs/canon/usb.c:883
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:914
+#: camlibs/canon/usb.c:938
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1036
+#: camlibs/canon/usb.c:1067
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1052
+#: camlibs/canon/usb.c:1083
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1077
+#: camlibs/canon/usb.c:1101
+msgid "canon_usb_capture_dialogue:secondary image descriptor received"
+msgstr ""
+
+#: camlibs/canon/usb.c:1127
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1085
+#: camlibs/canon/usb.c:1135
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1095
+#: camlibs/canon/usb.c:1145
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1113
+#: camlibs/canon/usb.c:1164
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1148
+#: camlibs/canon/usb.c:1199
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1333
+#: camlibs/canon/usb.c:1387
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1439
+#: camlibs/canon/usb.c:1493
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
 # camlibs/canon/usb.c:640
-#: camlibs/canon/usb.c:1561
+#: camlibs/canon/usb.c:1659
 msgid "Receiving data..."
 msgstr "正在接收数�..."
 
-#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
+#: camlibs/canon/usb.c:2047 camlibs/canon/usb.c:2183
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1959
+#: camlibs/canon/usb.c:2112
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1966
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
@@ -864,51 +1128,51 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/library.c:275
-#: camlibs/canon/usb.c:2041
+#: camlibs/canon/usb.c:2194
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "无法获��盘信�：%s"
 
-#: camlibs/canon/usb.c:2051
+#: camlibs/canon/usb.c:2204
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
 # camlibs/canon/serial.c:888
-#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
-#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
+#: camlibs/canon/usb.c:2237 camlibs/canon/usb.c:2248 camlibs/canon/usb.c:2284
+#: camlibs/canon/usb.c:2298 camlibs/canon/usb.c:2312
 #, fuzzy
 msgid "File upload failed."
 msgstr "正在上载文件..."
 
-#: camlibs/canon/usb.c:2185
+#: camlibs/canon/usb.c:2338
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
 msgstr "文件太大。你�能需�将相机关闭�打开，�能上传更多文件。"
 
-#: camlibs/canon/usb.c:2231
+#: camlibs/canon/usb.c:2384
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2248
+#: camlibs/canon/usb.c:2401
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2299
+#: camlibs/canon/usb.c:2452
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2318
+#: camlibs/canon/usb.c:2471
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -916,12 +1180,12 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/usb.c:871
-#: camlibs/canon/usb.c:2394
+#: camlibs/canon/usb.c:2547
 #, c-format
 msgid "Detected a '%s'."
 msgstr "已监测到一个“%s�。"
 
-#: camlibs/canon/usb.c:2400
+#: camlibs/canon/usb.c:2553
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -1129,8 +1393,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:2518
-#: camlibs/ptp2/ptp.c:2547 camlibs/ricoh/library.c:500
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2525
+#: camlibs/ptp2/ptp.c:2571 camlibs/ricoh/library.c:500
 #: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "闪光�"
@@ -1345,54 +1609,54 @@ msgid "Looks like a modem, not a camera"
 msgstr "看起�象调制解调器，而�象相机"
 
 # camlibs/directory/directory.c:159
-#: camlibs/directory/directory.c:192
+#: camlibs/directory/directory.c:198
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "正在“%s�中列举文件..."
 
 # camlibs/directory/directory.c:228
-#: camlibs/directory/directory.c:265
+#: camlibs/directory/directory.c:271
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "正在“%s�中列举文件夹..."
 
 # camlibs/directory/directory.c:195
-#: camlibs/directory/directory.c:282
+#: camlibs/directory/directory.c:288
 #, c-format
 msgid "Could not get information about '%s' (%m)."
 msgstr "无法获�关于“%s�(%m) 的信�。"
 
 # camlibs/directory/directory.c:269
-#: camlibs/directory/directory.c:322
+#: camlibs/directory/directory.c:328
 #, c-format
 msgid "Could not get information about '%s' in '%s' (%m)."
 msgstr "无法从“%2$s�中获�关于“%1$s�的信� (%3$m)。"
 
 # camlibs/directory/directory.c:340
-#: camlibs/directory/directory.c:380
+#: camlibs/directory/directory.c:386
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "无法改�“%2$s�中的文件“%1$s�的时间(%3$m)。"
 
 # camlibs/directory/directory.c:421
-#: camlibs/directory/directory.c:471
+#: camlibs/directory/directory.c:477
 #, c-format
 msgid "Could not open '%s'."
 msgstr "无法打开“%s�。"
 
 # camlibs/directory/directory.c:506
-#: camlibs/directory/directory.c:505
+#: camlibs/directory/directory.c:511
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr "目录�览“相机��许您为您硬盘上的照片编制索引。"
 
 # camlibs/directory/directory.c:515
-#: camlibs/directory/directory.c:514
+#: camlibs/directory/directory.c:520
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "目录�览模� - 由 Scott Fritzinger <scottf@unr.edu> 编制。"
 
 # camlibs/directory/directory.c:562
-#: camlibs/directory/directory.c:589
+#: camlibs/directory/directory.c:595
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "无法删除文件夹“%2$s�中的文件“%1$s�(错误� %3$i：%4$m)。"
@@ -1459,7 +1723,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:755
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:762
 #: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "正在下载..."
@@ -1828,13 +2092,13 @@ 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:3624
+#: camlibs/ptp2/library.c:3631
 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:3646
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3653
 #: camlibs/ptp2/ptp.c:2214 camlibs/ricoh/library.c:499
 #: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
@@ -1844,8 +2108,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:2982
-#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2581
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2989
+#: camlibs/ptp2/library.c:3277 camlibs/ptp2/ptp.c:2605
 #: 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,11 +2163,11 @@ msgstr "�光补�"
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2826 camlibs/ptp2/library.c:2847
-#: camlibs/ptp2/library.c:2979 camlibs/ptp2/library.c:3159
-#: camlibs/ptp2/library.c:3247 camlibs/ptp2/library.c:3258
-#: camlibs/ptp2/library.c:3289 camlibs/ptp2/ptp.c:2543 camlibs/ptp2/ptp.c:2578
-#: camlibs/ptp2/ptp.c:2594 camlibs/ptp2/ptp.c:2635 camlibs/ptp2/ptp.c:2643
+#: camlibs/ptp2/library.c:2833 camlibs/ptp2/library.c:2854
+#: camlibs/ptp2/library.c:2986 camlibs/ptp2/library.c:3166
+#: camlibs/ptp2/library.c:3254 camlibs/ptp2/library.c:3265
+#: camlibs/ptp2/library.c:3296 camlibs/ptp2/ptp.c:2567 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/ptp.c:2618 camlibs/ptp2/ptp.c:2659 camlibs/ptp2/ptp.c:2667
 #: camlibs/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
@@ -1942,8 +2206,8 @@ msgstr "强制"
 
 # frontends/command-line/actions.c:168
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
-#: camlibs/ptp2/library.c:1989 camlibs/ptp2/library.c:1993
-#: camlibs/ptp2/library.c:3253 camlibs/ptp2/ptp.c:2641
+#: camlibs/ptp2/library.c:1996 camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2665
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "æ— "
@@ -1964,13 +2228,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:2470
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2484
-#: camlibs/ptp2/library.c:2577 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2591 camlibs/ptp2/library.c:2610
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2596 camlibs/ricoh/library.c:338
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2477
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2491
+#: camlibs/ptp2/library.c:2584 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2598 camlibs/ptp2/library.c:2617
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2631
+#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2620 camlibs/ricoh/library.c:338
 #: camlibs/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
@@ -1994,14 +2258,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:2471
-#: camlibs/ptp2/library.c:2472 camlibs/ptp2/library.c:2488
-#: camlibs/ptp2/library.c:2578 camlibs/ptp2/library.c:2579
-#: camlibs/ptp2/library.c:2595 camlibs/ptp2/library.c:2611
-#: camlibs/ptp2/library.c:2612 camlibs/ptp2/library.c:2628
-#: camlibs/ptp2/library.c:3160 camlibs/ptp2/library.c:3269
-#: camlibs/ptp2/library.c:3320 camlibs/ptp2/ptp.c:2492 camlibs/ptp2/ptp.c:2493
-#: camlibs/ptp2/ptp.c:2595 camlibs/ricoh/library.c:339
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:2479 camlibs/ptp2/library.c:2495
+#: camlibs/ptp2/library.c:2585 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2602 camlibs/ptp2/library.c:2618
+#: camlibs/ptp2/library.c:2619 camlibs/ptp2/library.c:2635
+#: camlibs/ptp2/library.c:3167 camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:3327 camlibs/ptp2/ptp.c:2516 camlibs/ptp2/ptp.c:2517
+#: camlibs/ptp2/ptp.c:2619 camlibs/ricoh/library.c:339
 #: camlibs/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
@@ -2679,16 +2943,6 @@ msgstr "自动关机时间"
 msgid "Slide Show Interval"
 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/konica/library.c:718 camlibs/konica/library.c:932
-#: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
-msgid "Resolution"
-msgstr "分辨率"
-
 # camlibs/konica/library.c:686 camlibs/konica/library.c:694
 # camlibs/konica/library.c:901
 #: camlibs/konica/library.c:720 camlibs/konica/library.c:728
@@ -2839,10 +3093,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:400 camlibs/ptp2/library.c:3235
-#: camlibs/ptp2/library.c:3248 camlibs/ptp2/library.c:3259
-#: camlibs/ptp2/library.c:3355 camlibs/ptp2/ptp.c:2626 camlibs/ptp2/ptp.c:2636
-#: camlibs/ptp2/ptp.c:2644 camlibs/ptp2/ptp.c:2651 camlibs/ricoh/library.c:348
+#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/library.c:3242
+#: camlibs/ptp2/library.c:3255 camlibs/ptp2/library.c:3266
+#: camlibs/ptp2/library.c:3362 camlibs/ptp2/ptp.c:2650 camlibs/ptp2/ptp.c:2660
+#: camlibs/ptp2/ptp.c:2668 camlibs/ptp2/ptp.c:2675 camlibs/ricoh/library.c:348
 #: camlibs/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
@@ -2928,7 +3182,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:3249 camlibs/ptp2/ptp.c:2637
+#: camlibs/ptp2/library.c:3256 camlibs/ptp2/ptp.c:2661
 #: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
 #: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
@@ -2946,7 +3200,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:3252 camlibs/ptp2/ptp.c:2640
+#: camlibs/ptp2/library.c:3259 camlibs/ptp2/ptp.c:2664
 #: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
 #: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
 #: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
@@ -3047,7 +3301,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:3053 camlibs/ptp2/library.c:3324
+#: camlibs/ptp2/library.c:3060 camlibs/ptp2/library.c:3331
 #: 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
@@ -3260,8 +3514,8 @@ msgstr ""
 "闪光�模�：\t\t"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:2995
-#: camlibs/ptp2/ptp.c:2588
+#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/library.c:3002
+#: camlibs/ptp2/ptp.c:2612
 msgid "Remote"
 msgstr "远程"
 
@@ -3275,7 +3529,7 @@ msgstr "本地"
 # frontends/command-line/gphoto2-cmd-config.c:372
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "Yes"
 msgstr "是"
 
@@ -3284,7 +3538,7 @@ msgstr "是"
 # frontends/command-line/gphoto2-cmd-config.c:372
 #: 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:2494
+#: camlibs/ptp2/ptp.c:2518
 msgid "No"
 msgstr "�"
 
@@ -3300,7 +3554,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:300 camlibs/ptp2/library.c:3051
+#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/library.c:3058
 #: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
 #: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
 #: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
@@ -3356,7 +3610,7 @@ msgstr "未满"
 
 # camlibs/minolta/dimagev/dimagev.c:367 camlibs/minolta/dimagev/dimagev.c:410
 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403
-#: camlibs/ptp2/library.c:2756 camlibs/ptp2/ptp.c:2603
+#: camlibs/ptp2/library.c:2763 camlibs/ptp2/ptp.c:2627
 #, c-format
 msgid "Full"
 msgstr "满"
@@ -3562,7 +3816,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:798 camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:805 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "正在上载..."
 
@@ -3748,14 +4002,14 @@ msgid ""
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:159
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3630
-#: camlibs/ptp2/library.c:3631 camlibs/ptp2/ptp.c:2202
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3637
+#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2202
 msgid "Image Quality"
 msgstr "图�质�"
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3632
-#: camlibs/ptp2/library.c:3633 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3639
+#: camlibs/ptp2/library.c:3640 camlibs/ptp2/ptp.c:2149 camlibs/ptp2/ptp.c:2203
 msgid "Image Size"
 msgstr "图�大�"
 
@@ -3775,12 +4029,12 @@ msgid "Information"
 msgstr "信�"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2731
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2738
 msgid "normal"
 msgstr "普通"
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2732
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2739
 msgid "fine"
 msgstr "精细"
 
@@ -3791,8 +4045,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:2741
-#: camlibs/ptp2/library.c:3331 camlibs/sierra/epson-desc.c:116
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2748
+#: camlibs/ptp2/library.c:3338 camlibs/sierra/epson-desc.c:116
 #: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
 #: camlibs/sierra/sierra.c:1726
 msgid "auto"
@@ -3800,14 +4054,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:2742 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2749 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:2740 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2747 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "å…³"
@@ -4144,7 +4398,7 @@ msgstr "PTP �议错误，需�数�"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP �议错误，需��应"
 
-#: camlibs/ptp2/library.c:982
+#: camlibs/ptp2/library.c:989
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2005 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -4159,89 +4413,75 @@ msgid ""
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1058 camlibs/ptp2/library.c:1147
+#: camlibs/ptp2/library.c:1065 camlibs/ptp2/library.c:1154
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "您的相机�支�文件改�。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1188
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "您的相机�支�文件改�。"
 
-#: camlibs/ptp2/library.c:1186
+#: camlibs/ptp2/library.c:1193
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1191
+#: camlibs/ptp2/library.c:1198
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1201
+#: camlibs/ptp2/library.c:1208
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1303
+#: camlibs/ptp2/library.c:1310
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "您的相机�支�文件改�。"
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1384
+#: camlibs/ptp2/library.c:1391
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "您的相机�支�文件改�。"
 
-#: camlibs/ptp2/library.c:1398
+#: camlibs/ptp2/library.c:1405
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
 # libgphoto2/gphoto2-camera.c:850
-#: camlibs/ptp2/library.c:1492
+#: camlibs/ptp2/library.c:1499
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "您的相机�支�文件改�。"
 
-#: camlibs/ptp2/library.c:1540
+#: camlibs/ptp2/library.c:1547
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1547
+#: camlibs/ptp2/library.c:1554
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/ptp2/library.c:1709
+#: camlibs/ptp2/library.c:1716
 #, fuzzy
 msgid "read only"
 msgstr "就绪"
 
-#: camlibs/ptp2/library.c:1710
+#: camlibs/ptp2/library.c:1717
 msgid "readwrite"
 msgstr ""
 
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# 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:1711 camlibs/ptp2/library.c:1713
-#: camlibs/ptp2/ptp.c:2655
-#, fuzzy
-msgid "Unknown"
-msgstr "%i (未知)"
-
-#: camlibs/ptp2/library.c:1841
+#: camlibs/ptp2/library.c:1848
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -4252,7 +4492,7 @@ msgid ""
 msgstr ""
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:1859
+#: camlibs/ptp2/library.c:1866
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4260,29 +4500,29 @@ msgid ""
 msgstr "日期格�"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/library.c:1873
+#: camlibs/ptp2/library.c:1880
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "日期格�"
 
-#: camlibs/ptp2/library.c:1889
+#: camlibs/ptp2/library.c:1896
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1905
+#: camlibs/ptp2/library.c:1912
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1922
+#: camlibs/ptp2/library.c:1929
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1926
+#: camlibs/ptp2/library.c:1933
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
@@ -4290,7 +4530,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:1929
+#: camlibs/ptp2/library.c:1936
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "文件分辨率"
@@ -4298,169 +4538,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:1931
+#: camlibs/ptp2/library.c:1938
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "文件分辨率"
 
 # camlibs/canon/serial.c:888
-#: camlibs/ptp2/library.c:1935
+#: camlibs/ptp2/library.c:1942
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "正在上载文件..."
 
-#: camlibs/ptp2/library.c:1937
+#: camlibs/ptp2/library.c:1944
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1942
+#: camlibs/ptp2/library.c:1949
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:1944
+#: camlibs/ptp2/library.c:1951
 #, 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:1947
+#: camlibs/ptp2/library.c:1954
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:1949
+#: camlibs/ptp2/library.c:1956
 #, 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:1955
+#: camlibs/ptp2/library.c:1962
 #, 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:1959
+#: camlibs/ptp2/library.c:1966
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:1961
+#: camlibs/ptp2/library.c:1968
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1973
+#: camlibs/ptp2/library.c:1980
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1988
+#: camlibs/ptp2/library.c:1995
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1992
+#: camlibs/ptp2/library.c:1999
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/library.c:1998 camlibs/ptp2/library.c:2012
-#: camlibs/ptp2/library.c:3278
+#: camlibs/ptp2/library.c:2005 camlibs/ptp2/library.c:2019
+#: camlibs/ptp2/library.c:3285
 #, fuzzy
 msgid "Undefined"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/library.c:1999
+#: camlibs/ptp2/library.c:2006
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2000
+#: camlibs/ptp2/library.c:2007
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2001
+#: camlibs/ptp2/library.c:2008
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2002
+#: camlibs/ptp2/library.c:2009
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2004 camlibs/ptp2/library.c:2017
-#: camlibs/ptp2/library.c:2029
+#: camlibs/ptp2/library.c:2011 camlibs/ptp2/library.c:2024
+#: camlibs/ptp2/library.c:2036
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "未知 (0x%02x)"
 
-#: camlibs/ptp2/library.c:2008
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/library.c:2013
+#: camlibs/ptp2/library.c:2020
 #, fuzzy
 msgid "Generic Flat"
 msgstr "普通"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2021
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2015
+#: camlibs/ptp2/library.c:2022
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2021
+#: camlibs/ptp2/library.c:2028
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2025
+#: camlibs/ptp2/library.c:2032
 msgid "Read-Write"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:2026
+#: camlibs/ptp2/library.c:2033
 #, fuzzy
 msgid "Read-Only"
 msgstr "就绪"
 
-#: camlibs/ptp2/library.c:2027
+#: camlibs/ptp2/library.c:2034
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2033
+#: camlibs/ptp2/library.c:2040
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2035
+#: camlibs/ptp2/library.c:2042
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2040
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:2045
+#: camlibs/ptp2/library.c:2052
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "图�数�：%d\n"
 
-#: camlibs/ptp2/library.c:2050
+#: camlibs/ptp2/library.c:2057
 #, c-format
 msgid ""
 "\n"
@@ -4468,16 +4708,16 @@ msgid ""
 msgstr ""
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: camlibs/ptp2/library.c:2218 camlibs/ptp2/library.c:2244
-#: camlibs/ptp2/library.c:2291 camlibs/ptp2/library.c:2322
-#: camlibs/ptp2/library.c:2350
+#: camlibs/ptp2/library.c:2225 camlibs/ptp2/library.c:2251
+#: camlibs/ptp2/library.c:2298 camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2357
 #, fuzzy, c-format
 msgid "Unknown value %04x"
 msgstr "未知的文件类型 %i。"
 
 # camlibs/canon/serial.c:672
-#: camlibs/ptp2/library.c:2379 camlibs/ptp2/library.c:2396
-#: camlibs/ptp2/library.c:2502
+#: camlibs/ptp2/library.c:2386 camlibs/ptp2/library.c:2403
+#: camlibs/ptp2/library.c:2509
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "错误：未预期的包类型。"
@@ -4490,29 +4730,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:2512 camlibs/ptp2/library.c:2750
-#: camlibs/ptp2/library.c:3279 camlibs/ptp2/ptp.c:2601
+#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:2757
+#: camlibs/ptp2/library.c:3286 camlibs/ptp2/ptp.c:2625
 #: camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "无手册"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2513 camlibs/ptp2/library.c:3280
+#: camlibs/ptp2/library.c:2520 camlibs/ptp2/library.c:3287
 #, fuzzy
 msgid "Automatic"
 msgstr "自动\n"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:2514
+#: camlibs/ptp2/library.c:2521
 #, 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:2515 camlibs/ptp2/library.c:3290
-#: camlibs/ptp2/ptp.c:2546 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2522 camlibs/ptp2/library.c:3297
+#: camlibs/ptp2/ptp.c:2570 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 #, fuzzy
 msgid "Daylight"
@@ -4520,8 +4760,8 @@ msgstr "日光"
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/library.c:2516 camlibs/ptp2/library.c:3293
-#: camlibs/ptp2/ptp.c:2545 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2523 camlibs/ptp2/library.c:3300
+#: camlibs/ptp2/ptp.c:2569 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
@@ -4530,7 +4770,7 @@ msgstr "�光"
 
 # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
 # camlibs/sierra/sierra.c:1239
-#: camlibs/ptp2/library.c:2517 camlibs/ptp2/library.c:3292
+#: camlibs/ptp2/library.c:2524 camlibs/ptp2/library.c:3299
 #: 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
@@ -4539,27 +4779,27 @@ msgstr "é’¨"
 
 # camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963
 # camlibs/sierra/sierra.c:1241
-#: camlibs/ptp2/library.c:2519 camlibs/ptp2/library.c:3291
-#: camlibs/ptp2/ptp.c:2548 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2526 camlibs/ptp2/library.c:3298
+#: camlibs/ptp2/ptp.c:2572 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:2520 camlibs/ptp2/ptp.c:2549
+#: camlibs/ptp2/library.c:2527 camlibs/ptp2/ptp.c:2573
 msgid "Shade"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/ptp2/library.c:2521 camlibs/ptp2/ptp.c:2550
+#: camlibs/ptp2/library.c:2528 camlibs/ptp2/ptp.c:2574
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "葡�牙语"
 
-#: camlibs/ptp2/library.c:2529 camlibs/ptp2/ptp.c:2538
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/ptp.c:2562
 msgid "JPEG Basic"
 msgstr ""
 
@@ -4571,91 +4811,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:2530
+#: camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "普通"
 
-#: camlibs/ptp2/library.c:2531 camlibs/ptp2/ptp.c:2540
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:2564
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:2532
+#: camlibs/ptp2/library.c:2539
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2533
+#: camlibs/ptp2/library.c:2540
 msgid "NEF+BASIC"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:167
-#: camlibs/ptp2/library.c:2733
+#: camlibs/ptp2/library.c:2740
 #, fuzzy
 msgid "super fine"
 msgstr "超精细"
 
-#: camlibs/ptp2/library.c:2743
+#: camlibs/ptp2/library.c:2750
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2744
+#: camlibs/ptp2/library.c:2751
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2749
+#: camlibs/ptp2/library.c:2756
 msgid "iTTL"
 msgstr ""
 
 # camlibs/konica/konica.c:131
-#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2602
+#: camlibs/ptp2/library.c:2758 camlibs/ptp2/ptp.c:2626
 #, fuzzy
 msgid "Commander"
 msgstr "命令顺�错误。"
 
-#: camlibs/ptp2/library.c:2766
+#: camlibs/ptp2/library.c:2773
 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:2825
+#: camlibs/ptp2/library.c:2832
 #, fuzzy
 msgid "Center"
 msgstr "光圈"
 
 # camlibs/polaroid/pdc700.c:999
-#: camlibs/ptp2/library.c:2832
+#: camlibs/ptp2/library.c:2839
 #, fuzzy
 msgid "large"
 msgstr "图�"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:2833
+#: camlibs/ptp2/library.c:2840
 #, fuzzy
 msgid "medium 1"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:2834
+#: camlibs/ptp2/library.c:2841
 #, fuzzy
 msgid "medium 2"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:2835
+#: camlibs/ptp2/library.c:2842
 msgid "small"
 msgstr ""
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/library.c:2842 camlibs/ptp2/library.c:3301
+#: camlibs/ptp2/library.c:2849 camlibs/ptp2/library.c:3308
 #, fuzzy
 msgid "Factory Default"
 msgstr "日光"
 
-#: camlibs/ptp2/library.c:2976
+#: camlibs/ptp2/library.c:2983
 msgid "Creative"
 msgstr ""
 
@@ -4671,152 +4911,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:2977
+#: camlibs/ptp2/library.c:2984
 #, fuzzy
 msgid "Action"
 msgstr "自动"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/library.c:2978 camlibs/ptp2/library.c:2980
-#: camlibs/ptp2/library.c:3240 camlibs/ptp2/ptp.c:2579 camlibs/ptp2/ptp.c:2631
+#: camlibs/ptp2/library.c:2985 camlibs/ptp2/library.c:2987
+#: camlibs/ptp2/library.c:3247 camlibs/ptp2/ptp.c:2603 camlibs/ptp2/ptp.c:2655
 #, fuzzy
 msgid "Portrait"
 msgstr "对比度-"
 
-#: camlibs/ptp2/library.c:2981 camlibs/ptp2/library.c:3241
-#: camlibs/ptp2/ptp.c:2580 camlibs/ptp2/ptp.c:2632
+#: camlibs/ptp2/library.c:2988 camlibs/ptp2/library.c:3248
+#: camlibs/ptp2/ptp.c:2604 camlibs/ptp2/ptp.c:2656
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2983 camlibs/ptp2/ptp.c:2582
+#: camlibs/ptp2/library.c:2990 camlibs/ptp2/ptp.c:2606
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2984 camlibs/ptp2/ptp.c:2584
+#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2608
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2985 camlibs/ptp2/ptp.c:2583
+#: camlibs/ptp2/library.c:2992 camlibs/ptp2/ptp.c:2607
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2991 camlibs/ptp2/ptp.c:2585
+#: camlibs/ptp2/library.c:2998 camlibs/ptp2/ptp.c:2609
 msgid "Single Shot"
 msgstr ""
 
 # camlibs/sierra/sierra.c:790 camlibs/sierra/sierra.c:799
 # camlibs/sierra/sierra.c:1127
-#: camlibs/ptp2/library.c:2992
+#: camlibs/ptp2/library.c:2999
 #, fuzzy
 msgid "Burst"
 msgstr "最佳"
 
-#: camlibs/ptp2/library.c:2993
+#: camlibs/ptp2/library.c:3000
 msgid "Timelapse"
 msgstr ""
 
 # camlibs/konica/library.c:797 camlibs/konica/library.c:1018
 # camlibs/polaroid/pdc700.c:163
-#: camlibs/ptp2/library.c:2994 camlibs/ptp2/ptp.c:2587
+#: camlibs/ptp2/library.c:3001 camlibs/ptp2/ptp.c:2611
 #, fuzzy
 msgid "Timer"
 msgstr "自动定时"
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/ptp2/library.c:2996 camlibs/ptp2/ptp.c:2589
+#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2613
 #, fuzzy
 msgid "Timer + Remote"
 msgstr "远程"
 
-#: camlibs/ptp2/library.c:3002 camlibs/ptp2/ptp.c:2556
+#: camlibs/ptp2/library.c:3009 camlibs/ptp2/ptp.c:2580
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3003 camlibs/ptp2/ptp.c:2557
+#: camlibs/ptp2/library.c:3010 camlibs/ptp2/ptp.c:2581
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3004 camlibs/ptp2/ptp.c:2558
+#: camlibs/ptp2/library.c:3011 camlibs/ptp2/ptp.c:2582
 msgid "Closest Subject"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/library.c:3010
+#: camlibs/ptp2/library.c:3017
 #, fuzzy
 msgid "sRGB (portrait)"
 msgstr "对比度-"
 
-#: camlibs/ptp2/library.c:3011
+#: camlibs/ptp2/library.c:3018
 msgid "AdobeRGB"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3012
+#: camlibs/ptp2/library.c:3019
 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:3018 camlibs/ptp2/ptp.c:2621
+#: camlibs/ptp2/library.c:3025 camlibs/ptp2/ptp.c:2645
 #, fuzzy
 msgid "Centre"
 msgstr "光圈"
 
-#: camlibs/ptp2/library.c:3019 camlibs/ptp2/ptp.c:2622
+#: camlibs/ptp2/library.c:3026 camlibs/ptp2/ptp.c:2646
 msgid "Top"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
-#: camlibs/ptp2/library.c:3020 camlibs/ptp2/ptp.c:2623
+#: camlibs/ptp2/library.c:3027 camlibs/ptp2/ptp.c:2647
 #, fuzzy
 msgid "Bottom"
 msgstr "缩放"
 
-#: camlibs/ptp2/library.c:3021 camlibs/ptp2/ptp.c:2624
+#: camlibs/ptp2/library.c:3028 camlibs/ptp2/ptp.c:2648
 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:3022 camlibs/ptp2/ptp.c:2625
+#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2649
 #, fuzzy
 msgid "Right"
 msgstr "高"
 
-#: camlibs/ptp2/library.c:3028
+#: camlibs/ptp2/library.c:3035
 msgid "Average"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3029 camlibs/ptp2/ptp.c:2571
+#: camlibs/ptp2/library.c:3036 camlibs/ptp2/ptp.c:2595
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3030
+#: camlibs/ptp2/library.c:3037
 msgid "Multi Spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3031
+#: camlibs/ptp2/library.c:3038
 msgid "Center Spot"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:3037
+#: camlibs/ptp2/library.c:3044
 #, 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:3038
+#: camlibs/ptp2/library.c:3045
 #, fuzzy
 msgid "Flash off"
 msgstr "闪光�模�"
 
 # camlibs/dimera/dimera3500.c:533 camlibs/konica/library.c:744
 # camlibs/konica/library.c:984
-#: camlibs/ptp2/library.c:3039
+#: camlibs/ptp2/library.c:3046
 #, fuzzy
 msgid "Fill flash"
 msgstr "闪光�"
@@ -4824,25 +5064,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:3040
+#: camlibs/ptp2/library.c:3047
 #, fuzzy
 msgid "Red-eye automatic"
 msgstr "消红眼"
 
-#: camlibs/ptp2/library.c:3041
+#: camlibs/ptp2/library.c:3048
 #, fuzzy
 msgid "Red-eye fill"
 msgstr "红眼闪光�"
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/library.c:3042
+#: camlibs/ptp2/library.c:3049
 #, fuzzy
 msgid "External sync"
 msgstr "外部"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/ptp2/library.c:3043 camlibs/ptp2/ptp.c:2551
+#: camlibs/ptp2/library.c:3050 camlibs/ptp2/ptp.c:2575
 #, fuzzy
 msgid "Default"
 msgstr "日光"
@@ -4850,7 +5090,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:3044 camlibs/ptp2/ptp.c:2554
+#: camlibs/ptp2/library.c:3051 camlibs/ptp2/ptp.c:2578
 #: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
 #: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
 #: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
@@ -4858,214 +5098,214 @@ msgstr "日光"
 msgid "Slow Sync"
 msgstr "慢�步"
 
-#: camlibs/ptp2/library.c:3045 camlibs/ptp2/ptp.c:2555
+#: camlibs/ptp2/library.c:3052 camlibs/ptp2/ptp.c:2579
 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:3046 camlibs/ptp2/ptp.c:2553
+#: camlibs/ptp2/library.c:3053 camlibs/ptp2/ptp.c:2577
 #, 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:3052 camlibs/ricoh/library.c:330
+#: camlibs/ptp2/library.c:3059 camlibs/ricoh/library.c:330
 #: camlibs/sierra/epson-desc.c:137
 msgid "Black & White"
 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:3167 camlibs/ptp2/ptp.c:2565
+#: camlibs/ptp2/library.c:3174 camlibs/ptp2/ptp.c:2589
 #, fuzzy
 msgid "AE/AF Lock"
 msgstr "�焦模�"
 
-#: camlibs/ptp2/library.c:3168 camlibs/ptp2/ptp.c:2567
+#: camlibs/ptp2/library.c:3175 camlibs/ptp2/ptp.c:2591
 msgid "AE Lock only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3169
+#: camlibs/ptp2/library.c:3176
 msgid "AF Lock Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3170 camlibs/ptp2/ptp.c:2568
+#: camlibs/ptp2/library.c:3177 camlibs/ptp2/ptp.c:2592
 msgid "AF Lock Hold"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3171 camlibs/ptp2/ptp.c:2569
+#: camlibs/ptp2/library.c:3178 camlibs/ptp2/ptp.c:2593
 msgid "AF On"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3172
+#: camlibs/ptp2/library.c:3179
 msgid "Flash Level Lock"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3177 camlibs/ptp2/library.c:3197
+#: camlibs/ptp2/library.c:3184 camlibs/ptp2/library.c:3204
 msgid "10 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3178 camlibs/ptp2/library.c:3198
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3205
 msgid "20 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3179 camlibs/ptp2/library.c:3227
+#: camlibs/ptp2/library.c:3186 camlibs/ptp2/library.c:3234
 #, fuzzy
 msgid "1 minute"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3180 camlibs/ptp2/library.c:3228
+#: camlibs/ptp2/library.c:3187 camlibs/ptp2/library.c:3235
 msgid "5 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3181 camlibs/ptp2/library.c:3229
+#: camlibs/ptp2/library.c:3188 camlibs/ptp2/library.c:3236
 #, fuzzy
 msgid "10 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3186
+#: camlibs/ptp2/library.c:3193
 msgid "4 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3187
+#: camlibs/ptp2/library.c:3194
 msgid "6 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3188
+#: camlibs/ptp2/library.c:3195
 msgid "8 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3189
+#: camlibs/ptp2/library.c:3196
 msgid "16 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3190
+#: camlibs/ptp2/library.c:3197
 msgid "30 minutes"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3195
+#: camlibs/ptp2/library.c:3202
 msgid "2 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3196
+#: camlibs/ptp2/library.c:3203
 msgid "5 seconds"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3203
+#: camlibs/ptp2/library.c:3210
 #, fuzzy
 msgid "6 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3204
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "8 mm"
 msgstr "58 mm"
 
-#: camlibs/ptp2/library.c:3205
+#: camlibs/ptp2/library.c:3212
 #, fuzzy
 msgid "10 mm"
 msgstr "51 mm"
 
-#: camlibs/ptp2/library.c:3206
+#: camlibs/ptp2/library.c:3213
 #, fuzzy
 msgid "20 mm"
 msgstr "29 mm"
 
-#: camlibs/ptp2/library.c:3211
+#: camlibs/ptp2/library.c:3218
 msgid "1/60"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3212
+#: camlibs/ptp2/library.c:3219
 msgid "1/30"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:174
-#: camlibs/ptp2/library.c:3213
+#: camlibs/ptp2/library.c:3220
 #, fuzzy
 msgid "1/15"
 msgstr "115200"
 
-#: camlibs/ptp2/library.c:3214
+#: camlibs/ptp2/library.c:3221
 msgid "1/8"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3215
+#: camlibs/ptp2/library.c:3222
 msgid "1/4"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3216
+#: camlibs/ptp2/library.c:3223
 msgid "1/2"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
-#: camlibs/ptp2/library.c:3217
+#: camlibs/ptp2/library.c:3224
 #, fuzzy
 msgid "1"
 msgstr "1x"
 
 # camlibs/sierra/sierra.c:1362 camlibs/sierra/sierra.c:1370
 # camlibs/sierra/sierra.c:1605
-#: camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3225
 #, fuzzy
 msgid "2"
 msgstr "F2"
 
 # camlibs/sierra/sierra.c:1365 camlibs/sierra/sierra.c:1376
 # camlibs/sierra/sierra.c:1611
-#: camlibs/ptp2/library.c:3219
+#: camlibs/ptp2/library.c:3226
 #, fuzzy
 msgid "4"
 msgstr "F4"
 
 # camlibs/sierra/sierra.c:1367 camlibs/sierra/sierra.c:1380
 # camlibs/sierra/sierra.c:1615
-#: camlibs/ptp2/library.c:3220
+#: camlibs/ptp2/library.c:3227
 #, fuzzy
 msgid "8"
 msgstr "F8"
 
-#: camlibs/ptp2/library.c:3221
+#: camlibs/ptp2/library.c:3228
 #, fuzzy
 msgid "15"
 msgstr "1.5"
 
-#: camlibs/ptp2/library.c:3222
+#: camlibs/ptp2/library.c:3229
 msgid "30"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3230
+#: camlibs/ptp2/library.c:3237
 #, fuzzy
 msgid "15 minutes"
 msgstr "41 mm"
 
-#: camlibs/ptp2/library.c:3236 camlibs/ptp2/library.c:3321
-#: camlibs/ptp2/ptp.c:2627
+#: camlibs/ptp2/library.c:3243 camlibs/ptp2/library.c:3328
+#: camlibs/ptp2/ptp.c:2651
 msgid "Vivid"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:3237 camlibs/ptp2/ptp.c:2628
+#: camlibs/ptp2/library.c:3244 camlibs/ptp2/ptp.c:2652
 #, fuzzy
 msgid "Sharper"
 msgstr "正在充电"
 
-#: camlibs/ptp2/library.c:3238 camlibs/ptp2/ptp.c:2629
+#: camlibs/ptp2/library.c:3245 camlibs/ptp2/ptp.c:2653
 msgid "Softer"
 msgstr ""
 
 # libgphoto2/gphoto2-result.c:49
-#: camlibs/ptp2/library.c:3239 camlibs/ptp2/ptp.c:2630
+#: camlibs/ptp2/library.c:3246 camlibs/ptp2/ptp.c:2654
 #, fuzzy
 msgid "Direct Print"
 msgstr "目录存在"
 
 # camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
 # camlibs/sierra/sierra.c:1653
-#: camlibs/ptp2/library.c:3242 camlibs/ptp2/library.c:3264
-#: camlibs/ptp2/library.c:3295 camlibs/ptp2/ptp.c:2633 camlibs/ptp2/ptp.c:2649
+#: camlibs/ptp2/library.c:3249 camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3302 camlibs/ptp2/ptp.c:2657 camlibs/ptp2/ptp.c:2673
 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1535
 #: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1762
 msgid "Custom"
@@ -5073,59 +5313,59 @@ msgstr "定制"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:3250 camlibs/ptp2/ptp.c:2638
+#: camlibs/ptp2/library.c:3257 camlibs/ptp2/ptp.c:2662
 #, fuzzy
 msgid "Medium Low"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:3251 camlibs/ptp2/library.c:3262
-#: camlibs/ptp2/ptp.c:2639 camlibs/ptp2/ptp.c:2647
+#: camlibs/ptp2/library.c:3258 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/ptp.c:2663 camlibs/ptp2/ptp.c:2671
 #, fuzzy
 msgid "Medium high"
 msgstr "中"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/library.c:3260 camlibs/ptp2/ptp.c:2645
+#: camlibs/ptp2/library.c:3267 camlibs/ptp2/ptp.c:2669
 #, fuzzy
 msgid "Low contrast"
 msgstr "对比度-"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
-#: camlibs/ptp2/library.c:3261 camlibs/ptp2/ptp.c:2646
+#: camlibs/ptp2/library.c:3268 camlibs/ptp2/ptp.c:2670
 #, fuzzy
 msgid "Medium low"
 msgstr "中"
 
-#: camlibs/ptp2/library.c:3263 camlibs/ptp2/ptp.c:2648
+#: camlibs/ptp2/library.c:3270 camlibs/ptp2/ptp.c:2672
 msgid "High control"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3271
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Long distance"
 msgstr "�焦�置"
 
 # camlibs/minolta/dimagev/dimagev.c:323
-#: camlibs/ptp2/library.c:3281
+#: camlibs/ptp2/library.c:3288
 #, fuzzy
 msgid "Automatic Macro"
 msgstr "自动\n"
 
-#: camlibs/ptp2/library.c:3282
+#: camlibs/ptp2/library.c:3289
 msgid "AF-S"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3283
+#: camlibs/ptp2/library.c:3290
 msgid "AF-C"
 msgstr ""
 
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
-#: camlibs/ptp2/library.c:3294
+#: camlibs/ptp2/library.c:3301
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "�光"
@@ -5138,140 +5378,140 @@ 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:3322
+#: camlibs/ptp2/library.c:3329
 #, fuzzy
 msgid "Neutral"
 msgstr "普通"
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:3323
+#: camlibs/ptp2/library.c:3330
 #, fuzzy
 msgid "Low sharpening"
 msgstr "正在充电"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/ptp2/library.c:3325
+#: camlibs/ptp2/library.c:3332
 #, fuzzy
 msgid "Black & white"
 msgstr "黑白"
 
 # camlibs/dimera/dimera3500.c:533
-#: camlibs/ptp2/library.c:3347
+#: camlibs/ptp2/library.c:3354
 #, fuzzy
 msgid "AE & Flash"
 msgstr "无闪光�"
 
 # camlibs/dimera/dimera3500.c:543
-#: camlibs/ptp2/library.c:3348
+#: camlibs/ptp2/library.c:3355
 #, 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:3349
+#: camlibs/ptp2/library.c:3356
 #, fuzzy
 msgid "Flash only"
 msgstr "闪光�模�"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3350
+#: camlibs/ptp2/library.c:3357
 #, fuzzy
 msgid "WB bracketing"
 msgstr "�光测定"
 
-#: camlibs/ptp2/library.c:3356 camlibs/ptp2/ptp.c:2652
+#: camlibs/ptp2/library.c:3363 camlibs/ptp2/ptp.c:2676
 msgid "Moderate"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3357 camlibs/ptp2/ptp.c:2653
+#: camlibs/ptp2/library.c:3364 camlibs/ptp2/ptp.c:2677
 msgid "Enhanced"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3363
+#: camlibs/ptp2/library.c:3370
 msgid "MTR > Under"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3364
+#: camlibs/ptp2/library.c:3371
 msgid "Under > MTR"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:549
-#: camlibs/ptp2/library.c:3570
+#: camlibs/ptp2/library.c:3577
 #, fuzzy
 msgid "Internal RAM"
 msgstr "内部"
 
 # camlibs/kodak/dc240/library.c:618
-#: camlibs/ptp2/library.c:3571
+#: camlibs/ptp2/library.c:3578
 #, fuzzy
 msgid "Memory card"
 msgstr "无�"
 
 # camlibs/canon/serial.c:1190
-#: camlibs/ptp2/library.c:3609 camlibs/ptp2/ptp.c:2218
+#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Camera Owner"
 msgstr "相机就绪。\n"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/ptp2/library.c:3610 camlibs/ptp2/ptp.c:2217
+#: camlibs/ptp2/library.c:3617 camlibs/ptp2/ptp.c:2217
 #, fuzzy
 msgid "Camera Model"
 msgstr "%s相机型�：%s\n"
 
 # camlibs/stv0680/library.c:525
-#: camlibs/ptp2/library.c:3611 camlibs/ptp2/ptp.c:2216
+#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Firmware Version"
 msgstr "固件版本：%d.%d\n"
 
 # camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/ptp2/library.c:3612 camlibs/ptp2/library.c:3613
+#: camlibs/ptp2/library.c:3619 camlibs/ptp2/library.c:3620
 #, 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:3614 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
+#: camlibs/ptp2/library.c:3621 camlibs/ptp2/ptp.c:2189 camlibs/ptp2/ptp.c:2200
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED 模�"
 
-#: camlibs/ptp2/library.c:3615
+#: camlibs/ptp2/library.c:3622
 #, fuzzy
 msgid "Image Comment"
 msgstr "图�调整"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/library.c:3616 camlibs/ptp2/ptp.c:2307
+#: camlibs/ptp2/library.c:3623 camlibs/ptp2/ptp.c:2307
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "自动关机时间"
 
 # camlibs/konica/library.c:670 camlibs/konica/library.c:879
-#: camlibs/ptp2/library.c:3617
+#: camlibs/ptp2/library.c:3624
 #, fuzzy
 msgid "Meter Off Time"
 msgstr "自动关机时间"
 
-#: camlibs/ptp2/library.c:3618 camlibs/ptp2/ptp.c:2385
+#: camlibs/ptp2/library.c:3625 camlibs/ptp2/ptp.c:2385
 msgid "CSM Menu"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3621
+#: camlibs/ptp2/library.c:3628
 msgid "Fast Filesystem"
 msgstr ""
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/library.c:3622 camlibs/ptp2/library.c:3623
+#: camlibs/ptp2/library.c:3629 camlibs/ptp2/library.c:3630
 #, fuzzy
 msgid "Capture Target"
 msgstr "照片设置"
 
-#: camlibs/ptp2/library.c:3634 camlibs/ptp2/library.c:3657
+#: camlibs/ptp2/library.c:3641 camlibs/ptp2/library.c:3664
 #: camlibs/ptp2/ptp.c:2210 camlibs/sierra/olympus-desc.c:698
 #: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
@@ -5279,18 +5519,18 @@ 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:3635 camlibs/ptp2/library.c:3636
+#: camlibs/ptp2/library.c:3642 camlibs/ptp2/library.c:3643
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "白平衡"
 
-#: camlibs/ptp2/library.c:3637 camlibs/ptp2/ptp.c:2221
+#: camlibs/ptp2/library.c:3644 camlibs/ptp2/ptp.c:2221
 msgid "Photo Effect"
 msgstr ""
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/ptp2/library.c:3638 camlibs/ptp2/ptp.c:2251
+#: camlibs/ptp2/library.c:3645 camlibs/ptp2/ptp.c:2251
 #, fuzzy
 msgid "Color Model"
 msgstr "彩色模�"
@@ -5307,28 +5547,28 @@ 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:3639 camlibs/ptp2/ptp.c:2287
+#: camlibs/ptp2/library.c:3646 camlibs/ptp2/ptp.c:2287
 #, fuzzy
 msgid "Auto ISO"
 msgstr "自动"
 
-#: camlibs/ptp2/library.c:3644
+#: camlibs/ptp2/library.c:3651
 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:3645
+#: camlibs/ptp2/library.c:3652
 #, fuzzy
 msgid "Auto Focus Mode"
 msgstr "�焦模�"
 
-#: camlibs/ptp2/library.c:3647 camlibs/ptp2/library.c:3648
+#: camlibs/ptp2/library.c:3654 camlibs/ptp2/library.c:3655
 #: camlibs/ptp2/ptp.c:2222
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3649 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
+#: camlibs/ptp2/library.c:3656 camlibs/ptp2/ptp.c:2213 camlibs/ptp2/ptp.c:2295
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
@@ -5336,285 +5576,277 @@ 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/library.c:3651
-#: camlibs/ptp2/library.c:3664 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
+#: camlibs/ptp2/library.c:3657 camlibs/ptp2/library.c:3658
+#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2158 camlibs/ptp2/ptp.c:2204
 #: camlibs/ptp2/ptp.c:2329 camlibs/ptp2/ptp.c:2401 camlibs/sierra/sierra.c:994
 #: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
 #: camlibs/sierra/sierra.c:1735
 msgid "Flash Mode"
 msgstr "闪光�模�"
 
-#: camlibs/ptp2/library.c:3652 camlibs/ptp2/ptp.c:2399
+#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2399
 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:3653 camlibs/ptp2/ptp.c:2387
+#: camlibs/ptp2/library.c:3660 camlibs/ptp2/ptp.c:2387
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "LED 模�"
 
-#: camlibs/ptp2/library.c:3654
+#: camlibs/ptp2/library.c:3661
 msgid "F Number"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3655 camlibs/ptp2/ptp.c:2154
+#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2154
 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:3656 camlibs/ptp2/ptp.c:2156
+#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2156
 #: 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:3658 camlibs/ptp2/ptp.c:2159
+#: camlibs/ptp2/library.c:3665 camlibs/ptp2/ptp.c:2159
 #, fuzzy
 msgid "Exposure Time"
 msgstr "闪光�闪光时间"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/library.c:3659 camlibs/ptp2/ptp.c:2171
+#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2171
 #, fuzzy
 msgid "Effect Mode"
 msgstr "录制模�"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3660
+#: camlibs/ptp2/library.c:3667
 #, fuzzy
 msgid "Exposure Program"
 msgstr "�光测定"
 
-#: camlibs/ptp2/library.c:3661 camlibs/ptp2/ptp.c:2167
+#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2167
 msgid "Still Capture Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/library.c:3662 camlibs/ptp2/ptp.c:2176
+#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "场景测�模�"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3663 camlibs/ptp2/ptp.c:2157
+#: camlibs/ptp2/library.c:3670 camlibs/ptp2/ptp.c:2157
 #, 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:3665 camlibs/ptp2/ptp.c:2211
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
-msgid "Aperture"
-msgstr "光圈"
-
 # camlibs/konica/konica.c:62
-#: camlibs/ptp2/library.c:3666 camlibs/ptp2/ptp.c:2208
+#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Focusing Point"
 msgstr "�焦错误。"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/library.c:3667
+#: camlibs/ptp2/library.c:3674
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/library.c:3668 camlibs/ptp2/ptp.c:2206
+#: camlibs/ptp2/library.c:3675 camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Metering Mode"
 msgstr "场景测�模�"
 
-#: camlibs/ptp2/library.c:3669 camlibs/ptp2/ptp.c:2207
+#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2207
 #, 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:3670 camlibs/ptp2/ptp.c:2283
+#: camlibs/ptp2/library.c:3677 camlibs/ptp2/ptp.c:2283
 #, fuzzy
 msgid "Focus Area Wrap"
 msgstr "�焦模�"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/library.c:3671 camlibs/ptp2/ptp.c:2299
+#: camlibs/ptp2/library.c:3678 camlibs/ptp2/ptp.c:2299
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "�光"
 
-#: camlibs/ptp2/library.c:3672
+#: camlibs/ptp2/library.c:3679
 msgid "AE-L/AF-L Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3673 camlibs/ptp2/ptp.c:2317
+#: camlibs/ptp2/library.c:3680 camlibs/ptp2/ptp.c:2317
 msgid "File Number Sequencing"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/ptp2/library.c:3674 camlibs/ptp2/ptp.c:2405
+#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2405
 #, fuzzy
 msgid "Flash Sign"
 msgstr "闪光�设置"
 
-#: camlibs/ptp2/library.c:3675
+#: camlibs/ptp2/library.c:3682
 msgid "Viewfinder Grid"
 msgstr ""
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/ptp2/library.c:3676 camlibs/ptp2/ptp.c:2395
+#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2395
 #, fuzzy
 msgid "Image Review"
 msgstr "图�大�"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/library.c:3677
+#: camlibs/ptp2/library.c:3684
 #, fuzzy
 msgid "Image Rotation Flag"
 msgstr "相机设置"
 
-#: camlibs/ptp2/library.c:3678
+#: camlibs/ptp2/library.c:3685
 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:3679 camlibs/ptp2/ptp.c:2403
+#: camlibs/ptp2/library.c:3686 camlibs/ptp2/ptp.c:2403
 #, 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:3680
+#: camlibs/ptp2/library.c:3687
 #, fuzzy
 msgid "Auto Focus Area"
 msgstr "�焦模�"
 
-#: camlibs/ptp2/library.c:3681 camlibs/ptp2/ptp.c:2407
+#: camlibs/ptp2/library.c:3688 camlibs/ptp2/ptp.c:2407
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "�光补�"
 
 # camlibs/konica/library.c:750 camlibs/konica/library.c:762
-#: camlibs/ptp2/library.c:3682 camlibs/ptp2/ptp.c:2333
+#: camlibs/ptp2/library.c:3689 camlibs/ptp2/ptp.c:2333
 #, fuzzy
 msgid "Bracket Set"
 msgstr "自动，消红眼"
 
-#: camlibs/ptp2/library.c:3683 camlibs/ptp2/ptp.c:2337
+#: camlibs/ptp2/library.c:3690 camlibs/ptp2/ptp.c:2337
 msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3684 camlibs/ptp2/ptp.c:2172
+#: camlibs/ptp2/library.c:3691 camlibs/ptp2/ptp.c:2172
 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:3685
+#: camlibs/ptp2/library.c:3692
 #, 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:3686
+#: camlibs/ptp2/library.c:3693
 #, 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:3687
+#: camlibs/ptp2/library.c:3694
 #, 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:3688
+#: camlibs/ptp2/library.c:3695
 #, 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:3689
+#: camlibs/ptp2/library.c:3696
 #, 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:3690
+#: camlibs/ptp2/library.c:3697
 #, 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:3691
+#: camlibs/ptp2/library.c:3698
 #, fuzzy
 msgid "Shade Whitebalance Bias"
 msgstr "白平衡"
 
 # camlibs/konica/library.c:663 camlibs/konica/library.c:871
-#: camlibs/ptp2/library.c:3692
+#: camlibs/ptp2/library.c:3699
 #, fuzzy
 msgid "Selftimer Delay"
 msgstr "自动定时器时间"
 
-#: camlibs/ptp2/library.c:3693
+#: camlibs/ptp2/library.c:3700
 msgid "Center Weight Area"
 msgstr ""
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/ptp2/library.c:3694 camlibs/ptp2/ptp.c:2327
+#: camlibs/ptp2/library.c:3701 camlibs/ptp2/ptp.c:2327
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "快门速度 (秒)"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/library.c:3695 camlibs/ptp2/ptp.c:2409
+#: camlibs/ptp2/library.c:3702 camlibs/ptp2/ptp.c:2409
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "日期和时间"
 
-#: camlibs/ptp2/library.c:3696 camlibs/ptp2/ptp.c:2381
+#: camlibs/ptp2/library.c:3703 camlibs/ptp2/ptp.c:2381
 msgid "Optimize Image"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:371
-#: camlibs/ptp2/library.c:3697 camlibs/ptp2/ptp.c:2247
+#: camlibs/ptp2/library.c:3704 camlibs/ptp2/ptp.c:2247
 #, fuzzy
 msgid "Sharpening"
 msgstr "正在充电"
 
-#: camlibs/ptp2/library.c:3698 camlibs/ptp2/ptp.c:2249
+#: camlibs/ptp2/library.c:3705 camlibs/ptp2/ptp.c:2249
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "�光补�"
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
-#: camlibs/ptp2/library.c:3699 camlibs/ptp2/ptp.c:2383
+#: camlibs/ptp2/library.c:3706 camlibs/ptp2/ptp.c:2383
 #, fuzzy
 msgid "Saturation"
 msgstr "�置"
 
-#: camlibs/ptp2/library.c:3700 camlibs/ptp2/ptp.c:2253
+#: camlibs/ptp2/library.c:3707 camlibs/ptp2/ptp.c:2253
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "图�调整"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/library.c:3706 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3713 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
@@ -5623,48 +5855,48 @@ msgid "Camera Settings"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/ptp2/library.c:3707
+#: camlibs/ptp2/library.c:3714
 #, fuzzy
 msgid "Image Settings"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/ptp2/library.c:3708
+#: camlibs/ptp2/library.c:3715
 #, fuzzy
 msgid "Capture Settings"
 msgstr "照片设置"
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:3765
+#: camlibs/ptp2/library.c:3772
 #, fuzzy
 msgid "Number of values"
 msgstr "图�数�：%d\n"
 
-#: camlibs/ptp2/library.c:3769
+#: camlibs/ptp2/library.c:3776
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3777
+#: camlibs/ptp2/library.c:3784
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:4421 camlibs/ptp2/library.c:4425
+#: camlibs/ptp2/library.c:4428 camlibs/ptp2/library.c:4432
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:4431
+#: camlibs/ptp2/library.c:4438
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
 # camlibs/canon/library.c:176
-#: camlibs/ptp2/library.c:4840
+#: camlibs/ptp2/library.c:4847
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "关闭相机"
 
 # camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:4948
+#: camlibs/ptp2/library.c:4955
 #, fuzzy, c-format
 msgid ""
 "PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
@@ -6387,30 +6619,68 @@ msgstr ""
 msgid "Low Light"
 msgstr "高"
 
-#: camlibs/ptp2/ptp.c:2522 camlibs/ptp2/ptp.c:2523 camlibs/ptp2/ptp.c:2524
+# camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
+#: camlibs/ptp2/ptp.c:2434
+#, fuzzy
+msgid "Secure Time"
+msgstr "闪光�闪光时间"
+
+#: camlibs/ptp2/ptp.c:2435
+msgid "Device Certificate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2437
+msgid "Synchronization Partner"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2439
+msgid "Device Friendly Name"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2440
+msgid "Volume Level"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2441
+msgid "Device Icon"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2442
+msgid "Playback Rate"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2443
+msgid "Playback Object"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2445
+msgid "Playback Container Index"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2446
+msgid "Playback Position"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2546 camlibs/ptp2/ptp.c:2547 camlibs/ptp2/ptp.c:2548
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2525
+#: camlibs/ptp2/ptp.c:2549
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2539
+#: camlibs/ptp2/ptp.c:2563
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:2541
-msgid "RAW"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:2542
+#: camlibs/ptp2/ptp.c:2566
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2544 camlibs/ricoh/library.c:329
+#: camlibs/ptp2/ptp.c:2568 camlibs/ricoh/library.c:329
 #: camlibs/sierra/nikon-desc.c:284
 msgid "Incandescent"
 msgstr ""
@@ -6418,7 +6688,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:2552 camlibs/sierra/epson-desc.c:154
+#: camlibs/ptp2/ptp.c:2576 camlibs/sierra/epson-desc.c:154
 #: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
 #: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
 #: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
@@ -6433,193 +6703,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:2559
+#: camlibs/ptp2/ptp.c:2583
 #, fuzzy
 msgid "Manual Focus"
 msgstr "无手册"
 
-#: camlibs/ptp2/ptp.c:2566
+#: camlibs/ptp2/ptp.c:2590
 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:2570
+#: camlibs/ptp2/ptp.c:2594
 #, fuzzy
 msgid "Flash Lock"
 msgstr "闪光�模�"
 
-#: camlibs/ptp2/ptp.c:2572 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2596 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2573 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2597 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptp.c:2586
+#: camlibs/ptp2/ptp.c:2610
 #, fuzzy
 msgid "Power Wind"
 msgstr "无电�指示�"
 
-#: camlibs/ptp2/ptp.c:2609
+#: camlibs/ptp2/ptp.c:2633
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2610
+#: camlibs/ptp2/ptp.c:2634
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2611
+#: camlibs/ptp2/ptp.c:2635
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2612
+#: camlibs/ptp2/ptp.c:2636
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2762
+#: camlibs/ptp2/ptp.c:2785
 msgid "Firmware"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2763
+#: camlibs/ptp2/ptp.c:2786
 msgid "WindowsImageFormat"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2764
+#: camlibs/ptp2/ptp.c:2787
 #, fuzzy
 msgid "Undefined Audio"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2767
+#: camlibs/ptp2/ptp.c:2790
 #, fuzzy
 msgid "Undefined Video"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2770
+#: camlibs/ptp2/ptp.c:2793
 #, fuzzy
 msgid "Undefined Collection"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:2771
+#: camlibs/ptp2/ptp.c:2794
 msgid "Abstract Multimedia Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2772
+#: camlibs/ptp2/ptp.c:2795
 msgid "Abstract Image Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2773
+#: camlibs/ptp2/ptp.c:2796
 msgid "Abstract Audio Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2774
+#: camlibs/ptp2/ptp.c:2797
 msgid "Abstract Video Album"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2775
+#: camlibs/ptp2/ptp.c:2798
 msgid "Abstract Audio Video Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2776
+#: camlibs/ptp2/ptp.c:2799
 msgid "Abstract Contact Group"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2777
+#: camlibs/ptp2/ptp.c:2800
 msgid "Abstract Message Folder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2778
+#: camlibs/ptp2/ptp.c:2801
 msgid "Abstract Chaptered Production"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2779
+#: camlibs/ptp2/ptp.c:2802
 msgid "WPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2780
+#: camlibs/ptp2/ptp.c:2803
 msgid "M3U Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2781
+#: camlibs/ptp2/ptp.c:2804
 msgid "MPL Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2782
+#: camlibs/ptp2/ptp.c:2805
 msgid "ASX Playlist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2783
+#: camlibs/ptp2/ptp.c:2806
 msgid "PLS Playlist"
 msgstr ""
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptp.c:2784
+#: camlibs/ptp2/ptp.c:2807
 #, fuzzy
 msgid "UndefinedDocument"
 msgstr "未定义的 PTP 错误"
 
-#: camlibs/ptp2/ptp.c:2785
+#: camlibs/ptp2/ptp.c:2808
 msgid "AbstractDocument"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2786
+#: camlibs/ptp2/ptp.c:2809
 msgid "UndefinedMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2787
+#: camlibs/ptp2/ptp.c:2810
 msgid "AbstractMessage"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2788
+#: camlibs/ptp2/ptp.c:2811
 msgid "UndefinedContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2789
+#: camlibs/ptp2/ptp.c:2812
 msgid "AbstractContact"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2790
+#: camlibs/ptp2/ptp.c:2813
 msgid "vCard2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2791
+#: camlibs/ptp2/ptp.c:2814
 msgid "vCard3"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2792
+#: camlibs/ptp2/ptp.c:2815
 msgid "UndefinedCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2793
+#: camlibs/ptp2/ptp.c:2816
 msgid "AbstractCalendarItem"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2794
+#: camlibs/ptp2/ptp.c:2817
 msgid "vCalendar1"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2795
+#: camlibs/ptp2/ptp.c:2818
 msgid "vCalendar2"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2796
+#: camlibs/ptp2/ptp.c:2819
 msgid "Undefined Windows Executable"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2813
+#: camlibs/ptp2/ptp.c:2836
 #, c-format
 msgid "M3U"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2826
+#: camlibs/ptp2/ptp.c:2849
 #, fuzzy, c-format
 msgid "Unknown(%04x)"
 msgstr "未知 (0x%02x)"