revert po files (committed accidentally)

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

1 files changed, 500 insertions, 650 deletions

diff --git a/po/ru.po b/po/ru.po
index 0a7fbeae0..4e9dd6801 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2005-04-10 10:46+0200\n"
+"Report-Msgid-Bugs-To: <gphoto-translation@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2005-03-19 16:35+0100\n"
 "PO-Revision-Date: 2005-01-08 23:52+0300\n"
 "Last-Translator: Вячеслав Диконов (Vyacheslav Dikonov) <slava@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -13,12 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: camlibs/adc65/adc65.c:83
-msgid ""
-"Adc65\n"
-"Benjamin Moos <benjamin@psnw.com>"
-msgstr ""
-
 #: camlibs/agfa-cl20/agfa_cl20.c:555
 msgid ""
 "agfa_cl20\n"
@@ -85,84 +79,82 @@ msgstr ""
 "Реализовано благодаря документации доступной в\n"
 "Интернете с согласия Vision."
 
-#: camlibs/canon/canon.c:549
+#: camlibs/canon/canon.c:528
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Невозможно создать каталог %s."
 
-#: camlibs/canon/canon.c:552
+#: camlibs/canon/canon.c:531
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Невозможно удалить каталог %s."
 
-#: camlibs/canon/canon.c:916 camlibs/canon/canon.c:1207
-#: camlibs/canon/usb.c:481
+#: camlibs/canon/canon.c:883 camlibs/canon/canon.c:1152
+#: camlibs/canon/usb.c:370
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:981
+#: camlibs/canon/canon.c:947 camlibs/canon/canon.c:948
 msgid "*UNKNOWN*"
 msgstr "*НЕИЗВЕСТНО*"
 
-#: camlibs/canon/canon.c:1151
+#: camlibs/canon/canon.c:1096
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1238
+#: camlibs/canon/canon.c:1183
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1344
+#: camlibs/canon/canon.c:1302
 #, c-format
 msgid "Name '%s' (%i characters) too long, maximum 30 characters are allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1753
+#: camlibs/canon/canon.c:1702
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr "Нельзя использовать строчные буквы в %s."
 
-#: camlibs/canon/canon.c:1928
+#: camlibs/canon/canon.c:1859
 #, c-format
-msgid ""
-"canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
+msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1950
+#: camlibs/canon/canon.c:1881
 msgid ""
-"canon_int_list_directory: Reached end of packet while examining the first "
-"dirent"
+"canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2035
-msgid "canon_int_list_directory: truncated directory entry encountered"
+#: camlibs/canon/canon.c:1966
+msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2377
+#: camlibs/canon/canon.c:2283
 msgid "File protected."
 msgstr "Файл защищен."
 
-#: camlibs/canon/canon.c:2448
+#: camlibs/canon/canon.c:2354
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Невозможно получить миниатюру JPEG: Данные не соответствуют формату JFIF"
 
-#: camlibs/canon/canon.c:2473
+#: camlibs/canon/canon.c:2379
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Невозможно получить миниатюру JPEG: Отсутствует начало/конец"
 
-#: camlibs/canon/canon.h:146 camlibs/canon/canon.h:160
+#: camlibs/canon/canon.h:144 camlibs/canon/canon.h:158
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:350
+#: camlibs/canon/canon.h:342
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
@@ -174,7 +166,6 @@ 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 ""
 
@@ -187,66 +178,65 @@ msgstr ""
 "внимание: контрольная сумма не проверена (+ длина %d, значение 0x%04x) "
 "#########################\n"
 
-#: camlibs/canon/library.c:125
+#: camlibs/canon/library.c:134
 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 A510 and EOS 350D of\n"
-" 2005.\n"
+" and Pro70 of 1998 and as new as the PowerShot SD20 of 2004.\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:254
+#: camlibs/canon/library.c:262
 #, fuzzy, c-format
 msgid "Camera unavailable: %s"
 msgstr "Фотоаппарат недоступен"
 
-#: camlibs/canon/library.c:274
+#: camlibs/canon/library.c:282
 msgid "Switching Camera Off"
 msgstr "Фотоаппарат выключается"
 
-#: camlibs/canon/library.c:332 camlibs/canon/library.c:366
+#: camlibs/canon/library.c:340 camlibs/canon/library.c:374
 msgid "Error capturing image"
 msgstr "Ошибка захвата изображения"
 
-#: camlibs/canon/library.c:422
+#: camlibs/canon/library.c:430
 #, c-format
 msgid "Could not get disk name: %s"
 msgstr "Невозможно получить имя диска: %s"
 
-#: camlibs/canon/library.c:423
+#: camlibs/canon/library.c:431
 msgid "No reason available"
 msgstr "Причина неизвестна"
 
-#: camlibs/canon/library.c:430
+#: camlibs/canon/library.c:438
 #, c-format
 msgid "Could not get disk info: %s"
 msgstr "Невозможно получить информацию о диске: %s"
 
-#: camlibs/canon/library.c:494
+#: camlibs/canon/library.c:502
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Внутренняя ошибка 1 в функции get_file_func() (%s строка %i)"
 
-#: camlibs/canon/library.c:517
+#: camlibs/canon/library.c:525
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Не найден файл звукозаписи для %s"
 
-#: camlibs/canon/library.c:565 camlibs/canon/library.c:603
+#: camlibs/canon/library.c:573 camlibs/canon/library.c:611
 #, c-format
 msgid "%s is a file type for which no thumbnail is provided"
 msgstr "%s относится к одному из типов файлов, не имеющих миниатюр"
 
-#: camlibs/canon/library.c:773
+#: camlibs/canon/library.c:781
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -257,35 +247,35 @@ msgstr ""
 "  %11s байт всего\n"
 "  %11s байт свободно"
 
-#: camlibs/canon/library.c:781 camlibs/canon/library.c:787
-#: camlibs/canon/library.c:1305 camlibs/canon/library.c:1311
+#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
+#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
 msgid "AC adapter"
 msgstr "блок питания"
 
-#: camlibs/canon/library.c:781 camlibs/canon/library.c:787
-#: camlibs/canon/library.c:1305 camlibs/canon/library.c:1311
+#: camlibs/canon/library.c:789 camlibs/canon/library.c:795
+#: camlibs/canon/library.c:1312 camlibs/canon/library.c:1318
 msgid "on battery"
 msgstr "аккумулятор"
 
-#: camlibs/canon/library.c:783 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
 msgid "power OK"
 msgstr "питание ОК"
 
-#: camlibs/canon/library.c:783 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:791 camlibs/canon/library.c:1314
 msgid "power bad"
 msgstr "сбой питания"
 
-#: camlibs/canon/library.c:791
+#: camlibs/canon/library.c:799
 #, c-format
 msgid "not available: %s"
 msgstr "нет данных: %s"
 
-#: camlibs/canon/library.c:817
+#: camlibs/canon/library.c:825
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (время компьютера %s%i секунд)"
 
-#: camlibs/canon/library.c:827
+#: camlibs/canon/library.c:835
 #, c-format
 msgid ""
 "\n"
@@ -312,18 +302,17 @@ msgstr ""
 "\n"
 "Время: %s\n"
 
-#: camlibs/canon/library.c:844
+#: camlibs/canon/library.c:852
 #, fuzzy
 msgid ""
 "Canon PowerShot series driver by\n"
-" Wolfgang G. Reissnegger,\n"
-" Werner Almesberger,\n"
-" Edouard Lafargue,\n"
-" Philippe Marzouk,\n"
+"Wolfgang G. Reissnegger,\n"
+"Werner Almesberger,\n"
+"Edouard Lafargue,\n"
+"Philippe Marzouk,\n"
 "A5 additions by Ole W. Saastad\n"
-"Additional enhancements by\n"
-" Holger Klemm\n"
-" Stephen H. Westin"
+"Holger Klemm\n"
+"Stephen H. Westin"
 msgstr ""
 "Драйвер Canon PowerShot создан\n"
 "Wolfgang G. Reissnegger,\n"
@@ -333,114 +322,114 @@ msgstr ""
 "добавление A5 - Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:887
+#: camlibs/canon/library.c:894
 msgid "Error deleting file"
 msgstr "Ошибка удаления файла"
 
