keep namespace clear: rename GP_SYSTEM_* to gp_system_*

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

1 files changed, 937 insertions, 790 deletions

diff --git a/po/uk.po b/po/uk.po
index e0539cdbc..2474759f9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"Report-Msgid-Bugs-To: <gphoto-translation@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2005-03-19 16:35+0100\n"
+"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2005-06-10 19:41+0200\n"
 "PO-Revision-Date: 2000-06-27 16:33+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <ru@li.org>\n"
@@ -14,6 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/adc65/adc65.c:83
+msgid ""
+"Adc65\n"
+"Benjamin Moos <benjamin@psnw.com>"
+msgstr ""
+
 #: camlibs/agfa-cl20/agfa_cl20.c:555
 msgid ""
 "agfa_cl20\n"
@@ -58,85 +64,87 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:528
+#: camlibs/canon/canon.c:581
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/canon/canon.c:531
+#: camlibs/canon/canon.c:584
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/canon/canon.c:883 camlibs/canon/canon.c:1152
-#: camlibs/canon/usb.c:370
+#: camlibs/canon/canon.c:957 camlibs/canon/canon.c:1295
+#: camlibs/canon/usb.c:513
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:947 camlibs/canon/canon.c:948
+#: camlibs/canon/canon.c:1021 camlibs/canon/canon.c:1022
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1096
+#: camlibs/canon/canon.c:1192
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1183
+#: camlibs/canon/canon.c:1329
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1302
+#: camlibs/canon/canon.c:1436
 #, c-format
-msgid "Name '%s' (%i characters) too long, maximum 30 characters are allowed."
+msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1702
+#: camlibs/canon/canon.c:1851
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1859
+#: camlibs/canon/canon.c:2026
 #, c-format
-msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
+msgid ""
+"canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1881
+#: camlibs/canon/canon.c:2048
 msgid ""
-"canon_int_list_dir: Reached end of packet while examining the first dirent"
+"canon_int_list_directory: Reached end of packet while examining the first "
+"dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1966
-msgid "canon_int_list_dir: truncated directory entry encountered"
+#: camlibs/canon/canon.c:2133
+msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2283
+#: camlibs/canon/canon.c:2492
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2354
-msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
+#: camlibs/canon/canon.c:2584
+msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2379
-msgid "Could not extract JPEG thumbnail from data: No beginning/end"
+#: camlibs/canon/canon.c:2671
+msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.h:144 camlibs/canon/canon.h:158
+#: camlibs/canon/canon.h:155 camlibs/canon/canon.h:169
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:342
+#: camlibs/canon/canon.h:359
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -148,6 +156,7 @@ msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
 #: camlibs/canon/crc.c:250
+#, c-format
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
@@ -158,71 +167,72 @@ msgid ""
 "#########################\n"
 msgstr ""
 
-#: camlibs/canon/library.c:134
+#: camlibs/canon/library.c:125
 msgid ""
 "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n"
 " and EOS Digital cameras in their native (sometimes called \"normal\")\n"
 " mode. It also supports a small number of Canon digital camcorders\n"
 " with still image capability.\n"
 "It includes code for communicating over a serial port or USB connection,\n"
-" but not (yet) over IEEE 1394 (Firewire().\n"
+" but not (yet) over IEEE 1394 (Firewire).\n"
 "It is designed to work with over 70 models as old as the PowerShot A5\n"
-" and Pro70 of 1998 and as new as the PowerShot SD20 of 2004.\n"
+" and Pro70 of 1998 and as new as the PowerShot A510 and EOS 350D of\n"
+" 2005.\n"
 "It has not been verified against the EOS 1D or EOS 1Ds.\n"
 "For the A50, using 115200 bps may effectively be slower than using 57600\n"
 "If you experience a lot of serial transmission errors, try to have your\n"
 " computer as idle as possible (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:262
+#: camlibs/canon/library.c:254
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Не доступно"
 
-#: camlibs/canon/library.c:282
+#: camlibs/canon/library.c:274
 msgid "Switching Camera Off"
 msgstr ""
 
-#: camlibs/canon/library.c:340 camlibs/canon/library.c:374
+#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
 #, fuzzy
 msgid "Error capturing image"
 msgstr "В╕дкрити зображення"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:422
 #, fuzzy, c-format
 msgid "Could not get disk name: %s"
 msgstr "Не вдалось отримати перегляд"
 
-#: camlibs/canon/library.c:431
+#: camlibs/canon/library.c:423
 #, fuzzy
 msgid "No reason available"
 msgstr "Не доступно"
 
-#: camlibs/canon/library.c:438
+#: camlibs/canon/library.c:430
 #, fuzzy, c-format
 msgid "Could not get disk info: %s"
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/canon/library.c:502
+#: camlibs/canon/library.c:494
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:525
+#: camlibs/canon/library.c:517
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/canon/library.c:573 camlibs/canon/library.c:611
+#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
 
-#: camlibs/canon/library.c:781
+#: camlibs/canon/library.c:776
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -230,35 +240,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
-#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
+#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
+#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
-#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
+#: camlibs/canon/library.c:784 camlibs/canon/library.c:790
+#: camlibs/canon/library.c:1308 camlibs/canon/library.c:1314
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:786 camlibs/canon/library.c:1310
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:799
+#: camlibs/canon/library.c:794
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Не доступно"
 
-#: camlibs/canon/library.c:825
+#: camlibs/canon/library.c:820
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:835
+#: camlibs/canon/library.c:830
 #, c-format
 msgid ""
 "\n"
@@ -274,132 +284,133 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:852
+#: camlibs/canon/library.c:847
 msgid ""
 "Canon PowerShot series driver by\n"
-"Wolfgang G. Reissnegger,\n"
-"Werner Almesberger,\n"
-"Edouard Lafargue,\n"
-"Philippe Marzouk,\n"
+" Wolfgang G. Reissnegger,\n"
+" Werner Almesberger,\n"
+" Edouard Lafargue,\n"
+" Philippe Marzouk,\n"
 "A5 additions by Ole W. Saastad\n"
-"Holger Klemm\n"
-"Stephen H. Westin"
+"Additional enhancements by\n"
+" Holger Klemm\n"
+" Stephen H. Westin"
 msgstr ""
 
-#: camlibs/canon/library.c:894
+#: camlibs/canon/library.c:890
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:910
+#: camlibs/canon/library.c:906
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:1040 camlibs/canon/library.c:1169
+#: camlibs/canon/library.c:1036 camlibs/canon/library.c:1165
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1057 camlibs/canon/library.c:1186
+#: camlibs/canon/library.c:1053 camlibs/canon/library.c:1182
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Не вдалось в╕дновити #%i"
 
-#: camlibs/canon/library.c:1101 camlibs/canon/library.c:1209
+#: camlibs/canon/library.c:1097 camlibs/canon/library.c:1205
 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:1123 camlibs/canon/library.c:1229
+#: camlibs/canon/library.c:1119 camlibs/canon/library.c:1225
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1129 camlibs/canon/library.c:1235
+#: camlibs/canon/library.c:1125 camlibs/canon/library.c:1231
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1267 camlibs/ptp2/library.c:1706
-#: camlibs/ptp2/library.c:1794
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:2586
+#: camlibs/ptp2/library.c:2677
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Конф╕гурац╕я камери"
 
-#: camlibs/canon/library.c:1269 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1265 camlibs/polaroid/pdc700.c:982
 #, fuzzy
 msgid "Camera"
 msgstr "Жива камера!"
 
-#: camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:1268
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Модель камери:"
 
-#: camlibs/canon/library.c:1276 camlibs/canon/library.c:1353
+#: camlibs/canon/library.c:1272 camlibs/canon/library.c:1349
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1283 camlibs/canon/library.c:1287
-#: camlibs/canon/library.c:1292
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1283
+#: camlibs/canon/library.c:1288
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1288
+#: camlibs/canon/library.c:1284
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1289 camlibs/canon/library.c:1316
 #, fuzzy
 msgid "Unavailable"
 msgstr "Не доступно"
 
-#: camlibs/canon/library.c:1297 camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1362
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1300
+#: camlibs/canon/library.c:1296
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1324 camlibs/ptp2/library.c:1740
-#: camlibs/ptp2/library.c:1770
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:2624
+#: camlibs/ptp2/library.c:2653
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1328
+#: camlibs/canon/library.c:1324
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1380
+#: camlibs/canon/library.c:1327 camlibs/canon/library.c:1376
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1336 camlibs/canon/library.c:1388
+#: camlibs/canon/library.c:1332 camlibs/canon/library.c:1385
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1357 camlibs/canon/library.c:1370
+#: camlibs/canon/library.c:1353 camlibs/canon/library.c:1366
 msgid "Camera unavailable"
 msgstr ""
 
-#: camlibs/canon/library.c:1360
+#: camlibs/canon/library.c:1356
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1362
+#: camlibs/canon/library.c:1358
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1373
+#: camlibs/canon/library.c:1369
 #, fuzzy
 msgid "time set"
 msgstr "Скасувати"
 
-#: camlibs/canon/library.c:1375
+#: camlibs/canon/library.c:1371
 #, fuzzy
 msgid "could not set time"
 msgstr "Не вдалось зберегти #%i"
 
-#: camlibs/canon/library.c:1591
+#: camlibs/canon/library.c:1589
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -568,247 +579,247 @@ msgstr ""
 msgid "Getting thumbnail..."
 msgstr "Отримання м╕н╕атюри %i..."
 
-#: camlibs/canon/usb.c:82
+#: camlibs/canon/usb.c:202
 msgid "NOT RECOGNIZED"
 msgstr ""
 
-#: camlibs/canon/usb.c:97
+#: camlibs/canon/usb.c:217
 #, fuzzy
 msgid "Could not establish initial contact with camera"
 msgstr "Не вдалось отримати зображення."
 
-#: camlibs/canon/usb.c:103
+#: camlibs/canon/usb.c:223
 msgid "Camera was already active"
 msgstr ""
 