-#: camlibs/canon/library.c:903
+#: camlibs/canon/library.c:910
 msgid "Error deleting associated thumbnail file"
 msgstr "Ошибка удаления связанного файла миниатюры"
 
-#: camlibs/canon/library.c:1033 camlibs/canon/library.c:1162
+#: camlibs/canon/library.c:1040 camlibs/canon/library.c:1169
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Превышающие 57600 скорости не поддерживаются при загрузке в этот фотоаппарат"
 
-#: camlibs/canon/library.c:1050 camlibs/canon/library.c:1179
+#: camlibs/canon/library.c:1057 camlibs/canon/library.c:1186
 msgid "Could not get flash drive letter"
 msgstr "Невозможно получить букву устройства карты памяти"
 
-#: camlibs/canon/library.c:1094 camlibs/canon/library.c:1202
+#: camlibs/canon/library.c:1101 camlibs/canon/library.c:1209
 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:1116 camlibs/canon/library.c:1222
+#: camlibs/canon/library.c:1123 camlibs/canon/library.c:1229
 msgid "Could not create \\DCIM directory."
 msgstr "Невозможно создать каталог \\DCIM."
 
-#: camlibs/canon/library.c:1122 camlibs/canon/library.c:1228
+#: camlibs/canon/library.c:1129 camlibs/canon/library.c:1235
 msgid "Could not create destination directory."
 msgstr "Невозможно создать целевой каталог"
 
-#: camlibs/canon/library.c:1260 camlibs/ptp2/library.c:2508
-#: camlibs/ptp2/library.c:2599
+#: camlibs/canon/library.c:1267 camlibs/ptp2/library.c:1706
+#: camlibs/ptp2/library.c:1794
 msgid "Camera and Driver Configuration"
 msgstr "Конфигурация фотоаппарата и драйвера "
 
-#: camlibs/canon/library.c:1262 camlibs/polaroid/pdc700.c:982
+#: camlibs/canon/library.c:1269 camlibs/polaroid/pdc700.c:982
 msgid "Camera"
 msgstr "Фотоаппарат"
 
-#: camlibs/canon/library.c:1265
+#: camlibs/canon/library.c:1272
 msgid "Camera Model (readonly)"
 msgstr "Модель фотоаппарата (только для чтения)"
 
-#: camlibs/canon/library.c:1269 camlibs/canon/library.c:1346
+#: camlibs/canon/library.c:1276 camlibs/canon/library.c:1353
 msgid "Owner name"
 msgstr "Имя владельца"
 
-#: camlibs/canon/library.c:1276 camlibs/canon/library.c:1280
-#: camlibs/canon/library.c:1285
+#: camlibs/canon/library.c:1283 camlibs/canon/library.c:1287
+#: camlibs/canon/library.c:1292
 msgid "Date and Time (readonly)"
 msgstr "Дата и время (только для чтения)"
 
-#: camlibs/canon/library.c:1281
+#: camlibs/canon/library.c:1288
 msgid "Error"
 msgstr "Ошибка"
 
-#: camlibs/canon/library.c:1286 camlibs/canon/library.c:1313
+#: camlibs/canon/library.c:1293 camlibs/canon/library.c:1320
 msgid "Unavailable"
 msgstr "нет данных"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1359
+#: camlibs/canon/library.c:1297 camlibs/canon/library.c:1366
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1293
+#: camlibs/canon/library.c:1300
 msgid "Firmware revision (readonly)"
 msgstr "Версия прошивки (только для чтения)"
 
-#: camlibs/canon/library.c:1317 camlibs/ptp2/library.c:2546
-#: camlibs/ptp2/library.c:2575
+#: camlibs/canon/library.c:1324 camlibs/ptp2/library.c:1740
+#: camlibs/ptp2/library.c:1770
 msgid "Power (readonly)"
 msgstr "Питание (только для чтения)"
 
-#: camlibs/canon/library.c:1321
+#: camlibs/canon/library.c:1328
 msgid "Driver"
 msgstr "Драйвер"
 
-#: camlibs/canon/library.c:1324 camlibs/canon/library.c:1373
+#: camlibs/canon/library.c:1331 camlibs/canon/library.c:1380
 msgid "List all files"
 msgstr "Показатьсписок всех файлов"
 
-#: camlibs/canon/library.c:1329 camlibs/canon/library.c:1382
+#: camlibs/canon/library.c:1336 camlibs/canon/library.c:1388
 msgid "Keep filename on upload"
 msgstr "Сохранить имя файла при закачке"
 
-#: camlibs/canon/library.c:1350 camlibs/canon/library.c:1363
+#: camlibs/canon/library.c:1357 camlibs/canon/library.c:1370
 msgid "Camera unavailable"
 msgstr "Фотоаппарат недоступен"
 
-#: camlibs/canon/library.c:1353
+#: camlibs/canon/library.c:1360
 msgid "Owner name changed"
 msgstr "Имя владельца изменено"
 
-#: camlibs/canon/library.c:1355
+#: camlibs/canon/library.c:1362
 msgid "could not change owner name"
 msgstr "невозможно изменить имя владельца"
 
-#: camlibs/canon/library.c:1366
+#: camlibs/canon/library.c:1373
 msgid "time set"
 msgstr "время установлено"
 
-#: camlibs/canon/library.c:1368
+#: camlibs/canon/library.c:1375
 msgid "could not set time"
 msgstr "невозможно установить время"
 
-#: camlibs/canon/library.c:1586
+#: camlibs/canon/library.c:1591
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -604,237 +593,243 @@ msgstr "ОШИБКА: %d слишком велик"
 msgid "Getting thumbnail..."
 msgstr "Получение миниатюры..."
 
-#: camlibs/canon/usb.c:193
+#: camlibs/canon/usb.c:82
 msgid "NOT RECOGNIZED"
 msgstr "НЕ РАСПОЗНАНО"
 
-#: camlibs/canon/usb.c:208
+#: camlibs/canon/usb.c:97
 msgid "Could not establish initial contact with camera"
 msgstr "Невозможно установить соединение с фотоаппаратом"
 
-#: camlibs/canon/usb.c:214
+#: camlibs/canon/usb.c:103
 msgid "Camera was already active"
 msgstr "Фотоаппарат уже был активен"
 
-#: camlibs/canon/usb.c:217
+#: camlibs/canon/usb.c:106
 msgid "Camera was woken up"
 msgstr "Фотоаппарат выведен из спящего режима"
 
-#: camlibs/canon/usb.c:222
+#: camlibs/canon/usb.c:111
 #, fuzzy
 msgid "Unknown (some kind of error)"
 msgstr "Неизвестно что (какая-то ошибка))"
 
-#: camlibs/canon/usb.c:223
+#: camlibs/canon/usb.c:112
 #, fuzzy, c-format
 msgid "Initial camera response '%c' unrecognized"
 msgstr "не распознан начальный ответ фотоаппарата %c/'%s')"
 
-#: camlibs/canon/usb.c:237
+#: camlibs/canon/usb.c:126
+#, c-format
+msgid ""
+"Step #2 of initialization failed for PowerShot camera! (returned %i, "
+"expected %i) Camera not operational"
+msgstr ""
+
+#: camlibs/canon/usb.c:147
 #, c-format
 msgid ""
-"Step #2 of initialization failed! (returned %i, expected %i) Camera not "
+"EOS Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:257 camlibs/canon/usb.c:278
+#: camlibs/canon/usb.c:167
 #, c-format
 msgid ""
 "Step #3 of initialization failed! (returned %i, expected %i) Camera not "
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:309 camlibs/canon/usb.c:336
+#: camlibs/canon/usb.c:197
 #, c-format
-msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
+msgid "Step #4.1 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:408 camlibs/sipix/blink.c:1068
+#: camlibs/canon/usb.c:258 camlibs/sipix/blink.c:1068
 #: camlibs/stv0674/stv0674.c:250
 msgid "Could not apply USB settings"
 msgstr "Невозможно применить конфигурацию USB"
 
-#: camlibs/canon/usb.c:433
+#: camlibs/canon/usb.c:283
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Фотоаппарат не готов, несколько запросов идентификации завершились ошибкой: %"
 "s"
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:316
 #, c-format
 msgid ""
 "canon_usb_init: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:472 camlibs/canon/usb.c:488
+#: camlibs/canon/usb.c:322 camlibs/canon/usb.c:377
 #, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Фотоаппарат не готов, %s"
 