-#: camlibs/canon/usb.c:106
+#: camlibs/canon/usb.c:226
 msgid "Camera was woken up"
 msgstr ""
 
-#: camlibs/canon/usb.c:111
+#: camlibs/canon/usb.c:231
 msgid "Unknown (some kind of error)"
 msgstr ""
 
-#: camlibs/canon/usb.c:112
+#: camlibs/canon/usb.c:232
 #, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr ""
 
-#: camlibs/canon/usb.c:126
+#: camlibs/canon/usb.c:247
 #, c-format
 msgid ""
-"Step #2 of initialization failed for PowerShot camera! (returned %i, "
-"expected %i) Camera not operational"
+"Step #2 of initialization failed: \"%s\" on read of %i) Camera not "
+"operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:147
+#: camlibs/canon/usb.c:253
 #, c-format
 msgid ""
-"EOS Step #3 of initialization failed! (returned %i, expected %i) Camera not "
-"operational"
+"Step #2 of initialization failed! (returned %i bytes, expected %i) Camera "
+"not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:167
+#: camlibs/canon/usb.c:272
+#, 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
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:197
+#: camlibs/canon/usb.c:299
 #, c-format
-msgid "Step #4.1 failed! (returned %i, expected %i) Camera not operational"
+msgid ""
+"Step #3 of initialization failed: \"%s\" on write of %i Camera not "
+"operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:258 camlibs/sipix/blink.c:1068
-#: camlibs/stv0674/stv0674.c:250
-#, fuzzy
-msgid "Could not apply USB settings"
+#: camlibs/canon/usb.c:336 camlibs/canon/usb.c:377
+#, c-format
+msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
-"Не вдалося в╕дкрити:\n"
-"%s"
 
-#: camlibs/canon/usb.c:283
+#: camlibs/canon/usb.c:343 camlibs/canon/usb.c:384
 #, c-format
-msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
+msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:316
+#: camlibs/canon/usb.c:466
 #, c-format
-msgid ""
-"canon_usb_init: Unexpected return of %i bytes (expected %i) from \"get "
-"picture abilities.\""
+msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:322 camlibs/canon/usb.c:377
+#: camlibs/canon/usb.c:504 camlibs/canon/usb.c:520
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:441 camlibs/canon/usb.c:463 camlibs/canon/usb.c:489
-#: camlibs/canon/usb.c:530
+#: camlibs/canon/usb.c:584
 #, c-format
 msgid ""
-"canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
-"i)"
+"canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
+"(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:514
+#: camlibs/canon/usb.c:606 camlibs/canon/usb.c:632 camlibs/canon/usb.c:672
 #, c-format
-msgid ""
-"canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
-"picture abilities.\" We will continue."
+msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:573 camlibs/canon/usb.c:589
+#: camlibs/canon/usb.c:715 camlibs/canon/usb.c:731
 #, c-format
 msgid ""
-"canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
-"expected %i)"
+"canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:644 camlibs/canon/usb.c:662
+#: camlibs/canon/usb.c:786 camlibs/canon/usb.c:804
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:710
+#: camlibs/canon/usb.c:858
 #, c-format
 msgid ""
-"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
+"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
+"sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:763
+#: camlibs/canon/usb.c:913
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:861
+#: camlibs/canon/usb.c:1035
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:872
+#: camlibs/canon/usb.c:1051
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:892
+#: camlibs/canon/usb.c:1076
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:900
+#: camlibs/canon/usb.c:1084
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:910
+#: camlibs/canon/usb.c:1094
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:928
+#: camlibs/canon/usb.c:1112
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:962
+#: camlibs/canon/usb.c:1147
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1117
+#: camlibs/canon/usb.c:1332
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1220
+#: camlibs/canon/usb.c:1438
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1324
+#: camlibs/canon/usb.c:1560
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1622 camlibs/canon/usb.c:1758
+#: camlibs/canon/usb.c:1893 camlibs/canon/usb.c:2029
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1685
+#: camlibs/canon/usb.c:1958
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1692
+#: camlibs/canon/usb.c:1965
 #, c-format
 msgid ""
-"canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
-"08x from camera"
+"Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
+"status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1769
+#: camlibs/canon/usb.c:2040
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1779
+#: camlibs/canon/usb.c:2050
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1812 camlibs/canon/usb.c:1823 camlibs/canon/usb.c:1859
-#: camlibs/canon/usb.c:1873 camlibs/canon/usb.c:1887
+#: camlibs/canon/usb.c:2083 camlibs/canon/usb.c:2094 camlibs/canon/usb.c:2130
+#: camlibs/canon/usb.c:2144 camlibs/canon/usb.c:2158
 #, fuzzy
 msgid "File upload failed."
 msgstr "Масштаб зображення 50%..."
 
-#: camlibs/canon/usb.c:1911
+#: camlibs/canon/usb.c:2184
 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:1957
+#: camlibs/canon/usb.c:2230
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1974
+#: camlibs/canon/usb.c:2247
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2025
+#: camlibs/canon/usb.c:2298
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2044
+#: camlibs/canon/usb.c:2317
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2113
+#: camlibs/canon/usb.c:2386
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:2119
+#: camlibs/canon/usb.c:2392
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -836,12 +847,13 @@ msgstr ""
 
 #: camlibs/casio/casio-qv.c:261 camlibs/dimera/dimera3500.c:771
 #: camlibs/kodak/dc210/dc210.c:168 camlibs/polaroid/pdc700.c:980
-#: camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1433
+#: camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:1437
 #: camlibs/sierra/sierra-desc.c:203
 msgid "Camera Configuration"
 msgstr "Конф╕гурац╕я камери"
 
 #: camlibs/casio/casio-qv.c:264 camlibs/konica/qm150.c:1140
+#, c-format
 msgid "Battery"
 msgstr ""
 
@@ -921,8 +933,8 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:399 camlibs/dimera/dimera3500.c:785
 #: camlibs/kodak/dc210/dc210.c:253 camlibs/kodak/dc210/dc210.c:421
 #: camlibs/konica/library.c:778 camlibs/konica/library.c:1019
-#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1255
-#: camlibs/ptp2/library.c:1688 camlibs/ptp2/ptp.c:1928
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1599
+#: camlibs/ptp2/library.c:2568 camlibs/ptp2/ptp.c:1959
 #: camlibs/ricoh/library.c:500 camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr ""
@@ -1030,7 +1042,7 @@ msgstr ""
 
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
-#: camlibs/ricoh/g3.c:316 camlibs/samsung/samsung.c:214
+#: camlibs/ricoh/g3.c:321 camlibs/samsung/samsung.c:214
 #: camlibs/sipix/web2.c:175 camlibs/smal/ultrapocket.c:127
 #: camlibs/smal/ultrapocket.c:173
 #, fuzzy
@@ -1213,7 +1225,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/ricoh/g3.c:310
+#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:315
 #, fuzzy
 msgid "Downloading..."
 msgstr "Прийом завершено."
@@ -1265,7 +1277,7 @@ msgstr ""
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1661 camlibs/sierra/sierra.c:1834
+#: camlibs/sierra/sierra.c:1665 camlibs/sierra/sierra.c:1838
 msgid "Date & Time"
 msgstr ""
 
@@ -1498,24 +1510,26 @@ msgid "High (good quality)"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:217 camlibs/konica/qm150.c:1053
+#: camlibs/ptp2/library.c:2542
 #, fuzzy
 msgid "Capture"
 msgstr "В╕дкрити зображення"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:1685
-#: camlibs/ptp2/ptp.c:1603 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1363
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:2565
+#: camlibs/ptp2/ptp.c:1634 camlibs/ricoh/library.c:499
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1367
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/ptp.c:1956
-#: camlibs/ricoh/library.c:498 camlibs/sierra/epson-desc.c:218
-#: camlibs/sierra/nikon-desc.c:324 camlibs/sierra/olympus-desc.c:488
-#: camlibs/sierra/sierra.c:1058 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1334 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1533 camlibs/sierra/sierra.c:1746
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2187
+#: camlibs/ptp2/ptp.c:1987 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:1062
+#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1338
+#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1537
+#: camlibs/sierra/sierra.c:1750
 msgid "Macro"
 msgstr ""
 
@@ -1552,7 +1566,8 @@ 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/ptp.c:1924 camlibs/ptp2/ptp.c:1953 camlibs/ptp2/ptp.c:1969
+#: camlibs/ptp2/library.c:2147 camlibs/ptp2/library.c:2227
+#: camlibs/ptp2/ptp.c:1955 camlibs/ptp2/ptp.c:1984 camlibs/ptp2/ptp.c:2000
 #: 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
@@ -1564,25 +1579,25 @@ msgstr ""
 #: camlibs/sierra/olympus-desc.c:411 camlibs/sierra/olympus-desc.c:430
 #: camlibs/sierra/olympus-desc.c:449 camlibs/sierra/olympus-desc.c:468
 #: camlibs/sierra/olympus-desc.c:489 camlibs/sierra/olympus-desc.c:690
-#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:866
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:906
-#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:1027
-#: camlibs/sierra/sierra.c:1034 camlibs/sierra/sierra.c:1201
-#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1270
-#: camlibs/sierra/sierra.c:1313 camlibs/sierra/sierra.c:1476
-#: camlibs/sierra/sierra.c:1482 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1729
+#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:870
+#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:910
+#: camlibs/sierra/sierra.c:916 camlibs/sierra/sierra.c:970
+#: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1038 camlibs/sierra/sierra.c:1205
+#: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1274
+#: camlibs/sierra/sierra.c:1317 camlibs/sierra/sierra.c:1480
+#: camlibs/sierra/sierra.c:1486 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1713
+#: camlibs/sierra/sierra.c:1733
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
 #: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
 #: camlibs/sierra/olympus-desc.c:395 camlibs/sierra/olympus-desc.c:412