-#: camlibs/canon/usb.c:552 camlibs/canon/usb.c:574 camlibs/canon/usb.c:600
-#: camlibs/canon/usb.c:641
+#: camlibs/canon/usb.c:441 camlibs/canon/usb.c:463 camlibs/canon/usb.c:489
+#: camlibs/canon/usb.c:530
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:625
+#: camlibs/canon/usb.c:514
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\" We will continue."
 msgstr ""
 
-#: camlibs/canon/usb.c:684 camlibs/canon/usb.c:700
+#: camlibs/canon/usb.c:573 camlibs/canon/usb.c:589
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:755 camlibs/canon/usb.c:773
+#: camlibs/canon/usb.c:644 camlibs/canon/usb.c:662
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:827
+#: camlibs/canon/usb.c:710
 #, c-format
 msgid ""
-"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
-"sec \"%s\""
+"canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:881
+#: camlibs/canon/usb.c:763
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:986
+#: camlibs/canon/usb.c:861
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1002
+#: camlibs/canon/usb.c:872
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1027
+#: camlibs/canon/usb.c:892
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1035
+#: camlibs/canon/usb.c:900
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1045
+#: camlibs/canon/usb.c:910
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1063
+#: camlibs/canon/usb.c:928
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1098
+#: camlibs/canon/usb.c:962
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1284
+#: camlibs/canon/usb.c:1117
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1390
+#: camlibs/canon/usb.c:1220
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1511
+#: camlibs/canon/usb.c:1324
 msgid "Receiving data..."
 msgstr "Принимаются данные..."
 
-#: camlibs/canon/usb.c:1837 camlibs/canon/usb.c:1973
+#: camlibs/canon/usb.c:1622 camlibs/canon/usb.c:1758
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Недостаточно памяти: необходимо %d байт(ов)."
 
-#: camlibs/canon/usb.c:1902
+#: camlibs/canon/usb.c:1685
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1909
+#: camlibs/canon/usb.c:1692
 #, c-format
 msgid ""
-"Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
-"status 0x%08x from camera"
+"canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
+"08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1984
+#: camlibs/canon/usb.c:1769
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Невозможно прочесть файл \"%s\""
 
-#: camlibs/canon/usb.c:1994
+#: camlibs/canon/usb.c:1779
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr "Недостаточно памяти: необходимо %ld байт(ов)."
 
-#: camlibs/canon/usb.c:2027 camlibs/canon/usb.c:2038 camlibs/canon/usb.c:2074
-#: camlibs/canon/usb.c:2088 camlibs/canon/usb.c:2102
+#: 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
 msgid "File upload failed."
 msgstr "Закачка файла не удалась."
 
-#: camlibs/canon/usb.c:2128
+#: camlibs/canon/usb.c:1911
 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:2174
+#: camlibs/canon/usb.c:1957
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2191
+#: camlibs/canon/usb.c:1974
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2242
+#: camlibs/canon/usb.c:2025
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2261
+#: camlibs/canon/usb.c:2044
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2330
+#: camlibs/canon/usb.c:2113
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Обнаружен '%s'."
 
-#: camlibs/canon/usb.c:2336
+#: camlibs/canon/usb.c:2119
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Сообщаемого фооаппаратом названия \"%s\" нет среди известных моделей"
@@ -866,13 +861,12 @@ 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:856 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1433
 #: 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 "Аккумулятор"
 
@@ -962,8 +956,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:1521
-#: camlibs/ptp2/library.c:2490 camlibs/ptp2/ptp.c:1928
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1255
+#: camlibs/ptp2/library.c:1688 camlibs/ptp2/ptp.c:1928
 #: camlibs/ricoh/library.c:500 camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Вспышка"
@@ -1091,7 +1085,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:321 camlibs/samsung/samsung.c:214
+#: camlibs/ricoh/g3.c:316 camlibs/samsung/samsung.c:214
 #: camlibs/sipix/web2.c:175 camlibs/smal/ultrapocket.c:127
 #: camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
@@ -1263,7 +1257,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:315
+#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:310
 msgid "Downloading..."
 msgstr "Копирование..."
 
@@ -1316,7 +1310,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:1662 camlibs/sierra/sierra.c:1835
+#: camlibs/sierra/sierra.c:1661 camlibs/sierra/sierra.c:1834
 msgid "Date & Time"
 msgstr "Дата и время"
 
@@ -1580,25 +1574,23 @@ msgid "High (good quality)"
 msgstr "высокое (хорошее качество)"
 
 #: camlibs/kodak/dc210/dc210.c:217 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:2464
 msgid "Capture"
 msgstr "Съёмка"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:2487
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:1685
 #: camlibs/ptp2/ptp.c:1603 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1363
 msgid "Zoom"
 msgstr "Приближение"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2109
-#: camlibs/ptp2/ptp.c:1956 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:488 camlibs/sierra/sierra.c:1059
-#: camlibs/sierra/sierra.c:1064 camlibs/sierra/sierra.c:1335
-#: camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1534
-#: camlibs/sierra/sierra.c:1747
+#: 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
 msgid "Macro"
 msgstr "Макро"
 
@@ -1635,7 +1627,6 @@ msgstr ""
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2069 camlibs/ptp2/library.c:2149
 #: camlibs/ptp2/ptp.c:1924 camlibs/ptp2/ptp.c:1953 camlibs/ptp2/ptp.c:1969
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
 #: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:151
@@ -1648,25 +1639,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:867
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:907
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:974 camlibs/sierra/sierra.c:1028
-#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1202
-#: camlibs/sierra/sierra.c:1231 camlibs/sierra/sierra.c:1271
-#: camlibs/sierra/sierra.c:1314 camlibs/sierra/sierra.c:1477
-#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1505
-#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1710
-#: camlibs/sierra/sierra.c:1730
+#: 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
 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:968 camlibs/sierra/sierra.c:976
-#: camlibs/sierra/sierra.c:1273 camlibs/sierra/sierra.c:1478
-#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1712
+#: 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
 msgid "Force"
 msgstr ""
 
@@ -1687,15 +1678,17 @@ 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:1474
-#: camlibs/ptp2/library.c:1476 camlibs/ptp2/library.c:1488
-#: camlibs/ptp2/library.c:1681 camlibs/ptp2/library.c:1683
-#: camlibs/ptp2/library.c:1695 camlibs/ptp2/library.c:1714
-#: camlibs/ptp2/library.c:1716 camlibs/ptp2/library.c:1728
-#: camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874 camlibs/ptp2/ptp.c:1971
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1084
-#: camlibs/sierra/sierra.c:1090 camlibs/sierra/sierra.c:1353
+#: 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
 msgid "On"
 msgstr "Вкл"
 
@@ -1708,24 +1701,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:1475
-#: camlibs/ptp2/library.c:1476 camlibs/ptp2/library.c:1492
-#: camlibs/ptp2/library.c:1682 camlibs/ptp2/library.c:1683
-#: camlibs/ptp2/library.c:1699 camlibs/ptp2/library.c:1715
-#: camlibs/ptp2/library.c:1716 camlibs/ptp2/library.c:1732
-#: camlibs/ptp2/library.c:2108 camlibs/ptp2/library.c:2246
-#: camlibs/ptp2/ptp.c:1873 camlibs/ptp2/ptp.c:1874 camlibs/ptp2/ptp.c:1970
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:396
-#: camlibs/sierra/olympus-desc.c:413 camlibs/sierra/olympus-desc.c:509
-#: camlibs/sierra/olympus-desc.c:673 camlibs/sierra/olympus-desc.c:757
-#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:978
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1088
-#: camlibs/sierra/sierra.c:1275 camlibs/sierra/sierra.c:1355
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1487
-#: camlibs/sierra/sierra.c:1714
+#: 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
 msgid "Off"
 msgstr "Выкл"
 
@@ -1899,7 +1892,6 @@ msgstr ""
 "выполнение нескольких команд. Дождитесь окончания текущей операции.."
 
 #: camlibs/kodak/dc3200/dc3200.c:142
-#, c-format
 msgid "camera inactive for > 9 seconds, re-initing.\n"
 msgstr ""
 