-#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:975
-#: camlibs/sierra/sierra.c:1272 camlibs/sierra/sierra.c:1477
-#: camlibs/sierra/sierra.c:1484 camlibs/sierra/sierra.c:1711
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:979
+#: camlibs/sierra/sierra.c:1276 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1488 camlibs/sierra/sierra.c:1715
 msgid "Force"
 msgstr ""
 
@@ -1604,17 +1619,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:815 camlibs/konica/qm150.c:857
 #: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:1027
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
-#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:1208
-#: camlibs/ptp2/library.c:1210 camlibs/ptp2/library.c:1222
-#: camlibs/ptp2/library.c:1415 camlibs/ptp2/library.c:1417
-#: camlibs/ptp2/library.c:1429 camlibs/ptp2/library.c:1446
-#: camlibs/ptp2/library.c:1448 camlibs/ptp2/library.c:1460
-#: camlibs/ptp2/library.c:1522 camlibs/ptp2/library.c:1524
-#: camlibs/ptp2/library.c:1536 camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874
-#: camlibs/ptp2/ptp.c:1971 camlibs/ricoh/library.c:338
-#: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:305
-#: camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1089
-#: camlibs/sierra/sierra.c:1352
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:1552
+#: camlibs/ptp2/library.c:1554 camlibs/ptp2/library.c:1566
+#: camlibs/ptp2/library.c:1759 camlibs/ptp2/library.c:1761
+#: camlibs/ptp2/library.c:1773 camlibs/ptp2/library.c:1792
+#: camlibs/ptp2/library.c:1794 camlibs/ptp2/library.c:1806
+#: camlibs/ptp2/ptp.c:1904 camlibs/ptp2/ptp.c:1905 camlibs/ptp2/ptp.c:2002
+#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
+#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1087
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1356
 msgid "On"
 msgstr ""
 
@@ -1627,24 +1640,24 @@ 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:1209
-#: camlibs/ptp2/library.c:1210 camlibs/ptp2/library.c:1226
-#: camlibs/ptp2/library.c:1416 camlibs/ptp2/library.c:1417
-#: camlibs/ptp2/library.c:1433 camlibs/ptp2/library.c:1447
-#: camlibs/ptp2/library.c:1448 camlibs/ptp2/library.c:1464
-#: camlibs/ptp2/library.c:1523 camlibs/ptp2/library.c:1524
-#: camlibs/ptp2/library.c:1540 camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874
-#: camlibs/ptp2/ptp.c:1970 camlibs/ricoh/library.c:339
-#: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:153 camlibs/sierra/nikon-desc.c:236
-#: camlibs/sierra/nikon-desc.c:304 camlibs/sierra/nikon-desc.c:359
-#: camlibs/sierra/olympus-desc.c:396 camlibs/sierra/olympus-desc.c:413
-#: camlibs/sierra/olympus-desc.c:509 camlibs/sierra/olympus-desc.c:673
-#: camlibs/sierra/olympus-desc.c:757 camlibs/sierra/sierra.c:968
-#: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1084
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1274
-#: camlibs/sierra/sierra.c:1354 camlibs/sierra/sierra.c:1478
-#: camlibs/sierra/sierra.c:1486 camlibs/sierra/sierra.c:1713
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:1553
+#: camlibs/ptp2/library.c:1554 camlibs/ptp2/library.c:1570
+#: camlibs/ptp2/library.c:1760 camlibs/ptp2/library.c:1761
+#: camlibs/ptp2/library.c:1777 camlibs/ptp2/library.c:1793
+#: camlibs/ptp2/library.c:1794 camlibs/ptp2/library.c:1810
+#: camlibs/ptp2/library.c:2186 camlibs/ptp2/library.c:2324
+#: camlibs/ptp2/ptp.c:1904 camlibs/ptp2/ptp.c:1905 camlibs/ptp2/ptp.c:2001
+#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
+#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
+#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
+#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:396
+#: camlibs/sierra/olympus-desc.c:413 camlibs/sierra/olympus-desc.c:509
+#: camlibs/sierra/olympus-desc.c:673 camlibs/sierra/olympus-desc.c:757
+#: camlibs/sierra/sierra.c:972 camlibs/sierra/sierra.c:981
+#: camlibs/sierra/sierra.c:1088 camlibs/sierra/sierra.c:1091
+#: camlibs/sierra/sierra.c:1278 camlibs/sierra/sierra.c:1358
+#: camlibs/sierra/sierra.c:1482 camlibs/sierra/sierra.c:1490
+#: camlibs/sierra/sierra.c:1717
 msgid "Off"
 msgstr ""
 
@@ -1808,6 +1821,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/kodak/dc3200/dc3200.c:142
+#, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr ""
 
@@ -2042,8 +2056,8 @@ msgstr ""
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:865 camlibs/sierra/sierra.c:1197
-#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1757
+#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:1201
+#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1761
 msgid "Resolution"
 msgstr ""
 
@@ -2068,7 +2082,7 @@ msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
 #: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1624 camlibs/sierra/sierra.c:1808
+#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1812
 msgid "Language"
 msgstr ""
 
@@ -2136,8 +2150,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1505
-#: camlibs/sierra/sierra.c:1511 camlibs/sierra/sierra.c:1731
+#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1509
+#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1735
 msgid "Fixed"
 msgstr ""
 
@@ -2162,13 +2176,14 @@ msgstr ""
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
 #: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
 #: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:376
-#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:997
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1059
-#: camlibs/sierra/sierra.c:1065 camlibs/sierra/sierra.c:1249
-#: camlibs/sierra/sierra.c:1292 camlibs/sierra/sierra.c:1336
-#: camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1535
-#: camlibs/sierra/sierra.c:1748
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:940
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1001
+#: camlibs/sierra/sierra.c:1008 camlibs/sierra/sierra.c:1063
+#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1253
+#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1340
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1539
+#: camlibs/sierra/sierra.c:1752
+#, c-format
 msgid "Normal"
 msgstr ""
 
@@ -2233,21 +2248,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:907
-#: camlibs/sierra/sierra.c:914 camlibs/sierra/sierra.c:1232
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:911
+#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1236
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:908
-#: camlibs/sierra/sierra.c:916 camlibs/sierra/sierra.c:1234
+#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:912
+#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:1238
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:868 camlibs/sierra/sierra.c:876
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:918
-#: camlibs/sierra/sierra.c:1205 camlibs/sierra/sierra.c:1236
+#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
+#: camlibs/sierra/sierra.c:1209 camlibs/sierra/sierra.c:1240
 #, fuzzy
 msgid "High"
 msgstr "Висота:"
@@ -2284,7 +2299,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1557
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1588
 msgid "Sharpness"
 msgstr ""
 
@@ -2317,9 +2332,9 @@ msgid "Black and White"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:378
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
-#: camlibs/sierra/sierra.c:1253
+#: camlibs/ptp2/library.c:2328 camlibs/ricoh/library.c:331
+#: camlibs/sierra/olympus-desc.c:378 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1257
 msgid "Sepia"
 msgstr ""
 
@@ -2353,28 +2368,34 @@ msgid "Everywhere"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1142
+#, c-format
 msgid "AC"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1145 camlibs/minolta/dimagev/dimagev.c:306
 #: camlibs/sierra/nikon-desc.c:361
+#, c-format
 msgid "Play"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1147 camlibs/minolta/dimagev/dimagev.c:306
 #: camlibs/sierra/nikon-desc.c:360
+#, c-format
 msgid "Record"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1157
+#, c-format
 msgid "DD/MM/YYYY"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1162
+#, c-format
 msgid "YYYY/MM/DD"
 msgstr ""
 
 #: camlibs/konica/qm150.c:1166
+#, c-format
 msgid "MM/DD/YYYY"
 msgstr ""
 
@@ -2392,6 +2413,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/konica/qm150.c:1193
+#, c-format
 msgid ""
 "Konica Q-M150 Library\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2401,6 +2423,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/konica/qm150.c:1208
+#, c-format
 msgid ""
 "About Konica Q-M150:\n"
 "This camera does not support to do any changes\n"
@@ -2488,7 +2511,7 @@ msgid ""
 "Flash Mode:\t\t"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/ptp.c:1963
+#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/ptp.c:1994
 msgid "Remote"
 msgstr ""
 
@@ -2498,38 +2521,41 @@ msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
 #: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:1875
+#: camlibs/ptp2/ptp.c:1906
 msgid "Yes"
 msgstr "Так"
 
 #: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
 #: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:1875
+#: camlibs/ptp2/ptp.c:1906
 msgid "No"
 msgstr "Н╕"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1557
-#: camlibs/sierra/sierra.c:1762
+#: camlibs/sierra/sierra.c:1554 camlibs/sierra/sierra.c:1561
+#: camlibs/sierra/sierra.c:1766
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:867
-#: camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:1203
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1555
-#: camlibs/sierra/sierra.c:1760
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:871
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1207
+#: camlibs/sierra/sierra.c:1553 camlibs/sierra/sierra.c:1559
+#: camlibs/sierra/sierra.c:1764
 msgid "Standard"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:321
+#, c-format
 msgid "Automatic\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:329
+#, c-format
 msgid "Force Flash\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:337
+#, c-format
 msgid "Prohibit Flash\n"
 msgstr ""
 
@@ -2554,7 +2580,8 @@ msgid "Not Full"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:1977
+#: camlibs/ptp2/ptp.c:2008
+#, c-format
 msgid "Full"
 msgstr ""
 
@@ -2575,14 +2602,17 @@ msgid "Ready"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:380
+#, c-format
 msgid "Normal\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:383
+#, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:386
+#, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
@@ -2592,14 +2622,17 @@ msgid "Bad value for lens status %d\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:398
+#, c-format
 msgid "Card Status:\t\t"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:411
+#, c-format
 msgid "Write-protected"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:414
+#, c-format
 msgid "Unsuitable card"
 msgstr ""
 