@@ -2156,8 +2148,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:866 camlibs/sierra/sierra.c:1198
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1758
+#: camlibs/sierra/sierra.c:865 camlibs/sierra/sierra.c:1197
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1757
 msgid "Resolution"
 msgstr "Разрешение"
 
@@ -2182,7 +2174,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:1625 camlibs/sierra/sierra.c:1809
+#: camlibs/sierra/sierra.c:1624 camlibs/sierra/sierra.c:1808
 msgid "Language"
 msgstr "Язык"
 
@@ -2250,8 +2242,8 @@ msgid "Focus"
 msgstr "Фокус"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1506
-#: camlibs/sierra/sierra.c:1512 camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1511 camlibs/sierra/sierra.c:1731
 msgid "Fixed"
 msgstr "Фикс."
 
@@ -2275,14 +2267,13 @@ 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:937
-#: camlibs/sierra/sierra.c:944 camlibs/sierra/sierra.c:998
-#: camlibs/sierra/sierra.c:1005 camlibs/sierra/sierra.c:1060
-#: camlibs/sierra/sierra.c:1066 camlibs/sierra/sierra.c:1250
-#: camlibs/sierra/sierra.c:1293 camlibs/sierra/sierra.c:1337
-#: camlibs/sierra/sierra.c:1532 camlibs/sierra/sierra.c:1536
-#: camlibs/sierra/sierra.c:1749
-#, c-format
+#: 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
 msgid "Normal"
 msgstr "Норм."
 
@@ -2346,21 +2337,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:908
-#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1233
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:914 camlibs/sierra/sierra.c:1232
 msgid "Low"
 msgstr "Низк."
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:909
-#: camlibs/sierra/sierra.c:917 camlibs/sierra/sierra.c:1235
+#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:916 camlibs/sierra/sierra.c:1234
 msgid "Medium"
 msgstr "Средн."
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:877
-#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
-#: camlibs/sierra/sierra.c:1206 camlibs/sierra/sierra.c:1237
+#: 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
 msgid "High"
 msgstr "Высок."
 
@@ -2426,9 +2417,9 @@ msgid "Black and White"
 msgstr "Чёрно-белый"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2250 camlibs/ricoh/library.c:331
-#: camlibs/sierra/olympus-desc.c:378 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:1254
+#: 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
 msgid "Sepia"
 msgstr "Сепия"
 
@@ -2461,34 +2452,29 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "YYYY/MM/DD"
 msgstr "ГГГГ/ММ/ДД"
 
 #: camlibs/konica/qm150.c:1166
-#, c-format
 msgid "MM/DD/YYYY"
 msgstr "ММ/ДД/ГГГГ"
 
@@ -2514,7 +2500,6 @@ msgstr ""
 "Дата и время: %s\n"
 
 #: camlibs/konica/qm150.c:1193
-#, c-format
 msgid ""
 "Konica Q-M150 Library\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -2529,7 +2514,6 @@ msgstr ""
 "Поддержка французской версии Konica Q-M150."
 
 #: camlibs/konica/qm150.c:1208
-#, c-format
 msgid ""
 "About Konica Q-M150:\n"
 "This camera does not support to do any changes\n"
@@ -2681,30 +2665,27 @@ msgid "No"
 msgstr "Нет"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
-#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1558
-#: camlibs/sierra/sierra.c:1763
+#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1557
+#: camlibs/sierra/sierra.c:1762
 msgid "Fine"
 msgstr "Улучшенный"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:868
-#: camlibs/sierra/sierra.c:875 camlibs/sierra/sierra.c:1204
-#: camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1556
-#: camlibs/sierra/sierra.c:1761
+#: 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
 msgid "Standard"
 msgstr "Стандартный"
 
 #: camlibs/minolta/dimagev/dimagev.c:321
-#, c-format
 msgid "Automatic\n"
 msgstr "Автомат\n"
 
 #: camlibs/minolta/dimagev/dimagev.c:329
-#, c-format
 msgid "Force Flash\n"
 msgstr "Принудительная вспышка\n"
 
 #: camlibs/minolta/dimagev/dimagev.c:337
-#, c-format
 msgid "Prohibit Flash\n"
 msgstr "Запрет вспышки\n"
 
@@ -2736,7 +2717,6 @@ msgstr "Неполная"
 
 #: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
 #: camlibs/ptp2/ptp.c:1977
-#, c-format
 msgid "Full"
 msgstr "Полная"
 
@@ -2757,17 +2737,14 @@ msgid "Ready"
 msgstr "Готов"
 
 #: camlibs/minolta/dimagev/dimagev.c:380
-#, c-format
 msgid "Normal\n"
 msgstr "Нормальный\n"
 
 #: camlibs/minolta/dimagev/dimagev.c:383
-#, c-format
 msgid "Lens direction does not match flash light\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:386
-#, c-format
 msgid "Lens is not connected\n"
 msgstr ""
 
@@ -2777,17 +2754,14 @@ msgid "Bad value for lens status %d\n"
 msgstr ""
 
 #: camlibs/minolta/dimagev/dimagev.c:398
-#, c-format
 msgid "Card Status:\t\t"
 msgstr "Состояние карты:\t\t"
 
 #: camlibs/minolta/dimagev/dimagev.c:411
-#, c-format
 msgid "Write-protected"
 msgstr "Защищена от записи"
 
 #: camlibs/minolta/dimagev/dimagev.c:414
-#, c-format
 msgid "Unsuitable card"
 msgstr "Несовместимая карта"
 
@@ -3117,13 +3091,13 @@ msgstr ""
 "sourceforge.net>.Исправление ошибок - Marcus Meissner <marcus@jet.franken."
 "de>."
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:2470
-#: camlibs/ptp2/library.c:2471 camlibs/ptp2/ptp.c:1590
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:1678
+#: camlibs/ptp2/ptp.c:1590
 msgid "Image Quality"
 msgstr "Качество изображения"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:2472
-#: camlibs/ptp2/library.c:2473 camlibs/ptp2/ptp.c:1537 camlibs/ptp2/ptp.c:1591
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:1679
+#: camlibs/ptp2/ptp.c:1537 camlibs/ptp2/ptp.c:1591
 msgid "Image Size"
 msgstr "Размер изображения"
 
@@ -3139,11 +3113,11 @@ msgstr "Автоматическое отключение (минуты)"
 msgid "Information"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1770
+#: camlibs/polaroid/pdc700.c:167
 msgid "normal"
 msgstr "нормальное"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1771
+#: camlibs/polaroid/pdc700.c:167
 msgid "fine"
 msgstr "высокое"
 
@@ -3151,22 +3125,19 @@ msgstr "высокое"
 msgid "superfine"
 msgstr "наилучшее"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:1813
-#: camlibs/ptp2/library.c:1982 camlibs/ptp2/library.c:2290
-#: camlibs/sierra/epson-desc.c:116 camlibs/sierra/sierra.c:1449
-#: camlibs/sierra/sierra.c:1463 camlibs/sierra/sierra.c:1698
+#: 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
 msgid "auto"
 msgstr "авто"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:1814 camlibs/sierra/nikon-desc.c:565
-#: camlibs/sierra/nikon-desc.c:570
+#: camlibs/sierra/nikon-desc.c:565 camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "вкл"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:1812 camlibs/sierra/nikon-desc.c:564
-#: camlibs/sierra/nikon-desc.c:569
+#: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "выкл"
 
@@ -3282,168 +3253,168 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:122
+#: camlibs/ptp2/library.c:119
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:120
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:121
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:122
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:123
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:127
+#: camlibs/ptp2/library.c:124
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:125
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Параметр не поддерживается"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:126
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:127
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:128
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:131
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:132
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:136
+#: camlibs/ptp2/library.c:133
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:134
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:135
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:136
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:137
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:141
+#: camlibs/ptp2/library.c:138
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Причина неизвестна"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:140
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:141
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:142
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:146
+#: camlibs/ptp2/library.c:143
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:148
+#: camlibs/ptp2/library.c:145
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:146
 msgid "PTP Device Busy"
 msgstr ""
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:147
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:148
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:149
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:150
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:151
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:152
 msgid "PTP Transaction Canceled"
 msgstr ""
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:154
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:155
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:156
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:157
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:159
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:160
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:161
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:162
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:719
+#: camlibs/ptp2/library.c:710
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3453,65 +3424,33 @@ msgstr ""
 "(c)2001-2003 - Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Пользуйтесь!"
 
-#: camlibs/ptp2/library.c:790 camlibs/ptp2/library.c:879
-msgid "Sorry, your Canon camera does not support Canon capture"
-msgstr ""
-
-#: camlibs/ptp2/library.c:915
-msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
-msgstr ""
-
-#: camlibs/ptp2/library.c:920
-#, c-format
-msgid "Canon enable viewfinder failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:925
-#, c-format
-msgid "Canon get viewfinder image failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:935
-#, c-format
-msgid "Canon disable viewfinder failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:990
-msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1004
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
-
-#: camlibs/ptp2/library.c:1063
+#: camlibs/ptp2/library.c:800
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1111
+#: camlibs/ptp2/library.c:848
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1118
+#: camlibs/ptp2/library.c:855
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1210
+#: camlibs/ptp2/library.c:947
 msgid "read only"
 msgstr "только для чтения"
 
-#: camlibs/ptp2/library.c:1211
+#: camlibs/ptp2/library.c:948
 msgid "readwrite"
 msgstr "чтение и запись"
 
-#: camlibs/ptp2/library.c:1212 camlibs/ptp2/library.c:1214
+#: camlibs/ptp2/library.c:949 camlibs/ptp2/library.c:951
 #: camlibs/ptp2/ptp.c:2000
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: camlibs/ptp2/library.c:1226
+#: camlibs/ptp2/library.c:963
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3526,282 +3465,166 @@ msgstr ""
 "ID фирменного дополнения: 0x%08x\n"
 "Описание фирменного дополнения: %s\n"
 
-#: camlibs/ptp2/library.c:1383 camlibs/ptp2/library.c:1400
-#: camlibs/ptp2/library.c:1506
+#: camlibs/ptp2/library.c:1116 camlibs/ptp2/library.c:1133
+#: camlibs/ptp2/library.c:1240
 #, c-format
 msgid "unexpected datatype %i"
 msgstr "неожиданный тип данных %i"
 
-#: camlibs/ptp2/library.c:1515 camlibs/ptp2/ptp.c:1975
+#: camlibs/ptp2/library.c:1249 camlibs/ptp2/ptp.c:1975
 #: camlibs/sierra/olympus-desc.c:490
 msgid "Manual"
 msgstr "Ручной"
 
-#: camlibs/ptp2/library.c:1516
+#: camlibs/ptp2/library.c:1250
 #, fuzzy
 msgid "Automatic"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/library.c:1517
+#: camlibs/ptp2/library.c:1251
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Автомат\n"
 
-#: camlibs/ptp2/library.c:1518 camlibs/ptp2/library.c:2150
-#: camlibs/ptp2/ptp.c:1927 camlibs/sierra/olympus-desc.c:431
-#: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
+#: 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
 msgid "Daylight"
 msgstr "Дневной свет"
 
-#: camlibs/ptp2/library.c:1519 camlibs/ptp2/library.c:2153
-#: camlibs/ptp2/ptp.c:1926 camlibs/ricoh/library.c:328
-#: camlibs/sierra/nikon-desc.c:285 camlibs/sierra/olympus-desc.c:432
-#: camlibs/sierra/olympus-desc.c:451 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1318
+#: 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
 msgid "Fluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: camlibs/ptp2/library.c:1520 camlibs/ptp2/library.c:2152
-#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:452
-#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1031
-#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1320
+#: 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
 msgid "Tungsten"
 msgstr "Вольфрамовая лампа"
 
-#: camlibs/ptp2/library.c:1522 camlibs/ptp2/library.c:2151
-#: camlibs/ptp2/ptp.c:1929 camlibs/sierra/nikon-desc.c:288
-#: camlibs/sierra/olympus-desc.c:434 camlibs/sierra/olympus-desc.c:453
-#: camlibs/sierra/olympus-desc.c:474 camlibs/sierra/sierra.c:1032
-#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1322
+#: 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
 msgid "Cloudy"
 msgstr "Облачность"
 
-#: camlibs/ptp2/library.c:1523 camlibs/ptp2/ptp.c:1930
+#: camlibs/ptp2/library.c:1257 camlibs/ptp2/ptp.c:1930
 #, fuzzy
 msgid "Shade"
 msgstr "Резко"
 
-#: camlibs/ptp2/library.c:1524 camlibs/ptp2/ptp.c:1931
+#: camlibs/ptp2/library.c:1258 camlibs/ptp2/ptp.c:1931
 #: camlibs/sierra/nikon-desc.c:287
 msgid "Preset"
 msgstr "Шаблон"
 
-#: camlibs/ptp2/library.c:1583 camlibs/ptp2/ptp.c:1919
+#: camlibs/ptp2/library.c:1317 camlibs/ptp2/ptp.c:1919
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1584
+#: camlibs/ptp2/library.c:1318
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Норм."
 
-#: camlibs/ptp2/library.c:1585 camlibs/ptp2/ptp.c:1921
+#: camlibs/ptp2/library.c:1319 camlibs/ptp2/ptp.c:1921
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:1586
+#: camlibs/ptp2/library.c:1320
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1587
+#: camlibs/ptp2/library.c:1321
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1772
-#, fuzzy
-msgid "super fine"
-msgstr "наилучшее"
-
-#: camlibs/ptp2/library.c:1815
-#, fuzzy
-msgid "auto red eye"
-msgstr "Против красных глаз"
-
-#: camlibs/ptp2/library.c:1816
-#, fuzzy
-msgid "on red eye"
-msgstr "Против красных глаз"
-
-#: camlibs/ptp2/library.c:1856
-#, fuzzy
-msgid "spot"
-msgstr "Точечный"
-
-#: camlibs/ptp2/library.c:1981
-#, fuzzy
-msgid "center"
-msgstr "Съёмка"
-
-#: camlibs/ptp2/library.c:2021
-#, fuzzy
-msgid "large"
-msgstr "Изображение"
-
-#: camlibs/ptp2/library.c:2022
-#, fuzzy
-msgid "medium 1"
-msgstr "Средн."
-
-#: camlibs/ptp2/library.c:2023
-#, fuzzy
-msgid "medium 2"
-msgstr "Средн."
-
-#: camlibs/ptp2/library.c:2024
-msgid "small"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2064 camlibs/ptp2/library.c:2194
-#, fuzzy
-msgid "Factory Default"
-msgstr "Дневной"
-
-#: camlibs/ptp2/library.c:2110
-#, fuzzy
-msgid "Long distance"
-msgstr "Фокусное расстояние"
-
-#: camlibs/ptp2/library.c:2154
-#, fuzzy
-msgid "Fluorescent H"
-msgstr "Флуоресцентная лампа"
-
-#: camlibs/ptp2/library.c:2155 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1507 camlibs/sierra/sierra.c:1514
-#: camlibs/sierra/sierra.c:1734
-msgid "Custom"
-msgstr "Пользовательский"
-
-#: camlibs/ptp2/library.c:2247
-msgid "Vivid"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2248
-#, fuzzy
-msgid "Neutral"
-msgstr "Норм."
-
-#: camlibs/ptp2/library.c:2249
-#, fuzzy
-msgid "Low sharpening"
-msgstr "Зарядка"
-
-#: camlibs/ptp2/library.c:2251
-#, fuzzy
-msgid "Black & white"
-msgstr "Чёрно-белый"
-
-#: camlibs/ptp2/library.c:2455 camlibs/ptp2/ptp.c:1607
+#: camlibs/ptp2/library.c:1666 camlibs/ptp2/ptp.c:1607
 msgid "Camera Owner"
 msgstr "Владелец фотоаппарата"
 
-#: camlibs/ptp2/library.c:2456 camlibs/ptp2/ptp.c:1606
+#: camlibs/ptp2/library.c:1667 camlibs/ptp2/ptp.c:1606
 msgid "Camera Model"
 msgstr "Модель фотоаппарата"
 
-#: camlibs/ptp2/library.c:2457 camlibs/ptp2/ptp.c:1605
+#: camlibs/ptp2/library.c:1668 camlibs/ptp2/ptp.c:1605
 msgid "Flash Memory"
 msgstr "Память ППЗУ"
 
-#: camlibs/ptp2/library.c:2458 camlibs/ptp2/library.c:2459
+#: camlibs/ptp2/library.c:1669 camlibs/ptp2/library.c:1670
 msgid "Camera Time"
 msgstr "Время фотоаппарата"
 