@@ -2867,13 +2900,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:1678
-#: camlibs/ptp2/ptp.c:1590
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:2548
+#: camlibs/ptp2/library.c:2549 camlibs/ptp2/ptp.c:1621
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:1679
-#: camlibs/ptp2/ptp.c:1537 camlibs/ptp2/ptp.c:1591
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:2550
+#: camlibs/ptp2/library.c:2551 camlibs/ptp2/ptp.c:1568 camlibs/ptp2/ptp.c:1622
 #, fuzzy
 msgid "Image Size"
 msgstr "Покажчик зображень"
@@ -2891,11 +2924,11 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1848
 msgid "normal"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1849
 msgid "fine"
 msgstr ""
 
@@ -2903,19 +2936,22 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:116
-#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1462
-#: camlibs/sierra/sierra.c:1697
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:1891
+#: camlibs/ptp2/library.c:2060 camlibs/ptp2/library.c:2368
+#: camlibs/sierra/epson-desc.c:116 camlibs/sierra/sierra.c:1452
+#: camlibs/sierra/sierra.c:1466 camlibs/sierra/sierra.c:1701
 msgid "auto"
 msgstr ""
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/sierra/nikon-desc.c:565 camlibs/sierra/nikon-desc.c:570
+#: camlibs/ptp2/library.c:1892 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/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
+#: camlibs/ptp2/library.c:1890 camlibs/sierra/nikon-desc.c:564
+#: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr ""
 
@@ -3017,204 +3053,239 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:148
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:149
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:150
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:122
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:152
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:153
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:154
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:155
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:127
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:157
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:158
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:159
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:160
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:161
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:162
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:163
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:164
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:136
+#: camlibs/ptp2/library.c:165
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:166
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:167
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Не доступно"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:169
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:141
+#: camlibs/ptp2/library.c:170
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:171
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:172
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:174
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:146
+#: camlibs/ptp2/library.c:175
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:147
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:179
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:180
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:181
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Прийом в╕дм╕нено."
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:183
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:186
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:188
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:189
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:191
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:710
+#: camlibs/ptp2/library.c:767
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:800
+#: camlibs/ptp2/library.c:838 camlibs/ptp2/library.c:927
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon capture"
+msgstr "Збереження покажчика ще не п╕дтриму╓ться"
+
+#: camlibs/ptp2/library.c:963
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
+msgstr "Збереження покажчика ще не п╕дтриму╓ться"
+
+#: camlibs/ptp2/library.c:968
+#, c-format
+msgid "Canon enable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:973
+#, c-format
+msgid "Canon get viewfinder image failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:983
+#, c-format
+msgid "Canon disable viewfinder failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1038
+#, fuzzy
+msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
+msgstr "Збереження покажчика ще не п╕дтриму╓ться"
+
+#: camlibs/ptp2/library.c:1052
+#, c-format
+msgid "Canon Capture failed: %d"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1111
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ptp2/library.c:848
+#: camlibs/ptp2/library.c:1159
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:855
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:947
+#: camlibs/ptp2/library.c:1258
 msgid "read only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:948
+#: camlibs/ptp2/library.c:1259
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:949 camlibs/ptp2/library.c:951
-#: camlibs/ptp2/ptp.c:2000
+#: camlibs/ptp2/library.c:1260 camlibs/ptp2/library.c:1262
+#: camlibs/ptp2/ptp.c:2031
 msgid "Unknown"
 msgstr ""
 
-#: camlibs/ptp2/library.c:963
+#: camlibs/ptp2/library.c:1304
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3224,1186 +3295,1262 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1116 camlibs/ptp2/library.c:1133
-#: camlibs/ptp2/library.c:1240
+#: camlibs/ptp2/library.c:1461 camlibs/ptp2/library.c:1478
+#: camlibs/ptp2/library.c:1584
 #, c-format
 msgid "unexpected datatype %i"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1249 camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/library.c:1593 camlibs/ptp2/ptp.c:2006
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1250
+#: camlibs/ptp2/library.c:1594
 msgid "Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1251
+#: camlibs/ptp2/library.c:1595
 msgid "One-push Automatic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1252 camlibs/ptp2/ptp.c:1927
-#: camlibs/sierra/olympus-desc.c:431 camlibs/sierra/olympus-desc.c:450
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/ptp2/library.c:1596 camlibs/ptp2/library.c:2228
+#: camlibs/ptp2/ptp.c:1958 camlibs/sierra/olympus-desc.c:431
+#: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1253 camlibs/ptp2/ptp.c:1926
-#: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:285
-#: camlibs/sierra/olympus-desc.c:432 camlibs/sierra/olympus-desc.c:451
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1317
+#: camlibs/ptp2/library.c:1597 camlibs/ptp2/library.c:2231
+#: camlibs/ptp2/ptp.c:1957 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:1033
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1321
 msgid "Fluorescent"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1254 camlibs/sierra/olympus-desc.c:433
-#: camlibs/sierra/olympus-desc.c:452 camlibs/sierra/olympus-desc.c:470
-#: camlibs/sierra/sierra.c:1030 camlibs/sierra/sierra.c:1040
-#: camlibs/sierra/sierra.c:1319
+#: camlibs/ptp2/library.c:1598 camlibs/ptp2/library.c:2230
+#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1034
+#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1323
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1256 camlibs/ptp2/ptp.c:1929
-#: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:434
-#: camlibs/sierra/olympus-desc.c:453 camlibs/sierra/olympus-desc.c:474
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1043
-#: camlibs/sierra/sierra.c:1321
+#: camlibs/ptp2/library.c:1600 camlibs/ptp2/library.c:2229
+#: camlibs/ptp2/ptp.c:1960 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:1035
+#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1325
 msgid "Cloudy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1257 camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/library.c:1601 camlibs/ptp2/ptp.c:1961
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1258 camlibs/ptp2/ptp.c:1931
+#: camlibs/ptp2/library.c:1602 camlibs/ptp2/ptp.c:1962
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1317 camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/library.c:1661 camlibs/ptp2/ptp.c:1950
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1318
+#: camlibs/ptp2/library.c:1662
 msgid "JPEG Normal"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1319 camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/library.c:1663 camlibs/ptp2/ptp.c:1952
 msgid "JPEG Fine"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1320
+#: camlibs/ptp2/library.c:1664
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1321
+#: camlibs/ptp2/library.c:1665
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1666 camlibs/ptp2/ptp.c:1607
+#: camlibs/ptp2/library.c:1850
+msgid "super fine"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1893
+msgid "auto red eye"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1894
+msgid "on red eye"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1934
+msgid "spot"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2059
+#, fuzzy
+msgid "center"
+msgstr "В╕дкрити зображення"
+
+#: camlibs/ptp2/library.c:2099
+#, fuzzy
+msgid "large"
+msgstr "Покажчик зображень"
+
+#: camlibs/ptp2/library.c:2100
+msgid "medium 1"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2101
+msgid "medium 2"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2102
+msgid "small"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2142 camlibs/ptp2/library.c:2272
+msgid "Factory Default"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2188
+msgid "Long distance"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2232
+msgid "Fluorescent H"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2233 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1517
+#: camlibs/sierra/sierra.c:1737
+msgid "Custom"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2325
+msgid "Vivid"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2326
+msgid "Neutral"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2327
+msgid "Low sharpening"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2329
+msgid "Black & white"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2533 camlibs/ptp2/ptp.c:1638
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Жива камера!"
 
-#: camlibs/ptp2/library.c:1667 camlibs/ptp2/ptp.c:1606
+#: camlibs/ptp2/library.c:2534 camlibs/ptp2/ptp.c:1637
 #, fuzzy
 msgid "Camera Model"
 msgstr "Модель камери:"
 
-#: camlibs/ptp2/library.c:1668 camlibs/ptp2/ptp.c:1605
+#: camlibs/ptp2/library.c:2535 camlibs/ptp2/ptp.c:1636
 msgid "Flash Memory"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1669 camlibs/ptp2/library.c:1670
+#: camlibs/ptp2/library.c:2536 camlibs/ptp2/library.c:2537
 #, fuzzy
 msgid "Camera Time"
 msgstr "Жива камера!"
 
-#: camlibs/ptp2/library.c:1671 camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1588
+#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:1608 camlibs/ptp2/ptp.c:1619
 #, fuzzy
 msgid "Beep Mode"
 msgstr "Лишити"
 
-#: camlibs/ptp2/library.c:1672
+#: camlibs/ptp2/library.c:2539
 #, fuzzy
 msgid "Image Comment"
 msgstr "П╕дб╕р кольору"
 
-#: camlibs/ptp2/library.c:1677
+#: camlibs/ptp2/library.c:2547
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1680
+#: camlibs/ptp2/library.c:2552 camlibs/ptp2/ptp.c:1630
+#: camlibs/sierra/olympus-desc.c:698 camlibs/sierra/olympus-desc.c:716
+msgid "ISO Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2553 camlibs/ptp2/ptp.c:1627
+#, fuzzy
+msgid "Macro Mode"
+msgstr "Кольори"
+
+#: camlibs/ptp2/library.c:2554 camlibs/ptp2/library.c:2556
 msgid "WhiteBalance"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1686 camlibs/ptp2/ptp.c:1611
+#: camlibs/ptp2/library.c:2555 camlibs/ptp2/ptp.c:1626
+#, fuzzy
+msgid "Metering Mode"
+msgstr "Кольори"
+
+#: camlibs/ptp2/library.c:2557 camlibs/ptp2/ptp.c:1641
+msgid "Photo Effect"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2558 camlibs/ptp2/ptp.c:1631
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1230
+#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1686
+msgid "Aperture"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2559 camlibs/ptp2/ptp.c:1628
+#, fuzzy
+msgid "Focusing Point"
+msgstr "Кольори"
+
+#: camlibs/ptp2/library.c:2560
+msgid "Shutter Speed"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2566 camlibs/ptp2/ptp.c:1642
 msgid "Assist Light"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1687 camlibs/ptp2/ptp.c:1602 camlibs/ptp2/ptp.c:1684
+#: camlibs/ptp2/library.c:2567 camlibs/ptp2/ptp.c:1633 camlibs/ptp2/ptp.c:1715
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1694 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:2574 camlibs/sierra/epson-desc.c:282
 #: camlibs/sierra/nikon-desc.c:662 camlibs/sierra/nikon-desc.c:673
 #: camlibs/sierra/olympus-desc.c:834 camlibs/sierra/olympus-desc.c:889
-#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1128
-#: camlibs/sierra/sierra.c:1590
+#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1132
+#: camlibs/sierra/sierra.c:1594
 #, fuzzy
 msgid "Camera Settings"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/library.c:1695
+#: camlibs/ptp2/library.c:2575
 #, fuzzy
 msgid "Image Settings"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/library.c:1696
+#: camlibs/ptp2/library.c:2576
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/library.c:1749
+#: camlibs/ptp2/library.c:2633
 #, fuzzy
 msgid "Number of values"
 msgstr "Нове зображення #%03i"
 
-#: camlibs/ptp2/library.c:1753
+#: camlibs/ptp2/library.c:2637
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1761
+#: camlibs/ptp2/library.c:2645
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2340
+#: camlibs/ptp2/library.c:3276
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2443
+#: camlibs/ptp2/library.c:3379
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1473
+#: camlibs/ptp2/ptp.c:1504
 msgid "PTP: Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1474
+#: camlibs/ptp2/ptp.c:1505
 msgid "PTP: OK!"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1475
+#: camlibs/ptp2/ptp.c:1506
 msgid "PTP: General Error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1476
+#: camlibs/ptp2/ptp.c:1507
 msgid "PTP: Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1477
+#: camlibs/ptp2/ptp.c:1508
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "Прийом в╕дм╕нено."
 
-#: camlibs/ptp2/ptp.c:1478
+#: camlibs/ptp2/ptp.c:1509
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ptp2/ptp.c:1479
+#: camlibs/ptp2/ptp.c:1510
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ptp2/ptp.c:1480
+#: camlibs/ptp2/ptp.c:1511
 msgid "PTP: Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1481
+#: camlibs/ptp2/ptp.c:1512
 msgid "PTP: Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1482
+#: camlibs/ptp2/ptp.c:1513
 msgid "PTP: Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1483
+#: camlibs/ptp2/ptp.c:1514
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ptp2/ptp.c:1484
+#: camlibs/ptp2/ptp.c:1515
 msgid "PTP: Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1485
+#: camlibs/ptp2/ptp.c:1516
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "Не доступно"
 
-#: camlibs/ptp2/ptp.c:1486
+#: camlibs/ptp2/ptp.c:1517
 msgid "PTP: Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1487
+#: camlibs/ptp2/ptp.c:1518
 msgid "PTP: Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1488
+#: camlibs/ptp2/ptp.c:1519
 msgid "PTP: Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1489
+#: camlibs/ptp2/ptp.c:1520
 msgid "PTP: No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1490
+#: camlibs/ptp2/ptp.c:1521
 msgid "PTP: Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1491
+#: camlibs/ptp2/ptp.c:1522
 msgid "PTP: Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1492
+#: camlibs/ptp2/ptp.c:1523
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "Не доступно"
 
-#: camlibs/ptp2/ptp.c:1494
+#: camlibs/ptp2/ptp.c:1525
 msgid "PTP: Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1495
+#: camlibs/ptp2/ptp.c:1526
 msgid "PTP: No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1496
+#: camlibs/ptp2/ptp.c:1527
 msgid "PTP: Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1497
+#: camlibs/ptp2/ptp.c:1528
 msgid "PTP: Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1499
+#: camlibs/ptp2/ptp.c:1530
 msgid "PTP: Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1500
+#: camlibs/ptp2/ptp.c:1531
 msgid "PTP: Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1501
+#: camlibs/ptp2/ptp.c:1532
 msgid "PTP: Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1502
+#: camlibs/ptp2/ptp.c:1533
 msgid "PTP: Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1503
+#: camlibs/ptp2/ptp.c:1534
 msgid "PTP: Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1504
+#: camlibs/ptp2/ptp.c:1535
 msgid "PTP: Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1505
+#: camlibs/ptp2/ptp.c:1536
 msgid "PTP: Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1506
+#: camlibs/ptp2/ptp.c:1537
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "Прийом в╕дм╕нено."
 
-#: camlibs/ptp2/ptp.c:1508
+#: camlibs/ptp2/ptp.c:1539
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1509
+#: camlibs/ptp2/ptp.c:1540
 msgid "PTP: EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1510
+#: camlibs/ptp2/ptp.c:1541
 msgid "PTP: EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1511
+#: camlibs/ptp2/ptp.c:1542
 msgid "PTP: EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1513
+#: camlibs/ptp2/ptp.c:1544
 msgid "PTP: I/O error"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1514
+#: camlibs/ptp2/ptp.c:1545
 msgid "PTP: Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1515
+#: camlibs/ptp2/ptp.c:1546
 msgid "PTP: Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1516
+#: camlibs/ptp2/ptp.c:1547
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1534
+#: camlibs/ptp2/ptp.c:1565
 msgid "Undefined PTP Property"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1535
+#: camlibs/ptp2/ptp.c:1566
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1536
+#: camlibs/ptp2/ptp.c:1567
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Прийом в╕дм╕нено."
 
-#: camlibs/ptp2/ptp.c:1538
+#: camlibs/ptp2/ptp.c:1569
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/ptp.c:1539 camlibs/ptp2/ptp.c:1598
+#: camlibs/ptp2/ptp.c:1570 camlibs/ptp2/ptp.c:1629
 #: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
 #: camlibs/sierra/olympus-desc.c:439 camlibs/sierra/olympus-desc.c:458
-#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1026
-#: camlibs/sierra/sierra.c:1309 camlibs/sierra/sierra.c:1503
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1313 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1730
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1540
+#: camlibs/ptp2/ptp.c:1571
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1541
+#: camlibs/ptp2/ptp.c:1572
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1542
+#: camlibs/ptp2/ptp.c:1573
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1543
+#: camlibs/ptp2/ptp.c:1574
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1544 camlibs/sierra/nikon-desc.c:331
+#: camlibs/ptp2/ptp.c:1575 camlibs/sierra/nikon-desc.c:331
 #: camlibs/sierra/olympus-desc.c:495
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1545
+#: camlibs/ptp2/ptp.c:1576
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1546 camlibs/ptp2/ptp.c:1592 camlibs/ptp2/ptp.c:1718
-#: camlibs/ptp2/ptp.c:1784 camlibs/sierra/sierra.c:965
-#: camlibs/sierra/sierra.c:1266 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1706
+#: camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1623 camlibs/ptp2/ptp.c:1749
+#: camlibs/ptp2/ptp.c:1815 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:1270 camlibs/sierra/sierra.c:1479
+#: camlibs/sierra/sierra.c:1710
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1547
+#: camlibs/ptp2/ptp.c:1578
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1548
+#: camlibs/ptp2/ptp.c:1579
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1550
+#: camlibs/ptp2/ptp.c:1581
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1552
+#: camlibs/ptp2/ptp.c:1583
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1553
+#: camlibs/ptp2/ptp.c:1584
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1554
+#: camlibs/ptp2/ptp.c:1585
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1555
+#: camlibs/ptp2/ptp.c:1586
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1556
+#: camlibs/ptp2/ptp.c:1587
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1558 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:1589 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1559
+#: camlibs/ptp2/ptp.c:1590
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1560
+#: camlibs/ptp2/ptp.c:1591
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1561
+#: camlibs/ptp2/ptp.c:1592
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1562
+#: camlibs/ptp2/ptp.c:1593
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1563
+#: camlibs/ptp2/ptp.c:1594
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1564
+#: camlibs/ptp2/ptp.c:1595
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1565
+#: camlibs/ptp2/ptp.c:1596
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1566
+#: camlibs/ptp2/ptp.c:1597
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1567
+#: camlibs/ptp2/ptp.c:1598
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1574
+#: camlibs/ptp2/ptp.c:1605
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1576
+#: camlibs/ptp2/ptp.c:1607
 msgid "Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1578
+#: camlibs/ptp2/ptp.c:1609
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1579
+#: camlibs/ptp2/ptp.c:1610
 msgid "Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1580
+#: camlibs/ptp2/ptp.c:1611
 msgid "UI Language"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1589
+#: camlibs/ptp2/ptp.c:1620
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1594
+#: camlibs/ptp2/ptp.c:1625
 msgid "TV A/V Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1595
-#, fuzzy
-msgid "Metering Mode"
-msgstr "Кольори"
-
-#: camlibs/ptp2/ptp.c:1596
-#, fuzzy
-msgid "Macro Mode"
-msgstr "Кольори"
-
-#: camlibs/ptp2/ptp.c:1597
-#, fuzzy
-msgid "Focusing Point"
-msgstr "Кольори"
-
-#: camlibs/ptp2/ptp.c:1599 camlibs/sierra/olympus-desc.c:698
-#: camlibs/sierra/olympus-desc.c:716
-msgid "ISO Speed"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1600 camlibs/sierra/sierra.c:905
-#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1682
-msgid "Aperture"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1601
+#: camlibs/ptp2/ptp.c:1632
 msgid "ShutterSpeed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1604
+#: camlibs/ptp2/ptp.c:1635
 msgid "Size Quality Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1608
+#: camlibs/ptp2/ptp.c:1639
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1609
+#: camlibs/ptp2/ptp.c:1640
 msgid "Real Image Width"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1610
-msgid "Photo Effect"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1620
+#: camlibs/ptp2/ptp.c:1651
 msgid "Auto White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1622
+#: camlibs/ptp2/ptp.c:1653
 msgid "Tungsten White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1624
+#: camlibs/ptp2/ptp.c:1655
 msgid "Flourescent White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1626