-#: camlibs/ptp2/library.c:2460 camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1588
+#: camlibs/ptp2/library.c:1671 camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1588
 msgid "Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2461
+#: camlibs/ptp2/library.c:1672
 #, fuzzy
 msgid "Image Comment"
 msgstr "Изображение защищено."
 
-#: camlibs/ptp2/library.c:2469
+#: camlibs/ptp2/library.c:1677
 msgid "Long Exp Noise Reduction"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2474 camlibs/ptp2/ptp.c:1599
-#: camlibs/sierra/olympus-desc.c:698 camlibs/sierra/olympus-desc.c:716
-msgid "ISO Speed"
-msgstr "Скорость ISO"
-
-#: camlibs/ptp2/library.c:2475 camlibs/ptp2/ptp.c:1596
-msgid "Macro Mode"
-msgstr "Макрорежим"
-
-#: camlibs/ptp2/library.c:2476 camlibs/ptp2/library.c:2478
+#: camlibs/ptp2/library.c:1680
 #, fuzzy
 msgid "WhiteBalance"
 msgstr "Баланс белого"
 
-#: camlibs/ptp2/library.c:2477 camlibs/ptp2/ptp.c:1595
-msgid "Metering Mode"
-msgstr "Режим замера"
-
-#: camlibs/ptp2/library.c:2479 camlibs/ptp2/ptp.c:1610
-msgid "Photo Effect"
-msgstr ""
-
-#: camlibs/ptp2/library.c:2480 camlibs/ptp2/ptp.c:1600
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:1227
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1683
-msgid "Aperture"
-msgstr "Диафрагма"
-
-#: camlibs/ptp2/library.c:2481 camlibs/ptp2/ptp.c:1597
-msgid "Focusing Point"
-msgstr "Точка фокусировки"
-
-#: camlibs/ptp2/library.c:2482
-#, fuzzy
-msgid "Shutter Speed"
-msgstr "Скорость ISO"
-
-#: camlibs/ptp2/library.c:2488 camlibs/ptp2/ptp.c:1611
+#: camlibs/ptp2/library.c:1686 camlibs/ptp2/ptp.c:1611
 msgid "Assist Light"
 msgstr "Вспомогательное освещение"
 
-#: camlibs/ptp2/library.c:2489 camlibs/ptp2/ptp.c:1602 camlibs/ptp2/ptp.c:1684
+#: camlibs/ptp2/library.c:1687 camlibs/ptp2/ptp.c:1602 camlibs/ptp2/ptp.c:1684
 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
 #: camlibs/sierra/olympus-desc.c:617
 msgid "Exposure Compensation"
 msgstr "Компенсация выдержки"
 
-#: camlibs/ptp2/library.c:2496 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:1694 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:1129
-#: camlibs/sierra/sierra.c:1591
+#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1128
+#: camlibs/sierra/sierra.c:1590
 msgid "Camera Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2497
+#: camlibs/ptp2/library.c:1695
 #, fuzzy
 msgid "Image Settings"
 msgstr "Прочие параметры"
 
-#: camlibs/ptp2/library.c:2498
+#: camlibs/ptp2/library.c:1696
 msgid "Capture Settings"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2555
+#: camlibs/ptp2/library.c:1749
 msgid "Number of values"
 msgstr "Число значений"
 
-#: camlibs/ptp2/library.c:2559
+#: camlibs/ptp2/library.c:1753
 msgid "Supported values"
 msgstr "Допустимые значения"
 
-#: camlibs/ptp2/library.c:2567
+#: camlibs/ptp2/library.c:1761
 msgid "Current value"
 msgstr "Текущее значение"
 
-#: camlibs/ptp2/library.c:3165
+#: camlibs/ptp2/library.c:2340
 msgid "Initializing Camera"
 msgstr "Инициализация фотоаппарата"
 
-#: camlibs/ptp2/library.c:3268
+#: camlibs/ptp2/library.c:2443
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3985,9 +3808,9 @@ msgstr "Параметры сжатия"
 #: camlibs/ptp2/ptp.c:1539 camlibs/ptp2/ptp.c:1598
 #: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
 #: camlibs/sierra/olympus-desc.c:439 camlibs/sierra/olympus-desc.c:458
-#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1027
-#: camlibs/sierra/sierra.c:1310 camlibs/sierra/sierra.c:1504
-#: camlibs/sierra/sierra.c:1727
+#: 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
 msgid "White Balance"
 msgstr "Баланс белого"
 
@@ -4017,9 +3840,9 @@ msgid "Exposure Metering Mode"
 msgstr "Режим экспозамера"
 
 #: camlibs/ptp2/ptp.c:1546 camlibs/ptp2/ptp.c:1592 camlibs/ptp2/ptp.c:1718
-#: camlibs/ptp2/ptp.c:1784 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:1267 camlibs/sierra/sierra.c:1476
-#: camlibs/sierra/sierra.c:1707
+#: 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
 msgid "Flash Mode"
 msgstr "Режим вспышки"
 
@@ -4124,6 +3947,29 @@ msgstr "Режим видоискателя"
 msgid "TV A/V Setting"
 msgstr "Настройка ТВ A/V·вывода"
 
+#: camlibs/ptp2/ptp.c:1595
+msgid "Metering Mode"
+msgstr "Режим замера"
+
+#: camlibs/ptp2/ptp.c:1596
+msgid "Macro Mode"
+msgstr "Макрорежим"
+
+#: camlibs/ptp2/ptp.c:1597
+msgid "Focusing Point"
+msgstr "Точка фокусировки"
+
+#: camlibs/ptp2/ptp.c:1599 camlibs/sierra/olympus-desc.c:698
+#: camlibs/sierra/olympus-desc.c:716
+msgid "ISO Speed"
+msgstr "Скорость ISO"
+
+#: camlibs/ptp2/ptp.c:1600 camlibs/sierra/sierra.c:905
+#: camlibs/sierra/sierra.c:1226 camlibs/sierra/sierra.c:1441
+#: camlibs/sierra/sierra.c:1682
+msgid "Aperture"
+msgstr "Диафрагма"
+
 #: camlibs/ptp2/ptp.c:1601
 msgid "ShutterSpeed"
 msgstr ""
@@ -4140,6 +3986,10 @@ msgstr "Время UNIX"
 msgid "Real Image Width"
 msgstr ""
 
+#: camlibs/ptp2/ptp.c:1610
+msgid "Photo Effect"
+msgstr ""
+
 #: camlibs/ptp2/ptp.c:1620
 #, fuzzy
 msgid "Auto White Balance Bias"
@@ -4596,9 +4446,9 @@ msgid "Default"
 msgstr "Дневной"
 
 #: camlibs/ptp2/ptp.c:1933 camlibs/sierra/epson-desc.c:154
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:980
-#: camlibs/sierra/sierra.c:1277 camlibs/sierra/sierra.c:1480
-#: camlibs/sierra/sierra.c:1489 camlibs/sierra/sierra.c:1716
+#: 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
 msgid "Red-eye Reduction"
 msgstr "Уменьшение эффекта красных глаз"
 
@@ -4608,9 +4458,9 @@ msgid "Red-eye Reduction + Slow Sync"
 msgstr "Уменьшение эффекта красных глаз"
 
 #: camlibs/ptp2/ptp.c:1935 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:982
-#: camlibs/sierra/sierra.c:1279 camlibs/sierra/sierra.c:1481
-#: camlibs/sierra/sierra.c:1491 camlibs/sierra/sierra.c:1718
+#: 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
 msgid "Slow Sync"
 msgstr "Замедленная синхронизация"
 
@@ -4737,81 +4587,80 @@ msgstr ""
 msgid "Right"
 msgstr "Светлый"
 
-#: camlibs/ricoh/g3.c:317
+#: camlibs/ricoh/g3.c:312
 msgid "Downloading movie..."
 msgstr "Копируется видеозапись..."
 
-#: camlibs/ricoh/g3.c:323
+#: camlibs/ricoh/g3.c:318
 msgid "Downloading audio..."
 msgstr "Копируется звукопись..."
 
-#: camlibs/ricoh/g3.c:338
+#: camlibs/ricoh/g3.c:333
 msgid "Downloading EXIF data..."
 msgstr "Копируется данные EXIF..."
 