+#: camlibs/ptp2/ptp.c:1657
 msgid "Daylight White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1628
+#: camlibs/ptp2/ptp.c:1659
 msgid "Flash White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1630
+#: camlibs/ptp2/ptp.c:1661
 msgid "Cloudy White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1632
+#: camlibs/ptp2/ptp.c:1663
 msgid "Shady White Balance Bias"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1634
+#: camlibs/ptp2/ptp.c:1665
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1636
+#: camlibs/ptp2/ptp.c:1667
 msgid "Sharpening"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1638
+#: camlibs/ptp2/ptp.c:1669
 msgid "Tone Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1640
+#: camlibs/ptp2/ptp.c:1671
 #, fuzzy
 msgid "Colour Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1642
+#: camlibs/ptp2/ptp.c:1673
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "П╕дб╕р кольору"
 
-#: camlibs/ptp2/ptp.c:1644
+#: camlibs/ptp2/ptp.c:1675
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1646
+#: camlibs/ptp2/ptp.c:1677
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1648
+#: camlibs/ptp2/ptp.c:1679
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1650
+#: camlibs/ptp2/ptp.c:1681
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1652
+#: camlibs/ptp2/ptp.c:1683
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1654
+#: camlibs/ptp2/ptp.c:1685
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1656
+#: camlibs/ptp2/ptp.c:1687
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1658
+#: camlibs/ptp2/ptp.c:1689
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1660
+#: camlibs/ptp2/ptp.c:1691
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1662
+#: camlibs/ptp2/ptp.c:1693
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1664
+#: camlibs/ptp2/ptp.c:1695
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1666
+#: camlibs/ptp2/ptp.c:1697
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1668
+#: camlibs/ptp2/ptp.c:1699
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1670
+#: camlibs/ptp2/ptp.c:1701
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1672
+#: camlibs/ptp2/ptp.c:1703
 #, fuzzy
 msgid "Focus Area"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1674
+#: camlibs/ptp2/ptp.c:1705
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1676
+#: camlibs/ptp2/ptp.c:1707
 msgid "Auto ISO"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1678
+#: camlibs/ptp2/ptp.c:1709
 msgid "ISO Step"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1680
+#: camlibs/ptp2/ptp.c:1711
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1682
+#: camlibs/ptp2/ptp.c:1713
 msgid "Exposure Compensation (EV)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1686
+#: camlibs/ptp2/ptp.c:1717
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1688
+#: camlibs/ptp2/ptp.c:1719
 msgid "Exposure Lock"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1690
+#: camlibs/ptp2/ptp.c:1721
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1692
+#: camlibs/ptp2/ptp.c:1723
 msgid "Auto Meter Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1694
+#: camlibs/ptp2/ptp.c:1725
 msgid "Self Timer Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1696
+#: camlibs/ptp2/ptp.c:1727
 msgid "LCD Off Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1698
+#: camlibs/ptp2/ptp.c:1729
 msgid "Shooting Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1700
+#: camlibs/ptp2/ptp.c:1731
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1702
+#: camlibs/ptp2/ptp.c:1733
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1704
+#: camlibs/ptp2/ptp.c:1735
 msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1706
+#: camlibs/ptp2/ptp.c:1737
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1708
+#: camlibs/ptp2/ptp.c:1739
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1710
+#: camlibs/ptp2/ptp.c:1741
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1712
+#: camlibs/ptp2/ptp.c:1743
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1714
+#: camlibs/ptp2/ptp.c:1745
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1716
+#: camlibs/ptp2/ptp.c:1747
 msgid "Flash Shutter Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1720
+#: camlibs/ptp2/ptp.c:1751
 msgid "Modeling Flash"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1722
+#: camlibs/ptp2/ptp.c:1753
 msgid "Auto Bracket Set"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1724
+#: camlibs/ptp2/ptp.c:1755
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1726
+#: camlibs/ptp2/ptp.c:1757
 msgid "Auto Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1728
+#: camlibs/ptp2/ptp.c:1759
 msgid "Auto Bracket Selection"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1730
+#: camlibs/ptp2/ptp.c:1761
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1732
+#: camlibs/ptp2/ptp.c:1763
 msgid "Center Button Playback Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1734
+#: camlibs/ptp2/ptp.c:1765
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1736
+#: camlibs/ptp2/ptp.c:1767
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1738
+#: camlibs/ptp2/ptp.c:1769
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1740
+#: camlibs/ptp2/ptp.c:1771
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1742
+#: camlibs/ptp2/ptp.c:1773
 msgid "Reverse Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1744
+#: camlibs/ptp2/ptp.c:1775
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/ptp.c:1746
+#: camlibs/ptp2/ptp.c:1777
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1748
+#: camlibs/ptp2/ptp.c:1779
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1750
+#: camlibs/ptp2/ptp.c:1781
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1752
+#: camlibs/ptp2/ptp.c:1783
 #, fuzzy
 msgid "Auto Image Rotation"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/ptp.c:1754
+#: camlibs/ptp2/ptp.c:1785
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1756
+#: camlibs/ptp2/ptp.c:1787
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1758
+#: camlibs/ptp2/ptp.c:1789
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1760
+#: camlibs/ptp2/ptp.c:1791
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1762
+#: camlibs/ptp2/ptp.c:1793
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1764
+#: camlibs/ptp2/ptp.c:1795
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1766
+#: camlibs/ptp2/ptp.c:1797
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Кольори"
 
-#: camlibs/ptp2/ptp.c:1768
+#: camlibs/ptp2/ptp.c:1799
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1770
+#: camlibs/ptp2/ptp.c:1801
 #, fuzzy
 msgid "AF Beep Mode"
 msgstr "Лишити"
 
-#: camlibs/ptp2/ptp.c:1772
+#: camlibs/ptp2/ptp.c:1803
 msgid "??? AF Related"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1774
+#: camlibs/ptp2/ptp.c:1805
 msgid "AF Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1776
+#: camlibs/ptp2/ptp.c:1807
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1778
+#: camlibs/ptp2/ptp.c:1809
 #, fuzzy
 msgid "Image Review"
 msgstr "Покажчик зображень"
 
-#: camlibs/ptp2/ptp.c:1780
+#: camlibs/ptp2/ptp.c:1811
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1782
+#: camlibs/ptp2/ptp.c:1813
 msgid "AF Area Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1786
+#: camlibs/ptp2/ptp.c:1817
 msgid "Flash Power"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1788
+#: camlibs/ptp2/ptp.c:1819
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/ptp.c:1790
+#: camlibs/ptp2/ptp.c:1821
 msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1792
+#: camlibs/ptp2/ptp.c:1823
 msgid "Remote Timeout"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1794
+#: camlibs/ptp2/ptp.c:1825
 #, fuzzy
 msgid "Image Comment String"
 msgstr "П╕дб╕р кольору"
 
-#: camlibs/ptp2/ptp.c:1796
+#: camlibs/ptp2/ptp.c:1827
 #, fuzzy
 msgid "Flash Open"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/ptp2/ptp.c:1798
+#: camlibs/ptp2/ptp.c:1829
 msgid "Flash Charged"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1800
+#: camlibs/ptp2/ptp.c:1831
 msgid "Lens ID"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1802
+#: camlibs/ptp2/ptp.c:1833
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1804
+#: camlibs/ptp2/ptp.c:1835
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1806
+#: camlibs/ptp2/ptp.c:1837
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1808
+#: camlibs/ptp2/ptp.c:1839
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1810
+#: camlibs/ptp2/ptp.c:1841
 #, fuzzy
 msgid "Low Light"
 msgstr "Висота:"
 
-#: camlibs/ptp2/ptp.c:1903 camlibs/ptp2/ptp.c:1904 camlibs/ptp2/ptp.c:1905
+#: camlibs/ptp2/ptp.c:1934 camlibs/ptp2/ptp.c:1935 camlibs/ptp2/ptp.c:1936
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:1937
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1920
+#: camlibs/ptp2/ptp.c:1951
 msgid "JPEG Norm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1922
+#: camlibs/ptp2/ptp.c:1953
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1923
+#: camlibs/ptp2/ptp.c:1954
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1925
+#: camlibs/ptp2/ptp.c:1956
 msgid "Incadescent"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1932
+#: camlibs/ptp2/ptp.c:1963
 msgid "Default"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1933 camlibs/sierra/epson-desc.c:154
-#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:979
-#: camlibs/sierra/sierra.c:1276 camlibs/sierra/sierra.c:1479
-#: camlibs/sierra/sierra.c:1488 camlibs/sierra/sierra.c:1715
+#: camlibs/ptp2/ptp.c:1964 camlibs/sierra/epson-desc.c:154
+#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:983
+#: camlibs/sierra/sierra.c:1280 camlibs/sierra/sierra.c:1483
+#: camlibs/sierra/sierra.c:1492 camlibs/sierra/sierra.c:1719
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1934
+#: camlibs/ptp2/ptp.c:1965
 msgid "Red-eye Reduction + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1935 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:981
-#: camlibs/sierra/sierra.c:1278 camlibs/sierra/sierra.c:1480
-#: camlibs/sierra/sierra.c:1490 camlibs/sierra/sierra.c:1717
+#: camlibs/ptp2/ptp.c:1966 camlibs/sierra/epson-desc.c:155
+#: camlibs/sierra/sierra.c:974 camlibs/sierra/sierra.c:985
+#: camlibs/sierra/sierra.c:1282 camlibs/sierra/sierra.c:1484
+#: camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1721
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1936
+#: camlibs/ptp2/ptp.c:1967
 msgid "Rear Curtain Sync + Slow Sync"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1937
+#: camlibs/ptp2/ptp.c:1968
 msgid "Dynamic Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1938
+#: camlibs/ptp2/ptp.c:1969
 msgid "Single Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1939
+#: camlibs/ptp2/ptp.c:1970
 msgid "Closest Subject"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1940
+#: camlibs/ptp2/ptp.c:1971
 msgid "Manual Focus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1946
+#: camlibs/ptp2/ptp.c:1977
 msgid "Center Weighted"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1947 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:1978 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1948 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:1979 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:1985
 msgid "Portrait"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1955
+#: camlibs/ptp2/ptp.c:1986
 msgid "Landscape"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1957
+#: camlibs/ptp2/ptp.c:1988
 msgid "Sports"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1958
+#: camlibs/ptp2/ptp.c:1989
 msgid "Night Landscape"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1959
+#: camlibs/ptp2/ptp.c:1990
 msgid "Night Portrait"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1960
+#: camlibs/ptp2/ptp.c:1991
 msgid "Single Shot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/ptp.c:1992
 msgid "Power Wind"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/ptp.c:1993
 msgid "Timer"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1964
+#: camlibs/ptp2/ptp.c:1995
 msgid "Timer + Remote"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1976
+#: camlibs/ptp2/ptp.c:2007
 msgid "Commander"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1983
+#: camlibs/ptp2/ptp.c:2014
 msgid "1 min"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1984
+#: camlibs/ptp2/ptp.c:2015
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
+#: camlibs/ptp2/ptp.c:2016
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1986
+#: camlibs/ptp2/ptp.c:2017
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1995
+#: camlibs/ptp2/ptp.c:2026
 #, fuzzy
 msgid "Centre"
 msgstr "В╕дкрити зображення"
 
-#: camlibs/ptp2/ptp.c:1996
+#: camlibs/ptp2/ptp.c:2027
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1997
+#: camlibs/ptp2/ptp.c:2028
 msgid "Bottom"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1998
+#: camlibs/ptp2/ptp.c:2029
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1999
+#: camlibs/ptp2/ptp.c:2030
 #, fuzzy
 msgid "Right"
 msgstr "Висота:"
 
-#: camlibs/ricoh/g3.c:312
+#: camlibs/ricoh/g3.c:317
 #, fuzzy
 msgid "Downloading movie..."
 msgstr "Прийом зупинено."
 
-#: camlibs/ricoh/g3.c:318
+#: camlibs/ricoh/g3.c:323
 #, fuzzy
 msgid "Downloading audio..."
 msgstr "Прийом завершено."
 
-#: camlibs/ricoh/g3.c:333
+#: camlibs/ricoh/g3.c:338
 #, fuzzy
 msgid "Downloading EXIF data..."
 msgstr "Прийом завершено."
 
-#: camlibs/ricoh/g3.c:335 camlibs/ricoh/g3.c:354
+#: camlibs/ricoh/g3.c:340 camlibs/ricoh/g3.c:359
 #, fuzzy, c-format
 msgid "No EXIF data available for %s."
 msgstr "Не доступно"
 
-#: camlibs/ricoh/g3.c:440
+#: camlibs/ricoh/g3.c:445
 #, fuzzy
 msgid "Could not delete file."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/ricoh/g3.c:467
+#: camlibs/ricoh/g3.c:472
 #, fuzzy
 msgid "Could not remove directory."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/ricoh/g3.c:494
+#: camlibs/ricoh/g3.c:499
 #, fuzzy
 msgid "Could not create directory."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: camlibs/ricoh/g3.c:513
+#: camlibs/ricoh/g3.c:518
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:518
+#: camlibs/ricoh/g3.c:523
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:524
+#: camlibs/ricoh/g3.c:529
 #, fuzzy, c-format
 msgid "Camera time: %s %s\n"
 msgstr "Модель камери:"
 
-#: camlibs/ricoh/g3.c:530
+#: camlibs/ricoh/g3.c:535
 #, fuzzy, c-format
 msgid "Camera ID: %s\n"
 msgstr "Модель камери:"
 
-#: camlibs/ricoh/g3.c:536
-#, fuzzy
+#: camlibs/ricoh/g3.c:541
+#, fuzzy, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Збереження покажчика ще не п╕дтриму╓ться"
 
-#: camlibs/ricoh/g3.c:539
+#: camlibs/ricoh/g3.c:544
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:547
+#: camlibs/ricoh/g3.c:552
 #, fuzzy, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Не вдалось отримати зображення."
 
-#: camlibs/ricoh/g3.c:553
+#: camlibs/ricoh/g3.c:558
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:560
+#: camlibs/ricoh/g3.c:565
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:570
+#: camlibs/ricoh/g3.c:575
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -4508,8 +4655,8 @@ msgstr "Покажчик зображень"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1106
-#: camlibs/sierra/sierra.c:1112
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1110
+#: camlibs/sierra/sierra.c:1116
 msgid "2x"
 msgstr ""
 
@@ -4674,8 +4821,8 @@ msgid "Aperature Settings"
 msgstr "Налаштування кольор╕в"
 
 #: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:1245
-#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1775
+#: camlibs/sierra/sierra.c:939 camlibs/sierra/sierra.c:1249
+#: camlibs/sierra/sierra.c:1578 camlibs/sierra/sierra.c:1779
 #, fuzzy
 msgid "Color Mode"
 msgstr "Кольори"
@@ -4686,11 +4833,6 @@ msgstr "Кольори"
 msgid "Flash Settings"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1506
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1733
-msgid "Custom"
-msgstr ""
-
 #: camlibs/sierra/epson-desc.c:193 camlibs/sierra/olympus-desc.c:560
 msgid "Host power save (seconds)"
 msgstr ""
@@ -4700,59 +4842,59 @@ msgstr ""
 msgid "Camera power save (seconds)"
 msgstr "Модель камери:"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1057
-#: camlibs/sierra/sierra.c:1330 camlibs/sierra/sierra.c:1529
-#: camlibs/sierra/sierra.c:1742
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1334 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1746
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1625
-#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1811
+#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1629
+#: camlibs/sierra/sierra.c:1638 camlibs/sierra/sierra.c:1815
 msgid "Korean"
 msgstr ""
 
 #: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1626 camlibs/sierra/sierra.c:1636
-#: camlibs/sierra/sierra.c:1813
+#: camlibs/sierra/sierra.c:1630 camlibs/sierra/sierra.c:1640
+#: camlibs/sierra/sierra.c:1817
 msgid "English"
 msgstr ""
 
 #: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1638
-#: camlibs/sierra/sierra.c:1815
+#: camlibs/sierra/sierra.c:1631 camlibs/sierra/sierra.c:1642
+#: camlibs/sierra/sierra.c:1819
 msgid "French"
 msgstr ""
 
 #: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1640
-#: camlibs/sierra/sierra.c:1817
+#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1644
+#: camlibs/sierra/sierra.c:1821
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1629
-#: camlibs/sierra/sierra.c:1642 camlibs/sierra/sierra.c:1819
+#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1633
+#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1823
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1644 camlibs/sierra/sierra.c:1821
+#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1634
+#: camlibs/sierra/sierra.c:1648 camlibs/sierra/sierra.c:1825
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1631
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1823
+#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1635
+#: camlibs/sierra/sierra.c:1650 camlibs/sierra/sierra.c:1827
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1648 camlibs/sierra/sierra.c:1825
+#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1652 camlibs/sierra/sierra.c:1829
 msgid "Portugese"
 msgstr ""
 
 #: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:658
 #: camlibs/sierra/nikon-desc.c:669 camlibs/sierra/olympus-desc.c:830
 #: camlibs/sierra/olympus-desc.c:885 camlibs/sierra/olympus-desc.c:896
-#: camlibs/sierra/sierra.c:856 camlibs/sierra/sierra.c:1523
+#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1527
 #, fuzzy
 msgid "Picture Settings"
 msgstr "Налаштування кольор╕в"
@@ -4889,13 +5031,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1298
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1004
+#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1302
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1001
-#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1300
+#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1005
+#: camlibs/sierra/sierra.c:1016 camlibs/sierra/sierra.c:1304
 msgid "Contrast-"
 msgstr ""
 
@@ -4942,7 +5084,7 @@ msgid "Operation Mode"
 msgstr "Прийом в╕дм╕нено."
 
 #: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:531
-#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1402
+#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1406
 msgid "LCD Brightness"
 msgstr ""
 
@@ -5127,242 +5269,242 @@ msgid ""
 "    please contact the developer mailing list.\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:713 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:717 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:727