-#: camlibs/ricoh/g3.c:340 camlibs/ricoh/g3.c:359
+#: camlibs/ricoh/g3.c:335 camlibs/ricoh/g3.c:354
 #, c-format
 msgid "No EXIF data available for %s."
 msgstr "Нет данных EXIF для %s."
 
-#: camlibs/ricoh/g3.c:445
+#: camlibs/ricoh/g3.c:440
 msgid "Could not delete file."
 msgstr "Невозможно удалить файл."
 
-#: camlibs/ricoh/g3.c:472
+#: camlibs/ricoh/g3.c:467
 msgid "Could not remove directory."
 msgstr "Невозможно удалить каталог."
 
-#: camlibs/ricoh/g3.c:499
+#: camlibs/ricoh/g3.c:494
 msgid "Could not create directory."
 msgstr "Невозможно создать каталог."
 
-#: camlibs/ricoh/g3.c:518
+#: camlibs/ricoh/g3.c:513
 #, c-format
 msgid "Version: %s\n"
 msgstr "Версия: %s\n"
 
-#: camlibs/ricoh/g3.c:523
+#: camlibs/ricoh/g3.c:518
 #, c-format
 msgid "RTC Status: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:529
+#: camlibs/ricoh/g3.c:524
 #, c-format
 msgid "Camera time: %s %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:535
+#: camlibs/ricoh/g3.c:530
 #, c-format
 msgid "Camera ID: %s\n"
 msgstr "ID фотоаппарата: %s\n"
 
-#: camlibs/ricoh/g3.c:541
-#, c-format
+#: camlibs/ricoh/g3.c:536
 msgid "No SD Card inserted.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:544
+#: camlibs/ricoh/g3.c:539
 #, c-format
 msgid "SD Card ID: %s\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:552
+#: camlibs/ricoh/g3.c:547
 #, c-format
 msgid "Photos on camera: %d\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:553
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:565
+#: camlibs/ricoh/g3.c:560
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:575
+#: camlibs/ricoh/g3.c:570
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -4925,8 +4774,8 @@ msgstr "Изображение и звук"
 msgid "Character & Sound"
 msgstr "Character & Sound"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1107
-#: camlibs/sierra/sierra.c:1113
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1106
+#: camlibs/sierra/sierra.c:1112
 msgid "2x"
 msgstr "2x"
 
@@ -5081,8 +4930,8 @@ msgid "Aperature Settings"
 msgstr "Параметры диафрагмы"
 
 #: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:936 camlibs/sierra/sierra.c:1246
-#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1776
+#: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:1245
+#: camlibs/sierra/sierra.c:1574 camlibs/sierra/sierra.c:1775
 msgid "Color Mode"
 msgstr "Режим цвета"
 
@@ -5091,6 +4940,11 @@ 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 "Время до перехода компьютера в спящий режим (секунд)"
@@ -5099,59 +4953,59 @@ msgstr "Время до перехода компьютера в спящий режим (секунд)"
 msgid "Camera power save (seconds)"
 msgstr "Время до перехода фотоаппарата в спящий режим (секунд)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1331 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1743
+#: 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
 msgid "Lens Mode"
 msgstr "Режим объектива"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1626
-#: camlibs/sierra/sierra.c:1635 camlibs/sierra/sierra.c:1812
+#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1625
+#: camlibs/sierra/sierra.c:1634 camlibs/sierra/sierra.c:1811
 msgid "Korean"
 msgstr "Корейский"
 
 #: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/sierra.c:1814
+#: camlibs/sierra/sierra.c:1626 camlibs/sierra/sierra.c:1636
+#: camlibs/sierra/sierra.c:1813
 msgid "English"
 msgstr "Английский"
 
 #: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1639
-#: camlibs/sierra/sierra.c:1816
+#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1638
+#: camlibs/sierra/sierra.c:1815
 msgid "French"
 msgstr "Французский"
 
 #: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1629 camlibs/sierra/sierra.c:1641
-#: camlibs/sierra/sierra.c:1818
+#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1640
+#: camlibs/sierra/sierra.c:1817
 msgid "German"
 msgstr "Немецкий"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1630
-#: camlibs/sierra/sierra.c:1643 camlibs/sierra/sierra.c:1820
+#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1629
+#: camlibs/sierra/sierra.c:1642 camlibs/sierra/sierra.c:1819
 msgid "Italian"
 msgstr "Итальянский"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1631
-#: camlibs/sierra/sierra.c:1645 camlibs/sierra/sierra.c:1822
+#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1630
+#: camlibs/sierra/sierra.c:1644 camlibs/sierra/sierra.c:1821
 msgid "Japanese"
 msgstr "Японский"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1632
-#: camlibs/sierra/sierra.c:1647 camlibs/sierra/sierra.c:1824
+#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1631
+#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1823
 msgid "Spanish"
 msgstr "Испанский"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1633
-#: camlibs/sierra/sierra.c:1649 camlibs/sierra/sierra.c:1826
+#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1632
+#: camlibs/sierra/sierra.c:1648 camlibs/sierra/sierra.c:1825
 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:857 camlibs/sierra/sierra.c:1524
+#: camlibs/sierra/sierra.c:856 camlibs/sierra/sierra.c:1523
 msgid "Picture Settings"
 msgstr "Настройки изображения"
 
@@ -5288,13 +5142,13 @@ msgstr "Против красных глаз"
 msgid "Slow-sync"
 msgstr "Замедленная синхронизация"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1001
-#: camlibs/sierra/sierra.c:1011 camlibs/sierra/sierra.c:1299
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1000
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1298
 msgid "Contrast+"
 msgstr "Контраст+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1013 camlibs/sierra/sierra.c:1301
+#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1001
+#: camlibs/sierra/sierra.c:1012 camlibs/sierra/sierra.c:1300
 msgid "Contrast-"
 msgstr "Контраст-"
 
@@ -5339,7 +5193,7 @@ msgid "Operation Mode"
 msgstr "Режим работы"
 
 #: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:531
-#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1403
+#: camlibs/sierra/sierra.c:1163 camlibs/sierra/sierra.c:1402
 msgid "LCD Brightness"
 msgstr "Яркость ЖК-экрана"
 
@@ -5587,105 +5441,105 @@ msgstr ""
 "    всех имеющихся параметров, напишите, пожа-\n"
 "    луйста в список рассылки для разработчиков.\n"
 
-#: camlibs/sierra/sierra.c:714 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:713 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:728
+#: camlibs/sierra/sierra.c:727
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:735
+#: camlibs/sierra/sierra.c:734
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:742
+#: camlibs/sierra/sierra.c:741
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:870 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:1208
+#: camlibs/sierra/sierra.c:869 camlibs/sierra/sierra.c:878
+#: camlibs/sierra/sierra.c:1207
 msgid "Best"
 msgstr "Лучшее"
 
-#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:922
-#: camlibs/sierra/sierra.c:955 camlibs/sierra/sierra.c:985
-#: camlibs/sierra/sierra.c:1016 camlibs/sierra/sierra.c:1047
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1093
-#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1466
-#: camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1517
-#: camlibs/sierra/sierra.c:1539 camlibs/sierra/sierra.c:1565
-#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1652
+#: 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
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1218
+#: camlibs/sierra/sierra.c:893 camlibs/sierra/sierra.c:1217
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:946
-#: camlibs/sierra/sierra.c:1252
+#: camlibs/sierra/sierra.c:937 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:1251
 msgid "Black/White"
 msgstr "Чёрный/белый"
 
-#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:1256
+#: camlibs/sierra/sierra.c:939 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1255
 msgid "White Board"
 msgstr "Белая доска"
 
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:952
-#: camlibs/sierra/sierra.c:1258
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:951
+#: camlibs/sierra/sierra.c:1257
 msgid "Black Board"
 msgstr "Чёрная доска"
 
-#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1289
+#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1288
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1007
-#: camlibs/sierra/sierra.c:1295
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1294
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1297
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1296
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1037
-#: camlibs/sierra/sierra.c:1316
+#: camlibs/sierra/sierra.c:1028 camlibs/sierra/sierra.c:1036
+#: camlibs/sierra/sierra.c:1315
 msgid "Skylight"
 msgstr "Дневной свет"
 
-#: camlibs/sierra/sierra.c:1061 camlibs/sierra/sierra.c:1068
-#: camlibs/sierra/sierra.c:1339
+#: camlibs/sierra/sierra.c:1060 camlibs/sierra/sierra.c:1067
+#: camlibs/sierra/sierra.c:1338
 msgid "Infinity/Fish-eye"
 msgstr "Бесконечность/Рыбий глаз"
 
-#: camlibs/sierra/sierra.c:1082 camlibs/sierra/sierra.c:1349
+#: camlibs/sierra/sierra.c:1081 camlibs/sierra/sierra.c:1348
 msgid "Spot Metering Mode"
 msgstr "Точечный режим замера"
 
-#: camlibs/sierra/sierra.c:1105 camlibs/sierra/sierra.c:1111
+#: camlibs/sierra/sierra.c:1104 camlibs/sierra/sierra.c:1110
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1106 camlibs/sierra/sierra.c:1116
+#: camlibs/sierra/sierra.c:1105 camlibs/sierra/sierra.c:1115
 msgid "1.6x"
 msgstr "1,6x"
 
-#: camlibs/sierra/sierra.c:1108 camlibs/sierra/sierra.c:1119
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1118
 msgid "2.5x"
 msgstr "2,5x"
 
-#: camlibs/sierra/sierra.c:1136 camlibs/sierra/sierra.c:1383
-#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1790
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1382
+#: camlibs/sierra/sierra.c:1597 camlibs/sierra/sierra.c:1789
 msgid "Auto Off (host) (in seconds)"
 msgstr "Автоматическое отключение (компьютер) (в секундах)"
 
-#: camlibs/sierra/sierra.c:1138 camlibs/sierra/sierra.c:1600
+#: camlibs/sierra/sierra.c:1137 camlibs/sierra/sierra.c:1599
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -5693,12 +5547,12 @@ msgstr ""
 "Сколько времени пройдёт до автоматического выключения фотоаппарата,когда он "
 "подключён к компьютеру?"
 
-#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1393
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1149 camlibs/sierra/sierra.c:1392
+#: camlibs/sierra/sierra.c:1611 camlibs/sierra/sierra.c:1799
 msgid "Auto Off (field) (in seconds)"
 msgstr "Автовыключение (автономн.) (в секундах)"
 
-#: camlibs/sierra/sierra.c:1152 camlibs/sierra/sierra.c:1614
+#: camlibs/sierra/sierra.c:1151 camlibs/sierra/sierra.c:1613
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -5706,123 +5560,123 @@ msgstr ""
 "Сколько времени пройдёт до автоматического выключения фотоаппарата,когда он "
 "не подключён к компьютеру?"
 
-#: camlibs/sierra/sierra.c:1174 camlibs/sierra/sierra.c:1412
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1411
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1436
+#: camlibs/sierra/sierra.c:1435
 msgid "Shot Settings"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1451
-#: camlibs/sierra/sierra.c:1686
+#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1450
+#: camlibs/sierra/sierra.c:1685
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1453
-#: camlibs/sierra/sierra.c:1688
+#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1452
+#: camlibs/sierra/sierra.c:1687
 msgid "F2.3"
 msgstr "F2,3"
 
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1455
-#: camlibs/sierra/sierra.c:1690
+#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1689
 msgid "F2.8"
 msgstr "F2,8"
 
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1457
-#: camlibs/sierra/sierra.c:1692
+#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1691
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1459
-#: camlibs/sierra/sierra.c:1694
+#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1693
 msgid "F5.6"
 msgstr "F5,6"
 
-#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1461
-#: camlibs/sierra/sierra.c:1696
+#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1695
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1560
-#: camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1559
+#: camlibs/sierra/sierra.c:1764
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1553 camlibs/sierra/sierra.c:1562
-#: camlibs/sierra/sierra.c:1767
+#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1561
+#: camlibs/sierra/sierra.c:1766
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1576 camlibs/sierra/sierra.c:1579
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/sierra.c:1575 camlibs/sierra/sierra.c:1578
+#: camlibs/sierra/sierra.c:1778
 msgid "color"
 msgstr "цвет"
 
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1581
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/sierra.c:1576 camlibs/sierra/sierra.c:1580
+#: camlibs/sierra/sierra.c:1780
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1883
+#: camlibs/sierra/sierra.c:1882
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1891
+#: camlibs/sierra/sierra.c:1890
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sМодель фотоаппарата: %s\n"
 
-#: camlibs/sierra/sierra.c:1893
+#: camlibs/sierra/sierra.c:1892
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sПроизводитель: %s\n"
 
-#: camlibs/sierra/sierra.c:1895
+#: camlibs/sierra/sierra.c:1894
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sID фотоаппарата: %s\n"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1896
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sСерийный номер: %s\n"
 
-#: camlibs/sierra/sierra.c:1899
+#: camlibs/sierra/sierra.c:1898
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sВерсия ПО: %s\n"
 
-#: camlibs/sierra/sierra.c:1904 camlibs/sierra/sierra.c:1907
+#: camlibs/sierra/sierra.c:1903 camlibs/sierra/sierra.c:1906
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sСнято кадров: %i\n"
 
-#: camlibs/sierra/sierra.c:1910
+#: camlibs/sierra/sierra.c:1909
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sОсталось кадров: %i\n"
 
-#: camlibs/sierra/sierra.c:1912
+#: camlibs/sierra/sierra.c:1911
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sРабота от аккумулятора: %i\n"
 
-#: camlibs/sierra/sierra.c:1914
+#: camlibs/sierra/sierra.c:1913
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sОсталось памяти: %i байт\n"
 
-#: camlibs/sierra/sierra.c:1919
+#: camlibs/sierra/sierra.c:1918
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sДата: %s"
 
-#: camlibs/sierra/sierra.c:1935
+#: camlibs/sierra/sierra.c:1934
 msgid "No camera manual available.\n"
 msgstr "Руководство пользователя фотоаппарата недоступно.\n"
 
-#: camlibs/sierra/sierra.c:1942
+#: camlibs/sierra/sierra.c:1941
 #, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -5843,7 +5697,7 @@ msgstr ""
 "  PhotoPC 3000z. Если ваш аппарат работает иначе, напишите,\n"
 "  пожалуйста по адресу %s (по английски)\n"
 
-#: camlibs/sierra/sierra.c:1954
+#: camlibs/sierra/sierra.c:1953
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -5881,7 +5735,7 @@ msgstr ""
 "    таком положении, нужно заново подключить аппарат к \n"
 "    компьютеру и переключить параметр в 'Off'."
 
-#: camlibs/sierra/sierra.c:1983
+#: camlibs/sierra/sierra.c:1982
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -5950,17 +5804,14 @@ msgid "Sorry, taking pictures is not implemented..."
 msgstr ""
 
 #: camlibs/sonydscf1/dsc_f1.c:152
-#, c-format
 msgid "Couldn't open camera.\n"
 msgstr "Невозможно открыть фотоаппарат.\n"
 
 #: camlibs/sonydscf1/dsc_f1.c:166
-#, c-format
 msgid "Error opening camera\n"
 msgstr "Ошибка открытия фотоаппарата\n"
 
 #: camlibs/sonydscf1/dsc_f1.c:171
-#, c-format
 msgid "Picture number is too large.\n"
 msgstr ""
 
@@ -5983,7 +5834,6 @@ msgstr ""
 "Работать наверняка не будет!\n"
 
 #: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, c-format
 msgid "Error opening camera.\n"
 msgstr "Ошибка открытия фотоаппарата.\n"
 
@@ -6312,18 +6162,18 @@ msgstr ""
 "David Hogue <david@jawa.gotdns.org>\n"
 "Драйвер Toshiba pdr-m11.\n"
 
-#: libgphoto2/gphoto2-abilities-list.c:176
-#: libgphoto2/gphoto2-abilities-list.c:277
+#: libgphoto2/gphoto2-abilities-list.c:181
+#: libgphoto2/gphoto2-abilities-list.c:278
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:265
+#: libgphoto2/gphoto2-abilities-list.c:266
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Невозможно открыть '%s'"
 
-#: libgphoto2/gphoto2-abilities-list.c:697
+#: libgphoto2/gphoto2-abilities-list.c:698
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Не найден драйвер для '%s'"