+#: camlibs/sierra/sierra.c:731
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:734
+#: camlibs/sierra/sierra.c:738
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:741
+#: camlibs/sierra/sierra.c:745
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:878
-#: camlibs/sierra/sierra.c:1207
+#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:882
+#: camlibs/sierra/sierra.c:1211
 #, fuzzy
 msgid "Best"
 msgstr "Скасувати"
 
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:921
-#: camlibs/sierra/sierra.c:954 camlibs/sierra/sierra.c:984
-#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1046
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1092
-#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1465
-#: camlibs/sierra/sierra.c:1493 camlibs/sierra/sierra.c:1516
-#: camlibs/sierra/sierra.c:1538 camlibs/sierra/sierra.c:1564
-#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:925
+#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:988
+#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1050
+#: camlibs/sierra/sierra.c:1074 camlibs/sierra/sierra.c:1096
+#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1469
+#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1520
+#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1568
+#: camlibs/sierra/sierra.c:1587 camlibs/sierra/sierra.c:1655
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:893 camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:1221
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:945
-#: camlibs/sierra/sierra.c:1251
+#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1255
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:939 camlibs/sierra/sierra.c:949
-#: camlibs/sierra/sierra.c:1255
+#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:953
+#: camlibs/sierra/sierra.c:1259
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:951
-#: camlibs/sierra/sierra.c:1257
+#: camlibs/sierra/sierra.c:944 camlibs/sierra/sierra.c:955
+#: camlibs/sierra/sierra.c:1261
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1288
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1292
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1006
-#: camlibs/sierra/sierra.c:1294
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1298
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1008
-#: camlibs/sierra/sierra.c:1296
+#: camlibs/sierra/sierra.c:1003 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1300
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1028 camlibs/sierra/sierra.c:1036
-#: camlibs/sierra/sierra.c:1315
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1040
+#: camlibs/sierra/sierra.c:1319
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1060 camlibs/sierra/sierra.c:1067
-#: camlibs/sierra/sierra.c:1338
+#: camlibs/sierra/sierra.c:1064 camlibs/sierra/sierra.c:1071
+#: camlibs/sierra/sierra.c:1342
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1081 camlibs/sierra/sierra.c:1348
+#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1352
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1110
+#: camlibs/sierra/sierra.c:1108 camlibs/sierra/sierra.c:1114
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1105 camlibs/sierra/sierra.c:1115
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1119
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1118
+#: camlibs/sierra/sierra.c:1111 camlibs/sierra/sierra.c:1122
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1382
-#: camlibs/sierra/sierra.c:1597 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1386
+#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1793
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1137 camlibs/sierra/sierra.c:1599
+#: camlibs/sierra/sierra.c:1141 camlibs/sierra/sierra.c:1603
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1392
-#: camlibs/sierra/sierra.c:1611 camlibs/sierra/sierra.c:1799
+#: camlibs/sierra/sierra.c:1153 camlibs/sierra/sierra.c:1396
+#: camlibs/sierra/sierra.c:1615 camlibs/sierra/sierra.c:1803
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1613
+#: camlibs/sierra/sierra.c:1155 camlibs/sierra/sierra.c:1617
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1411
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1415
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1435
+#: camlibs/sierra/sierra.c:1439
 #, fuzzy
 msgid "Shot Settings"
 msgstr "Налаштування кольор╕в"
 
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1685
+#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1689
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1687
+#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1691
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1693
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1691
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1695
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1458
-#: camlibs/sierra/sierra.c:1693
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1697
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1464
+#: camlibs/sierra/sierra.c:1699
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1764
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1563
+#: camlibs/sierra/sierra.c:1768
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1561
-#: camlibs/sierra/sierra.c:1766
+#: camlibs/sierra/sierra.c:1556 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1770
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1578
-#: camlibs/sierra/sierra.c:1778
+#: camlibs/sierra/sierra.c:1579 camlibs/sierra/sierra.c:1582
+#: camlibs/sierra/sierra.c:1782
 #, fuzzy
 msgid "color"
 msgstr "Кольори"
 
-#: camlibs/sierra/sierra.c:1576 camlibs/sierra/sierra.c:1580
-#: camlibs/sierra/sierra.c:1780
+#: camlibs/sierra/sierra.c:1580 camlibs/sierra/sierra.c:1584
+#: camlibs/sierra/sierra.c:1784
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1882
+#: camlibs/sierra/sierra.c:1886
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1890
+#: camlibs/sierra/sierra.c:1894
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "Модель камери:"
 
-#: camlibs/sierra/sierra.c:1892
+#: camlibs/sierra/sierra.c:1896
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1894
+#: camlibs/sierra/sierra.c:1898
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1896
+#: camlibs/sierra/sierra.c:1900
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1898
+#: camlibs/sierra/sierra.c:1902
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1903 camlibs/sierra/sierra.c:1906
+#: camlibs/sierra/sierra.c:1907 camlibs/sierra/sierra.c:1910
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1909
+#: camlibs/sierra/sierra.c:1913
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1911
+#: camlibs/sierra/sierra.c:1915
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1913
+#: camlibs/sierra/sierra.c:1917
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1918
+#: camlibs/sierra/sierra.c:1922
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1934
+#: camlibs/sierra/sierra.c:1938
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Не доступно"
 
-#: camlibs/sierra/sierra.c:1941
+#: camlibs/sierra/sierra.c:1945
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -5375,7 +5517,7 @@ msgid ""
 "  please send a mail to %s (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1953
+#: camlibs/sierra/sierra.c:1957
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -5396,7 +5538,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1982
+#: camlibs/sierra/sierra.c:1986
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -5420,6 +5562,13 @@ msgid ""
 "Marcus Meissner <marcus@jet.franken.de>.\n"
 msgstr ""
 
+#: camlibs/sipix/blink.c:1068 camlibs/stv0674/stv0674.c:250
+#, fuzzy
+msgid "Could not apply USB settings"
+msgstr ""
+"Не вдалося в╕дкрити:\n"
+"%s"
+
 #: camlibs/sipix/web2.c:629
 msgid ""
 "SiPix Web2\n"
@@ -5447,16 +5596,17 @@ msgid "Sorry, taking pictures is not implemented..."
 msgstr ""
 
 #: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
+#, fuzzy, c-format
 msgid "Couldn't open camera.\n"
 msgstr "Не вдалось отримати зображення."
 
 #: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error opening camera\n"
 msgstr "В╕дкрити зображення"
 
 #: camlibs/sonydscf1/dsc_f1.c:171
+#, c-format
 msgid "Picture number is too large.\n"
 msgstr ""
 
@@ -5472,7 +5622,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error opening camera.\n"
 msgstr "В╕дкрити зображення"
 
@@ -5731,88 +5881,73 @@ msgid ""
 "Toshiba pdr-m11 driver.\n"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:181
-#: libgphoto2/gphoto2-abilities-list.c:278
+#: libgphoto2/gphoto2-abilities-list.c:172
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:266
-#, fuzzy, c-format
-msgid "Could not open '%s'"
-msgstr ""
-"Не вдалося в╕дкрити:\n"
-"%s"
-
-#: libgphoto2/gphoto2-abilities-list.c:698
+#: libgphoto2/gphoto2-abilities-list.c:566
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:81
+#: libgphoto2/gphoto2-camera.c:79
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:85
+#: libgphoto2/gphoto2-camera.c:83
 #, fuzzy
 msgid "No additional information available."
 msgstr "Не доступно"
 
-#: libgphoto2/gphoto2-camera.c:686
+#: libgphoto2/gphoto2-camera.c:676
 #, fuzzy
 msgid "Could not detect any camera"
 msgstr "Не вдалось отримати зображення."
 
-#: libgphoto2/gphoto2-camera.c:708
+#: libgphoto2/gphoto2-camera.c:698
 msgid "You have to set the port prior initialization of the camera."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:734
+#: libgphoto2/gphoto2-camera.c:723
 #, fuzzy, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: libgphoto2/gphoto2-camera.c:743
-#, fuzzy, c-format
-msgid "Could not load required camera driver '%s'."
-msgstr ""
-"Не вдалося в╕дкрити:\n"
-"%s"
-
-#: libgphoto2/gphoto2-camera.c:763
+#: libgphoto2/gphoto2-camera.c:736
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:823
+#: libgphoto2/gphoto2-camera.c:788
 #, fuzzy
 msgid "This camera does not offer any configuration options."
 msgstr "Нема╓ параметр╕в конф╕гурац╕╖."
 
-#: libgphoto2/gphoto2-camera.c:855
+#: libgphoto2/gphoto2-camera.c:820
 msgid "This camera does not support setting configuration options."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:887
+#: libgphoto2/gphoto2-camera.c:852
 msgid "This camera does not support summaries."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:918
+#: libgphoto2/gphoto2-camera.c:883
 msgid "This camera does not offer a manual."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:949
+#: libgphoto2/gphoto2-camera.c:914
 msgid "This camera does not provide information about the driver."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:983
+#: libgphoto2/gphoto2-camera.c:948
 msgid "This camera can not capture."
 msgstr ""
 
-#: libgphoto2/gphoto2-camera.c:1016
+#: libgphoto2/gphoto2-camera.c:981
 msgid "This camera can not capture previews."
 msgstr ""
 
@@ -5821,124 +5956,124 @@ msgstr ""
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:405
+#: libgphoto2/gphoto2-filesys.c:417
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:577
+#: libgphoto2/gphoto2-filesys.c:599
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:594
+#: libgphoto2/gphoto2-filesys.c:616
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:658
+#: libgphoto2/gphoto2-filesys.c:680
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1035
+#: libgphoto2/gphoto2-filesys.c:1057
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
 "does not support deletion of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1138
+#: libgphoto2/gphoto2-filesys.c:1160
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1145
+#: libgphoto2/gphoto2-filesys.c:1167
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1187
+#: libgphoto2/gphoto2-filesys.c:1209
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1228
+#: libgphoto2/gphoto2-filesys.c:1250
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1273
+#: libgphoto2/gphoto2-filesys.c:1295
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1360
+#: libgphoto2/gphoto2-filesys.c:1382
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Не вдалося в╕дкрити:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1485
+#: libgphoto2/gphoto2-filesys.c:1507
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1520 libgphoto2/gphoto2-filesys.c:2067
-#: libgphoto2/gphoto2-filesys.c:2220
+#: libgphoto2/gphoto2-filesys.c:1542 libgphoto2/gphoto2-filesys.c:2089
+#: libgphoto2/gphoto2-filesys.c:2242
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1524
+#: libgphoto2/gphoto2-filesys.c:1546
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Прийом зупинено."
 
-#: libgphoto2/gphoto2-filesys.c:1734
+#: libgphoto2/gphoto2-filesys.c:1756
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1909
+#: libgphoto2/gphoto2-filesys.c:1931
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1917
+#: libgphoto2/gphoto2-filesys.c:1939
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1974
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1970
+#: libgphoto2/gphoto2-filesys.c:1992
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1978
+#: libgphoto2/gphoto2-filesys.c:2000
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2323
+#: libgphoto2/gphoto2-filesys.c:2345
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2346
+#: libgphoto2/gphoto2-filesys.c:2368
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -5996,6 +6131,18 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not open '%s'"
+#~ msgstr ""
+#~ "Не вдалося в╕дкрити:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Could not load required camera driver '%s'."
+#~ msgstr ""
+#~ "Не вдалося в╕дкрити:\n"
+#~ "%s"
+
+#, fuzzy
 #~ msgid "Could not find any driver for '%s' / '%s'"
 #~ msgstr ""
 #~ "Не вдалося в╕дкрити:\n"