po updates

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

13 files changed, 7925 insertions, 8355 deletions

diff --git a/po/da.po b/po/da.po
index a06c22b52..ec4c85f35 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2000-04-19 10:12+02:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -43,96 +44,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -148,8 +150,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -179,26 +181,24 @@ msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"Kunne ikke �bne:\n"
-"%s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -206,35 +206,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Ikke tilg�ngelig"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +250,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -261,114 +261,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Kunne ikke hente #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguration af kamera"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "Levende kamera!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Kameramodel:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "Ikke tilg�ngelig"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "S�t tilbage"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "Kunne ikke gemme #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -614,152 +614,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Skal�rer billede med 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -932,7 +932,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "Nedlastning stoppet."
@@ -952,8 +952,8 @@ msgid "Problem taking live image"
 msgstr "Finder levende billede..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Konfiguration af kamera"
 
@@ -1164,7 +1164,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1200,44 +1200,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke tage billede."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1247,6 +1221,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1393,17 +1372,17 @@ msgstr "�bn billede"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1441,31 +1420,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1489,8 +1469,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1505,15 +1485,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1809,8 +1789,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1902,8 +1882,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1927,8 +1907,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1996,8 +1976,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2020,15 +2000,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2098,21 +2078,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "H�jde:"
@@ -2149,7 +2129,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2161,7 +2141,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2182,9 +2162,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2342,15 +2322,15 @@ msgid "No"
 msgstr "Nej"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2549,7 +2529,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Skal�rer billede med 50%..."
@@ -2626,7 +2606,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s er ikke implementeret endnu"
@@ -2679,7 +2658,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "Billedindeks"
@@ -2709,9 +2688,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2778,8 +2757,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
@@ -2823,177 +2802,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Gemning af indeks er ikke underst�ttet endnu"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ikke tilg�ngelig"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Nedlastning afbrudt."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3003,24 +2982,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "Nyt billede er #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3191,166 +3170,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Nedlastning afbrudt."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Farveindstillinger"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Farver"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Farver"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Farver"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3416,8 +3392,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3425,7 +3402,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3454,8 +3431,8 @@ msgstr "Billedindeks"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3529,82 +3506,65 @@ msgstr "Gemning af indeks er ikke underst�ttet endnu"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3618,128 +3578,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "Farver"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "Kameramodel:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3748,10 +3708,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3778,104 +3738,90 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"Kunne ikke �bne:\n"
+"%s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "Henter indeks..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3883,13 +3829,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3910,9 +3856,9 @@ msgstr "Farvejustering"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3945,17 +3891,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Nedlastning afbrudt."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3963,11 +3909,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3975,11 +3921,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4037,53 +3983,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "Farver"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4104,7 +4051,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4121,247 +4068,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "S�t tilbage"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "Farveindstillinger"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "Farver"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "Kameramodel:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Ikke tilg�ngelig"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4382,7 +4342,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4413,55 +4373,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "Kunne ikke tage billede."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "�bn billede"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "�bn billede"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4499,15 +4417,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4539,6 +4448,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4762,129 +4676,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Nedlastning stoppet."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4930,24 +4844,49 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Kunne ikke finde smugkig"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "Kunne ikke �bne:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Rapport�r bugs og kamera succes til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Kunne ikke tage billede."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "�bn billede"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "�bn billede"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunne ikke finde smugkig"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "Konfiguration af kamera"
 
diff --git a/po/de.po b/po/de.po
index 03ef1b18d..76cf27a2b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2003-07-11 14:45-0400\n"
 "Last-Translator: Marcus Meissner <marcus@jet.franken.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -58,25 +59,26 @@ msgstr ""
 "Implementiert mit Hilfe von Dokumenten\n"
 "aus dem Web. Mit Erlaubnis von Vision."
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Konnte Verzeichnis >>%s<< nicht anlegen."
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Konnte Verzeichnis >>%s<< nicht l�schen."
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr "k�nnte Tasten nicht sperren."
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr "*UNBEKANNT*"
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -85,7 +87,7 @@ msgstr ""
 "canon_int_capture_image: erste canon_usb_list_all_dirs() fehlgeschlagen mit "
 "status %i"
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -94,7 +96,7 @@ msgstr ""
 "canon_int_capture_image: finalletzte canon_usb_list_all_dirs() "
 "fehlgeschlagen mit status %i"
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -102,56 +104,56 @@ msgid ""
 msgstr ""
 "Name �%s� (%i Zeichen) ist zu lang (%i Zeichen), maximal 30 Zeichen erlaubt."
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr "canon_int_list_dir: ERROR: erste Meldung zu kurz (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 "canon_int_list_dir: Ende des Pakets erreicht als erste Verzeichniselemente "
 "untersich wird"
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr "canon_int_list_dir: verkurzte Verzeichniselemente gefunden"
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "Datei gesch�tzt."
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "K�nnte JPEG Vorschaubild von Daten nicht ausziehen: Daten sind nicht JFIF"
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "K�nnte JPEG Vorschaubild von Daten nicht ausziehen: keine Anfang/Ende"
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -172,8 +174,8 @@ msgstr ""
 "den Computer so unbesch�ftigt wie m�glich zu lassen (besonders keine "
 "Plattenaktivit�t).\n"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "Kamera nicht verf�gbar"
 
@@ -199,22 +201,22 @@ msgstr "Kein Grund verf�gbar"
 msgid "Could not get disk info: %s"
 msgstr "Konnte Platteninfo nicht holen: %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Interne Fehler nr.1 in get_file_func() (%s Zeile %i)"
 
-#: camlibs/canon/library.c:501
-#, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "Kein Vorschaubild f�r %s gefunden"
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Keine Tondatei f�r �%s� konnte gefunden werden."
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -225,35 +227,35 @@ msgstr ""
 "  %11s bytes gesamt\n"
 "  %11s bytes verf�gbar"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "Netzadapter "
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "mit Batterie "
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "Energieversorgung OK"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "Energieversorgung nicht OK"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "nicht verf�gbar: %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (Zeit am PC %s%i Sekunden)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +282,7 @@ msgstr ""
 "\n"
 "Zeit: %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -298,25 +300,25 @@ msgstr ""
 "A5-Zus�tze von Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "Fehler beim L�schen der Datei"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "Fehler beim L�schen des zugeh�rigen Vorschaubildes"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Raten �ber 57600 sind mit dieser Kamera nicht f�r das Hochladen unterst�tzt"
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "Konnte keinen Laufwerksbuchstaben f�r das Flash-Laufwerk bekommen"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -325,84 +327,84 @@ msgstr ""
 "Der Verzeichnisname 999CANON existiert und enth�lt eine Datei namens "
 "AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "Konnte Verzeichnis \\\\DCIM nicht anlegen."
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "Konnte Zielverzeichnis nicht anlegen."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- und Treiber-Konfiguration"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "Kameramodell (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "Eigent�mername"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "Datum und Zeit (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "Fehler"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "Nicht verf�gbar"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "Setze Kameradatum auf das Datum des PCs"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "Firmware-Revision (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "Energie (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "Treiber"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "Liste alle Dateien"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "Dateinamen beim Hochladen beibehalten"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "Eigent�mername ge�ndert"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "Konnte Eigent�mernamen nicht �ndern"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "Zeit gesetzt"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "Konnte Zeit nicht setzen"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -660,7 +662,7 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "Kamera nicht bereit, get_battery-Anfrage fehlgeschlagen: %s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
@@ -669,7 +671,7 @@ msgstr ""
 "canon_usb_lock_keys: Unerwartete Dateil�nge erhalten (%i erhalten, %i "
 "erwartet)"
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
@@ -678,7 +680,7 @@ msgstr ""
 "canon_usb_lock_keys: Unerwartete Dateil�nge erhalten (%i erhalten, %i "
 "erwartet) bei >>get picture abilities<<"
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
@@ -687,7 +689,7 @@ msgstr ""
 "canon_usb_unlock_keys: Unerwartete Dateil�nge erhalten (%i erhalten, %i "
 "erwartet)"
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
@@ -695,7 +697,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: lesen von Interruptrohr fehlgeschlagen nach %"
 "i versuchen, >>%s<<"
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -704,28 +706,28 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: lesen vom Interruptrohr fehlgeschlagen nach %"
 "i versuchen, >>%s<<"
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 "canon_usb_capture_dialogue: Falsche Paketl�nge 0x%04x f�er Vorschaubildsl�nge"
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr "canon_usb_capture_dialogue: Falsche Paketl�nge 0x%04x f�r Bildsl�nge"
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: erste Interruptspaket au�er Reihenfolge"
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr "canon_usb_capture_dialogue: zweite Interruptspaket au�er Reihenfolge"
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
@@ -733,41 +735,41 @@ msgstr ""
 "canon_usb_capture_dialogue: Aufnahme photographisch fehlgeschlagen, code=0x%"
 "08x"
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: dritte EOS Interruptspaket au�er Reihenfolge"
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: zweite EOS Interruptspaket au�er Reihenfolge"
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr "canon_usb_dialogue: Nutzlast zu gro�, passt nicht in Puffer (%i > %i)"
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "Empfange Daten..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Speicherplatz fehlt: %d bytes ben�tigt."
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Konnte Daten vom Datei >>%s<< nicht holen"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 msgid "File upload failed."
 msgstr "Bildhochladung fehlgeschlagen."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -775,7 +777,7 @@ msgstr ""
 "Datei war zu gro�. M�glicherweise m�ssen Sie ihre Kamera aus- und wieder "
 "einschalten, um weitere Dateien hochzuladen."
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -783,7 +785,7 @@ msgid ""
 msgstr ""
 "canon_usb_get_dirents: Nutzlast passt nicht in Puffer, '%.96s' (verkurzt)"
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -792,7 +794,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue k�nnte keine "
 "Verzeichniselemente holen, status %i"
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -801,7 +803,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Nutzlast passt nicht in Puffer, >>'%.96s<< "
 "(verkurtzt) zu lang."
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -810,11 +812,11 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue k�nnte keine "
 "Verzeichniselemente holen, status %i"
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fehlgeschlagen"
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
@@ -823,12 +825,12 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue gibt status 0x%08x vom "
 "Kamera"
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Erkannte eine �%s�."
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Name >>%s<< passt mit keinem bekanntes Modell"
@@ -1028,7 +1030,7 @@ msgstr "Kein Speicherplatz vorhanden"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "Lade Bild herunter..."
 
@@ -1045,8 +1047,8 @@ msgid "Problem taking live image"
 msgstr "Problem bei der Aufnahme eines Live-Bildes"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamera-Konfiguration"
 
@@ -1250,7 +1252,7 @@ msgstr "Konfiguration der FUJI Kamera."
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "Datum und Zeit"
 
@@ -1294,13 +1296,11 @@ msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Nichtunterst�tzter Porttyp: %d. Dieser Treiber unterst�tzt nur USB-Kameras.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Konnte Kamera nicht zur�cksetzen.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1309,37 +1309,6 @@ msgstr ""
 "Diese Kamera kann nur die jeweils letzte Datei l�schen. In diesem Fall ist "
 "dies Datei �%s�."
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart-Bibliothek v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Unterst�tzung f�r die Mustek gSmart mini-Digitalkameras, basierend auf "
-"verschiedenen anderen gphoto2-Bibliotheken und dem Windows-Treiber, der "
-"freundlicherweise von Mustek zur Verf�gung gestellt wurde.\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Nichtunterst�tzter Porttyp: %d. Dieser Treiber unterst�tzt nur USB-Kameras.\n"
-
 # Haesslich [Colin]
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
@@ -1350,6 +1319,11 @@ msgstr "Aufgenommene Bilder: %4d\n"
 msgid "jamcam library v"
 msgstr "jamcam-Bibliothek v"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1514,17 +1488,17 @@ msgstr "Aufnahme"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "Makro"
 
@@ -1562,31 +1536,32 @@ msgstr "Belichtungskompensation"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "Immer"
 
@@ -1609,8 +1584,8 @@ msgstr "Rote-Augen-Blitz"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "An"
 
@@ -1625,15 +1600,15 @@ msgstr "An"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "Aus"
 
@@ -1944,11 +1919,11 @@ msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "Diese Kamera hat gerade einen unbekannten Fehlercode geschickt. Bitte "
 "berichten sie folgenden Fehlercode an <gphoto-devel@lists.sourceforge.net> "
@@ -2052,8 +2027,8 @@ msgstr "Diashow-Intervall"
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "Aufl�sung"
 
@@ -2077,8 +2052,8 @@ msgid "Localization"
 msgstr "Lokalisierung"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "Sprache"
 
@@ -2146,8 +2121,8 @@ msgid "Focus"
 msgstr "Fokus"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "Fest eingestellt"
 
@@ -2169,15 +2144,15 @@ msgstr "Selbstausl�ser (nur n�chstes Bild)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "Normal"
 
@@ -2247,21 +2222,21 @@ msgid "No answer from the camera."
 msgstr "Keine Antwort von der Kamera."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "Niedrig"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "Mittel"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "Hoch"
 
@@ -2297,7 +2272,7 @@ msgstr "B�ro"
 msgid "Day-lt"
 msgstr "Tageslicht"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr "Sch�rfe"
 
@@ -2309,7 +2284,7 @@ msgstr "Sch�rfe"
 msgid "Soft"
 msgstr "Weich"
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 msgid "Color"
 msgstr "farbig"
@@ -2328,9 +2303,9 @@ msgid "Black and White"
 msgstr "schwarz/wei�"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "Sepia"
 
@@ -2529,15 +2504,15 @@ msgid "No"
 msgstr "Nein"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "Fein"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "Standard"
 
@@ -2755,7 +2730,7 @@ msgstr ""
 "Dateigr��e ist %i bytes. Gr��tm�gliche Datei f�r das Hochladen ist %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Lade Bild hoch..."
 
@@ -2864,7 +2839,6 @@ msgstr ""
 " Anzahl Dateien: %d"
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "Handbuch noch nicht implementiert"
 
@@ -2933,7 +2907,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "Bildqualit�t"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "Bildgr��e"
 
@@ -2961,9 +2935,9 @@ msgstr "fein"
 msgid "superfine"
 msgstr "superfein"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "auto"
 
@@ -3029,10 +3003,10 @@ msgstr ""
 "Informationen �ber Bild %i"
 
 #: camlibs/polaroid/pdc700.c:916
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "%i Bytes eines unbekannten Bildformates erhalten. Bitte schreiben Sie an "
 "<gphoto-devel@lists.sourceforge.net> (auf Englisch) f�r Unterst�tzung."
@@ -3094,167 +3068,167 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Der angeforderte Port-Typ (%i) wird von diesem Treiber nicht unterst�tzt."
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP- Undefinierter Fehler"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP-OK!"
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP-Allgemeiner Fehler"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP-Sitzung nicht ge�ffnet"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP-Fehlerhafte Transaktions-ID"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "PTP-Operation nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "PTP-Parameter nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP-Unvollst�ndiger Transfer"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP-Fehlerhafte Storage-ID"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "PTP-Ung�ltiges Object Handle"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP-Ger�teeigenschaft nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP-Ung�ltiger Object Formatcode"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP-Speicher voll"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP-Objekt schreibgesch�tzt"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP-Speicher-schreibgesch�tzt"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP-Zugriff verweigert"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "PTP-Kein Thumbnail vorhanden"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP-Selbsttest fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP-Partiell gel�scht"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP- Speicher nicht verf�gbar"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP- Spezifikation durch Format nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP-Keine g�ltige Object Information"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP-Ung�ltiges Codeformat"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP-Unbekannter H�ndlercode"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP-Aufnahme bereits beendet"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP-Device Bus"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP-Ung�ltiges Vaterobjekt"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP-Ung�ltiges Ger�teeigenschaften Format"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP-Ung�ltiger Ger�teeigenschaftswert"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP-Ung�ltiger Parameter"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP- Sitzung bereits ge�ffnet."
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP-Transaktion abgebrochen"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP-Spezifikation des Zieles nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP-EK-Filename erforderlich"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP-EK Filenamenskonflikt"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "PTP-EK-Filename ung�ltig"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP-Ein/Ausgabefehler"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP- Fehler: Ung�ltiger Parameter"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP- Protokollfehler: Daten erwartet"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP-Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3264,7 +3238,7 @@ msgstr ""
 "(c) 2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Viel Spa�!"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3279,23 +3253,23 @@ msgstr ""
 "H�ndler Kennung: 0x%08x\n"
 "H�ndler Beschreibung: %s\n"
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 msgid "Number of values"
 msgstr "Anzahl der Werte"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr "Unterst�tzte Werte"
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr "Aktueller Wert"
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr "Initialisiere Kamera"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP- Ist nur f�r USB Kameras implementiert."
 
@@ -3459,162 +3433,159 @@ msgstr "PTP: Protokollfehler: Daten erwartet"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr "PTP: Undefinierter Fehler"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr "Batterie Ladezustand"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 msgid "Functional Mode"
 msgstr "Funktionsmodus"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 msgid "Compression Setting"
 msgstr "Kompressions Parameter"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "Wei�abgleich"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr "RGB Wert"
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr "F-Nummer"
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr "Fokus Tiefe"
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr "Fokus Entfernung"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "Fokusmodus"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr "Belichtungsmessmodus"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "Blitzmodus"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr "Belichtungszeit"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr "Belichtungs Programm Modus"
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr "Belichtungs Index (nach ISO)"
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr "Belichtungskompensation"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr "Datum / Zeit"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr "Aufnahmeverz�gerung"
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr "Bildaufnahme Modus"
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "Digitalzoom"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 msgid "Effect Mode"
 msgstr "Effektmodus"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr "Burst-Nummer"
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr "Burst Abstand"
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr "Zeitraffer Nummer"
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr "Zeitraffer Intervall"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 msgid "Focus Metering Mode"
 msgstr "Entfernungs Messungs Modus"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr "Upload URL"
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr "K�nstler"
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr "Copyright Information"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr "EK Farbtemperatur"
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr "EK Datums- und Zeitformat"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr "EK Signalton Modus"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr "EK Video Ausgang"
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr "EK Stromsparmodus"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr "EK Benutzerinterface Sprache"
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "Entwickelt von Mariusz Woloszyn <emsi@ipartners.pl>. Viel Spass!"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3686,8 +3657,9 @@ msgid "Outdoor"
 msgstr "Im Freien"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "Kunstlicht - Fluoreszenzlampe"
 
@@ -3695,7 +3667,7 @@ msgstr "Kunstlicht - Fluoreszenzlampe"
 msgid "Incandescent"
 msgstr "Kunstlicht - Gl�hlampe"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "schwarz/wei�"
 
@@ -3723,8 +3695,8 @@ msgstr "Bild & Sound"
 msgid "Character & Sound"
 msgstr "Charakter & Sound"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3794,88 +3766,77 @@ msgid "Speed %i is not supported!"
 msgstr "Aufnahmegeschwindigkeit %i wird nicht unterst�tzt!"
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
-"%i erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@lists."
-"sourceforge.net> (auf Englisch)."
+"%i Bytes erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@gphoto."
+"org> (auf Englisch)."
 
 #: camlibs/ricoh/ricoh.c:75
-#, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
-"%i Bytes erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@lists."
-"sourceforge.net> (auf Englisch)."
+"%i Bytes erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@gphoto."
+"org> (auf Englisch)."
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Wir haben 0x%x erwartet, aber 0x%x erhalten. Bitte kontaktieren Sie <gphoto-"
 "devel@gphoto.org> mit diesen und m�glichen weiteren Debuginformationen (auf "
 "Englisch)."
 
 #: camlibs/ricoh/ricoh.c:215
-#, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+#, fuzzy, c-format
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Fehlerhafte Zeichen (0x%x, 0x%x). Bitte kontaktieren Sie <gphoto-"
 "devel@gphoto.org> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Kamera besch�ftigt. Wenn dieses Problem l�nger auftritt, kontaktieren Sie "
 "bitte <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Time-Out selbst nach 2 Versuchen.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:308
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
-"Time-Out selbst nach 2 Versuchen.\n"
+"Kommunikationsproblem selbst nach 2 Versuchen.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Kamera ist im falschen Modus.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:349
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Kamera akzeptierte die Parameter nicht.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ein unbekannter Fehler trat auf.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3895,122 +3856,123 @@ msgstr ""
 "portierte den Treiber nach gphoto2. Marcus Mei�ner <marcus@jet.franken.de> "
 "vollendete und verbesserte die Portierung."
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "Aufl�sung und Gr��e"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "Datum und Zeit (GMT)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "Blendeneinstellungen"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "Farbmodus"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "Rote-Augen-Vermeidung"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "Langsame Sync"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "Blitzeinstellungen"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "Stromsparmodus am PC (in Sekunden)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "Stromsparmodus der Kamera (in Sekunden)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "Objektivmodus"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "Englisch"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "Franz�sisch"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "Deutsch"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "Italienisch"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "Portugiesisch"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "Bildeinstellungen"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "Kameraeinstellungen"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -4019,7 +3981,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Einige Kommentare �ber Epson-Kameras:\n"
 "- einige Parameter sind nicht fernsteuerbar:\n"
@@ -4030,7 +3992,7 @@ msgstr ""
 "  Wenn Ihre Kamera anders reagiert, dann senden Sie bitte\n"
 "  eine Mail an <gphoto-devel@lists.sourceforge.net> (auf Englisch).\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "Keine Speicherkarte vorhanden"
 
@@ -4058,114 +4020,100 @@ msgstr "Kamera hat 3 Versuche die Verbindung offen zu halten abgelehnt."
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Das erste empfangene Byte (0x%x) ist nicht g�ltig."
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "Time-Out f�r �bertragung des Datenpakets nach %i Versuchen. \n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "Konnte Paket auch nach mehreren Versuchen nicht senden."
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Datenpaket wurde von der Kamera abgelehnt. Bitte kontaktieren Sie <gphoto-"
 "devel@gphoto.org> (auf Englisch)."
 
-#: camlibs/sierra/library.c:789
-#, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+#: camlibs/sierra/library.c:790
+#, fuzzy, c-format
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Konnte Datenpaket nicht �bertragen (Fehlercode %i).\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "Time-Out f�r �bertragung auch noch 2 Versuchen. Gebe auf..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Unerwartetes Resultat (Fehlercode 0x%x) erhalten. Bitte kontaktieren Sie "
 "<gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Unerwartete Antwort (Fehlercode %i) erhalten. Bitte kontaktieren Sie <gphoto-"
 "devel@gphoto.org> (auf Englisch)."
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Konnte Register %i nicht holen. Bitte kontaktieren Sie <gphoto-devel@gphoto."
 "org> (auf Englisch)."
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "Zu viele Versuche misslungen."
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "Sende Daten..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Rekursive Aufrufe werden vom Sierra-Treiber nicht unterst�tzt.\n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Konnte String-Register %i nicht lesen. \n"
 "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf Englisch)."
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 Bytes erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@gphoto."
 "org> (auf Englisch)."
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Belichtungszeit (Mikrosekunden, 0 automatisch)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "Belichtungszeit (in Sekunden)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr "S/W"
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr "Anti-Rotaugen"
 
@@ -4173,13 +4121,13 @@ msgstr "Anti-Rotaugen"
 msgid "Slow-sync"
 msgstr "Langsame Synchronisation"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "Kontrast-"
 
@@ -4199,9 +4147,9 @@ msgstr "Bildjustierung"
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "Wolkig"
 
@@ -4233,17 +4181,17 @@ msgstr "Vorheriges"
 msgid "Operation Mode"
 msgstr "Kameramodus"
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "LCD-Helligkeit"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Autom. Abschaltung des LCD (in Sekunden)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Belichtungskompensation"
 
@@ -4251,11 +4199,11 @@ msgstr "Belichtungskompensation"
 msgid "Center-Weighted"
 msgstr "Mittelpunkt/Gewichtet"
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr "Punkt"
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr "Matrix"
 
@@ -4263,11 +4211,11 @@ msgstr "Matrix"
 msgid "Spot-AF"
 msgstr "Punkt-AF"
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "Belichtungsmessung"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (in Millimetern)"
 
@@ -4344,52 +4292,53 @@ msgstr ""
 "\n"
 "    Das Herunterladen sollte korrekt funktionieren.\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr "White Board"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr "Black Board"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr "Tageslicht"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "Kunstlicht - Gl�hlampe"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr "Manuell"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "LCD-Modus"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "Digitalzoom"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "ISO-Geschwindigkeit"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "Fokusposition"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "Zeitformat"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4428,7 +4377,7 @@ msgstr ""
 "    Sie die Kamera wieder mit dem PC verbinden und den \n"
 "    LCD-Modus auf �Aus� setzen."
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4459,111 +4408,111 @@ msgstr ""
 "    haben, dann kontaktieren Sie bitte \n"
 "    <gphoto-devel@gphoto.net>.\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "Die hochzuladende Datei hat eine Gr��e von null Bytes"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "Nicht gen�gend Speicherplatz auf der Karte vorhanden"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kann den Namen des Verzeichnisses mit den Bildern nicht bekommen"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Hochladen ist nur in das Verzeichnis �%s� unterst�tzt"
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "Beste"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (unbekannt)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Belichtungszeit (Mikrosekunden, 0 automatisch)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "Blende"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "Schwarz/Wei�"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "White Board-Effekt"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "Black Board-Effekt"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "Helligkeit/Kontrast"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "Hell+"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "Hell-"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "Tageslicht"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "Unendlich/Fischauge"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "Spotmessung"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "Autom. Abschaltung (am PC) (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -4571,12 +4520,12 @@ msgstr ""
 "Wie lange soll es dauern, bis die Kamera abschaltet, wenn sie an den "
 "Computer angeschlossen ist?"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "Autom. Abschaltung (nicht am PC) (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -4584,126 +4533,147 @@ msgstr ""
 "Wie lange soll es dauern, bis die Kamera abschaltet, wenn sie nicht an den "
 "Computer angeschlossen ist?"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "Autom. Abschaltung des LCD (in Sekunden)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "Aufnahme-Einstellungen"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "Superfein"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "farbig"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "schwarz/wei�"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Note: keine Speicherkarte vorhanden, einige Werte k�nnen ung�ltig sein\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sHersteller: %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sKamera-ID: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sSeriennummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sSoftware-Revision: %s\n"
 
 # Haesslich [Colin]
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sAufgenommene Bilder: %i\n"
 
 # Haesslich... [Colin]
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sVerbleibende Bilder: %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sBatterielebensdauer: %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sVerbleibender Speicher: %i bytes\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sDatum: %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 msgid "No camera manual available.\n"
 msgstr "Keine Kamera Hilfe verf�gbar.\n"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"Einige Kommentare �ber Epson-Kameras:\n"
+"- einige Parameter sind nicht fernsteuerbar:\n"
+"  * Zoom\n"
+"  * Fokus\n"
+"  * Benutzer-Wei�abgleich\n"
+"- Die Konfiguration wurde mit einer PhotoPC 3000z r�ckentwickelt.\n"
+"  Wenn Ihre Kamera anders reagiert, dann senden Sie bitte\n"
+"  eine Mail an <gphoto-devel@lists.sourceforge.net> (auf Englisch).\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4743,7 +4713,7 @@ msgstr ""
 "    LCD-Modus auf �Aus� setzen."
 
 # Ist "Freigabe" richtig? [Colin]
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4787,7 +4757,7 @@ msgstr ""
 "Marcus Mei�ner <marcus@jet.franken.de>\n"
 "Treiber f�r die SiPix Web2-Kamera."
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
@@ -4798,52 +4768,6 @@ msgstr ""
 "Bibliothek zum Zugriff auf die Smal Ultrapocket Kamera und ihre OEM "
 "Versionen (slimshot)."
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr "Sorry, diese Funktion ist nicht implementiert..."
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr "Sorry, es gibt nichts zu konfigurieren..."
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr "Sorry, Aufnehmen von Bildern ist nicht implementiert..."
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-msgid "Couldn't open camera.\n"
-msgstr "Konnte Kamera nicht �ffnen.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-msgid "Error opening camera\n"
-msgstr "Fehler beim �ffnen der Kamera\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr "Bildnummer ist zu gro�.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"Sony DSC-F1 Digitalkamera-Unterst�tzung\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Basierend auf dem chotplay CLI-Interface von\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"Diese Bibliothek funktioniert m�glicherweise nicht.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-msgid "Error opening camera.\n"
-msgstr "Fehler beim �ffnen der Kamera.\n"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4896,20 +4820,6 @@ msgstr ""
 "Soundvision-Treiber\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-"spca504_flash-Bibliothek\n"
-" Autoren: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"basierend auf Arbeit von Matthias Krauss\n"
-"und Mark A. Zimmerman <mark@foresthaven.com>"
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4955,6 +4865,12 @@ msgstr ""
 "freundlicherweise von Mustek zur Verf�gung gestellt wurden.\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"Nichtunterst�tzter Porttyp: %d. Dieser Treiber unterst�tzt nur USB-Kameras.\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5185,36 +5101,36 @@ msgstr "Diese Kamera kann keine Aufnahme machen."
 msgid "This camera can not capture previews."
 msgstr "Diese Kamera kann keine Vorschaubilder machen."
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Die Pfadangabe �%s� ist nicht absolut."
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 "Konnte Verzeichnis �%s� nicht anh�ngen, das dieses Verzeichnis bereits "
 "existiert."
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Konnte Verzeichnis �%s� nicht finden."
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Verzeichnis �%s� enth�lt kein Verzeichnis �%s�."
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Konnte �%s� nicht an Verzeichnis �%s� anh�ngen, das diese Datei bereits "
 "existiert."
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5223,7 +5139,7 @@ msgstr ""
 "Sie versuchen, �%s� aus dem Verzeichnis �%s� zu l�schen, aber das "
 "Dateisystem unterst�tzt kein L�schen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
@@ -5231,18 +5147,18 @@ msgstr ""
 "Im Verzeichnis �%s�, das Sie zu L�schen versuchen, befinden sich immer noch "
 "Unterverzeichnisse."
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 "Im Verzeichnis �%s�, das Sie zu L�schen versuchen, befinden sich immer noch "
 "Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "Das Dateisystem unterst�tzt kein Hochladen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5251,36 +5167,36 @@ msgstr ""
 "Verzeichnis �%s� enth�lt nur %i Dateien, aber Sie verlangten eine Datei mit "
 "der Nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Datei �%s� konnte nicht im Verzeichnis �%s� gefunden werden."
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Konnte Datei �%s� nicht finden."
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "Das Dateisystem unterst�tzt kein Holen von Dateien."
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Unbekannter Dateityp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Lade �%s� aus Verzeichnis �%s�..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr "Das Dateisystem unterst�tzt das Holen von Dateiinformationen nicht"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5289,31 +5205,31 @@ msgstr ""
 "Konnte �/proc/meminfo� nicht zum Lesen �ffnen (�%m�). Stellen Sie sicher, "
 "dass das proc-Dateisystem eingeh�ngt ist."
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "Ein Fehler trat beim Lesen von �/proc/meminfo� auf (�%m�)."
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "sysctl-Aufruf schlug fehl (�%m�)."
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "sysctl-Aufruf schlug fehl (�%m�)."
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "sysctl-Aufruf schlug fehl (�%m�)."
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr "Das Dateisystem unterst�tzt das Setzen von Dateiinformationen nicht"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "\"Nur-Lesen\"-Dateiattribute wie H�he und Breite k�nnen nicht ge�ndert "
@@ -5359,31 +5275,114 @@ msgstr "Unbekannter Fehler des Kamera-Treibers"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#~ msgid "create"
-#~ msgstr "anlegen"
+#, fuzzy
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "Kein Vorschaubild f�r %s gefunden"
 
-#~ msgid "remove"
-#~ msgstr "entfernen"
+#~ msgid "gsmart library v"
+#~ msgstr "gsmart-Bibliothek v"
 
-#, fuzzy
-#~ msgid "lock keys failed.\n"
-#~ msgstr "koennte Tasten nicht sperren."
+#~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Unterst�tzung f�r die Mustek gSmart mini-Digitalkameras, basierend auf "
+#~ "verschiedenen anderen gphoto2-Bibliotheken und dem Windows-Treiber, der "
+#~ "freundlicherweise von Mustek zur Verf�gung gestellt wurde.\n"
+#~ "\n"
+
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "Entwickelt von Mariusz Woloszyn <emsi@ipartners.pl>. Viel Spass!"
+
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "%i erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-devel@lists."
+#~ "sourceforge.net> (auf Englisch)."
 
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "%i Bytes erwartet, %i erhalten. Bitte kontaktieren Sie <gphoto-"
-#~ "devel@gphoto.org> (auf Englisch)."
+#~ "devel@lists.sourceforge.net> (auf Englisch)."
 
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "Kommunikationsproblem selbst nach 2 Versuchen.\n"
+#~ "Time-Out selbst nach 2 Versuchen.\n"
 #~ "Bitte kontaktieren Sie <gphoto-devel@lists.sourceforge.net> (auf "
 #~ "Englisch)."
 
+#~ msgid "Sorry, this function not implemented..."
+#~ msgstr "Sorry, diese Funktion ist nicht implementiert..."
+
+#~ msgid "Sorry, nothing to configure..."
+#~ msgstr "Sorry, es gibt nichts zu konfigurieren..."
+
+#~ msgid "Sorry, taking pictures is not implemented..."
+#~ msgstr "Sorry, Aufnehmen von Bildern ist nicht implementiert..."
+
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Konnte Kamera nicht �ffnen.\n"
+
+#~ msgid "Error opening camera\n"
+#~ msgstr "Fehler beim �ffnen der Kamera\n"
+
+#~ msgid "Picture number is too large.\n"
+#~ msgstr "Bildnummer ist zu gro�.\n"
+
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "Sony DSC-F1 Digitalkamera-Unterst�tzung\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Basierend auf dem chotplay CLI-Interface von\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "Diese Bibliothek funktioniert m�glicherweise nicht.\n"
+
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Fehler beim �ffnen der Kamera.\n"
+
+#~ msgid ""
+#~ "spca504_flash camlib\n"
+#~ " Authors: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "based on work by Matthias Krauss\n"
+#~ "and Mark A. Zimmerman <mark@foresthaven.com>"
+#~ msgstr ""
+#~ "spca504_flash-Bibliothek\n"
+#~ " Autoren: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "basierend auf Arbeit von Matthias Krauss\n"
+#~ "und Mark A. Zimmerman <mark@foresthaven.com>"
+
+#~ msgid "create"
+#~ msgstr "anlegen"
+
+#~ msgid "remove"
+#~ msgstr "entfernen"
+
+#, fuzzy
+#~ msgid "lock keys failed.\n"
+#~ msgstr "koennte Tasten nicht sperren."
+
 #, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "Treiber Konfiguration"
diff --git a/po/es.po b/po/es.po
index 47ea4d50d..f924fef0a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2003-07-11 14:03-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -55,25 +56,26 @@ msgstr ""
 "Implementado utilizando documentos encontrados\n"
 "en la web. Permiso acrodado por Vision."
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, c-format
 msgid "Could not create directory %s."
 msgstr "No se pudo crear el directorio %s."
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "No se pudo quitar el directorio %s."
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr "fall� traba de teclas."
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr "*DESCONOCIDO*"
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -82,7 +84,7 @@ msgstr ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() fall� con estado %"
 "i"
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -90,7 +92,7 @@ msgid ""
 msgstr ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() fall� con estado %i"
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -99,56 +101,56 @@ msgstr ""
 "El nombre '%s' (%i caracteres) es muy largo (%i car.), s�lo se permiten 30 "
 "caracteres como m�ximo."
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr "canon_int_list_dir: ERROR: mensaje inicial muy corto (%i < m�nimo %i)"
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 "canon_int_list_dir: Lleg� final de pacquete mientras se examinaba 1er. "
 "entrada de dir"
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr "canon_int_list_dir: se encontr� entrada de directorio truncada"
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "Archivo protegido."
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "No se pudo extraer diapositiva JPEG de los datos: Los datos no son JFIF"
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "No se pudo extraer diapositiva JPEG de los datos: Sin comienzo/fin"
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -169,8 +171,8 @@ msgstr ""
 "computadora lo m�s calma posible\n"
 " (ej: sin actividad en el disco)\n"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "C�mara no disponible"
 
@@ -196,22 +198,22 @@ msgstr "Raz�n desconocida"
 msgid "Could not get disk info: %s"
 msgstr "No se puede obtener informaci�n del disco: %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "error interno #1 en get_file_func() (%s l�nea %i)"
 
-#: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "No se encontr� diapositiva para %s"
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "No se pudo encontrar archivo de audio para %s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -222,35 +224,35 @@ msgstr ""
 "  %11s bytes en total\n"
 "  %11s bytes disponibles"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "Transformador de CA"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "con bater�as"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "energ�a OK"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "energ�a no-OK"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "no disponible: %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (hora del PC %s%i segundos)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +279,7 @@ msgstr ""
 "\n"
 "Hora: %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -295,24 +297,24 @@ msgstr ""
 "Adiciones para el modelo A5 por Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "Error al borrar el archivo"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "Error al borrar la diapositiva asociada"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Esta c�mara no soporta recibir a velocidades superiores a 57600"
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "No se puede obtener la letra del disco Flash"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -320,84 +322,84 @@ msgstr ""
 "�No se puede recibir, no hay un directorio libre!\n"
 "Existe el directorio 999CANON y contiene una foto AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "No se puede crear el directorio \\DCIM."
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "No se puede crear el directorio de destino."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "Configuraci�n del controlador y la c�mara"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "C�mara"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "Modelo de c�mara (s�lo lectura)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "Nombre del due�o"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "Fecha y hora (s�lo lectura)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "Error"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "Configurar la fecha de la c�mara con la de la PC"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "Revisi�n del firmware (s�lo lectura)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "Energ�a (s�lo lectura)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "Controlador"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "Lista de todos los archivos"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "Mantener el nombre de archivo al transferir"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "El nombre del due�o cambi�"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "no se pudo cambiar el nombre del due�o"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "hora configurada"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "no se pudo configurar la hora"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -651,7 +653,7 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "La c�mara no est� lista, fall� get_battery: %s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
@@ -660,7 +662,7 @@ msgstr ""
 "canon_usb_lock_keys: Devuelto cantidad de datos no esperada (%i bytes, "
 "esperados %i)"
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
@@ -669,7 +671,7 @@ msgstr ""
 "canon_usb_lock_keys: Retorno inesperado de %i bytes (se esperaban %i) de "
 "\"get picture abilities.\""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
@@ -678,7 +680,7 @@ msgstr ""
 "canon_usb_unlock_keys: Se retorn� cantidad de datos inesperada (%i bytes, "
 "esperados %i)"
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
@@ -686,7 +688,7 @@ msgstr ""
 "canon_usb_poll_interrupt_pipe: fall� lectura de interrupci�n luego de %i "
 "intentos, \"%s\""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
@@ -695,7 +697,7 @@ msgstr ""
 "canon_usb_poll_interrupt_multiple: fall� lectura de interrupci�n luego de %i "
 "intentos, \"%s\""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
@@ -703,7 +705,7 @@ msgstr ""
 "canon_usb_capture_dialogue: longitud err�nea 0x%04x para paquete de tama�o "
 "de diapositiva"
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
@@ -711,61 +713,61 @@ msgstr ""
 "canon_usb_capture_dialogue: longitud err�nea 0x%04x para paquete de tama�o "
 "de imagen completa"
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: primera lectura de interrupci�n fuera de "
 "secuencia"
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: segunda lectura de interrupci�n fuera de "
 "secuencia"
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 "canon_usb_capture_dialogue: se se�al� falla fotogr�fica, c�digo = 0x%08x"
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: tercera interrupci�n EOS le�da fuera de secuencia"
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 "canon_usb_capture_dialogue: cuarta interrupci�n EOS le�da fuera de secuencia"
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 "canon_usb_dialogue: payload muy grande, no entrar� en el buffer (%i > %i)"
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "Recibiendo datos..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr "Sin memoria: %d bytes necesarios."
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "No se puede leer desde el archivo \"%s\""
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 msgid "File upload failed."
 msgstr "Fall� el env�o de archivo."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -773,7 +775,7 @@ msgstr ""
 "El archivo era muy grande. Puede tener que apagar su c�mara y volver a "
 "encenderla antes de transferir m�s archivos."
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -782,7 +784,7 @@ msgstr ""
 "canon_usb_get_dirents: payload no cabe en el buffer, '%.96s' (truncado) muy "
 "grande."
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -791,7 +793,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue fall� al obtener entradas de "
 "dir, devolvi� %i"
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -800,7 +802,7 @@ msgstr ""
 "canon_usb_list_all_dirs: payload no cabe en el buffer, '%.96s' (truncado) "
 "muy grande."
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -809,11 +811,11 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue fall� al obtener entradas "
 "dir, retorn� %i"
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue fall�"
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
@@ -822,12 +824,12 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue devolvi� estado de error 0x"
 "%08x de la c�mara"
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Se detect� '%s'."
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "El nombre \"%s\" de la c�mara no conicide con nombre alguno conocido"
@@ -1029,7 +1031,7 @@ msgstr "Sin memoria"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "Descargando imagen..."
 
@@ -1046,8 +1048,8 @@ msgid "Problem taking live image"
 msgstr "Problema tomando imagen en tiempo real"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Configuraci�n de la c�mara"
 
@@ -1254,7 +1256,7 @@ msgstr "Configuraci�n para su c�mara FUJI"
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "Fecha y hora"
 
@@ -1298,13 +1300,11 @@ msgstr ""
 "Tipo de puerto no soportado: %d. Este controlador s�lo funciona con c�maras "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "No se puede inicializar la c�mara.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1313,38 +1313,6 @@ msgstr ""
 "Su c�mara no soporta borrar el �ltimo archivo en la c�mara. En este caso, "
 "este es el archivo '%s'."
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "Biblioteca gsmart v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Soporte para la mini-serie de c�maras digitales Mustek gSmart basadas en "
-"varios otros m�dulos camlib de gphoto2 y los fuentes del controlador Windows "
-"provistos amablemente por Mustek.\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Tipo de puerto no soportado: %d. Este controlador s�lo funciona con c�maras "
-"USB.\n"
-
 # Haesslich [Colin]
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
@@ -1355,6 +1323,11 @@ msgstr "Cuadros tomados:%4d\n"
 msgid "jamcam library v"
 msgstr "Biblioteca jamcam v"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1518,17 +1491,17 @@ msgstr "Capturar"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "Macro"
 
@@ -1566,31 +1539,32 @@ msgstr "Compensaci�n de la exposici�n"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "Autom�tica"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "Forzar"
 
@@ -1613,8 +1587,8 @@ msgstr "Flash de ojos rojos"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "S�"
 
@@ -1629,15 +1603,15 @@ msgstr "S�"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "No"
 
@@ -1948,11 +1922,11 @@ msgid "Unknown error."
 msgstr "Error desconocido."
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "La c�mara acaba de enviar un error que todav�a no ha sido descubierto. Por "
 "favor, reporte lo siguiente a <gphoto-devel@lists.sourceforge.net> con "
@@ -2055,8 +2029,8 @@ msgstr "Intervalo del proyector de diapositivas"
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "Resoluci�n"
 
@@ -2080,8 +2054,8 @@ msgid "Localization"
 msgstr "Localizaci�n"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "Idioma"
 
@@ -2149,8 +2123,8 @@ msgid "Focus"
 msgstr "Foco"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "Fijo"
 
@@ -2172,15 +2146,15 @@ msgstr "Temporizador (s�lo la foto siguiente)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "Normal"
 
@@ -2251,21 +2225,21 @@ msgid "No answer from the camera."
 msgstr "No hay respuesta de la c�mara."
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "Baja"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "Media"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "Alta"
 
@@ -2301,7 +2275,7 @@ msgstr "Oficina"
 msgid "Day-lt"
 msgstr "Luz natural"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr "Nitidez"
 
@@ -2313,7 +2287,7 @@ msgstr "N�tida"
 msgid "Soft"
 msgstr "Suave"
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 msgid "Color"
 msgstr "Color"
@@ -2331,9 +2305,9 @@ msgid "Black and White"
 msgstr "Blanco y negro"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "Sepia"
 
@@ -2531,15 +2505,15 @@ msgid "No"
 msgstr "No"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "Fina"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "Est�ndar"
 
@@ -2758,7 +2732,7 @@ msgstr ""
 "de: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Enviando..."
 
@@ -2866,7 +2840,6 @@ msgstr ""
 " Cuenta de archivos: %d"
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "�Manual no implementado a�n!"
 
@@ -2939,7 +2912,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "Calidad de imagen"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "Tama�o de la imagen"
 
@@ -2967,9 +2940,9 @@ msgstr "fina"
 msgid "superfine"
 msgstr "superfina"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "autom�tica"
 
@@ -3035,10 +3008,10 @@ msgstr ""
 "sobre la foto %i."
 
 #: camlibs/polaroid/pdc700.c:916
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "se han recibido %i bytes de un formato de im�gen desconocido. Por favor, "
 "escriba a <gphoto-devel@lists.sourceforge.net> para asistencia."
@@ -3099,167 +3072,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Este controlador no soporta el tipo de puerto pedido (%i)."
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP. Error no definido"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP �Ok!"
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP. Error general"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP. Sesi�n no abierta"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP. ID de transacci�n no v�lido"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "PTP. Operaci�n no soportada"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "Par�metro PTP no soportado"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP. Transferencia incompleta"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP. ID de almacenamiento no v�lido"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "PTP. Manejador de objeto no v�lido"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP. No se soporta prop. del dispositivo"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP. C�digo de formato de objeto no v�lido"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP. Almac�n completo"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP. Objeto protegido contra escritura"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP. Almac�n de s�lo lectura"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP. Acceso denegado"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "PTP. Sin diapositiva presente"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP. Fall� la auto-comprobaci�n"
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP. Borrado parcial"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP. Almac�n no disponible"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP. No se soporta especificaci�n por formato"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP. No hay informaci�n v�lida del objeto"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP. Formato de c�digo no v�lido"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP. C�digo de fabricante desconocido"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP. Ya termin� la captura"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP. Bus del dispositivo"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP. Objeto padre no v�lido"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP. Formato de prop. del dispositivo no v�lido"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP. Valor de prop. del dispositivo no v�lido"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP. Par�metro no v�lido"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP. La sesi�n ya est� abierta"
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP. Transacci�n cancelada"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP. No se soporta especificaci�n del destino"
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP. Se necesita nombre de archivo EK"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP. Conflictos con nombre de archivo EK"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "PTP. Nombre de archivo EK no v�lido"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP. Error de E/S"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP. Error: par�metro incorrecto"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP. Error de protocolo, se esperaban datos"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP. Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3269,7 +3242,7 @@ msgstr ""
 "(c)2001-2003 por Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "�Disfrute!"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3284,23 +3257,23 @@ msgstr ""
 "ID extensi�n del fabricante: 0x%08x\n"
 "Descripci�n extensi�n del fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 msgid "Number of values"
 msgstr "Cantidad de valores"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr "Valores soportados"
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr "Valor corriente"
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr "Inicializando la c�mara"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP est� implementado s�lo para c�maras USB."
 
@@ -3464,162 +3437,159 @@ msgstr "PTP: Error de protocolo, se esperaban datos"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr "PTP: Propiedad no definido"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr "Nivel de la bater�a"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 msgid "Functional Mode"
 msgstr "Modo funcional"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 msgid "Compression Setting"
 msgstr "Ajuste de compresi�n"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "Balance de blanco"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr "Ganancia RGB"
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr "N�mero F"
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr "Distancia focal"
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr "Distancia al foco"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "Modo del foco"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr "M�do de m�trica de la exposici�n"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "Modo del flash"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr "Tiempo de exposici�n"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr "Modo de programa de exposici�n"
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr "�ndice de exposici�n (velocidad ISO de la pel�cula)"
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr "Compensaci�n de error de exposici�n"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr "Fecha y hora"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr "Demora de pre-captura"
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr "Modo de captura de fotograma"
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr "Contraste"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "Zoom digital"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 msgid "Effect Mode"
 msgstr "Modo de efecto"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr "N�mero de r�faga"
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr "Intervalo de r�faga"
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr "N�mero lapso temporal"
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr "Intervalo lapso temporal"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 msgid "Focus Metering Mode"
 msgstr "Modo de medici�n de foco"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr "URL de transferencia"
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr "Artista"
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr "Informaci�n de Copyright"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr "Temperatura de color EK"
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr "Formato de la fecha y hora EK"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr "Modo de sonido EK"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr "Salida de v�deo EK"
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr "Ahorro de energ�a EK"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr "Idioma de la IU EK"
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "Por Mariusz Woloszyn <emsi@ipartners.pl>. �Disfrute!"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3691,8 +3661,9 @@ msgid "Outdoor"
 msgstr "Exteriores"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "Fluorescente"
 
@@ -3700,7 +3671,7 @@ msgstr "Fluorescente"
 msgid "Incandescent"
 msgstr "Incandescente"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "Blanco y Negro"
 
@@ -3728,8 +3699,8 @@ msgstr "Imagen y sonido"
 msgid "Character & Sound"
 msgstr "Caracter y sonido"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3799,87 +3770,76 @@ msgid "Speed %i is not supported!"
 msgstr "�No se soporta la velocidad %i!"
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Se esperaba %i, se recibi� %i. Por favor, reporte este error a <gphoto-"
 "devel@gphoto.org>."
 
 #: camlibs/ricoh/ricoh.c:75
-#, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Se esperaba %i bytes, se recibi� %i. Por favor, reporte este error a <gphoto-"
 "devel@lists.sourceforge.net>."
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Esper�bamos 0x%x pero recibimos 0x%x. Por favor, contactar a <gphoto-"
 "devel@lists.sourceforge.net>."
 
 #: camlibs/ricoh/ricoh.c:215
-#, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+#, fuzzy, c-format
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Caracteres no v�lidos (0x%x, 0x%x). Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "La c�mara est� ocupada. Si el problema persiste por favor contactar a "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Tiempo de espera superado incluso luego de 2 reintentos. Por favor, contacte "
 "a <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:308
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Tiempo de espera superado incluso luego de 2 reintentos. Por favor, contacte "
 "a <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "La c�mara en un modo incorrecto. Por favor, contactar a <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:349
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "La c�mara no acept� los par�metros. Por favor, contactar a <gphoto-"
 "devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ha ocurrido un error desconocido. Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3899,122 +3859,123 @@ msgstr ""
 "port� a gphoto2. Marcus Mei\"sner <marcus@jet.franken.de> lo corrigi� y "
 "mejor�."
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "Resoluci�n m�s Tama�o"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "Fecha y hora (UTC)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "Ajustes de apertura"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "Modo de color"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "Reducci�n de ojos rojos"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "Sincronizaci�n lenta"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "Ajustes del flash"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "Personalizada"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "Ahorro de energ�a del host (segundos)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "Ahorro de energ�a de la c�mara (segundos)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "Modo de lente"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "Coreano"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "Ingl�s"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "Franc�s"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "Alem�n"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "Italiano"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "Japon�s"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "Espa�ol"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "Portugu�s"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "Par�metros de la imagen"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "Par�metros de la c�mara"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -4023,7 +3984,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Algunas notas acerca de las c�maras Epson:\n"
 "- Ciertos par�metros no se pueden controlar remotamente:\n"
@@ -4034,7 +3995,7 @@ msgstr ""
 "  PhotoPC 3000z, si su c�mara se comporta diferente, por favor\n"
 "  env�e un correo a <gphoto-devel@lists.sourceforge.net> (en ingl�s)\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "No hay tarjeta de memoria"
 
@@ -4062,116 +4023,102 @@ msgstr "La c�mara se neg� 3 veces a mantener una conexi�n abierta."
 msgid "The first byte received (0x%x) is not valid."
 msgstr "El primer byte recibido (0x%x) no es v�lido."
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "La transmisi�n del paquete super� el tiempo de espera incluso luego de %i "
 "reintentos. Por favor, contacte a <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "No se pudo transmitir el paquete incluso despu�s de varios intentos."
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "La c�mara rechaz� al paquete. Por favor, contacte a <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/sierra/library.c:789
-#, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+#: camlibs/sierra/library.c:790
+#, fuzzy, c-format
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "No se puede transmitir el paquete (c�digo de error %i). Por favor, contactar "
 "a <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "La transmisi�n super� el tiempo de espera incluso luego de 2 reintentos. "
 "Abandonando..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Obtuve el resultado inesperado 0x%x. Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Recibida respuesta inesperada (%i). Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "No se puede obtener el registro %i. Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "Fallaron demasiados intentos."
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "Enviando datos..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "�El controlador sierra no soporta llamadas recursivas! Por favor, contacte a "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "No se puede obtener el registro %i. Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 bytes esperados, %i recibidos. Por favor, contactar a <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Velocidad del obturador en microsegundos (0 autom�tica)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "Velocidad del obturador (en segundos)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr "B/N"
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr "Anti-ojos rojos"
 
@@ -4179,13 +4126,13 @@ msgstr "Anti-ojos rojos"
 msgid "Slow-sync"
 msgstr "Sinc. lenta"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "Contraste+"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "Contraste-"
 
@@ -4205,9 +4152,9 @@ msgstr "Ajuste de imagen"
 msgid "Preset"
 msgstr "Preajustado"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "Nublado"
 
@@ -4239,17 +4186,17 @@ msgstr "Anterior"
 msgid "Operation Mode"
 msgstr "Modo de operaci�n"
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "Brillo del LCD"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Apagado autom�tico del LCD (segundos)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Compensaci�n de la exposici�n"
 
@@ -4257,11 +4204,11 @@ msgstr "Compensaci�n de la exposici�n"
 msgid "Center-Weighted"
 msgstr "Centrado en el medio"
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr "Matriz"
 
@@ -4269,11 +4216,11 @@ msgstr "Matriz"
 msgid "Spot-AF"
 msgstr "Spot-AF"
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "M�trica de la exposici�n"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (en mil�metros)"
 
@@ -4351,52 +4298,53 @@ msgstr ""
 "\n"
 "      La descarga deber�a funcionar correctamente.\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr "Pizarra blanca"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr "Pizarra negra"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr "Luz natural"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "Tungsteno"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr "Manual"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr "Monitor"
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "Modo LCD"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "Zoom digital"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "Velocidad ISO"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "Posici�n del foco"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "Formato de la hora"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4434,7 +4382,7 @@ msgstr ""
 "    deber�a volver a conectar la c�mara a la PC y\n"
 "    poner LCD en 'Off'."
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4464,111 +4412,111 @@ msgstr ""
 "     configuraci�n completa, por favor contacte a\n"
 "     gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "El archivo a enviar tiene longitud nula"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "No hay suficiente memoria disponible en la tarjeta de memoria"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "No se puede obtener el nombre del directorio que contiene las fotos"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "S�lo se soporta el env�o al directorio '%s'"
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "Mejor"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (desconocida)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Velocidad del obturador (microsegundos, 0 autom�tica)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "Apertura"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "Blanco y negro"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "Pizarra blanca"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "Pizarra negra"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "Brillo/Contraste"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "Brillo+"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "Brillo-"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "Luz de d�a"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "Infinito/Ojo de pez"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "Modo de medici�n de punto"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "Apagado autom�tico (en la m�quina) (en segundos)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -4576,12 +4524,12 @@ msgstr ""
 "�Cu�nto tiempo pasar� hasta que la c�mara se apague cuando est� conectada a "
 "la computadora?"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "Apagado autom�tico (en el campo) (en segundos)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -4589,126 +4537,147 @@ msgstr ""
 "�Cu�nto tiempo pasar� hasta que la c�mara se apague cuando no est� conectada "
 "a la computadora?"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "Apagado autom�tico del LCD (en segundos)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "Configuraci�n de la toma"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "SuperFina"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "coulor"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "blanco y negro"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Nota: no hay tarjeta de memoria, algunos valores pueden no ser v�lidos\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sModelo de la c�mara: %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sFabricante : %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sIdentificador de la c�mara: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sN�mero de serie: %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sRevisi�n del software: %s\n"
 
 # Haesslich [Colin]
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sCuadros tomados: %i\n"
 
 # Haesslich... [Colin]
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sCuadros restantes: %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sDuraci�n de la bater�a: %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sMemoria restante: %i octets\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sFecha: %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 msgid "No camera manual available.\n"
 msgstr "Manual de la c�mara no disponible.\n"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"Algunas notas acerca de las c�maras Epson:\n"
+"- Ciertos par�metros no se pueden controlar remotamente:\n"
+"  * el zoom\n"
+"  * la puesta en foco\n"
+"  * la configuraci�n personalizada del balance de blanco\n"
+"- La configuraci�n fue hecha con ingenier�a reversa de una c�mara\n"
+"  PhotoPC 3000z, si su c�mara se comporta diferente, por favor\n"
+"  env�e un correo a <gphoto-devel@lists.sourceforge.net> (en ingl�s)\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4747,7 +4716,7 @@ msgstr ""
 "    poner LCD en 'Off'."
 
 # Ist "Freigabe" richtig? [Colin]
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4793,7 +4762,7 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "Controlador para acceder la c�mara SiPix Web2."
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
@@ -4804,53 +4773,6 @@ msgstr ""
 "Controlador para acceder a la c�mara Smal Ultrapocket, y versiones OEM "
 "(slimshot)"
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr "Lo siento, esta funci�n no est� implementada..."
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr "Lo siento, nada para configurar..."
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr "Lo siento, no est� implementado tomar fotos..."
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-msgid "Couldn't open camera.\n"
-msgstr "No se pudo abrir la c�mara.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-msgid "Error opening camera\n"
-msgstr "Error al abrir la c�mara\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr "El n�mero de foto es muy grande.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"Soporte de las c�maras digitales Sony DSC-F1\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Basado en la interfaz CLI chotplay de\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"Puede ser que esta biblioteca no funcione. Su experiencia puede ser "
-"distinta\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-msgid "Error opening camera.\n"
-msgstr "Error abriendo la c�mara.\n"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4903,20 +4825,6 @@ msgstr ""
 "Controlador Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-"spca504_flash camlib\n"
-" Autores: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"basado en trabajo de Matthias Krauss\n"
-"y Mark A. Zimmerman <mark@foresthaven.com>"
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4962,6 +4870,13 @@ msgstr ""
 "Mustek.\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"Tipo de puerto no soportado: %d. Este controlador s�lo funciona con c�maras "
+"USB.\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5191,33 +5106,33 @@ msgstr "Esta c�mara no puede capturar."
 msgid "This camera can not capture previews."
 msgstr "Esta c�mara no permite la pre-visualizaci�n de las capturas."
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "La ruta '%s' no es absoulta."
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "No se puede adjuntar la carpeta '%s' porque esta ya existe."
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "No se puede encontrar la carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "La carpeta '%s' no contiene una sub-carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "No se puede adjuntar el archivo '%s' a la carpeta '%s' porque ya existe."
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5226,7 +5141,7 @@ msgstr ""
 "Ha estado intentando borrar '%s' de la carpeta '%s', pero el sistema de "
 "archivos no soporta el borrado de archivos."
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
@@ -5234,17 +5149,17 @@ msgstr ""
 "Todav�a hay sub-carpetas en la carpeta '%s' que Usted est� intentado "
 "eliminar."
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 "Todav�a hay archivos en la carpeta '%s' que Usted est� intentando eliminar."
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "Este sistema de archivos no soporta el env�o de archivos."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5253,37 +5168,37 @@ msgstr ""
 "La carpeta '%s' s�lo contiene %i archivos, pero Usted pidi� un archivo con "
 "n�mero %i."
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "El archivo '%s' no se puede encontrar en la carpeta '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "No se puede encontrar el archivo '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "El sistema de archivos no soporta la recuperaci�n de archivos"
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Tipo de archivo %i desconocido."
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Descargando '%s' de la carpeta '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "El sistema de archivos no soporta obtener informaci�n sobre los archivos"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5292,32 +5207,32 @@ msgstr ""
 "No se pudo abrir '/proc/meminfo' para leer ('%m') Aseg�rese que el sistema "
 "de archivos proc est� montado."
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "Ocurri� un error mientras se le�a '/proc/meminfo' ('%m')"
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "fall� la llamada sysctl ('%m')"
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "fall� la llamada sysctl ('%m')"
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "fall� la llamada sysctl ('%m')"
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "El sistema de archivos no soporta modificar la informaci�n sobre los archivos"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Los atributos de s�lo lectura no se pueden cambiar (ej: ancho y alto)."
 
@@ -5361,6 +5276,82 @@ msgstr "Error desonocido de la biblioteca de la c�mara"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "No se encontr� diapositiva para %s"
+
+#~ msgid "gsmart library v"
+#~ msgstr "Biblioteca gsmart v"
+
+#~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Soporte para la mini-serie de c�maras digitales Mustek gSmart basadas en "
+#~ "varios otros m�dulos camlib de gphoto2 y los fuentes del controlador "
+#~ "Windows provistos amablemente por Mustek.\n"
+#~ "\n"
+
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "Por Mariusz Woloszyn <emsi@ipartners.pl>. �Disfrute!"
+
+#~ msgid "Sorry, this function not implemented..."
+#~ msgstr "Lo siento, esta funci�n no est� implementada..."
+
+#~ msgid "Sorry, nothing to configure..."
+#~ msgstr "Lo siento, nada para configurar..."
+
+#~ msgid "Sorry, taking pictures is not implemented..."
+#~ msgstr "Lo siento, no est� implementado tomar fotos..."
+
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "No se pudo abrir la c�mara.\n"
+
+#~ msgid "Error opening camera\n"
+#~ msgstr "Error al abrir la c�mara\n"
+
+#~ msgid "Picture number is too large.\n"
+#~ msgstr "El n�mero de foto es muy grande.\n"
+
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "Soporte de las c�maras digitales Sony DSC-F1\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Basado en la interfaz CLI chotplay de\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "Puede ser que esta biblioteca no funcione. Su experiencia puede ser "
+#~ "distinta\n"
+
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Error abriendo la c�mara.\n"
+
+#~ msgid ""
+#~ "spca504_flash camlib\n"
+#~ " Authors: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "based on work by Matthias Krauss\n"
+#~ "and Mark A. Zimmerman <mark@foresthaven.com>"
+#~ msgstr ""
+#~ "spca504_flash camlib\n"
+#~ " Autores: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "basado en trabajo de Matthias Krauss\n"
+#~ "y Mark A. Zimmerman <mark@foresthaven.com>"
+
 #~ msgid "create"
 #~ msgstr "crear"
 
diff --git a/po/fr.po b/po/fr.po
index 2803a835d..f984c930a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2003-06-22 23:47+0200\n"
 "Last-Translator: Aur�lien Croc <aurelien@ap2c.com>\n"
 "Language-Team: Fran�ais\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.2beta3\n"
 
 #: camlibs/agfa-cl20/agfa_cl20.c:540
@@ -57,25 +57,26 @@ msgstr ""
 "Mis en oeuvre en utilisant des documents trouv�s sur\n"
 "le web. Permission accord�e par Vision."
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, c-format
 msgid "Could not create directory %s."
 msgstr "Impossible de cr�er le dossier %s."
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, c-format
 msgid "Could not remove directory %s."
 msgstr "Impossible de supprimer le dossier %s."
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr "Clefs de blocage manqu�es."
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr "*INCONNU*"
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
@@ -84,7 +85,7 @@ msgstr ""
 "canon_int_capture_image: appel initial � canon_usb_list_all_dirs() en erreur "
 "avec un statut %i"
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -93,7 +94,7 @@ msgstr ""
 "canon_int_capture_image: appel final � canon_usb_list_all_dirs() en erreur "
 "avec un statut %i"
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -102,57 +103,57 @@ msgstr ""
 "Le nom '%s' (%i caract�res) est trop long (%i car.), seuls 30 caract�res "
 "sont permis."
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 "canon_int_list_dir: ERREUR: message initial trop court (%i < minimum %i)"
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 "canon_int_list_dir: fin du paquet atteinte en examinant la premi�re entr�e"
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr "canon_int_list_dir: rencontre d'une entr�e de r�pertoire tronqu�e"
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "Fichier prot�g� en �criture."
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 "Impossible d'extraire la vignette JPEG des donn�es: les donn�es ne sont pas "
 "en JFIF"
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Impossible d'extraire la vignette JPEG des donn�es: pas de d�but/fin"
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -172,8 +173,8 @@ msgstr ""
 "si vous rencontrez beaucoup d'erreurs de transmission, essayez d'avoir votre "
 "ordinateur aussi calme que possible (c-�-d sans activit� disque)\n"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "Appareil non disponible"
 
@@ -199,22 +200,22 @@ msgstr "Raison inconnue"
 msgid "Could not get disk info: %s"
 msgstr "Ne peut obtenir d'information sur le disque : %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Erreur interne #1 dans get_file_func() (%s ligne %i)"
 
-#: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "Impossible de trouver une vignette pour %s"
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, c-format
 msgid "No audio file could be found for %s"
 msgstr "Impossible de trouver un fichier audio pour %s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -225,35 +226,35 @@ msgstr ""
 "  %11s octets au total\n"
 "  %11s octets disponibles"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "Transformateur"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "sur piles"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "�nergie OK"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "�nergie NOK"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "Indisponible : %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (heure du PC %s%i seconds)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +281,7 @@ msgstr ""
 "\n"
 "Heure : %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -298,26 +299,26 @@ msgstr ""
 "Ajouts pour le mod�le A5 par Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "Erreur � l'effacement du fichier"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "Erreur � l'effacement de la vignette associ�e"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "Les vitesses sup�rieures � 57600 ne sont pas support�es pour t�l�charger "
 "vers l'appareil"
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "Ne peut obtenir la lettre du disque flash"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -325,84 +326,84 @@ msgstr ""
 "Impossible de t�l�charger, pas de r�pertoire libre !\n"
 "Le r�pertoire 999CANON existe et contient d�j� une image AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "Impossible de cr�er le dossier \\DCIM."
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "Impossible d'obtenir le contenu du r�pertoire destination."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "Configuration de l'appareil et du pilote"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "Appareil"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "Mod�le de l'appareil (lecture seule)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "Nom du propri�taire"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "Date et heure (lecture seule)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "Erreur"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "Indisponible"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "Mettre l'appareil � la date du PC"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "R�vision de microcode (lecture seule)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "�nergie (lecture seule)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "Pilote"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "Liste de tous les fichiers"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "Conserver le nom du fichier lors du chargement"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "Le nom du propri�taire a chang�"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "ne peut changer le nom du propri�taire"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "heure mise � jour"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "ne peut mettre � l'heure"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Port de type non-support�, re�u %i = 0x%x. Initialisation impossible."
@@ -644,99 +645,99 @@ msgstr ""
 "Appareil pas pr�t, les requ�tes d'identification de l'appareil ont �chou� : %"
 "s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "R�ception des donn�es..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Impossible de lire le fichier \"%s\""
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 msgid "File upload failed."
 msgstr "Envoi du fichier rat�."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -744,7 +745,7 @@ msgstr ""
 "Fichier trop grand. Il est posssible que vous ayez besoin d'eteindre puis "
 "rallumer l'appareil avant de charger d'autres fichiers."
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
@@ -753,7 +754,7 @@ msgstr ""
 "canon_usb_get_dirents: Impossible de faire tenir la charge dans le buffer, "
 "'%.96s' (tronqu�) trop long."
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
@@ -762,7 +763,7 @@ msgstr ""
 "canon_usb_get_dirents: canon_usb_long_dialogue n'a pu r�cup�rer les "
 "r�pertoires, renvoy� %i"
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
@@ -771,7 +772,7 @@ msgstr ""
 "canon_usb_list_all_dirs: Impossible de faire tenir la charge dans le buffer, "
 "'%.96s' (tronqu�) trop long."
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
@@ -780,11 +781,11 @@ msgstr ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue n'a pu r�cup�rer les "
 "r�pertoires, renvoy� %i"
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr "canon_usb_set_file_attributes: canon_usb_dialogue rat�"
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
@@ -793,12 +794,12 @@ msgstr ""
 "canon_usb_set_file_attributes: canon_usb_dialogue renvoie un statut d'erreur "
 "0x%08x de l'appareil"
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "D�tection du '%s'."
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr "Nom \"%s\" de l'appareil ne correspond � aucun appareil connu"
@@ -1000,7 +1001,7 @@ msgstr "Plus de m�moire"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "T�l�chargement de l'image..."
 
@@ -1017,8 +1018,8 @@ msgid "Problem taking live image"
 msgstr "Probl�me � la prise de vue en temps-r�el"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Configuration de l'appareil"
 
@@ -1226,7 +1227,7 @@ msgstr "Configuration pour votre appareil FUJI"
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "Date & heure"
 
@@ -1271,13 +1272,11 @@ msgstr ""
 "Type de port non support�: %d. Ce pilote ne marche qu'avec des appareils "
 "USB.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Impossible de remettre l'appareil � z�ro.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1286,38 +1285,6 @@ msgstr ""
 "Votre appareil ne supporte que la suppression du dernier fichier de "
 "l'appareil. Dans ce cas, il s'agit du fichier '%s'."
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "Biblioth�que gsmart v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support pour la mini-s�rie d'appareils photos  Mustek gSmart bas� sur divers "
-"autres modules d'appareils gphoto2 et les sources du pilote windows "
-"gentiment pass�es par Mustek.\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Type de port non support�: %d. Ce pilote ne marche qu'avec des appareils "
-"USB.\n"
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1327,6 +1294,11 @@ msgstr "Prises de vue    : %4d\n"
 msgid "jamcam library v"
 msgstr "Biblioth�que jamcam v"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1491,17 +1463,17 @@ msgstr "Capture"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "Macro"
 
@@ -1539,31 +1511,32 @@ msgstr "Compensation de l'exposition"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "Automatique"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "Forcer"
 
@@ -1586,8 +1559,8 @@ msgstr "Flash anti yeux rouges"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "Oui"
 
@@ -1602,15 +1575,15 @@ msgstr "Oui"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "Non"
 
@@ -1921,11 +1894,11 @@ msgid "Unknown error."
 msgstr "Erreur inconnue."
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "L'appareil vient de retourner une erreur inconnue. Merci d'en informer "
 "l'�quipe de d�velopement <gphoto-devel@lists.sourceforge.net> en expliquant "
@@ -2027,8 +2000,8 @@ msgstr "Intervalle du projecteur de diapositives"
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "R�solution"
 
@@ -2052,8 +2025,8 @@ msgid "Localization"
 msgstr "Localisation"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "Langue"
 
@@ -2121,8 +2094,8 @@ msgid "Focus"
 msgstr "Mise au point"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "Fixe"
 
@@ -2144,15 +2117,15 @@ msgstr "Retardateur (image suivante uniquement)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "Normal"
 
@@ -2225,21 +2198,21 @@ msgid "No answer from the camera."
 msgstr "Pas de r�ponse de l'appareil"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "Faible"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "Moyenne"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "Haute"
 
@@ -2275,7 +2248,7 @@ msgstr "Bureau"
 msgid "Day-lt"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr "Duret�"
 
@@ -2287,7 +2260,7 @@ msgstr "Dur"
 msgid "Soft"
 msgstr "Doux"
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 msgid "Color"
 msgstr "Couleur"
@@ -2305,9 +2278,9 @@ msgid "Black and White"
 msgstr "Noir & Blanc"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "S�pia"
 
@@ -2506,15 +2479,15 @@ msgid "No"
 msgstr "Non"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "Fine"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "Standard"
 
@@ -2733,7 +2706,7 @@ msgstr ""
 "de : %i octets."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "T�l�chargement du fichier..."
 
@@ -2842,7 +2815,6 @@ msgstr ""
 "Nombre de fichiers : %d"
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "Le manuel n'est pas encore impl�ment�."
 
@@ -2915,7 +2887,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "Qualit� de l'image"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "Taille de l'image"
 
@@ -2943,9 +2915,9 @@ msgstr "fine"
 msgid "superfine"
 msgstr "tr�s fine"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "automatique"
 
@@ -3011,10 +2983,10 @@ msgstr ""
 "l'information sur l'image %i."
 
 #: camlibs/polaroid/pdc700.c:916
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "%i octets d'une image de format inconnu re�us. Merci d'�crire � <gphoto- "
 "devel@lists.sourceforge.net> pour une assistance."
@@ -3076,167 +3048,167 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Le type de port demand� (%i) n'est pas support� par ce pilote logiciel."
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP Erreur g�n�rale"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP Session non-ouverte"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID de transaction invalide"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "PTP Op�ration non support�e"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Param�tre non support�"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Transfert incomplet"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP Storage ID invalide"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "PTP identificateur d'objet invalide"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP Propri�t� de p�riph�rique non support�e"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Code de format d'objet incorrect"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP plus d'espace"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP Objet prot�g� en �criture"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP M�moire en lecture seule"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP Acc�s refus�"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "Pas de miniature pr�sente"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP Echec de l'autotest "
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP Effacement partiel"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP espace non disponible"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Sp�cification de format non support�e"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP Pas d'information valide sur l'objet"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP Format de code incorrect"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Mod�le inconnu"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Capture d�j� termin�"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP Bus des p�riph�riques"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP Objet p�re incorrect"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP Format de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP Valeur de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP Param�tre incorrect"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP Session d�j� ouverte"
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP Op�ration annul�e"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Sp�cification de la destination non support�e "
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP Nom de fichier EK n�cessaire"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP Conflit de nom de fichier EK"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "PTP Nom de fichier EK incorrect"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP erreur d'entr�e sortie"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP Erreur: mauvais param�tre"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP Erreur de protocole, donn�es attendues"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Errur de protocole, r�ponse attendue"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3246,7 +3218,7 @@ msgstr ""
 "(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Bonne chance !"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3261,23 +3233,23 @@ msgstr ""
 "ID �tendue du vendeur : 0x%08x\n"
 "Description �tendue du vendeur : %s\n"
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 msgid "Number of values"
 msgstr "Nombre de valeurs"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr "Valeurs support�es"
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr "Valeur actuelle"
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr "Initialisation de l'appareil photo"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP est impl�ment� uniquement pour les appareils USB."
 
@@ -3441,166 +3413,159 @@ msgstr "PTP: Erreur de protocole, donn�es attendues"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP: Erreur de protocole, r�ponse attendue"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr "PTP propri�t� non d�finie"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr "Niveau de la batterie"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 msgid "Functional Mode"
 msgstr "Mode d'op�ration"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 msgid "Compression Setting"
 msgstr "Configuration de la compression"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "Balance des blancs"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr "Gain RVB"
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr "Num�ro-F"
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr "Longueur de focal"
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "Mode focus"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr "Mode de mesure de l'exposition"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "Mode flash"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr "Temps d'exposition"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr "Mode du programme d'exposition"
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr "Index d'exposition (vitesse ISO du film)"
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr "Compensation de l'exposition"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr "Date heure"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr "D�lai de pr�-capture"
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr "Mode de capture continue"
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr "Contraste"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "Zoom num�rique"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 msgid "Effect Mode"
 msgstr "Mode d'effet"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 msgid "Focus Metering Mode"
 msgstr "Mode de mesure du focus"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr "URL d'envoi"
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr "Artiste"
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr "Info Copyright"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr "Temp�rature de la couleur EK"
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr "Format de date EK"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr "Mode beep EK"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr "�conomie d'�nergie EK"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr "Langue interface EK"
 
-#: camlibs/ptp/library.c:533
-#, fuzzy
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-"Pilote PTP2\n"
-"(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
-"Bonne chance !"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3672,8 +3637,9 @@ msgid "Outdoor"
 msgstr "Ext�rieur"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
@@ -3681,7 +3647,7 @@ msgstr "Fluorescent"
 msgid "Incandescent"
 msgstr "Incandescent"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "noir & blanc"
 
@@ -3709,8 +3675,8 @@ msgstr "image et son"
 msgid "Character & Sound"
 msgstr "personnage & son"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3780,87 +3746,76 @@ msgid "Speed %i is not supported!"
 msgstr "La vitesse %i n'est pas support�e!"
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "%i octets attendus, %i re�us. Merci de contacter <gphoto-devel@lists."
 "sourceforge.net>."
 
 #: camlibs/ricoh/ricoh.c:75
-#, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "%i octets attendus, %i re�us. Merci de contacter <gphoto-devel@lists."
 "sourceforge.net>."
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "R�sultat inattendu 0x%x, re�u 0x%x. Merci de contacter <gphoto-devel@gphoto."
 "org>."
 
 #: camlibs/ricoh/ricoh.c:215
-#, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+#, fuzzy, c-format
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Mauvais caract�res (0x%x, 0x%x). Merci de contacter <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "L'appareil est occup�. Si le probl�me persiste, merci de contacter <gphoto-"
 "devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "D�lai d'attente d�pass� m�me apr�s 2 tentatives. Contactez <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:308
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "D�lai d'attente d�pass� m�me apr�s 2 tentatives. Contactez <gphoto-"
 "devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "L'appareil n'est pas dans le bon mode. Contactez <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:349
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "L'appareil n'a pas accept� les param�tres. Contactez <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Une erreur inconnue est survenue. Contactez <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3880,122 +3835,123 @@ msgstr ""
 "l'a port� pour gphoto2. Marcus Mei�ner <marcus@jet.franken.de> l'a corrig� "
 "et am�lior�."
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "R�solution et taille"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "Date et heure (GMT)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "R�glages de l'image"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "Mode couleur"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "R�duction yeux rouges"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "R�glage du flash"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "Personnalis�"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "�conomie d'�nergie pour l'h�te (secondes)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "�conomie d'�nergie pour l'appareil (secondes)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "Mode lentille"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "Cor�en"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "Anglais"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "Fran�ais"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "Allemand"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "Italien"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "Japonais"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "Portugais"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "R�glages de l'image"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "R�glages de l'appareil"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -4004,7 +3960,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Quelques notes � propos des appareils photos Epson :\n"
 "- Certains param�tres ne sont pas configurables � distance :\n"
@@ -4016,7 +3972,7 @@ msgstr ""
 "  Merci  de contacter par mail : <gphoto-devel@lists.sourceforge.net> (en "
 "anglais)\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "Pas de carte."
 
@@ -4043,114 +3999,100 @@ msgstr "L'appareil a refus� 3 fois de garder la connexion ouverte."
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Le premier octet re�u (0x%x) n'est pas valide."
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "La transmission du paquet a �chou� apr�s %i essais. Merci de contacter "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "Impossible de transmettre des paquets malgr� plusieurs tentatives."
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Paquet rejet� par l'appareil photo. Merci de contacter <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/sierra/library.c:789
-#, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+#: camlibs/sierra/library.c:790
+#, fuzzy, c-format
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Impossible de transmettre le paquet (code erreur %i). Merci de contacter "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "La transmission du paquet a �chou� apr�s 2 essais. On en reste l� ..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "R�sultat inattendu 0x%x. Merci de contacter <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "R�ponse inattendue re�ue (%i). Merci de contacter <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Impossible d'obtenir le registre entier %i. Merci de contacter <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "Trop de tentatives infructueuses."
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "Envoi des donn�es..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Les appels r�cursifs ne sont pas support�s par le pilote sierra ! Contactez "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Impossible d'obtenir le registre cha�ne %i. Merci de contacter <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 octets attendus, %i re�us. Merci de contacter <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Vitesse de l'obturateur (microsecondes, 0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "Vitesse de l'obturateur (en secondes)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr "N/B"
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr "Anti yeux rouges"
 
@@ -4158,13 +4100,13 @@ msgstr "Anti yeux rouges"
 msgid "Slow-sync"
 msgstr "Synchronisation lente"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "Contraste+"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "Contraste-"
 
@@ -4184,9 +4126,9 @@ msgstr "Ajustement de l'image"
 msgid "Preset"
 msgstr "Pr�-configur�"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "Nuageux"
 
@@ -4218,17 +4160,17 @@ msgstr "Pr�c�dent"
 msgid "Operation Mode"
 msgstr "Mode d'op�ration"
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "Luminosit� de l'�cran LCD"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Auto-extinction de l'�cran LCD (en secondes)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Compensation de l'exposition"
 
@@ -4236,11 +4178,11 @@ msgstr "Compensation de l'exposition"
 msgid "Center-Weighted"
 msgstr "Poids centr�"
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr "Spot"
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr "Matrice"
 
@@ -4248,11 +4190,11 @@ msgstr "Matrice"
 msgid "Spot-AF"
 msgstr "Spot-AF"
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "Mesure de l'exposition"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (en millim�tres)"
 
@@ -4329,52 +4271,53 @@ msgstr ""
 "\n"
 "    La r�cup�ration des images doit fonctionner correctement.\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr "Tableau blanc"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr "Tableau noir"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "Tungst�ne"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr "Manuel"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "Mode LCD"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "Zoom num�rique"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "Vitesse ISO"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "Position du focus"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "Format du temps"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4411,7 +4354,7 @@ msgstr ""
 "    arrivez � cet �tat, vous devez reconnecter l'appareil au PC\n"
 "    et remettre LCD � Off."
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4441,111 +4384,111 @@ msgstr ""
 "    pour supporter une configuration compl�te,\n"
 "    veuillez contacter gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "Le fichier � envoyer est de longueur nulle"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "Pas assez de m�moire disponible sur la carte m�moire"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Impossible d'obtenir le nom du r�pertoire contenant les images"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Le t�l�chargement est support� uniquement dans le r�pertoire '%s'"
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "Meilleure"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (inconnu)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Vitesse de l'obturateur (microsecondes, 0 auto)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "Ouverture"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "Noir et Blanc"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "Tableau blanc"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "Tableau noir"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "Lumi�re/Contraste"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "Lumi�re+"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "Lumi�re-"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "Lumi�re naturelle"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "Infini/Fish-eye"
 
 # Translation thanks to Martin Kroeker. [Colin]
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "Mode compte-fil"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "Auto-extinction (serveur) (en secondes)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -4553,12 +4496,12 @@ msgstr ""
 "Combien de temps cela prendra-t'il jusqu'� l'extinction de l'appareil quand "
 "il est connect� � l'ordinateur ?"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "Auto-extinction (test) (en secondes)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -4566,126 +4509,148 @@ msgstr ""
 "Combien de temps cela prendra-t'il jusqu'� l'extinction de l'appareil quand "
 "il n'est pas connect� � l'ordinateur ?"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "Auto-extinction de l'�cran LCD (en secondes)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "R�glage de la prise de vue"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "Tr�s fine"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "couleur"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "noir & blanc"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Note: absence de carte m�moire, quelques valeurs peuvent �tre invalides\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sMod�le de l'appareil : %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sFabricant : %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sIdentifiant appareil: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sNum�ro de s�rie : %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sR�vision du logiciel : %s\n"
 
 # Haesslich [Colin]
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sPrises de vue : %i\n"
 
 # Haesslich... [Colin]
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sImages restantes : %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sDur�e de vie de la batterie : %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sM�moire restante : %i octets\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sDate : %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 msgid "No camera manual available.\n"
 msgstr "Manuel de l'appareil non disponible.\n"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"Quelques notes � propos des appareils photos Epson :\n"
+"- Certains param�tres ne sont pas configurables � distance :\n"
+"  * le zoom\n"
+"  * la mise au point\n"
+"  * la configuration personnalis�e de la balance des blancs\n"
+"- La configuration a �t� retro-con�ue avec un appareil\n"
+"  PhotoPC 3000z, au cas o� le v�tre se comporterait diff�remment,\n"
+"  Merci  de contacter par mail : <gphoto-devel@lists.sourceforge.net> (en "
+"anglais)\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4723,7 +4688,7 @@ msgstr ""
 "    et remettre LCD � Off."
 
 # Ist "Freigabe" richtig? [Colin]
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4769,7 +4734,7 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "Pilote pour acc�der � l'appareil SiPix Web2."
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
@@ -4779,52 +4744,6 @@ msgstr ""
 "Lee Benfield <lee@benf.org>\n"
 "Pilote de contr�le des appareils Smal Ultrapocket, et versions OEM (slimshot)"
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr "D�sol�, cette fonction n'est pas impl�ment�e..."
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr "D�sol�, rien � configurer..."
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr "D�sol�, la prise de vues n'est pas impl�ment�e..."
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-msgid "Couldn't open camera.\n"
-msgstr "Impossible d'ouvrir l'appareil.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-msgid "Error opening camera\n"
-msgstr "Probl�me � l'ouverture de l'appareil\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr "Num�ro d'image trop grand.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"Support des appareils num�riques Sony DSC-F1\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Bas� sur l'interface ligne de commande chotplay\n"
-"de Ken-ichi Hayashi\n"
-"\n"
-"Ce pilote peut ne pas fonctionner, vous avez �t� avertis.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-msgid "Error opening camera.\n"
-msgstr "Probl�me � l'ouverture de l'appareil.\n"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4877,20 +4796,6 @@ msgstr ""
 "Pilote Soundvision\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-"Pilote spca504_flash\n"
-" Auteur: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"bas� sur du code par Matthias Krauss\n"
-"et Mark A. Zimmerman <mark@foresthaven.com>"
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4936,6 +4841,13 @@ msgstr ""
 "fournies par Mustek.\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"Type de port non support�: %d. Ce pilote ne marche qu'avec des appareils "
+"USB.\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5166,33 +5078,33 @@ msgstr "Cet appareil ne peut �tre pilot� pour la capture."
 msgid "This camera can not capture previews."
 msgstr "Cet appareil ne peut fournir de pr�-visualisation de la capture."
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Le chemin '%s' n'est pas absolu."
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Impossible d'ajouter le dossier '%s' car il existe d�j�."
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Impossible de trouver le dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Le dossier '%s' ne contient pas de sous-dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Impossible d'ajouter le fichier '%s' au dossier '%s' car il existe d�j�."
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5201,7 +5113,7 @@ msgstr ""
 "Vous avez essay� d'effacer '%s' du dossier '%s', mais le syst�me de fichiers "
 "ne supporte pas l'effacement de fichier."
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
@@ -5209,18 +5121,18 @@ msgstr ""
 "Il existe toujours des sous-dossiers dans le dossier '%s' que vous essayez "
 "d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 "Il existe toujours des fichiers dans le dossier '%s' que vous essayez "
 "d'effacer."
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "Ce syst�me de fichier ne supporte pas la r�cup�ration des fichiers."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5229,38 +5141,38 @@ msgstr ""
 "Le dossier '%s' ne contient que %i fichiers, alors que vous avez demand� un "
 "fichier num�rot� %i."
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Le dossier '%s' ne contient pas de sous-dossier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Impossible de trouver le fichier '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "Ce syst�me de fichier ne supporte pas la r�cup�ration des fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Type de fichier %i inconnu."
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "T�l�chargement de '%s' du dossier '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 "Ce syst�me de fichier ne supporte pas la r�cup�ration d'informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5269,33 +5181,33 @@ msgstr ""
 "Ne peut ouvrir '/proc/meminfo' en lecture ('%m'). V�rifiez que le syst�me de "
 "fichier proc est mont�."
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "Une erreur est arriv�e lors de la lecture de '/proc/meminfo' ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "Erreur lors de l'appel � sysctl() ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "Erreur lors de l'appel � sysctl() ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "Erreur lors de l'appel � sysctl() ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 "Ce syst�me de fichier ne supporte pas la modification d'informations sur les "
 "fichiers"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "Les attributs en lecture seule ne peuvent �tre modifi�s (comme la hauteur et "
@@ -5341,6 +5253,85 @@ msgstr "Erreur inconnue de la biblioth�que de l'appareil"
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "Impossible de trouver une vignette pour %s"
+
+#~ msgid "gsmart library v"
+#~ msgstr "Biblioth�que gsmart v"
+
+#~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support pour la mini-s�rie d'appareils photos  Mustek gSmart bas� sur "
+#~ "divers autres modules d'appareils gphoto2 et les sources du pilote "
+#~ "windows gentiment pass�es par Mustek.\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr ""
+#~ "Pilote PTP2\n"
+#~ "(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+#~ "Bonne chance !"
+
+#~ msgid "Sorry, this function not implemented..."
+#~ msgstr "D�sol�, cette fonction n'est pas impl�ment�e..."
+
+#~ msgid "Sorry, nothing to configure..."
+#~ msgstr "D�sol�, rien � configurer..."
+
+#~ msgid "Sorry, taking pictures is not implemented..."
+#~ msgstr "D�sol�, la prise de vues n'est pas impl�ment�e..."
+
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Impossible d'ouvrir l'appareil.\n"
+
+#~ msgid "Error opening camera\n"
+#~ msgstr "Probl�me � l'ouverture de l'appareil\n"
+
+#~ msgid "Picture number is too large.\n"
+#~ msgstr "Num�ro d'image trop grand.\n"
+
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "Support des appareils num�riques Sony DSC-F1\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Bas� sur l'interface ligne de commande chotplay\n"
+#~ "de Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "Ce pilote peut ne pas fonctionner, vous avez �t� avertis.\n"
+
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Probl�me � l'ouverture de l'appareil.\n"
+
+#~ msgid ""
+#~ "spca504_flash camlib\n"
+#~ " Authors: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "based on work by Matthias Krauss\n"
+#~ "and Mark A. Zimmerman <mark@foresthaven.com>"
+#~ msgstr ""
+#~ "Pilote spca504_flash\n"
+#~ " Auteur: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "bas� sur du code par Matthias Krauss\n"
+#~ "et Mark A. Zimmerman <mark@foresthaven.com>"
+
 #~ msgid "create"
 #~ msgstr "cr�er"
 
diff --git a/po/hu.po b/po/hu.po
index 3db4c928a..b8c45b7d5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2003-02-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -55,39 +56,40 @@ msgstr ""
 "A weben talált dokumentáció alapján\n"
 "készült. A Vision engedélyével."
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -96,53 +98,53 @@ msgstr ""
 "A(z) '%s' név (%i karakter) túl hosszú (%i karakter), legfeljebb 30 "
 "karaktert lehet használni."
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "Védett fájl."
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -163,8 +165,8 @@ msgstr ""
 "Ha sok átviteli hibával találkozik, próbálja csökkenti a számítógép "
 "terhelését (pl. a lemezkezelését)"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "Nem áll rendelkezésre kamera"
 
@@ -190,22 +192,22 @@ msgstr "A hiba oka nem ismert"
 msgid "Could not get disk info: %s"
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
-#, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -216,35 +218,35 @@ msgstr ""
 "  %11s bájt összesen\n"
 "  %11s bájt szabad"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "AC adapterről"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "akkumulátorról"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "energiaszint: megfelelő"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "energiaszint: nem megfelelő"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "nem érhető el: %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (a számítógép ideje %s%i másodperc)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +273,7 @@ msgstr ""
 "\n"
 "Idő: %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -289,26 +291,26 @@ msgstr ""
 "A5-kiegészítések: Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "Hiba történt a fájl törlésekor"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "Nem sikerült törölni a társított előnézeti képet"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 "57600-nál magasabb sebességet nem lehet használni ennél a kameránál "
 "feltöltéshez"
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "Nem sikerült lekérdezni a Flash meghajtó betűjelét"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 #, fuzzy
 msgid ""
 "Could not upload, no free folder name available!\n"
@@ -317,84 +319,84 @@ msgstr ""
 "A feltöltés nem sikerült, nincs szabad könyvtárnév.\n"
 "A 999CANON könyvtár létezik, és található benne egy AUT 9999.JPG nevű kép."
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "Nem sikerült létrehozni a célkönyvtárat."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "A kamera és a meghajtóprogram beállításai"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "A kamera típusa (csak olvasható)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "A tulajdonos neve"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "Dátum és idő (csak olvasható)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "Hiba"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "Nem áll rendelkezésre"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "A kamera dátumának beállítása a számítógép dátumára"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "A firmware revíziószáma (csak olvasható)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "Energia (csak olvasható)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "Meghajtó"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "Az összes fájl kilistázása"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "A fájlnév megőrzése feltöltéskor"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "A tulajdonos neve megváltozott"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "a tulajdonos nevét nem sikerült megváltoztatni"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "az idő beállítva"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "az idő beállítása nem sikerült"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -638,100 +640,100 @@ msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "A kamera nem áll készen, több kameraazonosítási kísérlet nem sikerült: %s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "Adatok fogadása..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Nem sikerült lekérdezni a lemez jellemzőit: %s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Fájl feltöltése..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -739,51 +741,51 @@ msgstr ""
 "A fájl túl nagy. A következő feltöltési kísérlet előtt érdemes ki- és "
 "bekapcsolni a kamerát."
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detektálva: '%s'."
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -984,7 +986,7 @@ msgstr "Elfogyott a memória"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "Kép letöltése..."
 
@@ -1001,8 +1003,8 @@ msgid "Problem taking live image"
 msgstr "Nem sikerült közvetlenül felvételt készíteni"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "A kamera beállításai"
 
@@ -1208,7 +1210,7 @@ msgstr "A Fuji kamera beállításai"
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "Dátum és idő"
 
@@ -1253,13 +1255,11 @@ msgstr ""
 "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
 "működik.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "A kamerát nem sikerült alapállapotba hozni.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1268,38 +1268,6 @@ msgstr ""
 "A kamera csak az utolsó felvétel törlését teszi lehetővé. Jelen pillanatban "
 "ennek neve: '%s'."
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart programkönyvtár v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Támogatás a Mustek gSmart mini digitális kamerákhoz, több gphoto2 camlib "
-"modul és a Windows-meghajtó forráskódja alapján (ezt a Mustek bocsátotta "
-"rendelkezésre).\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
-"működik.\n"
-
 #: camlibs/jamcam/jamcam.c:284
 #, fuzzy, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1309,6 +1277,11 @@ msgstr "%sFelvett képkocka: %i\n"
 msgid "jamcam library v"
 msgstr "jamcam programkönyvtár v"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1471,17 +1444,17 @@ msgstr "Rögzítés"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "Nagyítás"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "Makró"
 
@@ -1519,31 +1492,32 @@ msgstr "Exponálási kompenzáció"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "Automatikus"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "Kényszerítés"
 
@@ -1566,8 +1540,8 @@ msgstr "Vörösszem-vaku"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "Be"
 
@@ -1582,15 +1556,15 @@ msgstr "Be"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "Ki"
 
@@ -1900,11 +1874,11 @@ msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "A kamera nem értelmezhető hibaüzenetet küldött. Kérjük küldje el az alábbi "
 "adatokat a <gphoto-devel@lists.sourceforge.net> címre a hiba "
@@ -2006,8 +1980,8 @@ msgstr "Diavetítési időköz"
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "Felbontás"
 
@@ -2031,8 +2005,8 @@ msgid "Localization"
 msgstr "Nemzetköziesítés"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "Nyelv"
 
@@ -2100,8 +2074,8 @@ msgid "Focus"
 msgstr "Fókusz"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "Rögzített"
 
@@ -2123,15 +2097,15 @@ msgstr "Saját időzítő (csak a következő képnél)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "Normál"
 
@@ -2202,21 +2176,21 @@ msgid "No answer from the camera."
 msgstr "A kamera nem válaszolt"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "Alacsony"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "Közepes"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "Magas"
 
@@ -2257,7 +2231,7 @@ msgstr "Ki"
 msgid "Day-lt"
 msgstr "Égbolt"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2269,7 +2243,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2291,9 +2265,9 @@ msgid "Black and White"
 msgstr "Fekete-fehér"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "Szépia"
 
@@ -2471,15 +2445,15 @@ msgid "No"
 msgstr "Nem"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "Finom"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "Standard"
 
@@ -2696,7 +2670,7 @@ msgid ""
 msgstr "A fájlméret %i bájt. A feltölthető fájlok maximális mérete: %i bájt."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -2801,7 +2775,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "A kézikönyv még nem készült el"
 
@@ -2855,7 +2828,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "Képminőség"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "Képméret"
 
@@ -2883,9 +2856,9 @@ msgstr "finom"
 msgid "superfine"
 msgstr "nagyon finom"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "automatikus"
 
@@ -2953,8 +2926,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "%i bájtnyi adat érkezett ismeretlen képformátumban. Kérem küldje el a hiba "
 "körülményeinek leírását a <gphoto-devel@lists.sourceforge.net> címre."
@@ -3012,167 +2985,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "A kért porttípust (%i) nem támogatja ez a meghajtó."
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP OK."
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP - általános hiba"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP - a munkafolyamat nincs megnyitva"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP - érvénytelen tranzakciós azonosító"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "PTP - nem támogatott művelet"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "PTP - nem támogatott paraméter"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP - nem teljes transzfer"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP érvénytelen tárolóazonosító"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "Érvénytelen PTP objektumazonosító"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP érvénytelen objektumformátum-kód"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP - az objektum írásvédett"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP - a tároló csak olvasható"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP - a hozzáférés megtagadva"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "PTP - nem érhető el előnézeti kép"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "A PTP-tároló nem érhető el"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "Nem támogatott formátumú PTP-specifikáció"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP érvénytelen objektuminformáció"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP érvénytelen kódformátum"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "A PTP-felvétel már befejeződött"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP érvénytelen eszköztulajdonság-formátum"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP érvénytelen eszköztulajdonság-érték"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP - érvénytelen paraméter"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP - a munkafolyamat már meg van nyitva"
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP - a tranzakció félbeszakadt"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Nem támogatott PTP specifikáció vagy cél"
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP EK fájlnév szükséges"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK fájlnévütközés"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "Érvénytelen PTP EK fájlnév"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP I/O-hiba"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP hiba: nem megfelelő paraméter"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollhiba, nem érkezett adat"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3180,7 +3153,7 @@ msgid ""
 "Enjoy!"
 msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3190,25 +3163,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "A PTP csak USB-csatolós kameráknál használható."
 
@@ -3412,179 +3385,175 @@ msgstr "PTP protokollhiba, nem érkezett adat"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 #, fuzzy
 msgid "PTP Undefined Property"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Működési mód"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Tömörítés"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "Fehéregyensúly"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 #, fuzzy
 msgid "Focus Distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "Fókuszálási mód"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponálásmérés"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "Vakus mód"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Az izzó exponálási ideje"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponálási kompenzáció"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 #, fuzzy
 msgid "Date Time"
 msgstr "Dátum és idő"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontraszt-"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "Digitális nagyítás"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Felvételi mód"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Szerzői jog"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 #, fuzzy
 msgid "EK Date Time Stamp Format"
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 #, fuzzy
 msgid "EK Beep Mode"
 msgstr "LED-mód"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 #, fuzzy
 msgid "EK Power Saving"
 msgstr "NINCS energiajelző fény"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 #, fuzzy
 msgid "EK UI Language"
 msgstr "Nyelv"
 
-#: camlibs/ptp/library.c:533
-#, fuzzy
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3656,8 +3625,9 @@ msgid "Outdoor"
 msgstr "Szabadban"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "Fluoreszkáló"
 
@@ -3665,7 +3635,7 @@ msgstr "Fluoreszkáló"
 msgid "Incandescent"
 msgstr "Fehéren izzó"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "Fekete-fehér"
 
@@ -3693,8 +3663,8 @@ msgstr "Kép és hang"
 msgid "Character & Sound"
 msgstr "Karakter és hang"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3764,91 +3734,77 @@ msgid "Speed %i is not supported!"
 msgstr "A megadott sebesség (%i) nem támogatott."
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
-"%i helyett %i érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
-"org>."
+"%i bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
+"devel@gphoto.org>."
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
-"%i helyett %i érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
-"org>."
+"%i bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
+"devel@gphoto.org>."
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "0x%x helyett 0x%x érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
 "org>."
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Hibás karakterek (0x%x, 0x%x). Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "A kamera nem tud kéréseket fogadni, mert más feladattal foglalkozik. Ha a "
 "probkléma nem szűnik meg, kérjük jelezze itt: <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Időtúllépési hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 "hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
-"Időtúllépési hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
+"Adatátviteli hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 "hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "A kamera nem megfelelő módba van kacsolva. További információ: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "A kamera nem fogadta el a paramétereket. Kérjük jelezze a hibát ezen a "
 "címen: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ismeretlen hiba történt. Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3866,122 +3822,123 @@ msgstr ""
 "átírta a gphoto2-höz. Marcus Meissner <marcus@jet.franken.de> tovább "
 "tökéletesítette az átiratot, kijavítva néhány hibát."
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "Felbontás és méret"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "Dátum és idő (GMT)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "Az apertúra beállításai"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "Színmód"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "Vörösszemhatás-csökkentés"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "A vaku beállításai"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "egyéni"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "A számítógép energiatakarékossági ideje (s)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "A kamera energiatakarékossági ideje (s)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "Lencsemód"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "koreai"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "angol"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "francia"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "német"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "olasz"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "japán"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "spanyol"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "portugál"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "Képbeállítások"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "A kamera beállításai"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3990,7 +3947,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Néhány megjegyzés az Epson kamerákkal kapcsolatban:\n"
 "- Néhány paraméter nem módosítható távolról:\n"
@@ -4001,7 +3958,7 @@ msgstr ""
 "  fejtettem vissza, ha az Ön gépénél nem működik valami,\n"
 "  kérem értesítsen a <gphoto-devel@lists.sourceforge.net> címen (angolul)\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "Nincs behelyezve memóriakártya"
 
@@ -4029,116 +3986,102 @@ msgstr "A kamera háromszor is megtagadta a kapcsolat nyitvatartását."
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Az első fogadott bájt (0x%x) érvénytelen."
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "Egy csomag átvitele %i próbálkozás után is időtúllépési hibával fejeződött "
 "be. Kérjük jelezze a hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "Több próbálkozás után sem sikerült egy csomag átvitele."
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "A kamera visszautasított egy csomagot. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Egy csomag átvitele nem sikerült (hibakód: %i). Kérjük jelezze a hibát itt: "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 "Az adatátvitel 2 próbálkozás után sem sikerült (időtúllépés történt). A "
 "művelet nem sikerült..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Nem várt eredmény: 0x%x. További információ: <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Nem várt válasz érkezett (%i). Küldjön hibajelentést erre a címre: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Nem sikerült regisztrálni: %i. További információ: <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "Túl sok próbálkozás nem sikerült."
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "Adatok küldése..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Rekurzív hívásokat nem támogat a Sierra-meghajtó! További információ: "
 "<gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Egy sztringregiszter (%i) letöltése nem sikerült. Kérjük jelezze a hibát "
 "itt: <gphoto-devel@lists.sourceforge.net>."
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Zársebesség [ezredmásodpercben] (0=automatikus)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "Zársebesség (s)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -4147,13 +4090,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr "Lassú szinkronizálás"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "Kontraszt+"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "Kontraszt-"
 
@@ -4176,9 +4119,9 @@ msgstr "Képkiigazítás"
 msgid "Preset"
 msgstr "portugál"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "Felhős"
 
@@ -4211,17 +4154,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Működési mód"
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "Az LCD fényereje"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "Az LCD automatikus kikapcsolása (s)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Exponálási kompenzáció"
 
@@ -4229,11 +4172,11 @@ msgstr "Exponálási kompenzáció"
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -4241,11 +4184,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "Exponálásmérés"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "Nagyítás (mm)"
 
@@ -4325,56 +4268,57 @@ msgstr ""
 "\n"
 "    A letöltési funkciónak mindenképpen működnie kell.\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 #, fuzzy
 msgid "White board"
 msgstr "Fehér alap"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 #, fuzzy
 msgid "Black board"
 msgstr "Fekete alap"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 #, fuzzy
 msgid "Daylight"
 msgstr "Égbolt"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "Tungsten"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 #, fuzzy
 msgid "Manual"
 msgstr "Nincs kézikönyv"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "LCD-mód"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "Digitális nagyítás"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "ISO-sebesség"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "A fókusz helyzete"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "Időformátum"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4412,7 +4356,7 @@ msgstr ""
 "    kösse össze újból a számítógépet és a kamerát,\n"
 "    és kapcsolja 'Off' állapotba az LCD-t."
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4442,246 +4386,267 @@ msgstr ""
 "    a hiányzó opciók elkészítésében, kérjük\n"
 "    értesítsen minket a gphoto-devel@gphoto.net címen.\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "A feltöltendő fájl 0 hosszúságú"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "Nincs elég szabad memória a memóriakártyán"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Nem sikerült lekérdezni a képeket tartalmazó könyvtár nevét"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Csak a(z) '%s' mappába lehet fájlokat feltölteni"
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "Legjobb"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (ismeretlen)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Zársebesség (ezredmásodperc, 0 = automatikus)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "Apertúra"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "Fekete/fehér"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "Fehér alap"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "Fekete alap"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "Fényerő/kontraszt"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "Fényerő+"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "Fényerő-"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "Égbolt"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "Végtelen/halszem"
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "Pontmérő mód (spot metering)"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1,6x"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2,5x"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "Automatikus kikapcsolás (kapcsolat esetén) (s)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 "Mennyi idő után kapcsoljon le a kamera, ha össze van kötve egy számítógéppel?"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "Automatikus kikapcsolás (kapcsolat nélkül) (s)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 "Mennyi idő után kapcsoljon le a kamera, ha nincs összekötve számítógéppel?"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD automatikus kikapcsolás (s)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "Képkészítési beállítások"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "SuperFine"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "színes"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "fekete-fehér"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "Megjegyzés: nincs memóriakártya, néhány érték érvénytelen lehet\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sA kamera típusa: %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sGyártó: %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sKameraazonosító: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sSorozatszám: %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sA szoftver revíziója: %s\n"
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sFelvett képkocka: %i\n"
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sMegmaradt képkocka: %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sA telep élettartama: %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sMegmaradt memória: %i bájt\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sDátum: %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Nem áll rendelkezésre kamera"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"Néhány megjegyzés az Epson kamerákkal kapcsolatban:\n"
+"- Néhány paraméter nem módosítható távolról:\n"
+"  * nagyítás\n"
+"  * fókusz\n"
+"  * egyéni fehéregyensúly-beállítás\n"
+"- A beállításokat a PhotoPC 3000z készüléknél\n"
+"  fejtettem vissza, ha az Ön gépénél nem működik valami,\n"
+"  kérem értesítsen a <gphoto-devel@lists.sourceforge.net> címen (angolul)\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4719,7 +4684,7 @@ msgstr ""
 "    kösse össze újból a számítógépet és a kamerát,\n"
 "    és kapcsolja 'Off' állapotba az LCD-t."
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4764,59 +4729,13 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "Meghajtó a SiPix Web2 kamera kezeléséhez."
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr "Ez a funkció még nem használható."
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr "Nincs mit beállítani."
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr "Képek készítése egyelőre nem lehetséges."
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-msgid "Couldn't open camera.\n"
-msgstr "A kamera megnyitása nem sikerült.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-msgid "Error opening camera\n"
-msgstr "Hiba történt a kamera megnyitása közben\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr "A képek száma túl nagy.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"Támogatás a Sony DSC-F1 digitális kamerákhoz\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"A chotplay CLI felületen alapul, amely\n"
-"Ken-ichi Hayashi munkája\n"
-"\n"
-"Elképzelhető, hogy a program nem minden konfigurációval működik\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-msgid "Error opening camera.\n"
-msgstr "Hiba történt a kamera megnyitásakor.\n"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4865,21 +4784,6 @@ msgstr ""
 "Soundvision-meghajtó\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-#, fuzzy
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-"spca504 Flash camlib\n"
-" Szerzők: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"Matthias Krauss és\n"
-"Mark A. Zimmerman <mark@foresthaven.com> munkájának felhasználásával"
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4919,6 +4823,13 @@ msgstr ""
 "rendelkezésre).\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
+"működik.\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5140,36 +5051,36 @@ msgstr "Ez a kamera nem támogat rögzítést."
 msgid "This camera can not capture previews."
 msgstr "Ez a kamera nem támogat gyorsnézeteket."
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Az elérési út ('%s') nem abszolút."
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 "A(z) '%s' nevű könyvtár hozzáfűzése nem sikerült, mert már létezik ilyen "
 "nevű könyvtár."
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "'%s' nevű könyvtár nem ttalálható."
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "A(z) '%s' nevű könyvtár nem tartalmaz '%s' nevű fájlt."
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Nem sikerült hozzáfűzni ezt: '%s' a(z) '%s' mappához, mert a fájl már "
 "létezik."
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5178,23 +5089,23 @@ msgstr ""
 "A program megpróbálta törölni a(z) '%s' fájlt a(z) '%s' mappából, de a "
 "fájlrendszer nem támogatja fájlok törlését."
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 "Az eltávolítani kívánt '%s' könyvtár nem üres, még tartalmaz alkönyvtárakat."
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Az eltávolítani kívánt '%s' könyvtár még nem üres, fájlokat tartalmaz."
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "A fájlrendszer nem támogatja fájlok feltöltését."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5202,36 +5113,36 @@ msgid ""
 msgstr ""
 "A(z) '%s' könyvtár csak %i fájlt tartalmaz, de a kért fájl száma %i volt."
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "A(z) '%s' fájl nem található."
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "A fájlrendszer nem támogatja fájlok letöltését"
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ismeretlen fájltípus: %i."
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "'%s' letöltése a(z) '%s' mappából..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr "A fájlrendszer nem támogatja a fájljellemzők lekérdezését."
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5240,31 +5151,31 @@ msgstr ""
 "Nem sikerült megnyitni olvasásra a '/proc/meminfo' fájlt ('%m'). "
 "Ellenőrizze, hogy a proc fájlrendszer csatlakoztatva van-e."
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "Hiba történt '/proc/meminfo' olvasása közben ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "A sysctl hívás nem sikerült ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "A sysctl hívás nem sikerült ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "A sysctl hívás nem sikerült ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr "A fájlrendszer nem támogatja fájlinformációk beállítását"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 "A csak olvasható fájljellemzők (pl. szélesség, magasság) nem változtathatók "
@@ -5311,27 +5222,114 @@ msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #, fuzzy
-#~ msgid "remove"
-#~ msgstr "távoli"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
+
+#~ msgid "gsmart library v"
+#~ msgstr "gsmart programkönyvtár v"
+
+#~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Támogatás a Mustek gSmart mini digitális kamerákhoz, több gphoto2 camlib "
+#~ "modul és a Windows-meghajtó forráskódja alapján (ezt a Mustek bocsátotta "
+#~ "rendelkezésre).\n"
+#~ "\n"
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
 
 #~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "%i helyett %i érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
+#~ "org>."
+
+#, fuzzy
+#~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "%i bájt helyett %i bájt érkezett. Kérjük jelezze a hibát itt: <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "%i helyett %i érkezett. Kérjük jelezze a hibát itt: <gphoto-devel@gphoto."
+#~ "org>."
 
+#, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "Adatátviteli hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
+#~ "Időtúllépési hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 #~ "hibát itt: <gphoto-devel@lists.sourceforge.net>."
 
+#~ msgid "Sorry, this function not implemented..."
+#~ msgstr "Ez a funkció még nem használható."
+
+#~ msgid "Sorry, nothing to configure..."
+#~ msgstr "Nincs mit beállítani."
+
+#~ msgid "Sorry, taking pictures is not implemented..."
+#~ msgstr "Képek készítése egyelőre nem lehetséges."
+
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "A kamera megnyitása nem sikerült.\n"
+
+#~ msgid "Error opening camera\n"
+#~ msgstr "Hiba történt a kamera megnyitása közben\n"
+
+#~ msgid "Picture number is too large.\n"
+#~ msgstr "A képek száma túl nagy.\n"
+
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "Támogatás a Sony DSC-F1 digitális kamerákhoz\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "A chotplay CLI felületen alapul, amely\n"
+#~ "Ken-ichi Hayashi munkája\n"
+#~ "\n"
+#~ "Elképzelhető, hogy a program nem minden konfigurációval működik\n"
+
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Hiba történt a kamera megnyitásakor.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "spca504_flash camlib\n"
+#~ " Authors: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "based on work by Matthias Krauss\n"
+#~ "and Mark A. Zimmerman <mark@foresthaven.com>"
+#~ msgstr ""
+#~ "spca504 Flash camlib\n"
+#~ " Szerzők: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "Matthias Krauss és\n"
+#~ "Mark A. Zimmerman <mark@foresthaven.com> munkájának felhasználásával"
+
+#, fuzzy
+#~ msgid "remove"
+#~ msgstr "távoli"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
+
 #~ msgid "Camera not ready, could not lock camera keys: %s"
 #~ msgstr "A kamera nem áll készen, a kamera gombjait nem sikerült zárolni: %s"
 
diff --git a/po/it.po b/po/it.po
index 59583c002..70bc33df0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: sab lug 22 11:35:36 CEST 2000\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -42,96 +43,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -147,8 +149,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -178,26 +180,24 @@ msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"Non � possibile aprire:\n"
-"%s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -205,35 +205,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Non disponibile"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -260,114 +260,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Non � possibile ritrarre #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Configurazione fotocamera"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "Live Camera!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Modello fotocamera:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "Non disponibile"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "Cancella"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "Non � possibile salvare #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -613,152 +613,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Riduci l'immagine del 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -931,7 +931,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "Download interrotto."
@@ -951,8 +951,8 @@ msgid "Problem taking live image"
 msgstr "Ricezione immagini live..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Configurazione fotocamera"
 
@@ -1163,7 +1163,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1199,44 +1199,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Non � possibile ricevere un'immagine."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1246,6 +1220,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1392,17 +1371,17 @@ msgstr "Apri immagine"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1440,31 +1419,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1488,8 +1468,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1504,15 +1484,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1808,8 +1788,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1901,8 +1881,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1926,8 +1906,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1995,8 +1975,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2019,15 +1999,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2097,21 +2077,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "Altezza:"
@@ -2148,7 +2128,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2160,7 +2140,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2181,9 +2161,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2341,15 +2321,15 @@ msgid "No"
 msgstr "No"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2548,7 +2528,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Riduci l'immagine del 50%..."
@@ -2625,7 +2605,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s non � ancora implementato"
@@ -2678,7 +2657,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "Indice immagini"
@@ -2708,9 +2687,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2777,8 +2756,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #: camlibs/polaroid/pdc700.c:941
@@ -2821,177 +2800,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Il salvataggio dell'indice non � ancora implementato"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Non disponibile"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Download annullato."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3001,24 +2980,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "La nuova immagine � #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3189,166 +3168,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Download annullato."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Configurazioni colore"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Colori"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Colori"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Colori"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3414,8 +3390,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3423,7 +3400,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3452,8 +3429,8 @@ msgstr "Indice immagini"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3527,72 +3504,55 @@ msgstr "Il salvataggio dell'indice non � ancora implementato"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3606,128 +3566,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "Configurazioni colore"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "Colori"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "Configurazioni colore"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "Modello fotocamera:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "Configurazioni colore"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "Configurazioni colore"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3736,10 +3696,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3766,99 +3726,85 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"Non � possibile aprire:\n"
+"%s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "Ricezione indice..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3866,13 +3812,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3893,9 +3839,9 @@ msgstr "Aggiustamento colore"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3928,17 +3874,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Download annullato."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3946,11 +3892,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3958,11 +3904,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4020,53 +3966,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "Colori"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4087,7 +4034,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4104,247 +4051,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "Cancella"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "Configurazioni colore"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "Colori"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "Modello fotocamera:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Non disponibile"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4365,7 +4325,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4396,55 +4356,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "Non � possibile ricevere un'immagine."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "Apri immagine"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "Apri immagine"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4482,15 +4400,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4522,6 +4431,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4745,129 +4659,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Download interrotto."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4913,22 +4827,46 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Non � possibile ricevere l'anteprima"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "Non � possibile aprire:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr "Riportate bug e critiche a gphoto-devel@lists.sourceforge.net\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Non � possibile ricevere un'immagine."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "Apri immagine"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Apri immagine"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Non � possibile ricevere l'anteprima"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "Configurazione fotocamera"
 
diff --git a/po/ja.po b/po/ja.po
index a02f1d81e..b26615a3e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2 2.1.1rc2\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2002-11-26 00:46+0900\n"
 "Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -56,39 +57,40 @@ msgstr ""
 "WEB ��˼����Ѥߤλ�����ˡ�Υɥ������\n"
 "������ޤ���Vison �ξ����Ѥߡ�"
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -97,53 +99,53 @@ msgstr ""
 "̾�� '%s' (%i �Ĥ�ʸ��) ��Ĺ�����ޤ� (%i �Ĥ�ʸ��)������ 30 ʸ���ޤ�ͭ����"
 "����"
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "�ե����뤬�ݸ��Ƥ��ޤ���"
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -164,8 +166,8 @@ msgstr ""
 "��������Υȥ�󥹥ߥå���󡦥��顼��ȯ���������ϡ������ɥ���Υ���ԥ塼"
 "���Dz�ǽ�ʸ¤��ԤäƤߤƲ�������(�ǥ����������������ʤ�)"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "����餬̵���Ǥ�"
 
@@ -191,22 +193,22 @@ msgstr "�����ԲĤ���ͳ"
 msgid "Could not get disk info: %s"
 msgstr "�ǥ����������������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
-#, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -217,35 +219,35 @@ msgstr ""
 "  ��� %11s ����\n"
 "  %11s �Х���ͭ��"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "AC �����ץ�"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "�Хåƥ�����"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "�Ÿ� ��"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "�Ÿ� ��"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "�����Բ�: %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (host ���� %s%i ��)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +274,7 @@ msgstr ""
 "\n"
 "����: %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -290,24 +292,24 @@ msgstr ""
 "A5 �ɲä� Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "�ե�����κ����˥��顼"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "��ͭ����ͥ���κ����˥��顼"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "���Υ����˥��ԡ��� 57600 �ʾ�ǥ��åץ����ɤ��뤳�ȤϤǤ��ޤ���"
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "�ե�å���ɥ饤�֤�������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -315,84 +317,84 @@ msgstr ""
 "���åץ����ɤǤ��ޤ���Ǥ������Ȥ��Ƥ��ʤ��ե����̾������ޤ���\n"
 "�ե���� 999CANON �ϴ���¸�ߤ��Ƥ��ꡢ���� AUT_9999.JPG ��������ˤ���ޤ���"
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "�оݤȤʤ�ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "�����ȥɥ饤�Ф�����"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "�����"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "�����η��� (�ɤ߼��Τ�)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "��ͭ�Ԥ�̾��"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "���դȻ��� (�ɤ߼��Τ�)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "���顼"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "�����Բ�"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "���������դ� PC �����դ˥��åȤ��ޤ�"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "�ե����०�����Υ�ӥ���� (�ɤ߼��Τ�)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "�Ÿ� (�ɤ߼��Τ�)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "�ɥ饤��"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "���ե�����ΰ���"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "���åץ����ɻ��˥ե�����̾���ݻ�����"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "��ͭ�Ԥ��ѹ�����ޤ���"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "��ͭ�Ԥ�̾�����ѹ����뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "����Υ��å�"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "����򥻥åȤ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -634,100 +636,100 @@ msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "�����ν������Ǥ��Ƥ��ޤ���ʣ���� \"��������\" �׵᤬���Ԥ��ޤ���: %s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "�ǡ����μ�����..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "�ǥ����������������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "�ե�����Υ��åץ�������..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -735,51 +737,51 @@ msgstr ""
 "�ե����뤬�礭�����ޤ������Ȥ��Υ������Ÿ��� OFF �ˤ��ơ��ե�����򥢥å�"
 "�����ɤ��������ᤷ�Ʋ�������"
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "'%s' �򸡽Ф��ޤ�����"
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -979,7 +981,7 @@ msgstr "���꤬����ޤ���"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "�����������������..."
 
@@ -996,8 +998,8 @@ msgid "Problem taking live image"
 msgstr "�ꥢ�륿��������μ���������꤬ȯ�����ޤ���"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "����������"
 
@@ -1210,7 +1212,7 @@ msgstr "FUJI ����������"
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "���դȻ���"
 
@@ -1255,13 +1257,11 @@ msgstr ""
 "���ݡ��Ȥ��Ƥ��ʤ��ݡ��Ȥμ���: %d �ڤ��Υɥ饤�Ф� USB �����ǤΤ�ư���"
 "����\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "������ꥻ�åȤ��뤳�Ȥ�����ޤ���Ǥ�����\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1270,38 +1270,6 @@ msgstr ""
 "���Ȥ��Υ����ǤϺǸ�Υե�����κ���Τߥ��ݡ��Ȥ��Ƥ��ޤ������ߤ��Υե���"
 "��� '%s' �˳������ޤ���"
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart �饤�֥�� Ver"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"�����Ĥ��� gPhoto2 camlib �⥸�塼��� Mustek �Ҥ����󶡤���ĺ���� Windows ��"
-"���Υɥ饤�С���������ή�Ѥ����ǥ����륫���� Mustek gSmart �ߥˡ����꡼����"
-"���ݡ��ȡ�\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"���ݡ��Ȥ��Ƥ��ʤ��ݡ��Ȥμ���: %d �ڤ��Υɥ饤�Ф� USB �����ǤΤ�ư���"
-"����\n"
-
 #: camlibs/jamcam/jamcam.c:284
 #, fuzzy, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1311,6 +1279,11 @@ msgstr "%s�ե졼���: %i\n"
 msgid "jamcam library v"
 msgstr "jamcam �饤�֥�� Ver"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1473,17 +1446,17 @@ msgstr "����ץ���"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "������"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "�ޥ���"
 
@@ -1521,31 +1494,32 @@ msgstr "Ϫ����"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "��ư"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "����ȯ��"
 
@@ -1568,8 +1542,8 @@ msgstr "���ܷڸ��ե�å���"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "ON"
 
@@ -1584,15 +1558,15 @@ msgstr "ON"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "OFF"
 
@@ -1901,11 +1875,11 @@ msgid "Unknown error."
 msgstr "���顼������Ǥ��ޤ���"
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "����餬�����ʥ��顼���֤��Ƥ��ޤ��������Υ��顼 (0x%x,0x%x) ��Ƹ�������ˡ��"
 "�Х�����ݡ��ȤȤ��� <gphoto-devel@lists.sourceforge.net> ����𤷤Ʋ�������"
@@ -2007,8 +1981,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "������"
 
@@ -2032,8 +2006,8 @@ msgid "Localization"
 msgstr "���ܸ첽"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "����"
 
@@ -2101,8 +2075,8 @@ msgid "Focus"
 msgstr "�ե�������"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "����"
 
@@ -2124,15 +2098,15 @@ msgstr "����ե����� (���μ̿��Τ�)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "ɸ��"
 
@@ -2203,21 +2177,21 @@ msgid "No answer from the camera."
 msgstr "����餫��ȿ��������ޤ���"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "��"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "��"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "�⤤"
 
@@ -2258,7 +2232,7 @@ msgstr "OFF"
 msgid "Day-lt"
 msgstr "��ŷ"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2270,7 +2244,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2292,9 +2266,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "���ԥ�"
 
@@ -2472,15 +2446,15 @@ msgid "No"
 msgstr "������"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "�ե�����"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "ɸ��"
 
@@ -2697,7 +2671,7 @@ msgid ""
 msgstr "�ե����륵������ %i �Х��ȤǤ������åץ����ɲ�ǽ�ʥ�����: %i �Х���"
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "���åץ�������..."
 
@@ -2800,7 +2774,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "��갷���������̤����������Ƥ��ޤ���"
 
@@ -2854,7 +2827,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "�������ʼ�"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "����������"
 
@@ -2882,9 +2855,9 @@ msgstr "�ե�����"
 msgid "superfine"
 msgstr "�����ѡ��ե�����"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "��ư"
 
@@ -2952,8 +2925,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "%i �Х��Ȥ������ʲ���������������ޤ�����<gphoto-devel@lists.sourceforge."
 "net> �ޤ�Ϣ�����Ʋ�������"
@@ -3011,167 +2984,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "���Υɥ饤�ФǤ��׵ᤷ���ݡ��ȷ��� (%i) �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP �������ʥ��顼"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP �ΰ���Ū�ʥ��顼"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP �Υ��å���󤬳�����Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP �������ʥȥ�󥶥������ ID"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP ���"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP �ѥ�᡼��"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ��ž������λ���Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP �������ʥ��ȥ졼�� ID"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "PTP �����ʥ��֥����������"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP �ǥХ��� Prop"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP �������ʥ��֥������Ƚ񼰥�����"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP �ζ������̤�����ޤ���"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP ���֥������Ȥؤν񤭹����ݸͭ���Ǥ�"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP ���ɤ߹������ѤǤ�"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP �ؤΥ������������ݤ���ޤ���"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "PTP �ˤϥ���ͥ��뤬����ޤ���"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP �μ��ʿ��Ǥ˼��Ԥ��ޤ���"
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP ����ʬŪ�ʺ��"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP �˳�Ǽ�Ǥ��ޤ���"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "���ݡ��Ȥ��Ƥ��ʤ� PTP �񼰤λ���"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP �������ʥ��֥������Ⱦ���"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP �������ʥ����ɽ�"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP �������ʥ٥���������ɤǤ�"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP �Υ���ץ�������Ǥ��ޤ���"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP �ΥǥХ������Х�"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP �����ʥ��֥�������"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP �������ʥǥХ��� Prop ��"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP �������ʥǥХ��� Prop ��"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP �������ʥѥ�᡼��"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP �Υ��å����ϥ����ץ󤷤Ƥ��ޤ�"
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP �ȥ�󥶥�����󤬥���󥻥뤵��ޤ���"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "���ݡ��Ȥ��Ƥ��ʤ� PTP ž����λ���"
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP EK �ե�����̾��ɬ�פǤ�"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK �ե�����̾����ʣ���Ƥ��ޤ�"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK �����ʥե�����̾�Ǥ�"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP I/O ���顼�Ǥ�"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP ���顼: �ѥ�᡼��������������ޤ���"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP �ץ��ȥ��롦���顼 (������: �ǡ���)"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP �ץ��ȥ��롦���顼 (������: ����)"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3179,7 +3152,7 @@ msgid ""
 "Enjoy!"
 msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3189,25 +3162,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "�̿��ο�: %d\n"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "������ OFF �ˤ��ޤ�"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP �� USB �����Τߥ��ݡ��Ȥ��Ƥ��ޤ���"
 
@@ -3411,178 +3384,175 @@ msgstr "PTP �ץ��ȥ��롦���顼 (������: �ǡ���)"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP �ץ��ȥ��롦���顼 (������: ����)"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 #, fuzzy
 msgid "PTP Undefined Property"
 msgstr "PTP �������ʥ��顼"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 #, fuzzy
 msgid "Battery Level"
 msgstr "%s�Хåƥ꡼�μ�̿: %i\n"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "���⡼��"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "����"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "�ۥ磻�ȥХ��"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 #, fuzzy
 msgid "Focus Distance"
 msgstr "�ե�����������"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "�ե����������⡼��"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Ϫ������"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "�ե�å���⡼��"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 #, fuzzy
 msgid "Exposure Time"
 msgstr "�Х��Ϫ�л���"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Ϫ����"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 #, fuzzy
 msgid "Date Time"
 msgstr "���դȻ���"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 #, fuzzy
 msgid "Contrast"
 msgstr "����ȥ饹��(-)"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "�ǥ����롦������"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "��Ͽ�⡼��"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "���ݥå�¬���⡼��"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 #, fuzzy
 msgid "Copyright Info"
 msgstr "���ԡ��饤��"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 #, fuzzy
 msgid "EK Date Time Stamp Format"
 msgstr "�ǡ�������"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 #, fuzzy
 msgid "EK Beep Mode"
 msgstr "�վ��⡼��"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 #, fuzzy
 msgid "EK Power Saving"
 msgstr "�Ÿ����פʤ�"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 #, fuzzy
 msgid "EK UI Language"
 msgstr "����"
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3654,8 +3624,9 @@ msgid "Outdoor"
 msgstr "����"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "�ָ���"
 
@@ -3663,7 +3634,7 @@ msgstr "�ָ���"
 msgid "Incandescent"
 msgstr "��Ǯ��"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "�����"
 
@@ -3691,8 +3662,8 @@ msgstr "�����ȥ������"
 msgid "Character & Sound"
 msgstr "ʸ���ȥ������"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3762,90 +3733,76 @@ msgid "Speed %i is not supported!"
 msgstr "����å���®�� %i �ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
-"%i ����Ԥ��ޤ�������%i ��������ޤ�����<gphoto-devel@lists.sourceforge."
-"net> ��Ϣ�����Ʋ�������"
+"%i �Х��Ȥ���Ԥ��ޤ�������%i �Х��Ȥ�������ޤ�����<gphoto-devel@gphoto."
+"org> ��Ϣ�����Ʋ�������"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
-"%i ����Ԥ��ޤ�������%i ��������ޤ�����<gphoto-devel@lists.sourceforge."
-"net> ��Ϣ�����Ʋ�������"
+"%i �Х��Ȥ���Ԥ��ޤ�������%i �Х��Ȥ�������ޤ�����<gphoto-devel@gphoto."
+"org> ��Ϣ�����Ʋ�������"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "0x%x ����Ԥ��ޤ�������0x%x ��������ޤ�����<gphoto-devel@lists."
 "sourceforge.net> ��Ϣ�����Ʋ�������"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "��������ʸ�� (0x%x, 0x%x) �Ǥ���<gphoto-devel@lists.sourceforge.net> ��Ϣ����"
 "�Ʋ�������"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "����餬�ӥ����Ǥ������ξ��֤�Ĺ��³�������� <gphoto-devel@lists."
 "sourceforge.net> ��Ϣ�����Ʋ�������"
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "����ȥ饤���ޤ����������ॢ���ȤǤ���<gphoto-devel@lists.sourceforge.net> "
 "��Ϣ�����Ʋ�������"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
-"����ȥ饤���ޤ����������ॢ���ȤǤ���<gphoto-devel@lists.sourceforge.net> "
-"��Ϣ�����Ʋ�������"
+"���ȥ饤���ޤ������̿����顼�Ǥ���<gphoto-devel@lists.sourceforge.net> ��Ϣ"
+"�����Ʋ�������"
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "����餬�ְ�ä��⡼�ɤˤ���ޤ���<gphoto-devel@lists.sourceforge.net> ��Ϣ��"
 "���Ʋ�������"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "����餬������������ޤ���<gphoto-devel@lists.sourceforge.net> ��Ϣ������"
 "��������"
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "�����ʥ��顼��ȯ�����ޤ�����<gphoto-devel@lists.sourceforge.net> ��Ϣ�����Ʋ�"
 "������"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3863,122 +3820,123 @@ msgstr ""
 "sourceforge.net> ��Ϥ���� gphoto2 �����˼�����ľ���ޤ�����Marcus Meissner "
 "�� <marcus@jet.franken.de> ��ϥХ��ե��å����ȳ�ĥ��ǽ��ô�����ޤ�����"
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "�����٤���ʬ��"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "���դȻ��� (GMT)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "���Ѥ�����"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "���顼�⡼��"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "���ܷڸ�ȯ��"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "���������󥯥�"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "�ե�å��������"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "��������"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "�ۥ��ȤΥѥ������ (��)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "�����Υѥ������ (��)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "��󥺥⡼��"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "�ڹ��"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "�Ѹ�"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "�ե�󥹸�"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "�ɥ��ĸ�"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "�����ꥢ��"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "���ܸ�"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "���ڥ����"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "�ݥ�ȥ����"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "�̿�������"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "����������"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3987,7 +3945,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "Epson �� �����ˤĤ���:\n"
 "- �ʲ��Υѥ�᡼���ϥ�⡼�Ȥ�����Ǥ��ޤ���:\n"
@@ -3998,7 +3956,7 @@ msgstr ""
 "  ���Ȥ��Υ���餬��������ư���򤷤�����\n"
 "  <gphoto-devel@lists.sourceforge.net> (�Ѹ��) �ޤ�Ϣ�����Ʋ�������\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "���ꡦ�����ɤ�����ޤ���"
 
@@ -4025,114 +3983,100 @@ msgstr "��³���ݻ�����Τˣ����Ԥ��ޤ�����"
 msgid "The first byte received (0x%x) is not valid."
 msgstr "�ǽ�˼�����ä��ǡ��� (0x%x) ��̵���Ǥ���"
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "�ѥ��åȤ� %i ���������ޤ������������ॢ���Ȥ��ޤ�����<gphoto-devel@gphoto."
 "org> ��Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "��ȥ饤���ѥ��å�����������ޤ���Ǥ�����"
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "�ѥ��åȤ������˵��ݤ���ޤ�����<gphoto-devel@lists.sourceforge.net> ��Ϣ��"
 "���Ʋ�������"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "�ѥ��åȤ������Ǥ��ޤ���Ǥ��� (���顼������ %i)��<gphoto-devel@lists."
 "sourceforge.net> ��Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "���������ޤ����������ॢ���Ȥ��ޤ�������λ���ޤ�..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "ͽ�����ʤ���� 0x%x ��������ޤ�����<gphoto-devel@lists.sourceforge.net> ��"
 "Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "ͽ�����ʤ���� (%i) ��������ޤ�����<gphoto-devel@lists.sourceforge.net> ��"
 "Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "�쥸���� %i ������Ǥ��ޤ���<gphoto-devel@lists.sourceforge.net> ��Ϣ������"
 "��������"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "��ȥ饤�˼��Ԥ��ޤ�����"
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "�ǡ�����������..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Sierra �ɥ饤�ФǤϺƵ��ƤӽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ��� <gphoto-devel@gphoto."
 "org> ��Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "string ���쥸���� %i ������Ǥ��ޤ���Ǥ�����<gphoto-devel@lists.sourceforge."
 "net> ��Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "32 �Х��Ȥ���Ԥ��ޤ�������%i �Х��Ȥ�������ޤ�����<gphoto-devel@gphoto."
 "org> ��Ϣ�����Ʋ�������"
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "����å���®�� (�ޥ�������, 0:��ư)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "����å���®�� (��, 0:��ư)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -4141,13 +4085,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr "���������󥯥�"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "����ȥ饹��(+)"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "����ȥ饹��(-)"
 
@@ -4170,9 +4114,9 @@ msgstr "������Ĵ��"
 msgid "Preset"
 msgstr "�ݥ�ȥ����"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "��ŷ"
 
@@ -4205,17 +4149,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "���⡼��"
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "�վ���˥������뤵"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "�վ���˥��μ�ư���� (��)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Ϫ����"
 
@@ -4223,11 +4167,11 @@ msgstr "Ϫ����"
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -4235,11 +4179,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "Ϫ������"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "������ (�ߥ�ñ��)"
 
@@ -4318,56 +4262,57 @@ msgstr ""
 "\n"
 "    ����������ɤ���������ǽ����ɬ�פ�����ޤ���\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 #, fuzzy
 msgid "White board"
 msgstr "����"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 #, fuzzy
 msgid "Black board"
 msgstr "����"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 #, fuzzy
 msgid "Daylight"
 msgstr "��ŷ"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "�ŵ�"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 #, fuzzy
 msgid "Manual"
 msgstr "��갷��������ʤ�"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "�վ��⡼��"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "�ǥ����롦������"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "ISO ���ԡ���"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "�ե�����������"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "������"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4403,7 +4348,7 @@ msgstr ""
 "    �⤷���Τ褦�ʾ��֤ˤʤä��顢PC �����곰�����ƺƤ���³��\n"
 "    �վ��� \"OFF\" ���ڤ��ؤ��Ʋ�������"
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4431,245 +4376,266 @@ msgstr ""
 "    ���굡ǽ�����ˤ��뤿��˳�ȯ�˶��Ϥ��Ƥ����Τʤ��\n"
 "    gphoto-devel@gphoto.net �γ�ȯ�Ԥ�Ϣ�����Ʋ�������\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "���åץ����ɤ����ե�����Υ������� NULL �Ǥ�"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "���ꥫ���ɤ˶������̤�����ޤ���"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "�̿����Ǽ����ե����̾�������Ǥ��ޤ���"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "�ե���� '%s' �ؤΥ��åץ����ɤΤߥ��ݡ��Ȥ��Ƥ��ޤ�"
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "�٥���"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (����)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "����å���®�� (�ޥ�������, 0:��ư)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "�ʤ�"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "�����"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "����"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "����"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "���뤵/����ȥ饹��"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "���뤵(+)"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "���뤵(-)"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "��ŷ"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "��/�ե�å��奢��"
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "���ݥå�¬���⡼��"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "x1"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "x1.6"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "x2.5"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "��ư�ѥ���� (host) (�ø�)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr "����ԥ塼������³�������˼�ưŪ�˥ѥ���դ���ޤǤλ��֤Ǥ�"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "��ư�ѥ���� (����) (�ø�)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "�����Ǽ�ưŪ�˥ѥ���դ���ޤǤλ��֤Ǥ�"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "�վ���˥��μ�ư���� (�ø�)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "����åȤ�����"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "�����ѡ��ե�����"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "�������"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "����"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "�����"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "����: ���ꡦ�����ɤ�����ޤ��󡣤����Ĥ����ͤ������ˤʤ뤫�⤷��ޤ���\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%s�������: %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%s��¤: %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%s�����ID: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%s���ꥢ���ֹ�: %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%s���եȥ���������ӥ����: %s\n"
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%s�ե졼���: %i\n"
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%s�Ĥ�ե졼���: %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%s�Хåƥ꡼�μ�̿: %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%s����ζ�������: %i �Х���\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%s����: %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "����餬̵���Ǥ�"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"Epson �� �����ˤĤ���:\n"
+"- �ʲ��Υѥ�᡼���ϥ�⡼�Ȥ�����Ǥ��ޤ���:\n"
+"  * ������\n"
+"  * �ե�������\n"
+"  * �ۥ磻�ȡ��Х�󥹤Υ�����������\n"
+"- ����� PhotoPC 3000z �ǥ�С������󥸥˥�����ޤ�����\n"
+"  ���Ȥ��Υ���餬��������ư���򤷤�����\n"
+"  <gphoto-devel@lists.sourceforge.net> (�Ѹ��) �ޤ�Ϣ�����Ʋ�������\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4705,7 +4671,7 @@ msgstr ""
 "    �⤷���Τ褦�ʾ��֤ˤʤä��顢PC �����곰�����ƺƤ���³��\n"
 "    �վ��� \"OFF\" ���ڤ��ؤ��Ʋ�������"
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4750,61 +4716,13 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "SiPix Web2 �����إ�����������ɥ饤�ФǤ���"
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "������ꥻ�åȤ��뤳�Ȥ�����ޤ���Ǥ�����\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "�����κ�����������꤬ȯ�����ޤ���"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-#, fuzzy
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"SONY DSC-F1 �ǥ����륫���Υ��ݡ���ô��\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"Kenichi Hayashi �ᤫ�� chotplay CLI \n"
-"���󥿥ե����������󶡤����㤤�ޤ���\n"
-"Gphoto2 �������� Bart van Leeuwen <bart@netage.nl>"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "�����κ�����������꤬ȯ�����ޤ���"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4854,15 +4772,6 @@ msgstr ""
 "Soundvision �ɥ饤��\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4902,6 +4811,13 @@ msgstr ""
 "���ݡ��ȡ�\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"���ݡ��Ȥ��Ƥ��ʤ��ݡ��Ȥμ���: %d �ڤ��Υɥ饤�Ф� USB �����ǤΤ�ư���"
+"����\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5122,34 +5038,34 @@ msgstr "���Υ����Ǥϥ���ץ���Ǥ��ޤ���"
 msgid "This camera can not capture previews."
 msgstr "���Υ����ϥ���ץ���Υץ�ӥ塼���Ǥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "�ѥ�̾ '%s' ��̵���Ǥ���"
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "�ե���� '%s' ������¸�ߤ��Ƥ���Τ��ɲä��뤳�Ȥ�����ޤ���Ǥ�����"
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "�ե���� '%s' �����Ĥ���ޤ���Ǥ�����"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "�ե���� '%s' ����˥ե���� '%s' ������ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "�ե����� '%s' ������¸�ߤ��Ƥ���Τǥե���� '%s' ���ɲä��뤳�Ȥ�����ޤ���"
 "�Ǥ�����"
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5158,22 +5074,22 @@ msgstr ""
 "'%s' ��ե���� '%s' ���������褦�Ȥ��ޤ��������ե����륷���ƥ�ϥե������"
 "����򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "������褦�Ȥ����ե���� '%s' ����˥��֥ե������¸�ߤ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "������褦�Ȥ����ե���� '%s' ����˥ե����뤬¸�ߤ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "�ե����륷���ƥ�Ǥϥե�����Υ��åץ����ɤ򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5181,36 +5097,36 @@ msgid ""
 msgstr ""
 "�ե���� '%s' �ˤ� %i �ĤΥե����뤬����ޤ������׵ᤷ���ֹ�� %i �Ǥ���"
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "�ե����� '%s' �����Ĥ���ޤ���Ǥ�����"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "�ե����륷���ƥ�Ϥ��η����Υե���������򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "�����ʥե�������� %i �Ǥ���"
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "'%s' ��ե���� '%s' ����������������..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr "�ե����륷���ƥ�Ϥ��η����Υե������������򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5219,31 +5135,31 @@ msgstr ""
 "'/proc/meminfo' �� ('%m') ���ɤ߹��ि��˳����ޤ���Ǥ�����proc �ե����륷��"
 "�ƥब¸�ߤ��뤫��ǧ���Ʋ�������"
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "'/proc/meminfo' ('%m') ���ɤ߹�����˥��顼��ȯ�����ޤ�����"
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "�����ƥॳ����θƤӽФ��˼��Ԥ��ޤ��� ('%m')��"
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "�����ƥॳ����θƤӽФ��˼��Ԥ��ޤ��� ('%m')��"
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "�����ƥॳ����θƤӽФ��˼��Ԥ��ޤ��� ('%m')��"
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr "�ե����륷���ƥ�Ϥ��η����Υե�������������򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "�ե���������ȹ⤵�ʤɤ��ɤ߹�������°�����ѹ����뤳�ȤϤǤ��ޤ���"
 
@@ -5288,26 +5204,88 @@ msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
 #, fuzzy
-#~ msgid "remove"
-#~ msgstr "��⡼��"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
 
-#, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "�ǥ�����̾��������뤳�Ȥ�����ޤ���Ǥ���: %s"
+#~ msgid "gsmart library v"
+#~ msgstr "gsmart �饤�֥�� Ver"
 
 #~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "�����Ĥ��� gPhoto2 camlib �⥸�塼��� Mustek �Ҥ����󶡤���ĺ���� "
+#~ "Windows �����Υɥ饤�С���������ή�Ѥ����ǥ����륫���� Mustek gSmart ��"
+#~ "�ˡ����꡼���Υ��ݡ��ȡ�\n"
+#~ "\n"
+
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
+
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "%i ����Ԥ��ޤ�������%i ��������ޤ�����<gphoto-devel@lists.sourceforge."
+#~ "net> ��Ϣ�����Ʋ�������"
+
+#, fuzzy
+#~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "%i �Х��Ȥ���Ԥ��ޤ�������%i �Х��Ȥ�������ޤ�����<gphoto-"
-#~ "devel@gphoto.org> ��Ϣ�����Ʋ�������"
+#~ "%i ����Ԥ��ޤ�������%i ��������ޤ�����<gphoto-devel@lists.sourceforge."
+#~ "net> ��Ϣ�����Ʋ�������"
 
+#, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "���ȥ饤���ޤ������̿����顼�Ǥ���<gphoto-devel@lists.sourceforge.net> "
-#~ "��Ϣ�����Ʋ�������"
+#~ "����ȥ饤���ޤ����������ॢ���ȤǤ���<gphoto-devel@lists.sourceforge."
+#~ "net> ��Ϣ�����Ʋ�������"
+
+#, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "������ꥻ�åȤ��뤳�Ȥ�����ޤ���Ǥ�����\n"
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "�����κ�����������꤬ȯ�����ޤ���"
+
+#, fuzzy
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "SONY DSC-F1 �ǥ����륫���Υ��ݡ���ô��\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "Kenichi Hayashi �ᤫ�� chotplay CLI \n"
+#~ "���󥿥ե����������󶡤����㤤�ޤ���\n"
+#~ "Gphoto2 �������� Bart van Leeuwen <bart@netage.nl>"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "�����κ�����������꤬ȯ�����ޤ���"
+
+#, fuzzy
+#~ msgid "remove"
+#~ msgstr "��⡼��"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�ǥ�����̾��������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
 #, fuzzy
 #~ msgid "Driver Configuration"
diff --git a/po/no.po b/po/no.po
index b76b71d70..336cfbdf9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2000-04-11 10:12+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -42,96 +43,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -147,8 +149,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -178,26 +180,24 @@ msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"Kunne ikke �pne:\n"
-"%s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -205,35 +205,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -260,114 +260,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Kunne ikke hente #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Kamerakonfigurasjon"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "Kamera i sanntid!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Kamera modell:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "Nullstill"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "Kunne ikke lagre #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -613,152 +613,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Skalerer bilde med 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -931,7 +931,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "Nedlasting stoppet."
@@ -951,8 +951,8 @@ msgid "Problem taking live image"
 msgstr "Henter sanntidsbilde..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamerakonfigurasjon"
 
@@ -1163,7 +1163,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1199,44 +1199,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke ta bilde."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1246,6 +1220,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1392,17 +1371,17 @@ msgstr "�pne bilde"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1440,31 +1419,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1488,8 +1468,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1504,15 +1484,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1808,8 +1788,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1901,8 +1881,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1926,8 +1906,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1995,8 +1975,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2019,15 +1999,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2097,21 +2077,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "H�yde:"
@@ -2148,7 +2128,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2160,7 +2140,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2181,9 +2161,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2341,15 +2321,15 @@ msgid "No"
 msgstr "Nei"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2548,7 +2528,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Skalerer bilde med 50%..."
@@ -2625,7 +2605,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s er ikke implementert enn�"
@@ -2678,7 +2657,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "Bildeindeks"
@@ -2708,9 +2687,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2777,8 +2756,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
@@ -2822,177 +2801,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3002,24 +2981,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "Nytt bilde er #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3190,166 +3169,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Farger"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3415,8 +3391,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3424,7 +3401,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3453,8 +3430,8 @@ msgstr "Bildeindeks"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3528,82 +3505,65 @@ msgstr "Lagring av indeks er ikke st�ttet enn�"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3617,128 +3577,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "Farger"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "Kamera modell:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3747,10 +3707,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3777,104 +3737,90 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"Kunne ikke �pne:\n"
+"%s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "Henter indeks..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3882,13 +3828,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3909,9 +3855,9 @@ msgstr "Fargejustering"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3944,17 +3890,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3962,11 +3908,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3974,11 +3920,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4036,53 +3982,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "Farger"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4103,7 +4050,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4120,247 +4067,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "Nullstill"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "Fargeinnstillinger"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "Farger"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "Kamera modell:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4381,7 +4341,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4412,55 +4372,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "Kunne ikke ta bilde."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "�pne bilde"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "�pne bilde"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4498,15 +4416,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4538,6 +4447,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4761,129 +4675,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Nedlasting stoppet."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4929,24 +4843,49 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Kunne ikke hente forh�ndsvisning"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "Kunne ikke �pne:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Rapport�r feil ok kamerasuksess til gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Kunne ikke ta bilde."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "�pne bilde"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "�pne bilde"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunne ikke hente forh�ndsvisning"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "Kamerakonfigurasjon"
 
diff --git a/po/ru.po b/po/ru.po
index f95802b7c..7f7d3b058 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2000-05-23 22:02+00:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -41,96 +42,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -146,8 +148,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -177,26 +179,24 @@ msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"�� ������� �������:\n"
-"%s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -204,35 +204,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "�� ��������"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +248,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -259,114 +259,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "�� ������� ������������ #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "������������ ������"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "����� ������!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "������ ������:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "�� ��������"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "��������"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "�� ������� ��������� #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -612,152 +612,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "������� ����������� 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -930,7 +930,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "���������� �����������."
@@ -950,8 +950,8 @@ msgid "Problem taking live image"
 msgstr "��������� ������ �����������..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "������������ ������"
 
@@ -1162,7 +1162,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1198,44 +1198,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "�� ������� �������� �����������."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1245,6 +1219,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1391,17 +1370,17 @@ msgstr "������� �����������"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1439,31 +1418,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1487,8 +1467,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1503,15 +1483,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1807,8 +1787,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1900,8 +1880,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1925,8 +1905,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1994,8 +1974,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2018,15 +1998,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2096,21 +2076,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "������:"
@@ -2147,7 +2127,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2159,7 +2139,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2180,9 +2160,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2340,15 +2320,15 @@ msgid "No"
 msgstr "�� �������"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2547,7 +2527,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "������� ����������� 50%..."
@@ -2624,7 +2604,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s ��� �� �����������"
@@ -2677,7 +2656,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "������ �����������"
@@ -2707,9 +2686,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2776,8 +2755,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
@@ -2822,177 +2801,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "���������� ������� ��� �� ��������������"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "�� ��������"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "���������� ��������."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3002,24 +2981,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "����� ����������� #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3190,166 +3169,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "���������� ��������."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "�������� ���������"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "�����"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "�����"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "�����"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3415,8 +3391,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3424,7 +3401,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3453,8 +3430,8 @@ msgstr "������ �����������"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3528,92 +3505,75 @@ msgstr "���������� ������� ��� �� ��������������"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3627,128 +3587,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "�������� ���������"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "�����"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "�������� ���������"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "������ ������:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "�������� ���������"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "�������� ���������"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3757,10 +3717,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3787,109 +3747,95 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"�� ������� �������:\n"
+"%s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "��������� �������..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3897,13 +3843,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3924,9 +3870,9 @@ msgstr "������ �����"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3959,17 +3905,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "���������� ��������."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3977,11 +3923,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3989,11 +3935,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4051,53 +3997,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "�����"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4118,7 +4065,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4135,247 +4082,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "��������"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "�������� ���������"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "�����"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "������ ������:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "�� ��������"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4396,7 +4356,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4427,55 +4387,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "�� ������� �������� �����������."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "������� �����������"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "������� �����������"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4513,15 +4431,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4553,6 +4462,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4776,129 +4690,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "���������� �����������."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4944,13 +4858,23 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "�� ������� �������� ��������"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "�� ������� �������:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
+#~ "net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 #~ "net.\n"
@@ -4958,12 +4882,28 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "��������� �� ������� � ������� �� ������ gphoto-devel@lists.sourceforge."
 #~ "net.\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "�� ������� �������� �����������."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "������� �����������"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "������� �����������"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�� ������� �������� ��������"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "������������ ������"
 
diff --git a/po/sl.po b/po/sl.po
index 385c96fa2..1cc6b67d1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2002-01-04 19:25+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -42,96 +43,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -147,8 +149,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -178,26 +180,24 @@ msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"Ne morem odpreti:\n"
-" %s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -205,35 +205,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -260,114 +260,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "Ne morem dobiti #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Nastaviteve fotoaparata"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "�iva slika!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "Model fotoaparata:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "Ni na voljo"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "Ponastavi"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "Ne morem shraniti #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -613,152 +613,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Pomanj�ujem sliko za 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -931,7 +931,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "Prena�anje ustavljeno."
@@ -951,8 +951,8 @@ msgid "Problem taking live image"
 msgstr "Dobivam �ivo sliko..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Nastaviteve fotoaparata"
 
@@ -1163,7 +1163,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1199,44 +1199,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Nisem uspel slikati."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1246,6 +1220,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1392,17 +1371,17 @@ msgstr "Odpri sliko"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1440,31 +1419,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1488,8 +1468,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1504,15 +1484,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1808,8 +1788,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1901,8 +1881,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1926,8 +1906,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1995,8 +1975,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2019,15 +1999,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2097,21 +2077,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "Vi�ina:"
@@ -2148,7 +2128,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2160,7 +2140,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2181,9 +2161,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2341,15 +2321,15 @@ msgid "No"
 msgstr "Ne"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2548,7 +2528,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "Pomanj�ujem sliko za 50%..."
@@ -2625,7 +2605,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s �e ni implementiran"
@@ -2678,7 +2657,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "Kazalo slik"
@@ -2708,9 +2687,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2777,8 +2756,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
@@ -2823,177 +2802,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ni na voljo"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3003,24 +2982,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "Nova slika je #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3191,166 +3170,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Nstavitev barv"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Barve"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3416,8 +3392,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3425,7 +3402,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3454,8 +3431,8 @@ msgstr "Kazalo slik"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3529,92 +3506,75 @@ msgstr "Shranjevanje kazala �e ni podprto"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3628,128 +3588,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "Barve"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "Model fotoaparata:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3758,10 +3718,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3788,109 +3748,95 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"Ne morem odpreti:\n"
+" %s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "Dobivam kazalo..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists.sourceforge."
 "net.\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3898,13 +3844,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3925,9 +3871,9 @@ msgstr "Nastavitev barv"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3960,17 +3906,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3978,11 +3924,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3990,11 +3936,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4052,53 +3998,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "Barve"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4119,7 +4066,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4136,247 +4083,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "Ponastavi"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "Nstavitev barv"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "Barve"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "Model fotoaparata:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Ni na voljo"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4397,7 +4357,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4428,55 +4388,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "Nisem uspel slikati."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "Odpri sliko"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "Odpri sliko"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4514,15 +4432,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4554,6 +4463,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4777,129 +4691,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Prena�anje ustavljeno."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4945,13 +4859,23 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Ne morem dobiti vzorca"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "Ne morem odpreti:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists."
+#~ "sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists."
 #~ "sourceforge.net.\n"
@@ -4959,12 +4883,28 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "Sporo�ite hro��e in uspehe s fotoaparati na gphoto-devel@lists."
 #~ "sourceforge.net.\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Nisem uspel slikati."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "Odpri sliko"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Odpri sliko"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Ne morem dobiti vzorca"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "Nastaviteve fotoaparata"
 
diff --git a/po/sv.po b/po/sv.po
index cef5ea465..8ab10c656 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2003-01-09 08:13+0100\n"
 "Last-Translator: Stefan Bj�rnelund <stefanb@update.uu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -56,39 +57,40 @@ msgstr ""
 "Implementerat med hj�lp av dokument fr�n\n"
 "n�tet. Med tillst�nd fr�n Vision."
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -96,53 +98,53 @@ msgid ""
 msgstr ""
 "Namnet '%s' (%i tecken) �r f�r l�ngt (%i tecken), maximalt 30 tecken till�ts."
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "Filen skyddad."
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -163,8 +165,8 @@ msgstr ""
 "om du m�rker m�nga �verf�ringsfel, f�rs�k att ha datorn s� l�tt lastad som "
 "m�jligt (d.v.s. ingen diskettaktivitet)"
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "Kameran ej tillg�nglig"
 
@@ -190,22 +192,22 @@ msgstr "Ingen anledning tillg�nglig"
 msgid "Could not get disk info: %s"
 msgstr "Kunde inte f� tag p� disk info: %s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
-#, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
-
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -216,35 +218,35 @@ msgstr ""
 "  %11s bytes totalt\n"
 "  %11s bytes tillg�ngliga"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "N�tadapter"
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "p� batteri"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "kraft OK"
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "kraft d�lig"
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "ej tillg�nglig: %s"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (v�rdtid %s%i sekunder)"
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +273,7 @@ msgstr ""
 "\n"
 "Tid: %s\n"
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -289,24 +291,24 @@ msgstr ""
 "A5-till�gg av Ole W. Saastad\n"
 "Holger Klemm\n"
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "Fel vid filradering"
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "Fel vid radering av associerad minibild till fil"
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "Kameran st�der inte hastigheter �verstigande 57600 vid uppladdning."
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "Kunde inte f� tag p� flash-enhetens enhetsbokstav"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -314,84 +316,84 @@ msgstr ""
 "Kunde inte ladda upp, inget ledigt mappnamn tillg�ngligt!\n"
 "Mappnamnet 999CANON existerar och har en bild AUT_9999.JPG."
 
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "Kamera"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "Kameramodell (skrivskyddad)"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "�garnamn"
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "Datum och Tid (skrivskyddad)"
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "Fel"
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "Otillg�nglig"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "S�tt kamerans datum till datorns datum"
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "Fastvarurevision (skrivskyddad)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "Kraft (skrivskyddad)"
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "Drivrutin"
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "Lista alla filer"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "Beh�ll filnamnet vid uppladdning"
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "�garnamnet �ndrat"
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "kunde inte �ndra �garnamnet"
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "tiden inst�lld"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "kunde inte st�lla in tiden"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ej st�dd port typ %i = 0x%x given. Initialisering om�jlig."
@@ -632,100 +634,100 @@ msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "Kamera ej redo, flera 'Identifiera kamera'-f�rfr�gningar misslyckades: %s\""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "Tar emot data..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunde inte f� tag p� disk info: %s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "Laddar upp fil..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -733,51 +735,51 @@ msgstr ""
 "Filen var f�r stor. Du kan beh�va st�nga av kameran och sl� p� den ingen "
 "innan du kan ladda upp mer filer."
 
-#: camlibs/canon/usb.c:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detekterade ett '%s'."
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -976,7 +978,7 @@ msgstr "Slut p� minne"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "Nerladdning av bild..."
 
@@ -993,8 +995,8 @@ msgid "Problem taking live image"
 msgstr "Problem med att ta aktuell bild"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamerakonfiguration"
 
@@ -1197,7 +1199,7 @@ msgstr "Konfiguration f�r din FUJI kamera"
 
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "Datum & Tid"
 
@@ -1241,13 +1243,11 @@ msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Kunde inte nollst�lla kameran.\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
@@ -1256,37 +1256,6 @@ msgstr ""
 "Din kamera st�djer radering av den senaste filen p� kameran. I detta fall, "
 "denh�r filen '%s'."
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart bibliotek v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr "�"
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\\n\"\n"
-"St�d f�r Mustek gSmart mini serien av digital kameror baserade p�\n"
-"flera andra gphoto2 kamerabiblioteks moduler och windows k�llkoden \n"
-"v�nligen tillhandah�llen av Mustek.\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-"Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
-
 #: camlibs/jamcam/jamcam.c:284
 #, fuzzy, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1296,6 +1265,11 @@ msgstr "%sbilder tagna: %i\n"
 msgid "jamcam library v"
 msgstr "jamcam bibliotek v"
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr "�"
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1459,17 +1433,17 @@ msgstr "Foto"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "Zoom"
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "Makro"
 
@@ -1507,31 +1481,32 @@ msgstr "Exponerings kompensation"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "Auto"
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "Tvinga"
 
@@ -1554,8 +1529,8 @@ msgstr "R�da �gon reduktion"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "P�"
 
@@ -1570,15 +1545,15 @@ msgstr "P�"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "Av"
 
@@ -1891,11 +1866,11 @@ msgid "Unknown error."
 msgstr "Ok�nt fel."
 
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "Kameran har precis skickat ett en felkod som inte tidigare har uppt�ckts. "
 "V�nligen rapportera det f�ljande till <<gphoto-devel@lists.sourceforge.net> "
@@ -1998,8 +1973,8 @@ msgstr "Bildspelsintervall"
 
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "Uppl�sning"
 
@@ -2023,8 +1998,8 @@ msgid "Localization"
 msgstr "Lokalisering"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "Spr�k"
 
@@ -2092,8 +2067,8 @@ msgid "Focus"
 msgstr "Fokus"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "Fast"
 
@@ -2115,15 +2090,15 @@ msgstr "Sj�lvutl�sare (endast n�sta bild)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "Normal"
 
@@ -2194,21 +2169,21 @@ msgid "No answer from the camera."
 msgstr "Ingen svar fr�n kamera"
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "L�g"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "Medium"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "H�g"
 
@@ -2249,7 +2224,7 @@ msgstr "Av"
 msgid "Day-lt"
 msgstr "Dagsljus"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2261,7 +2236,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2283,9 +2258,9 @@ msgid "Black and White"
 msgstr "Svartvit"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "Sepiabrunt"
 
@@ -2463,15 +2438,15 @@ msgid "No"
 msgstr "Nej"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "Standard"
 
@@ -2689,7 +2664,7 @@ msgstr ""
 "Filstorleken �r %i bytes. Den st�rsta fil som kan laddas upp �r: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Uppladdning..."
 
@@ -2793,7 +2768,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "Manual inte implementerat �nnu"
 
@@ -2847,7 +2821,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr "Bildkvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "Bildstorlek"
 
@@ -2875,9 +2849,9 @@ msgstr "fin"
 msgid "superfine"
 msgstr "extrafin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "auto"
 
@@ -2945,8 +2919,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "%i bytes av ok�nd bildformat har mottagits. V�nligen skriv till <gphoto-"
 "devel@gphoto.org> f�r assistans."
@@ -3004,167 +2978,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den beg�rda porttypen (%i) st�ds ej av denna drivrutin."
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP sessionen inte �ppen"
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "PTP operationen st�ds ej"
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter st�ds ej"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ofullst�ndig �verf�ring"
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhet egenskap st�ds ej"
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP �tkomst nekad"
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen minibild tillg�nglig"
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP sj�lvtest misslyckades"
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP lagring inte tillg�nglig"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation av format st�ds ej"
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP ok�nd tillvekarkod"
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ogiltigt f�r�ndra objekt"
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter v�rde"
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP sessionen redan �ppen"
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare st�ds ej"
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "PTP EK filnamn kr�vs"
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollfel, data f�r�ldrat"
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollfel, svar f�rv�ntat"
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3172,7 +3146,7 @@ msgid ""
 "Enjoy!"
 msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3182,25 +3156,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "St�nger av kameran"
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP endast implementerat f�r USB kamror."
 
@@ -3404,178 +3378,175 @@ msgstr "PTP protokollfel, data f�r�ldrat"
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP protokollfel, svar f�rv�ntat"
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 #, fuzzy
 msgid "PTP Undefined Property"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sBatteritid: %i\n"
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Operationsl�ge."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Kompression"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "Fokusl�ge"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "Blixt L�ge"
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 #, fuzzy
 msgid "Exposure Time"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 #, fuzzy
 msgid "Date Time"
 msgstr "Datum & Tid"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "Digital Zoom"
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "Inspelningsl�ge"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "Punktm�tningsl�ge"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 #, fuzzy
 msgid "EK Date Time Stamp Format"
 msgstr "Datumformat"
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 #, fuzzy
 msgid "EK Beep Mode"
 msgstr "LED-l�ge"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 #, fuzzy
 msgid "EK Power Saving"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 #, fuzzy
 msgid "EK UI Language"
 msgstr "Spr�k"
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3647,8 +3618,9 @@ msgid "Outdoor"
 msgstr "Utomhus"
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "Lysr�r"
 
@@ -3656,7 +3628,7 @@ msgstr "Lysr�r"
 msgid "Incandescent"
 msgstr "Bl�ndande"
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "Svartvit"
 
@@ -3684,8 +3656,8 @@ msgstr "Bild & Ljud"
 msgid "Character & Sound"
 msgstr "Karakt�r & Ljud"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -3755,90 +3727,76 @@ msgid "Speed %i is not supported!"
 msgstr "Hastighet %i st�ds ej!"
 
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
-"F�rv�ntade %i, fick %i. V�nligen rapprotera detta fel till <gphoto-"
+"F�rv�ntade %i bytes, fick %i. V�nligen rapportera felet till <gphoto-"
 "devel@gphoto.org>."
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
-"F�rv�ntade %i, fick %i. V�nligen rapprotera detta fel till <gphoto-"
+"F�rv�ntade %i bytes, fick %i. V�nligen rapportera felet till <gphoto-"
 "devel@gphoto.org>."
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "Vi F�rv�ntade 0x%x ben mottog 0x%x. V�nligen kontakta <gphoto-devel@gphoto."
 "org>."
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "D�ligt tecken (0x%xm 0x%x). V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "Kameran upptagen. Om problemet kvarst�r, v�nligen kontakta <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "Timeout �ven efter 2 f�rs�k.  V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
-"Timeout �ven efter 2 f�rs�k.  V�nligen kontakta <gphoto-devel@lists."
-"sourceforge.net>."
+"Kommunikationsfel �ven efter 2 f�rs�k.  V�nligen kontakta <gphoto-"
+"devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Kameran �r i fel l�ge. V�nligen kontakta <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Kameran accepterade inte parametrarna.  V�nligen kontakta <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ett ok�nt fel uppstod.  V�nligen kontakta <gphoto-devel@lists.sourceforge."
 "net>."
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3856,122 +3814,123 @@ msgstr ""
 "konverterade den till gphoto2. Marcus Me�ssner <marcus@jet.franken.de> "
 "fixade och f�rb�ttrade konverteringen."
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "Uppl�sning plus Storlek"
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "Datum och Tid (GMT)"
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 msgid "Aperature Settings"
 msgstr "Bildinst�llningar"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "F�rgl�ge"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "R�da-�gon Reduktion"
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "L�ngsam Synk"
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "Blixtinst�llningar"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "Annan"
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr "V�rd kraft besparing (sekunder)"
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 msgid "Camera power save (seconds)"
 msgstr "Kamera kraft besparing (skrivskyddad)"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "Linsl�ge"
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "Koreanska"
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "Engelska"
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "Franska"
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "Tyska"
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "Italienska"
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "Japanska"
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "Spanska"
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "Portugiska"
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "Bildinst�llningar"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "Kamerainst�llningar"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3980,7 +3939,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "N�gra anteckningar om Epson kameror:\n"
 "- Vissa parametrar g�r inte fj�rrstyra:\n"
@@ -3992,7 +3951,7 @@ msgstr ""
 "  vanligen skriv ett brev till <gphoto-devel@lists.sourceforge.net> (p� "
 "Engelska)\n"
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "Inget minnes kort isatt."
 
@@ -4019,114 +3978,100 @@ msgstr "Kameran 3 g�nger att h�lla f�rbindelsen �ppen."
 msgid "The first byte received (0x%x) is not valid."
 msgstr "Den f�rsta byten mottogs (0x%x) �r inte giltig."
 
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "�verf�rringen av paketet avbr�ts efter %i f�rs�k.  V�nligen kontakta <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "Kunde inte skicka paketet �ven efter flera f�rs�k."
 
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "Paketet blev avvisat av kameran.  V�nligen kontakta <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "Kunde inte skicka paket (felkod %i).  V�nligen kontakta <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "�verf�rringen tog f�r l�ng tid och avbr�ts efter %i f�rs�k. Ger upp..."
 
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "Fick ov�ntat resultat 0x%x. V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "Mottog ov�ntat resultat %i.  V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
 "Kunde inte h�mta register %i.  V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "F�r m�nga f�rs�k misslyckades."
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "H�mtar data..."
 
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "rekursiva anrop st�ds ej av sierra drivrutinen.  V�nligen kontakta <gphoto-"
 "devel@gphoto.org>."
 
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 "Kunde inte h�mta str�ng register %i. V�nligen kontakta <gphoto-devel@gphoto."
 "org>."
 
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 "F�rv�ntade 32 bytes, fick %i.  V�nligen kontakta <gphoto-devel@lists."
 "sourceforge.net>."
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "Slutartid mikrosekunder (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -4135,13 +4080,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr "L�ngsam Synk"
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "Kontrast-"
 
@@ -4164,9 +4109,9 @@ msgstr "Bildjustering"
 msgid "Preset"
 msgstr "Portugiska"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "Mulet"
 
@@ -4199,17 +4144,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "Operationsl�ge."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "LCD Ljusstyrka"
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD Automatisk avst�ngning (sekunder)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "Exponeringskompensation"
 
@@ -4217,11 +4162,11 @@ msgstr "Exponeringskompensation"
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -4229,11 +4174,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "Exponeringsm�tning"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "Zoom (i millimeter)"
 
@@ -4312,56 +4257,57 @@ msgstr ""
 "\n"
 "    Nerladdningen b�r fungera korrekt.\n"
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 #, fuzzy
 msgid "White board"
 msgstr "Vit tavla"
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 #, fuzzy
 msgid "Black board"
 msgstr "Svart tavla"
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 #, fuzzy
 msgid "Daylight"
 msgstr "Dagsljus"
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "Gl�dlampa"
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 #, fuzzy
 msgid "Manual"
 msgstr "Ingen manual"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "LCD-l�ge"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "Digital zoom"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "ISO hastighet"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "Fokusl�ge"
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "Tidsformat"
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4397,7 +4343,7 @@ msgstr ""
 "    kamerans knappar. Om du hamnar i detta l�ge, b�r du\n"
 "    �teransluta kameran till PC:n och �ndra LCD till 'Av'."
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4427,110 +4373,110 @@ msgstr ""
 "    kod f�r att st�dja en komplett konfiguration,\n"
 "    v�nligen kontakta gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "Filen som skall laddas upp har l�ngd noll"
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "Inte tillr�ckligt med minne tillg�ngligt p� minneskortet"
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "Kan inte h�mta namnet p� mappen som inneh�ller bilderna"
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Uppladdning st�ds endast till '%s' mappen."
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "B�st"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (ok�nd)"
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Slutartid (mikrosekunder, 0 auto)"
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "Bl�ndare"
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "Svartvitt"
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "Vit tavla"
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "Svart tavla"
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "Ljusstyrka/Kontrast"
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "Ljus+"
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "Ljus-"
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "Dagsljus"
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "O�ndlighet/fisk�geobjektiv"
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "Punktm�tningsl�ge"
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "Auto av (v�rd) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -4538,12 +4484,12 @@ msgstr ""
 "Hur l�ng tid tar det tills kameran st�nger av sig n�r den �r ansluten till "
 "datorn?"
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "Auto av (f�lt) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -4551,125 +4497,147 @@ msgstr ""
 "Hur l�ng tid tar det tills kameran st�nger av sig n�r den inte ansluten till "
 "datorn?"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "Auto av (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "Foto-inst�llningar"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "SuperFin"
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "f�rger"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "svartvitt"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 "Notera: inget minneskort tillg�ngligt, vissa v�rden kan vara ogiltiga\n"
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sTillverkare: %s\n"
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sKamera ID: %s\n"
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sSerienummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sMjukvaru-revision: %s\n"
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sbilder tagna: %i\n"
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sbilder kvar: %i\n"
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sBatteritid: %i\n"
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sMinne kvar: %i byte\n"
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sDatum: %s"
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Kameran ej tillg�nglig"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"N�gra anteckningar om Epson kameror:\n"
+"- Vissa parametrar g�r inte fj�rrstyra:\n"
+"  * zoom\n"
+"  * fokus\n"
+"  * s�rskild vitbalans-inst�llning\n"
+"- Konfigurationen har blivit reverse-engineered med\n"
+"  en PhotoPC 3000z, om din kamera beter sig annorlunda\n"
+"  vanligen skriv ett brev till <gphoto-devel@lists.sourceforge.net> (p� "
+"Engelska)\n"
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4705,7 +4673,7 @@ msgstr ""
 "    kamerans knappar. Om du hamnar i detta l�ge, b�r du\n"
 "    �teransluta kameran till PC:n och �ndra LCD till 'Av'."
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4749,59 +4717,13 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "Drivrutin f�r �tkomst av SiPix Web2 kameror."
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr "Ledsen, denna funktion �r inte implementerad..."
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr "Ledsen, inget att konfigurera..."
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr "Ledsen, att ta bilder �r inte implementerat..."
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-msgid "Couldn't open camera.\n"
-msgstr "Kunde inte �ppna kameran.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-msgid "Error opening camera\n"
-msgstr "Fel vid �ppning av kamera\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr "Bildnumret �r f�r stort.\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"Sony DSC-F1 digital kamera st�d\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Baserad p� chotplay CLI-gr�nssnittet av\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"Detta lib kanske inte fungerar. YMMV\n"
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-msgid "Error opening camera.\n"
-msgstr "Fel vid �ppning av kameran.\n"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4850,19 +4772,6 @@ msgstr ""
 "Soundvision drivrutin\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-"spca504_flash kamera bibliotek\n"
-"Upphovsman: Till Adam <till@adam-lilienthal.de>\n"
-"baserat p� arbete av Matthias Krauss\n"
-"och Mark A. Zimmerman <mark@foresthaven.com>"
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4902,6 +4811,12 @@ msgstr ""
 "v�nligen tillhandah�llen av Mustek.\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+"Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5122,33 +5037,33 @@ msgstr "Denna kamera kan inte ta bilder."
 msgid "This camera can not capture previews."
 msgstr "Denna kamera kan inte ta f�rgranskningsbilder."
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "S�kv�gen '%s' �r inte absolut."
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "Kunde inte l�gga till mappen '%s' eftersom denna mapp redan existerar."
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Kunde inte hitta mapp '%s'"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "Mapp '%s' inneh�ller inte n�gon mapp '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 "Kunde inte l�gga till '%s' till mapp '%s' eftersom denna fil redan existerar."
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5157,23 +5072,23 @@ msgstr ""
 "Du har f�rs�kt att radera '%s' fr�n mappen '%s', men filsystemet st�djer "
 "inte radering av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 "Det finns fortfarande undermappar i mappen '%s' som du f�rs�ker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "Det finns fortfarande filer i mappen '%s' som du f�rs�ker ta bort."
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet st�djer inte uppladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5181,36 +5096,36 @@ msgid ""
 msgstr ""
 "Mappen '%s' inneh�ller endast %i filer, men du beg�rde en fil med nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunde inte hitta filen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet st�djer inte nerladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Ok�nd filtyp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Laddar ner '%s' fr�n mappen '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr "Filsystemet har inget st�d f�r att h�mta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
@@ -5219,31 +5134,31 @@ msgstr ""
 "Kunde inte �ppna '/proc/meminfo' f�r l�sning ('%m'). Se till att proc-"
 "filsystemet �r monterat."
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "Ett fel uppstod vid l�sning av '/proc/meminfo' ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "sysctl anropet misslyckades ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "sysctl anropet misslyckades ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "sysctl anropet misslyckades ('%m')."
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr "Filsystemet har inget st�d f�r att s�tta filinformation"
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivskyddade filattribut som bredd och h�jd kan inte �ndras."
 
@@ -5288,26 +5203,110 @@ msgid "Unknown error"
 msgstr "Ok�nt fel"
 
 #, fuzzy
-#~ msgid "remove"
-#~ msgstr "Fj�rr"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
-#, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "Kunde inte f� tag p� disk namn: %s"
+#~ msgid "gsmart library v"
+#~ msgstr "gsmart bibliotek v"
 
 #~ msgid ""
-#~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\\n\"\n"
+#~ "St�d f�r Mustek gSmart mini serien av digital kameror baserade p�\n"
+#~ "flera andra gphoto2 kamerabiblioteks moduler och windows k�llkoden \n"
+#~ "v�nligen tillhandah�llen av Mustek.\n"
+#~ "\n"
+
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
+
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "F�rv�ntade %i, fick %i. V�nligen rapprotera detta fel till <gphoto-"
 #~ "devel@gphoto.org>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "F�rv�ntade %i bytes, fick %i. V�nligen rapportera felet till <gphoto-"
+#~ "F�rv�ntade %i, fick %i. V�nligen rapprotera detta fel till <gphoto-"
 #~ "devel@gphoto.org>."
 
+#, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "Kommunikationsfel �ven efter 2 f�rs�k.  V�nligen kontakta <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "Timeout �ven efter 2 f�rs�k.  V�nligen kontakta <gphoto-devel@lists."
+#~ "sourceforge.net>."
+
+#~ msgid "Sorry, this function not implemented..."
+#~ msgstr "Ledsen, denna funktion �r inte implementerad..."
+
+#~ msgid "Sorry, nothing to configure..."
+#~ msgstr "Ledsen, inget att konfigurera..."
+
+#~ msgid "Sorry, taking pictures is not implemented..."
+#~ msgstr "Ledsen, att ta bilder �r inte implementerat..."
+
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "Kunde inte �ppna kameran.\n"
+
+#~ msgid "Error opening camera\n"
+#~ msgstr "Fel vid �ppning av kamera\n"
+
+#~ msgid "Picture number is too large.\n"
+#~ msgstr "Bildnumret �r f�r stort.\n"
+
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
+#~ msgstr ""
+#~ "Sony DSC-F1 digital kamera st�d\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Baserad p� chotplay CLI-gr�nssnittet av\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "Detta lib kanske inte fungerar. YMMV\n"
+
+#~ msgid "Error opening camera.\n"
+#~ msgstr "Fel vid �ppning av kameran.\n"
+
+#~ msgid ""
+#~ "spca504_flash camlib\n"
+#~ " Authors: Till Adam\n"
+#~ " <till@adam-lilienthal.de>\n"
+#~ "based on work by Matthias Krauss\n"
+#~ "and Mark A. Zimmerman <mark@foresthaven.com>"
+#~ msgstr ""
+#~ "spca504_flash kamera bibliotek\n"
+#~ "Upphovsman: Till Adam <till@adam-lilienthal.de>\n"
+#~ "baserat p� arbete av Matthias Krauss\n"
+#~ "och Mark A. Zimmerman <mark@foresthaven.com>"
+
+#, fuzzy
+#~ msgid "remove"
+#~ msgstr "Fj�rr"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunde inte f� tag p� disk namn: %s"
 
 #, fuzzy
 #~ msgid "Driver Configuration"
diff --git a/po/uk.po b/po/uk.po
index dc1eb60f5..479af38de 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+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"
@@ -42,96 +43,97 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -147,8 +149,8 @@ msgid ""
 " (i.e. no disk activity)\n"
 msgstr ""
 
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr ""
 
@@ -178,26 +180,24 @@ msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
-#: camlibs/canon/library.c:501
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/library.c:545
-#, fuzzy, c-format
-msgid "No audio file could be found for %s"
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
 msgstr ""
-"�� ������� צ������:\n"
-"%s"
 
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -205,35 +205,35 @@ msgid ""
 "  %11s bytes available"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr ""
 
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr ""
 
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr ""
 
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, fuzzy, c-format
 msgid "not available: %s"
 msgstr "�� ��������"
 
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr ""
 
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgid ""
 "Time: %s\n"
 msgstr ""
 
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -260,114 +260,114 @@ msgid ""
 "Holger Klemm\n"
 msgstr ""
 
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr ""
 
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr ""
 
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr ""
 
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 #, fuzzy
 msgid "Could not get flash drive letter"
 msgstr "�� ������� צ������� #%i"
 
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 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:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "���Ʀ����æ� ������"
 
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 #, fuzzy
 msgid "Camera"
 msgstr "���� ������!"
 
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 #, fuzzy
 msgid "Camera Model (readonly)"
 msgstr "������ ������:"
 
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr ""
 
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 #, fuzzy
 msgid "Unavailable"
 msgstr "�� ��������"
 
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr ""
 
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr ""
 
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr ""
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr ""
 
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr ""
 
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr ""
 
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 #, fuzzy
 msgid "time set"
 msgstr "���������"
 
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 #, fuzzy
 msgid "could not set time"
 msgstr "�� ������� �������� #%i"
 
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -613,152 +613,152 @@ msgstr ""
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr ""
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "������� ���������� 50%..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
 "08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr ""
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -931,7 +931,7 @@ msgstr ""
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 #, fuzzy
 msgid "Downloading image..."
 msgstr "������ ��������."
@@ -951,8 +951,8 @@ msgid "Problem taking live image"
 msgstr "��������� ������ ����������..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "���Ʀ����æ� ������"
 
@@ -1163,7 +1163,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:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr ""
 
@@ -1199,44 +1199,18 @@ msgstr ""
 msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "�� ������� �������� ����������."
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr ""
-
 #: camlibs/jamcam/jamcam.c:284
 #, c-format
 msgid "Frames Taken     : %4d\n"
@@ -1246,6 +1220,11 @@ msgstr ""
 msgid "jamcam library v"
 msgstr ""
 
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
 "\n"
@@ -1392,17 +1371,17 @@ msgstr "�������� ����������"
 
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr ""
 
@@ -1440,31 +1419,32 @@ msgstr ""
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr ""
 
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr ""
 
@@ -1488,8 +1468,8 @@ msgstr ""
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr ""
 
@@ -1504,15 +1484,15 @@ msgstr ""
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr ""
 
@@ -1808,8 +1788,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 
 #: camlibs/konica/library.c:158 camlibs/pccam300/library.c:125
@@ -1901,8 +1881,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:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr ""
 
@@ -1926,8 +1906,8 @@ msgid "Localization"
 msgstr ""
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr ""
 
@@ -1995,8 +1975,8 @@ msgid "Focus"
 msgstr ""
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr ""
 
@@ -2019,15 +1999,15 @@ msgstr ""
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr ""
 
@@ -2097,21 +2077,21 @@ msgid "No answer from the camera."
 msgstr ""
 
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr ""
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr ""
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 #, fuzzy
 msgid "High"
 msgstr "������:"
@@ -2148,7 +2128,7 @@ msgstr ""
 msgid "Day-lt"
 msgstr ""
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2160,7 +2140,7 @@ msgstr ""
 msgid "Soft"
 msgstr ""
 
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2181,9 +2161,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:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr ""
 
@@ -2341,15 +2321,15 @@ msgid "No"
 msgstr "�"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr ""
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr ""
 
@@ -2548,7 +2528,7 @@ msgid ""
 msgstr ""
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 #, fuzzy
 msgid "Uploading..."
 msgstr "������� ���������� 50%..."
@@ -2625,7 +2605,6 @@ msgid ""
 msgstr ""
 
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 #, fuzzy
 msgid "Manual Not Implemented Yet"
 msgstr "%s �� �� ���̦������"
@@ -2678,7 +2657,7 @@ msgstr ""
 msgid "Image Quality"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 #, fuzzy
 msgid "Image Size"
 msgstr "�������� ���������"
@@ -2708,9 +2687,9 @@ msgstr ""
 msgid "superfine"
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr ""
 
@@ -2777,8 +2756,8 @@ msgstr ""
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
@@ -2822,177 +2801,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "���������� ��������� �� �� Ц�����դ����"
 
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "�� ��������"
 
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "������ צ�ͦ����."
 
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3002,24 +2981,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "���� ���������� #%03i"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3190,166 +3169,163 @@ msgstr ""
 msgid "PTP: Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 msgid "PTP Undefined Property"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 msgid "Battery Level"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "������ צ�ͦ����."
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 msgid "Focus Distance"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 #, fuzzy
 msgid "Focus Mode"
 msgstr "�������"
 
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 msgid "Exposure Metering Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 msgid "Exposure Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 msgid "Exposure Bias Compensation"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 msgid "Date Time"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 msgid "Contrast"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "�������"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "�������"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 msgid "Copyright Info"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 msgid "EK Date Time Stamp Format"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 msgid "EK Beep Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 msgid "EK Power Saving"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 msgid "EK UI Language"
 msgstr ""
 
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr ""
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -3415,8 +3391,9 @@ msgid "Outdoor"
 msgstr ""
 
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr ""
 
@@ -3424,7 +3401,7 @@ msgstr ""
 msgid "Incandescent"
 msgstr ""
 
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr ""
 
@@ -3453,8 +3430,8 @@ msgstr "�������� ���������"
 msgid "Character & Sound"
 msgstr ""
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr ""
 
@@ -3528,82 +3505,65 @@ msgstr "���������� ��������� �� �� Ц�����դ����"
 
 #: camlibs/ricoh/ricoh.c:66
 #, fuzzy, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
 #, fuzzy, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:292
-#, fuzzy
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:340
-#, fuzzy
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:355
-#, fuzzy
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -3617,128 +3577,128 @@ msgid ""
 "enhanced the port."
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 #, fuzzy
 msgid "Color Mode"
 msgstr "�������"
 
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 #, fuzzy
 msgid "Flash Settings"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 msgid "Host power save (seconds)"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "������ ������:"
 
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr ""
 
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 #, fuzzy
 msgid "Picture Settings"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 #, fuzzy
 msgid "Camera Settings"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -3747,10 +3707,10 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr ""
 
@@ -3777,104 +3737,90 @@ msgstr ""
 msgid "The first byte received (0x%x) is not valid."
 msgstr ""
 
-#: camlibs/sierra/library.c:713
+#: camlibs/sierra/library.c:714
 #, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr ""
 
-#: camlibs/sierra/library.c:762
-#, fuzzy
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr ""
 
-#: camlibs/sierra/library.c:900
+#: camlibs/sierra/library.c:901
 #, fuzzy, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:998
+#: camlibs/sierra/library.c:999
 #, fuzzy, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr ""
+"�� ������� צ������:\n"
+"%s"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr ""
 
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 #, fuzzy
 msgid "Sending data..."
 msgstr "��������� ���������..."
 
-#: camlibs/sierra/library.c:1201
-#, fuzzy
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
-#: camlibs/sierra/library.c:1250
+#: camlibs/sierra/library.c:1251
 #, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Could not get string register %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/library.c:1483
+#: camlibs/sierra/library.c:1484
 #, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -3882,13 +3828,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr ""
 
@@ -3909,9 +3855,9 @@ msgstr "��¦� �������"
 msgid "Preset"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr ""
 
@@ -3944,17 +3890,17 @@ msgstr ""
 msgid "Operation Mode"
 msgstr "������ צ�ͦ����."
 
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr ""
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr ""
 
@@ -3962,11 +3908,11 @@ msgstr ""
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -3974,11 +3920,11 @@ msgstr ""
 msgid "Spot-AF"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr ""
 
@@ -4036,53 +3982,54 @@ msgid ""
 "    The download should function correctly.\n"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 msgid "White board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 msgid "Black board"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 msgid "Daylight"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 msgid "Manual"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 #, fuzzy
 msgid "LCD Mode"
 msgstr "�������"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -4103,7 +4050,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -4120,247 +4067,260 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 #, fuzzy
 msgid "Best"
 msgstr "���������"
 
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 #, fuzzy
 msgid "Shot Settings"
 msgstr "������������ �����Ҧ�"
 
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 #, fuzzy
 msgid "color"
 msgstr "�������"
 
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, fuzzy, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "������ ������:"
 
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "�� ��������"
 
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1910
+#, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -4381,7 +4341,7 @@ msgid ""
 "    PC and switch LCD to 'Off'."
 msgstr ""
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -4412,55 +4372,13 @@ msgid ""
 "Driver for accessing the SiPix Web2 camera."
 msgstr ""
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "�� ������� �������� ����������."
-
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "�������� ����������"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:182
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "�������� ����������"
-
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
 "Sony DSC-F1 Digital Camera Support\n"
@@ -4498,15 +4416,6 @@ msgid ""
 "Vince Weaver <vince@deater.net>\n"
 msgstr ""
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -4538,6 +4447,11 @@ msgid ""
 "\n"
 msgstr ""
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr ""
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -4761,129 +4675,129 @@ msgstr ""
 msgid "This camera can not capture previews."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, fuzzy, c-format
 msgid "Could not find folder '%s'."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, fuzzy, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, 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:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
 "%i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, fuzzy, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, fuzzy, c-format
 msgid "Could not find file '%s'."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, fuzzy, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "������ ��������."
 
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, c-format
 msgid "sysconf call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, c-format
 msgid "swapctl call failed ('%m')."
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr ""
 
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr ""
 
@@ -4929,24 +4843,49 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "�� ������� �������� ��������"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr ""
+#~ "�� ������� צ������:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
 #~ "��צ�������� ��� ������� �� ������� gphoto-devel@lists.sourceforge.net.\n"
 
 #, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "�� ������� �������� ����������."
+
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "�������� ����������"
+
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "�������� ����������"
+
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�� ������� �������� ��������"
+
+#, fuzzy
 #~ msgid "Driver Configuration"
 #~ msgstr "���Ʀ����æ� ������"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 456c19e3e..9f36bbe44 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
-"POT-Creation-Date: 2003-07-27 13:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-05 23:02+0200\n"
 "PO-Revision-Date: 2002-11-21 11:02+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -57,33 +58,34 @@ msgstr ""
 " 授权。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:419
+#: camlibs/canon/canon.c:470
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:422
+#: camlibs/canon/canon.c:473
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
-#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
+#: camlibs/canon/canon.c:815 camlibs/canon/canon.c:1037
+#: camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
+#: camlibs/canon/canon.c:878 camlibs/canon/canon.c:879
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:935
+#: camlibs/canon/canon.c:986
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1016
+#: camlibs/canon/canon.c:1067
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -91,61 +93,61 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/canon.c:651
-#: camlibs/canon/canon.c:1135
+#: camlibs/canon/canon.c:1186
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr "名称“%s”(%i 个字符)太长(%i 个字符)，最多允许 30 个字符。"
 
-#: camlibs/canon/canon.c:1656
+#: camlibs/canon/canon.c:1707
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1678
+#: camlibs/canon/canon.c:1729
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1763
+#: camlibs/canon/canon.c:1814
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
 # camlibs/canon/canon.c:1490
-#: camlibs/canon/canon.c:2074
+#: camlibs/canon/canon.c:2124
 msgid "File protected."
 msgstr "文件已受到保护。"
 
-#: camlibs/canon/canon.c:2145
+#: camlibs/canon/canon.c:2195
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2170
+#: camlibs/canon/canon.c:2220
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#: camlibs/canon/canon.h:195 camlibs/canon/canon.h:209
 #, c-format
 msgid "NULL parameter \"%s\" in %s line %i"
 msgstr ""
 
-#: camlibs/canon/canon.h:376
+#: camlibs/canon/canon.h:392
 #, c-format
 msgid ""
 "Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
 msgstr ""
 
-#: camlibs/canon/crc.c:221
+#: camlibs/canon/crc.c:237
 #, c-format
 msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:234
+#: camlibs/canon/crc.c:250
 msgid "unable to guess initial CRC value\n"
 msgstr ""
 
-#: camlibs/canon/crc.c:261
+#: camlibs/canon/crc.c:277
 #, c-format
 msgid ""
 "warning: CRC not checked (add len %d, value 0x%04x) "
@@ -168,8 +170,8 @@ msgstr ""
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/canon/library.c:249 camlibs/canon/library.c:1311
-#: camlibs/canon/library.c:1324
+#: camlibs/canon/library.c:249 camlibs/canon/library.c:1339
+#: camlibs/canon/library.c:1352
 msgid "Camera unavailable"
 msgstr "相机不可用"
 
@@ -200,25 +202,24 @@ msgstr "不知缘由"
 msgid "Could not get disk info: %s"
 msgstr "无法获取磁盘信息：%s"
 
-#: camlibs/canon/library.c:486
+#: camlibs/canon/library.c:490
 #, c-format
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: camlibs/canon/library.c:501
-#, fuzzy, c-format
-msgid "No thumbnail could be found for %s"
-msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
-
-# libgphoto2/gphoto2-filesys.c:1199
-#: camlibs/canon/library.c:545
+#: camlibs/canon/library.c:513
 #, fuzzy, c-format
 msgid "No audio file could be found for %s"
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
+#: camlibs/canon/library.c:561 camlibs/canon/library.c:599
+#, c-format
+msgid "%s is a file type for which no thumbnail is provided"
+msgstr ""
+
 # camlibs/canon/library.c:568
-#: camlibs/canon/library.c:741
+#: camlibs/canon/library.c:769
 #, c-format
 msgid ""
 "  Drive %s\n"
@@ -231,42 +232,42 @@ msgstr ""
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "AC adapter"
 msgstr "交流变压器"
 
 # camlibs/canon/library.c:576 camlibs/canon/library.c:582
 # camlibs/canon/library.c:851 camlibs/canon/library.c:857
-#: camlibs/canon/library.c:749 camlibs/canon/library.c:755
-#: camlibs/canon/library.c:1266 camlibs/canon/library.c:1272
+#: camlibs/canon/library.c:777 camlibs/canon/library.c:783
+#: camlibs/canon/library.c:1294 camlibs/canon/library.c:1300
 msgid "on battery"
 msgstr "使用电池"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power OK"
 msgstr "电力充足"
 
 # camlibs/canon/library.c:578 camlibs/canon/library.c:853
-#: camlibs/canon/library.c:751 camlibs/canon/library.c:1268
+#: camlibs/canon/library.c:779 camlibs/canon/library.c:1296
 msgid "power bad"
 msgstr "电力不足"
 
 # camlibs/canon/library.c:586
-#: camlibs/canon/library.c:759
+#: camlibs/canon/library.c:787
 #, c-format
 msgid "not available: %s"
 msgstr "不可用：%s"
 
 # camlibs/canon/library.c:598
-#: camlibs/canon/library.c:785
+#: camlibs/canon/library.c:813
 #, c-format
 msgid "%s (host time %s%i seconds)"
 msgstr "%s (主机时间 %s%i 秒)"
 
 # camlibs/canon/library.c:608
-#: camlibs/canon/library.c:795
+#: camlibs/canon/library.c:823
 #, c-format
 msgid ""
 "\n"
@@ -294,7 +295,7 @@ msgstr ""
 "时间：%s\n"
 
 # camlibs/canon/library.c:625
-#: camlibs/canon/library.c:812
+#: camlibs/canon/library.c:840
 msgid ""
 "Canon PowerShot series driver by\n"
 "Wolfgang G. Reissnegger,\n"
@@ -313,28 +314,28 @@ msgstr ""
 "Holger Klemm 添加\n"
 
 # camlibs/canon/library.c:664
-#: camlibs/canon/library.c:851
+#: camlibs/canon/library.c:879
 msgid "Error deleting file"
 msgstr "删除文件出错"
 
 # camlibs/canon/library.c:680
-#: camlibs/canon/library.c:867
+#: camlibs/canon/library.c:895
 msgid "Error deleting associated thumbnail file"
 msgstr "删除相关缩略图文件出错"
 
 # camlibs/canon/library.c:713
-#: camlibs/canon/library.c:996 camlibs/canon/library.c:1123
+#: camlibs/canon/library.c:1024 camlibs/canon/library.c:1151
 msgid ""
 "Speeds greater than 57600 are not supported for uploading to this camera"
 msgstr "该相机不支持高于 57600 的速度的上载"
 
 # camlibs/canon/library.c:730
-#: camlibs/canon/library.c:1013 camlibs/canon/library.c:1140
+#: camlibs/canon/library.c:1041 camlibs/canon/library.c:1168
 msgid "Could not get flash drive letter"
 msgstr "无法获取闪存驱动字符"
 
 # camlibs/canon/library.c:754
-#: camlibs/canon/library.c:1056 camlibs/canon/library.c:1163
+#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1191
 msgid ""
 "Could not upload, no free folder name available!\n"
 "999CANON folder name exists and has an AUT_9999.JPG picture in it."
@@ -343,103 +344,103 @@ msgstr ""
 "已有 999 个佳能文件夹名称存在而且每个文件夹中都有照片 AUT_9999.JPG。"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/library.c:1078 camlibs/canon/library.c:1183
+#: camlibs/canon/library.c:1106 camlibs/canon/library.c:1211
 msgid "Could not create \\DCIM directory."
 msgstr "无法创建目录 \\DCIM。"
 
 # camlibs/canon/library.c:780
-#: camlibs/canon/library.c:1084 camlibs/canon/library.c:1189
+#: camlibs/canon/library.c:1112 camlibs/canon/library.c:1217
 msgid "Could not create destination directory."
 msgstr "无法创建目标目录。"
 
 # camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:629
+#: camlibs/canon/library.c:1249 camlibs/ptp2/library.c:639
 msgid "Camera and Driver Configuration"
 msgstr "相机及驱动器配置"
 
 # camlibs/canon/library.c:808 camlibs/polaroid/pdc700.c:983
-#: camlibs/canon/library.c:1223 camlibs/polaroid/pdc700.c:984
+#: camlibs/canon/library.c:1251 camlibs/polaroid/pdc700.c:984
 msgid "Camera"
 msgstr "相机"
 
 # camlibs/canon/library.c:811
-#: camlibs/canon/library.c:1226
+#: camlibs/canon/library.c:1254
 msgid "Camera Model (readonly)"
 msgstr "相机型号 (只读)"
 
 # camlibs/canon/library.c:815 camlibs/canon/library.c:885
-#: camlibs/canon/library.c:1230 camlibs/canon/library.c:1307
+#: camlibs/canon/library.c:1258 camlibs/canon/library.c:1335
 msgid "Owner name"
 msgstr "所有者姓名"
 
 # camlibs/canon/library.c:822 camlibs/canon/library.c:826
 # camlibs/canon/library.c:831
-#: camlibs/canon/library.c:1237 camlibs/canon/library.c:1241
-#: camlibs/canon/library.c:1246
+#: camlibs/canon/library.c:1265 camlibs/canon/library.c:1269
+#: camlibs/canon/library.c:1274
 msgid "Date and Time (readonly)"
 msgstr "日期和时间 (只读)"
 
 # camlibs/canon/library.c:827
-#: camlibs/canon/library.c:1242
+#: camlibs/canon/library.c:1270
 msgid "Error"
 msgstr "错误"
 
 # camlibs/canon/library.c:832 camlibs/canon/library.c:859
-#: camlibs/canon/library.c:1247 camlibs/canon/library.c:1274
+#: camlibs/canon/library.c:1275 camlibs/canon/library.c:1302
 msgid "Unavailable"
 msgstr "不可用"
 
 # camlibs/canon/library.c:836 camlibs/canon/library.c:898
-#: camlibs/canon/library.c:1251 camlibs/canon/library.c:1320
+#: camlibs/canon/library.c:1279 camlibs/canon/library.c:1348
 msgid "Set camera date to PC date"
 msgstr "将相机日期设置为 PC 日期"
 
 # camlibs/canon/library.c:839
-#: camlibs/canon/library.c:1254
+#: camlibs/canon/library.c:1282
 msgid "Firmware revision (readonly)"
 msgstr "固件版本 (只读)"
 
 # camlibs/canon/library.c:863
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:631
+#: camlibs/canon/library.c:1306 camlibs/ptp2/library.c:641
 msgid "Power (readonly)"
 msgstr "电源 (只读)"
 
 # camlibs/canon/library.c:867
-#: camlibs/canon/library.c:1282
+#: camlibs/canon/library.c:1310
 msgid "Driver"
 msgstr "驱动器"
 
 # camlibs/canon/library.c:870 camlibs/canon/library.c:912
-#: camlibs/canon/library.c:1285 camlibs/canon/library.c:1334
+#: camlibs/canon/library.c:1313 camlibs/canon/library.c:1362
 msgid "List all files"
 msgstr "列出所有文件"
 
-#: camlibs/canon/library.c:1290 camlibs/canon/library.c:1342
+#: camlibs/canon/library.c:1318 camlibs/canon/library.c:1370
 msgid "Keep filename on upload"
 msgstr "上传时保持文件名"
 
 # camlibs/canon/library.c:892
-#: camlibs/canon/library.c:1314
+#: camlibs/canon/library.c:1342
 msgid "Owner name changed"
 msgstr "所有者姓名已改变"
 
 # camlibs/canon/library.c:894
-#: camlibs/canon/library.c:1316
+#: camlibs/canon/library.c:1344
 msgid "could not change owner name"
 msgstr "无法改变所有者姓名"
 
 # camlibs/canon/library.c:905
-#: camlibs/canon/library.c:1327
+#: camlibs/canon/library.c:1355
 msgid "time set"
 msgstr "时间设置"
 
 # camlibs/canon/library.c:907
-#: camlibs/canon/library.c:1329
+#: camlibs/canon/library.c:1357
 msgid "could not set time"
 msgstr "无法设置时间"
 
 # camlibs/canon/library.c:1107
-#: camlibs/canon/library.c:1545
+#: camlibs/canon/library.c:1573
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "给出未知端口类型 %i = 0x%x。不可能初始化。"
@@ -712,141 +713,141 @@ msgstr "相机未就绪，多个“鉴别相机”请求均失败：%s"
 msgid "Camera not ready, get_battery failed: %s"
 msgstr "相机未就绪，多个“鉴别相机”请求均失败：%s"
 
-#: camlibs/canon/usb.c:349 camlibs/canon/usb.c:375 camlibs/canon/usb.c:424
+#: camlibs/canon/usb.c:350 camlibs/canon/usb.c:376 camlibs/canon/usb.c:425
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected amount of data returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:412
+#: camlibs/canon/usb.c:413
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected return of %i bytes (expected %i) from \"get "
 "picture abilities.\""
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:468
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected amount of data returned (%i bytes, "
 "expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:517
+#: camlibs/canon/usb.c:519
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:570
+#: camlibs/canon/usb.c:572
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:668
+#: camlibs/canon/usb.c:670
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:679
+#: camlibs/canon/usb.c:681
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:699
+#: camlibs/canon/usb.c:701
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:707
+#: camlibs/canon/usb.c:709
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:717
+#: camlibs/canon/usb.c:719
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:735
+#: camlibs/canon/usb.c:737
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:762
+#: camlibs/canon/usb.c:764
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:917
+#: camlibs/canon/usb.c:919
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
 # camlibs/canon/usb.c:640
-#: camlibs/canon/usb.c:1071
+#: camlibs/canon/usb.c:1073
 msgid "Receiving data..."
 msgstr "正在接收数据..."
 
-#: camlibs/canon/usb.c:1352 camlibs/canon/usb.c:1427 camlibs/canon/usb.c:1448
+#: camlibs/canon/usb.c:1354 camlibs/canon/usb.c:1429 camlibs/canon/usb.c:1450
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
 # camlibs/canon/library.c:275
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1440
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "无法获取磁盘信息：%s"
 
 # camlibs/canon/serial.c:888
-#: camlibs/canon/usb.c:1481 camlibs/canon/usb.c:1492 camlibs/canon/usb.c:1528
-#: camlibs/canon/usb.c:1539 camlibs/canon/usb.c:1550
+#: camlibs/canon/usb.c:1483 camlibs/canon/usb.c:1494 camlibs/canon/usb.c:1530
+#: camlibs/canon/usb.c:1541 camlibs/canon/usb.c:1552
 #, fuzzy
 msgid "File upload failed."
 msgstr "正在上载文件..."
 
-#: camlibs/canon/usb.c:1571
+#: camlibs/canon/usb.c:1573
 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:1617
+#: camlibs/canon/usb.c:1619
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1634
+#: camlibs/canon/usb.c:1636
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1684
+#: camlibs/canon/usb.c:1686
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:1703
+#: camlibs/canon/usb.c:1705
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:1755
+#: camlibs/canon/usb.c:1757
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1762
+#: camlibs/canon/usb.c:1764
 #, c-format
 msgid ""
 "canon_usb_set_file_attributes: canon_usb_dialogue returned error status 0x%"
@@ -854,12 +855,12 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/usb.c:871
-#: camlibs/canon/usb.c:1833
+#: camlibs/canon/usb.c:1835
 #, c-format
 msgid "Detected a '%s'."
 msgstr "已监测到一个“%s”。"
 
-#: camlibs/canon/usb.c:1839
+#: camlibs/canon/usb.c:1841
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
@@ -1093,7 +1094,7 @@ msgstr "内存耗尽"
 #: camlibs/dimera/dimera3500.c:567 camlibs/dimera/dimera3500.c:603
 #: camlibs/konica/qm150.c:259 camlibs/panasonic/coolshot/library.c:375
 #: camlibs/samsung/samsung.c:214 camlibs/sipix/web2.c:175
-#: camlibs/smal/ultrapocket.c:126
+#: camlibs/smal/ultrapocket.c:127 camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
 msgstr "正在下载图像..."
 
@@ -1115,8 +1116,8 @@ msgstr "获取现场图像有问题"
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
-#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:828
+#: camlibs/sierra/sierra.c:1405 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "相机配置"
 
@@ -1348,7 +1349,7 @@ msgstr "配置您的 FUJI 相机"
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403
 #: camlibs/ricoh/library.c:445 camlibs/ricoh/library.c:447
-#: camlibs/sierra/sierra.c:1627 camlibs/sierra/sierra.c:1800
+#: camlibs/sierra/sierra.c:1633 camlibs/sierra/sierra.c:1806
 msgid "Date & Time"
 msgstr "日期和时间"
 
@@ -1394,50 +1395,17 @@ msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
 
 # libgphoto2/gphoto2-camera.c:662
-#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
-#: camlibs/spca50x/library.c:604
+#: camlibs/gsmart300/library.c:216 camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "无法重置相机。\n"
 
-#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
-#: camlibs/spca50x/library.c:508
+#: camlibs/gsmart300/library.c:346 camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
 "Your camera does only support deleting the last file on the camera. In this "
 "case, this is file '%s'."
 msgstr "您的相机只支持删除相机中的最后一个文件。在此情况下，这是文件“%s”。"
 
-# camlibs/jamcam/jamcam.c:280
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart 库 v"
-
-# camlibs/jamcam/jamcam.c:281 camlibs/panasonic/coolshot/coolshot.c:265
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
-msgid ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
-"provided by Mustek.\n"
-"\n"
-msgstr ""
-"\n"
-"Till Adam <till@adam-lilienthal.de>\n"
-"根据一些其它 gphoto2 相机库和由 Mustek 友好提供的 Windows 驱动程序源代码编制"
-"的支持 Mustek gSmart mini 系列数码相机的库。\n"
-"\n"
-
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
-msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
-
 # camlibs/sierra/sierra.c:1826
 #: camlibs/jamcam/jamcam.c:284
 #, fuzzy, c-format
@@ -1449,6 +1417,12 @@ msgstr "%s已用帧：%i\n"
 msgid "jamcam library v"
 msgstr "jamcam 库 v"
 
+# camlibs/jamcam/jamcam.c:281 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/jamcam/jamcam.c:296 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
 # camlibs/jamcam/jamcam.c:281
 #: camlibs/jamcam/jamcam.c:296
 msgid ""
@@ -1640,7 +1614,7 @@ msgstr "光圈"
 # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283
 #: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
 #: camlibs/konica/qm150.c:1039 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1329
+#: camlibs/sierra/sierra.c:1075 camlibs/sierra/sierra.c:1335
 msgid "Zoom"
 msgstr "缩放"
 
@@ -1649,11 +1623,11 @@ msgstr "缩放"
 # camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666
 #: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
 #: camlibs/konica/qm150.c:1025 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:271 camlibs/sierra/nikon-desc.c:289
-#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:1024
-#: camlibs/sierra/sierra.c:1029 camlibs/sierra/sierra.c:1300
-#: camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1499
-#: camlibs/sierra/sierra.c:1712
+#: camlibs/sierra/epson-desc.c:273 camlibs/sierra/nikon-desc.c:289
+#: camlibs/sierra/olympus-desc.c:328 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1035 camlibs/sierra/sierra.c:1306
+#: camlibs/sierra/sierra.c:1502 camlibs/sierra/sierra.c:1505
+#: camlibs/sierra/sierra.c:1718
 msgid "Macro"
 msgstr "巨大"
 
@@ -1703,22 +1677,23 @@ msgstr "曝光补偿"
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
 #: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:204
-#: camlibs/sierra/epson-desc.c:222 camlibs/sierra/nikon-desc.c:134
+#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:206
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/nikon-desc.c:134
 #: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:200
 #: camlibs/sierra/nikon-desc.c:218 camlibs/sierra/nikon-desc.c:248
-#: camlibs/sierra/olympus-desc.c:147 camlibs/sierra/olympus-desc.c:191
-#: camlibs/sierra/olympus-desc.c:239 camlibs/sierra/olympus-desc.c:256
-#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:461
-#: camlibs/sierra/sierra.c:833 camlibs/sierra/sierra.c:839
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:879
-#: camlibs/sierra/sierra.c:932 camlibs/sierra/sierra.c:939
-#: camlibs/sierra/sierra.c:993 camlibs/sierra/sierra.c:1000
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1196
-#: camlibs/sierra/sierra.c:1236 camlibs/sierra/sierra.c:1279
-#: camlibs/sierra/sierra.c:1442 camlibs/sierra/sierra.c:1448
-#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1475
-#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/olympus-desc.c:150 camlibs/sierra/olympus-desc.c:194
+#: camlibs/sierra/olympus-desc.c:226 camlibs/sierra/olympus-desc.c:274
+#: camlibs/sierra/olympus-desc.c:291 camlibs/sierra/olympus-desc.c:310
+#: camlibs/sierra/olympus-desc.c:329 camlibs/sierra/olympus-desc.c:514
+#: camlibs/sierra/sierra.c:839 camlibs/sierra/sierra.c:845
+#: camlibs/sierra/sierra.c:879 camlibs/sierra/sierra.c:885
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:945
+#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1006
+#: camlibs/sierra/sierra.c:1173 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:1242 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1454
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1681 camlibs/sierra/sierra.c:1701
 msgid "Auto"
 msgstr "自动"
 
@@ -1726,11 +1701,11 @@ msgstr "自动"
 # camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1397
 # camlibs/sierra/sierra.c:1404 camlibs/sierra/sierra.c:1631
 #: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
-#: camlibs/sierra/epson-desc.c:205 camlibs/sierra/nikon-desc.c:201
-#: camlibs/sierra/olympus-desc.c:240 camlibs/sierra/sierra.c:933
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:1238
-#: camlibs/sierra/sierra.c:1443 camlibs/sierra/sierra.c:1450
-#: camlibs/sierra/sierra.c:1677
+#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/nikon-desc.c:201
+#: camlibs/sierra/olympus-desc.c:275 camlibs/sierra/sierra.c:939
+#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
+#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1456
+#: camlibs/sierra/sierra.c:1683
 msgid "Force"
 msgstr "强制"
 
@@ -1758,8 +1733,8 @@ msgstr "红眼闪光灯"
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
 #: camlibs/konica/qm150.c:1048 camlibs/ricoh/library.c:338
 #: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:270
-#: camlibs/sierra/sierra.c:1049 camlibs/sierra/sierra.c:1055
-#: camlibs/sierra/sierra.c:1318
+#: camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1061
+#: camlibs/sierra/sierra.c:1324
 msgid "On"
 msgstr "开"
 
@@ -1782,15 +1757,15 @@ msgstr "开"
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
 #: camlibs/konica/qm150.c:1045 camlibs/ricoh/library.c:339
 #: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
-#: camlibs/sierra/epson-desc.c:206 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/nikon-desc.c:202
 #: camlibs/sierra/nikon-desc.c:269 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:241 camlibs/sierra/olympus-desc.c:296
-#: camlibs/sierra/olympus-desc.c:444 camlibs/sierra/olympus-desc.c:494
-#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:943
-#: camlibs/sierra/sierra.c:1050 camlibs/sierra/sierra.c:1053
-#: camlibs/sierra/sierra.c:1240 camlibs/sierra/sierra.c:1320
-#: camlibs/sierra/sierra.c:1444 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1679
+#: camlibs/sierra/olympus-desc.c:276 camlibs/sierra/olympus-desc.c:349
+#: camlibs/sierra/olympus-desc.c:497 camlibs/sierra/olympus-desc.c:547
+#: camlibs/sierra/sierra.c:940 camlibs/sierra/sierra.c:949
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1246 camlibs/sierra/sierra.c:1326
+#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1458
+#: camlibs/sierra/sierra.c:1685
 msgid "Off"
 msgstr "关"
 
@@ -2148,11 +2123,11 @@ msgstr "未知的错误。"
 
 # camlibs/konica/konica.c:137
 #: camlibs/konica/konica.c:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The camera has just sent an error that has not yet been discovered. Please "
-"report the following to <gphoto-devel@lists.sourceforge.net> with additional "
-"information how you got this error: (0x%x,0x%x). Thank you very much!"
+"report the following to %s with additional information how you got this "
+"error: (0x%x,0x%x). Thank you very much!"
 msgstr ""
 "相机刚刚送出了一个尚未发现的错误。请将以下内容以及您如何得到错误：(0x%x,0x%"
 "x) 的附加信息发送到 <gphoto-devel@lists.sourceforge.net>。非常感谢您！"
@@ -2272,8 +2247,8 @@ msgstr "幻灯片显示间隔"
 # camlibs/sierra/sierra.c:1468 camlibs/sierra/sierra.c:1677
 #: camlibs/konica/library.c:718 camlibs/konica/library.c:932
 #: camlibs/konica/qm150.c:777 camlibs/ricoh/library.c:495
-#: camlibs/sierra/sierra.c:832 camlibs/sierra/sierra.c:1163
-#: camlibs/sierra/sierra.c:1514 camlibs/sierra/sierra.c:1723
+#: camlibs/sierra/sierra.c:838 camlibs/sierra/sierra.c:1169
+#: camlibs/sierra/sierra.c:1520 camlibs/sierra/sierra.c:1729
 msgid "Resolution"
 msgstr "分辨率"
 
@@ -2305,8 +2280,8 @@ msgstr "本地化"
 # camlibs/konica/library.c:710 camlibs/konica/library.c:915
 # camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
-#: camlibs/sierra/epson-desc.c:372 camlibs/sierra/nikon-desc.c:399
-#: camlibs/sierra/sierra.c:1590 camlibs/sierra/sierra.c:1774
+#: camlibs/sierra/epson-desc.c:374 camlibs/sierra/nikon-desc.c:399
+#: camlibs/sierra/sierra.c:1596 camlibs/sierra/sierra.c:1780
 msgid "Language"
 msgstr "语言"
 
@@ -2393,8 +2368,8 @@ msgstr "聚焦"
 # camlibs/sierra/sierra.c:1425 camlibs/sierra/sierra.c:1431
 # camlibs/sierra/sierra.c:1651
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:223 camlibs/sierra/sierra.c:1471
-#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/epson-desc.c:225 camlibs/sierra/sierra.c:1477
+#: camlibs/sierra/sierra.c:1483 camlibs/sierra/sierra.c:1703
 msgid "Fixed"
 msgstr "固定"
 
@@ -2428,15 +2403,15 @@ msgstr "自动定时 (仅用于下一张照片)"
 #: camlibs/konica/library.c:834 camlibs/konica/library.c:841
 #: camlibs/konica/qm150.c:1098 camlibs/konica/qm150.c:1105
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
-#: camlibs/sierra/epson-desc.c:272 camlibs/sierra/nikon-desc.c:219
-#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:221
-#: camlibs/sierra/olympus-desc.c:298 camlibs/sierra/sierra.c:902
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:963
-#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:1025
-#: camlibs/sierra/sierra.c:1031 camlibs/sierra/sierra.c:1215
-#: camlibs/sierra/sierra.c:1258 camlibs/sierra/sierra.c:1302
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1501
-#: camlibs/sierra/sierra.c:1714
+#: camlibs/sierra/epson-desc.c:274 camlibs/sierra/nikon-desc.c:219
+#: camlibs/sierra/nikon-desc.c:290 camlibs/sierra/olympus-desc.c:256
+#: camlibs/sierra/olympus-desc.c:351 camlibs/sierra/sierra.c:908
+#: camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:969
+#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1031
+#: camlibs/sierra/sierra.c:1037 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:1264 camlibs/sierra/sierra.c:1308
+#: camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1720
 msgid "Normal"
 msgstr "普通"
 
@@ -2518,16 +2493,16 @@ msgstr "相机无应答"
 # camlibs/sierra/sierra.c:828 camlibs/sierra/sierra.c:835
 # camlibs/sierra/sierra.c:1152
 #: camlibs/konica/qm150.c:779 camlibs/konica/qm150.c:787
-#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:874
-#: camlibs/sierra/sierra.c:881 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/nikon-desc.c:169 camlibs/sierra/sierra.c:880
+#: camlibs/sierra/sierra.c:887 camlibs/sierra/sierra.c:1204
 msgid "Low"
 msgstr "低"
 
 # camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:837
 # camlibs/sierra/sierra.c:1154
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:875
-#: camlibs/sierra/sierra.c:883 camlibs/sierra/sierra.c:1200
+#: camlibs/sierra/nikon-desc.c:170 camlibs/sierra/sierra.c:881
+#: camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:1206
 msgid "Medium"
 msgstr "中"
 
@@ -2535,9 +2510,9 @@ msgstr "中"
 # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839
 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:835 camlibs/sierra/sierra.c:843
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:885
-#: camlibs/sierra/sierra.c:1171 camlibs/sierra/sierra.c:1202
+#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:849
+#: camlibs/sierra/sierra.c:882 camlibs/sierra/sierra.c:891
+#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1208
 msgid "High"
 msgstr "高"
 
@@ -2591,7 +2566,7 @@ msgstr "关"
 msgid "Day-lt"
 msgstr "日光"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:526
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptpcam.c:573
 msgid "Sharpness"
 msgstr ""
 
@@ -2605,7 +2580,7 @@ msgstr ""
 
 # camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
 # camlibs/sierra/sierra.c:1698
-#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:189
+#: camlibs/konica/qm150.c:999 camlibs/sierra/epson-desc.c:191
 #: camlibs/sierra/nikon-desc.c:185
 #, fuzzy
 msgid "Color"
@@ -2635,9 +2610,9 @@ msgstr "黑白"
 # camlibs/sierra/sierra.c:858 camlibs/sierra/sierra.c:867
 # camlibs/sierra/sierra.c:1173
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:223
-#: camlibs/sierra/sierra.c:904 camlibs/sierra/sierra.c:913
-#: camlibs/sierra/sierra.c:1219
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:258
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:919
+#: camlibs/sierra/sierra.c:1225
 msgid "Sepia"
 msgstr "棕褐色"
 
@@ -2841,8 +2816,8 @@ msgstr "否"
 # camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470
 # camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:249
-#: camlibs/sierra/sierra.c:1516 camlibs/sierra/sierra.c:1523
-#: camlibs/sierra/sierra.c:1728
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1529
+#: camlibs/sierra/sierra.c:1734
 msgid "Fine"
 msgstr "精细"
 
@@ -2850,10 +2825,10 @@ msgstr "精细"
 # camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123
 # camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475
 # camlibs/sierra/sierra.c:1680
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:834
-#: camlibs/sierra/sierra.c:841 camlibs/sierra/sierra.c:1169
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1521
-#: camlibs/sierra/sierra.c:1726
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:840
+#: camlibs/sierra/sierra.c:847 camlibs/sierra/sierra.c:1175
+#: camlibs/sierra/sierra.c:1521 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:1732
 msgid "Standard"
 msgstr "标准"
 
@@ -3101,7 +3076,7 @@ msgstr "文件大小为 %i 字节。可以上载的文件最大为：%i 字节�
 
 # camlibs/panasonic/dc1000.c:476 camlibs/panasonic/dc1580.c:599
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:838
+#: camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "正在上载..."
 
@@ -3210,7 +3185,6 @@ msgstr ""
 
 # camlibs/sierra/library.c:1187
 #: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
-#: camlibs/spca504_flash/library.c:174
 msgid "Manual Not Implemented Yet"
 msgstr "手册尚未实现！"
 
@@ -3268,7 +3242,7 @@ msgid "Image Quality"
 msgstr "图像质量"
 
 # camlibs/polaroid/pdc700.c:160
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:506
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/ptpcam.c:553
 msgid "Image Size"
 msgstr "图像大小"
 
@@ -3304,9 +3278,9 @@ msgstr "超精细"
 
 # camlibs/polaroid/pdc700.c:169 camlibs/sierra/sierra.c:1368
 # camlibs/sierra/sierra.c:1382 camlibs/sierra/sierra.c:1617
-#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:169
-#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1428
-#: camlibs/sierra/sierra.c:1663
+#: camlibs/polaroid/pdc700.c:169 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1420 camlibs/sierra/sierra.c:1434
+#: camlibs/sierra/sierra.c:1669
 msgid "auto"
 msgstr "自动"
 
@@ -3386,8 +3360,8 @@ msgstr "请求关于照片 %i (= 0x%x) 的信息，但得到了关于照片 %i �
 #: camlibs/polaroid/pdc700.c:916
 #, fuzzy, c-format
 msgid ""
-"%i bytes of an unknown image format have been received. Please write <gphoto-"
-"devel@lists.sourceforge.net> for assistance."
+"%i bytes of an unknown image format have been received. Please write to %s "
+"and ask for assistance."
 msgstr ""
 "已接收 %i 字节的未知格式图像。请写 Email 到 <gphoto-devel@lists.sourceforge."
 "net> 以寻求帮助。"
@@ -3450,207 +3424,207 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr "该驱动程序不支持请求的端口类型 (%i)。"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
+#: camlibs/ptp2/library.c:102
 msgid "PTP Undefined Error"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:91
-#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
+#: camlibs/ptp2/library.c:103
 msgid "PTP OK!"
 msgstr "PTP OK！"
 
 # camlibs/ptp/library.c:92
-#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
+#: camlibs/ptp2/library.c:104
 msgid "PTP General Error"
 msgstr "PTP 通用错误"
 
 # camlibs/ptp/library.c:93
-#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
+#: camlibs/ptp2/library.c:105
 msgid "PTP Session Not Open"
 msgstr "PTP 会话未打开"
 
 # camlibs/ptp/library.c:94
-#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
+#: camlibs/ptp2/library.c:106
 msgid "PTP Invalid Transaction ID"
 msgstr "非法的 PTP 传输 ID"
 
 # camlibs/ptp/library.c:95
-#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
+#: camlibs/ptp2/library.c:107
 msgid "PTP Operation Not Supported"
 msgstr "不支持的 PTP 操作"
 
 # camlibs/ptp/library.c:96
-#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
+#: camlibs/ptp2/library.c:108
 msgid "PTP Parameter Not Supported"
 msgstr "不支持的 PTP 参数"
 
 # camlibs/ptp/library.c:97
-#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
+#: camlibs/ptp2/library.c:109
 msgid "PTP Incomplete Transfer"
 msgstr "未完成的 PTP 传输"
 
 # camlibs/ptp/library.c:98
-#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
+#: camlibs/ptp2/library.c:110
 msgid "PTP Invalid Storage ID"
 msgstr "非法的 PTP 存储 ID"
 
 # camlibs/ptp/library.c:99
-#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
+#: camlibs/ptp2/library.c:111
 msgid "PTP Invalid Object Handle"
 msgstr "非法的 PTP 对象句柄"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
+#: camlibs/ptp2/library.c:112
 msgid "PTP Device Prop Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/ptp/library.c:101
-#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
+#: camlibs/ptp2/library.c:113
 msgid "PTP Invalid Object Format Code"
 msgstr "非法的 PTP 对象格式代码"
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
+#: camlibs/ptp2/library.c:114
 msgid "PTP Store Full"
 msgstr "PTP 存储已满"
 
 # camlibs/ptp/library.c:103
-#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
+#: camlibs/ptp2/library.c:115
 msgid "PTP Object Write Protected"
 msgstr "PTP 对象已写保护"
 
 # camlibs/ptp/library.c:104
-#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
+#: camlibs/ptp2/library.c:116
 msgid "PTP Store Read Only"
 msgstr "只读的 PTP 存储"
 
 # camlibs/ptp/library.c:105
-#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
+#: camlibs/ptp2/library.c:117
 msgid "PTP Access Denied"
 msgstr "PTP 访问遭拒绝"
 
 # camlibs/ptp/library.c:106
-#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
+#: camlibs/ptp2/library.c:118
 msgid "PTP No Thumbnail Present"
 msgstr "不存在 PTP 缩略图"
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
+#: camlibs/ptp2/library.c:119
 msgid "PTP Self Test Failed"
 msgstr "PTP 自检失败"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
+#: camlibs/ptp2/library.c:120
 msgid "PTP Partial Deletion"
 msgstr "PTP 部分删除"
 
 # camlibs/ptp/library.c:109
-#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
+#: camlibs/ptp2/library.c:121
 msgid "PTP Store Not Available"
 msgstr "PTP 存储不可用"
 
 # camlibs/ptp/library.c:111
-#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
+#: camlibs/ptp2/library.c:123
 msgid "PTP Specification By Format Unsupported"
 msgstr "不支持的 PTP 格式规范"
 
 # camlibs/ptp/library.c:112
-#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
+#: camlibs/ptp2/library.c:124
 msgid "PTP No Valid Object Info"
 msgstr "没有合法的 PTP 对象信息"
 
 # camlibs/ptp/library.c:113
-#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
+#: camlibs/ptp2/library.c:125
 msgid "PTP Invalid Code Format"
 msgstr "非法的 PTP 代码格式"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
+#: camlibs/ptp2/library.c:126
 msgid "PTP Unknown Vendor Code"
 msgstr "未知的 PTP 厂家代码"
 
 # camlibs/ptp/library.c:116
-#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
+#: camlibs/ptp2/library.c:128
 msgid "PTP Capture Already Terminated"
 msgstr "PTP 捕获已终止"
 
 # camlibs/ptp/library.c:117
-#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
+#: camlibs/ptp2/library.c:129
 msgid "PTP Device Bus"
 msgstr "PTP 设备总线"
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
+#: camlibs/ptp2/library.c:130
 msgid "PTP Invalid Parent Object"
 msgstr "非法的 PTP 父对象"
 
 # camlibs/ptp/library.c:119
-#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
+#: camlibs/ptp2/library.c:131
 msgid "PTP Invalid Device Prop Format"
 msgstr "非法的 PTP 设备属性格式"
 
 # camlibs/ptp/library.c:120
-#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
+#: camlibs/ptp2/library.c:132
 msgid "PTP Invalid Device Prop Value"
 msgstr "非法的 PTP 设备属性值"
 
 # camlibs/ptp/library.c:121
-#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
+#: camlibs/ptp2/library.c:133
 msgid "PTP Invalid Parameter"
 msgstr "非法的 PTP 参数"
 
 # camlibs/ptp/library.c:122
-#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
+#: camlibs/ptp2/library.c:134
 msgid "PTP Session Already Opened"
 msgstr "PTP 会话已打开"
 
 # camlibs/ptp/library.c:123
-#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
+#: camlibs/ptp2/library.c:135
 msgid "PTP Transaction Canceled"
 msgstr "PTP 传输已取消"
 
 # camlibs/ptp/library.c:125
-#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
+#: camlibs/ptp2/library.c:137
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "不支持的 PTP 目标规范"
 
 # camlibs/ptp/library.c:126
-#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
+#: camlibs/ptp2/library.c:138
 msgid "PTP EK Filename Required"
 msgstr "需要 PTP EK 文件名"
 
 # camlibs/ptp/library.c:127
-#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
+#: camlibs/ptp2/library.c:139
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK 文件名冲突"
 
 # camlibs/ptp/library.c:128
-#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
+#: camlibs/ptp2/library.c:140
 msgid "PTP EK Filename Invalid"
 msgstr "非法的 PTP EK 文件名"
 
 # camlibs/ptp/library.c:130
-#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
+#: camlibs/ptp2/library.c:142
 msgid "PTP I/O error"
 msgstr "PTP I/O 错误"
 
 # camlibs/ptp/library.c:131
-#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
+#: camlibs/ptp2/library.c:143
 msgid "PTP Error: bad parameter"
 msgstr "PTP 错误：错误的参数"
 
 # camlibs/ptp/library.c:132
-#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
+#: camlibs/ptp2/library.c:144
 msgid "PTP Protocol error, data expected"
 msgstr "PTP 协议错误，需要数据"
 
 # camlibs/ptp/library.c:133
-#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
+#: camlibs/ptp2/library.c:145
 msgid "PTP Protocol error, response expected"
 msgstr "PTP 协议错误，需要响应"
 
 # camlibs/ptp/library.c:422
-#: camlibs/ptp2/library.c:560
+#: camlibs/ptp2/library.c:570
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3658,7 +3632,7 @@ msgid ""
 "Enjoy!"
 msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
 
-#: camlibs/ptp2/library.c:596
+#: camlibs/ptp2/library.c:606
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3669,27 +3643,27 @@ msgid ""
 msgstr ""
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:636
+#: camlibs/ptp2/library.c:646
 #, fuzzy
 msgid "Number of values"
 msgstr "图像数量：%d\n"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:650
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:653
+#: camlibs/ptp2/library.c:663
 msgid "Current value"
 msgstr ""
 
 # camlibs/canon/library.c:176
-#: camlibs/ptp2/library.c:1095
+#: camlibs/ptp2/library.c:1107
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "关闭相机"
 
 # camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:1167 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1179
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP 仅为 USB 相机实现。"
 
@@ -3934,203 +3908,199 @@ msgid "PTP: Protocol error, response expected"
 msgstr "PTP 协议错误，需要响应"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/ptpcam.c:503
+#: camlibs/ptp2/ptpcam.c:550
 #, fuzzy
 msgid "PTP Undefined Property"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/ptp2/ptpcam.c:504
+#: camlibs/ptp2/ptpcam.c:551
 #, fuzzy
 msgid "Battery Level"
 msgstr "%s电池寿命：%i\n"
 
 # frontends/command-line/gphoto2-cmd-capture.c:218
 # libgphoto2/gphoto2-result.c:51
-#: camlibs/ptp2/ptpcam.c:505
+#: camlibs/ptp2/ptpcam.c:552
 #, fuzzy
 msgid "Functional Mode"
 msgstr "操作模式"
 
-#: camlibs/ptp2/ptpcam.c:507
+#: camlibs/ptp2/ptpcam.c:554
 #, fuzzy
 msgid "Compression Setting"
 msgstr "压缩"
 
 # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229
 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646
-#: camlibs/ptp2/ptpcam.c:508 camlibs/sierra/epson-desc.c:229
-#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:265
-#: camlibs/sierra/sierra.c:992 camlibs/sierra/sierra.c:1275
-#: camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1692
+#: camlibs/ptp2/ptpcam.c:555 camlibs/sierra/epson-desc.c:231
+#: camlibs/sierra/nikon-desc.c:259 camlibs/sierra/olympus-desc.c:300
+#: camlibs/sierra/olympus-desc.c:319 camlibs/sierra/sierra.c:998
+#: camlibs/sierra/sierra.c:1281 camlibs/sierra/sierra.c:1475
+#: camlibs/sierra/sierra.c:1698
 msgid "White Balance"
 msgstr "白平衡"
 
-#: camlibs/ptp2/ptpcam.c:509
+#: camlibs/ptp2/ptpcam.c:556
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:510
+#: camlibs/ptp2/ptpcam.c:557
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:511
+#: camlibs/ptp2/ptpcam.c:558
 msgid "Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:512
+#: camlibs/ptp2/ptpcam.c:559
 #, fuzzy
 msgid "Focus Distance"
 msgstr "聚焦位置"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptpcam.c:513 camlibs/sierra/nikon-desc.c:296
-#: camlibs/sierra/olympus-desc.c:282
+#: camlibs/ptp2/ptpcam.c:560 camlibs/sierra/nikon-desc.c:296
+#: camlibs/sierra/olympus-desc.c:335
 msgid "Focus Mode"
 msgstr "聚焦模式"
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/ptp2/ptpcam.c:514
+#: camlibs/ptp2/ptpcam.c:561
 #, fuzzy
 msgid "Exposure Metering Mode"
 msgstr "曝光测定"
 
 # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186
 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626
-#: camlibs/ptp2/ptpcam.c:515 camlibs/sierra/sierra.c:931
-#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1441
-#: camlibs/sierra/sierra.c:1672
+#: camlibs/ptp2/ptpcam.c:562 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:1238 camlibs/sierra/sierra.c:1447
+#: camlibs/sierra/sierra.c:1678
 msgid "Flash Mode"
 msgstr "闪光灯模式"
 
 # camlibs/jd11/jd11.c:207 camlibs/jd11/jd11.c:255
-#: camlibs/ptp2/ptpcam.c:516
+#: camlibs/ptp2/ptpcam.c:563
 #, fuzzy
 msgid "Exposure Time"
 msgstr "闪光灯闪光时间"
 
-#: camlibs/ptp2/ptpcam.c:517
+#: camlibs/ptp2/ptpcam.c:564
 msgid "Exposure Program Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:519
+#: camlibs/ptp2/ptpcam.c:566
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:521
+#: camlibs/ptp2/ptpcam.c:568
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "曝光补偿"
 
 # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754
-#: camlibs/ptp2/ptpcam.c:522
+#: camlibs/ptp2/ptpcam.c:569
 #, fuzzy
 msgid "Date Time"
 msgstr "日期和时间"
 
-#: camlibs/ptp2/ptpcam.c:523
+#: camlibs/ptp2/ptpcam.c:570
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:524
+#: camlibs/ptp2/ptpcam.c:571
 msgid "Still Capture Mode"
 msgstr ""
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/ptp2/ptpcam.c:525
+#: camlibs/ptp2/ptpcam.c:572
 #, fuzzy
 msgid "Contrast"
 msgstr "对比度-"
 
-#: camlibs/ptp2/ptpcam.c:527 camlibs/sierra/nikon-desc.c:518
+#: camlibs/ptp2/ptpcam.c:574 camlibs/sierra/nikon-desc.c:518
 #: camlibs/sierra/nikon-desc.c:541
 msgid "Digital Zoom"
 msgstr "数字缩放"
 
 # camlibs/minolta/dimagev/dimagev.c:308
-#: camlibs/ptp2/ptpcam.c:528
+#: camlibs/ptp2/ptpcam.c:575
 #, fuzzy
 msgid "Effect Mode"
 msgstr "录制模式"
 
-#: camlibs/ptp2/ptpcam.c:529
+#: camlibs/ptp2/ptpcam.c:576
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:530
+#: camlibs/ptp2/ptpcam.c:577
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:531
+#: camlibs/ptp2/ptpcam.c:578
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:532
+#: camlibs/ptp2/ptpcam.c:579
 msgid "Timelapse Interval"
 msgstr ""
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/ptp2/ptpcam.c:533
+#: camlibs/ptp2/ptpcam.c:580
 #, fuzzy
 msgid "Focus Metering Mode"
 msgstr "场景测量模式"
 
-#: camlibs/ptp2/ptpcam.c:534
+#: camlibs/ptp2/ptpcam.c:581
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptpcam.c:535
+#: camlibs/ptp2/ptpcam.c:582
 msgid "Artist"
 msgstr ""
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/ptp2/ptpcam.c:536
+#: camlibs/ptp2/ptpcam.c:583
 #, fuzzy
 msgid "Copyright Info"
 msgstr "版权"
 
-#: camlibs/ptp2/ptpcam.c:543
+#: camlibs/ptp2/ptpcam.c:590
 msgid "EK Color Temperature"
 msgstr ""
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/ptp2/ptpcam.c:545
+#: camlibs/ptp2/ptpcam.c:592
 #, fuzzy
 msgid "EK Date Time Stamp Format"
 msgstr "日期格式"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/ptp2/ptpcam.c:546
+#: camlibs/ptp2/ptpcam.c:593
 #, fuzzy
 msgid "EK Beep Mode"
 msgstr "LED 模式"
 
-#: camlibs/ptp2/ptpcam.c:547
+#: camlibs/ptp2/ptpcam.c:594
 msgid "EK Video Out"
 msgstr ""
 
 # camlibs/dimera/dimera3500.c:539
-#: camlibs/ptp2/ptpcam.c:548
+#: camlibs/ptp2/ptpcam.c:595
 #, fuzzy
 msgid "EK Power Saving"
 msgstr "无电源指示灯"
 
 # camlibs/konica/library.c:710 camlibs/konica/library.c:915
 # camlibs/sierra/sierra.c:1544 camlibs/sierra/sierra.c:1728
-#: camlibs/ptp2/ptpcam.c:549
+#: camlibs/ptp2/ptpcam.c:596
 #, fuzzy
 msgid "EK UI Language"
 msgstr "语言"
 
-# camlibs/ptp/library.c:422
-#: camlibs/ptp/library.c:533
-msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
-
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4207,8 +4177,9 @@ msgstr "户外"
 # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958
 # camlibs/sierra/sierra.c:1237
 #: camlibs/ricoh/library.c:328 camlibs/sierra/nikon-desc.c:251
-#: camlibs/sierra/olympus-desc.c:258 camlibs/sierra/sierra.c:995
-#: camlibs/sierra/sierra.c:1004 camlibs/sierra/sierra.c:1283
+#: camlibs/sierra/olympus-desc.c:293 camlibs/sierra/olympus-desc.c:312
+#: camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1010
+#: camlibs/sierra/sierra.c:1289
 msgid "Fluorescent"
 msgstr "荧光"
 
@@ -4218,7 +4189,7 @@ msgstr ""
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:190
+#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:192
 msgid "Black & White"
 msgstr "黑白"
 
@@ -4251,8 +4222,8 @@ msgid "Character & Sound"
 msgstr "人物和音效"
 
 # camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1072
-#: camlibs/sierra/sierra.c:1078
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1078
+#: camlibs/sierra/sierra.c:1084
 msgid "2x"
 msgstr "2x"
 
@@ -4333,85 +4304,73 @@ msgstr "压缩"
 msgid "Speed %i is not supported!"
 msgstr "不支持速度 %i！"
 
-# camlibs/ricoh/ricoh.c:66
+# camlibs/ricoh/ricoh.c:75
 #: camlibs/ricoh/ricoh.c:66
-#, c-format
-msgid ""
-"Expected %i, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "Expected %i, got %i. Please report this error to %s."
 msgstr ""
-"需要 %i，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge.net>。"
+"需要 %i 字节，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge."
+"net>。"
 
-# camlibs/ricoh/ricoh.c:66
+# camlibs/ricoh/ricoh.c:75
 #: camlibs/ricoh/ricoh.c:75
 #, fuzzy, c-format
-msgid ""
-"Expected %i bytes, got %i. Please report this error to <gphoto-devel@lists."
-"sourceforge.net>."
+msgid "Expected %i bytes, got %i. Please report this error to %s."
 msgstr ""
-"需要 %i，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge.net>。"
+"需要 %i 字节，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge."
+"net>。"
 
 # camlibs/ricoh/ricoh.c:165 camlibs/ricoh/ricoh.c:179
 #: camlibs/ricoh/ricoh.c:172 camlibs/ricoh/ricoh.c:186
-#, c-format
-msgid ""
-"We expected 0x%x but received 0x%x. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#, fuzzy, c-format
+msgid "We expected 0x%x but received 0x%x. Please contact %s."
 msgstr ""
 "我们希望得到 0x%x 但收到 0x%x。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:208
 #: camlibs/ricoh/ricoh.c:215
 #, fuzzy, c-format
-msgid "Bad characters (0x%x, 0x%x). Please contact <gphoto-devel@gphoto.org>."
+msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "错误的字符 (0x%x，0x%x)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:250
-#: camlibs/ricoh/ricoh.c:257 camlibs/ricoh/ricoh.c:326
-#, fuzzy
-msgid ""
-"Camera busy. If the problem persists, please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#, fuzzy, c-format
+msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
 "相机忙。如果问题总是存在，请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/ricoh/ricoh.c:292
-msgid ""
-"Timeout even after 2 retries. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:291
+#, fuzzy, c-format
+msgid "Timeout even after 2 retries. Please contact %s."
 msgstr "两次重试后仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/ricoh/ricoh.c:308
-#, fuzzy
-msgid ""
-"Communication error even after 2 retries. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
-msgstr "两次重试后仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
+#: camlibs/ricoh/ricoh.c:307
+#, fuzzy, c-format
+msgid "Communication error even after 2 retries. Please contact %s."
+msgstr "两次重试后仍然通讯错误。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/ricoh/ricoh.c:250
-#: camlibs/ricoh/ricoh.c:340
-msgid ""
-"Camera is in wrong mode. Please contact <gphoto-devel@lists.sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:339
+#, fuzzy, c-format
+msgid "Camera is in wrong mode. Please contact %s."
 msgstr "相机处于错误的模式。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/ricoh/ricoh.c:349
-#, fuzzy
-msgid ""
-"Camera did not accept the parameters. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/ricoh/ricoh.c:348
+#, fuzzy, c-format
+msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "相机无法接收参数。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/ricoh/ricoh.c:355
-msgid ""
-"An unknown error occurred. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/ricoh/ricoh.c:354
+#, fuzzy, c-format
+msgid "An unknown error occurred. Please contact %s."
 msgstr "遇到未知的错误。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/ricoh/ricoh.c:817
+#: camlibs/ricoh/ricoh.c:816
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."
@@ -4430,163 +4389,164 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de> 修正并增强了移植后的版本。"
 
 # camlibs/dimera/dimera3500.c:537
-#: camlibs/sierra/epson-desc.c:83 camlibs/sierra/nikon-desc.c:92
-#: camlibs/sierra/olympus-desc.c:104
+#: camlibs/sierra/epson-desc.c:85 camlibs/sierra/nikon-desc.c:92
+#: camlibs/sierra/olympus-desc.c:107
 msgid "Resolution plus Size"
 msgstr "分辨率加尺寸"
 
 # camlibs/konica/library.c:633 camlibs/konica/library.c:844
 # camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018
 # camlibs/polaroid/pdc700.c:1088
-#: camlibs/sierra/epson-desc.c:101 camlibs/sierra/nikon-desc.c:110
-#: camlibs/sierra/olympus-desc.c:122
+#: camlibs/sierra/epson-desc.c:103 camlibs/sierra/nikon-desc.c:110
+#: camlibs/sierra/olympus-desc.c:125
 msgid "Date and time (GMT)"
 msgstr "日期和时间 (GMT)"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/sierra/epson-desc.c:180 camlibs/sierra/nikon-desc.c:176
-#: camlibs/sierra/olympus-desc.c:212
+#: camlibs/sierra/epson-desc.c:182 camlibs/sierra/nikon-desc.c:176
+#: camlibs/sierra/olympus-desc.c:215 camlibs/sierra/olympus-desc.c:247
 #, fuzzy
 msgid "Aperature Settings"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:855 camlibs/sierra/sierra.c:1165
 # camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1695
-#: camlibs/sierra/epson-desc.c:195 camlibs/sierra/nikon-desc.c:191
-#: camlibs/sierra/olympus-desc.c:230 camlibs/sierra/sierra.c:901
-#: camlibs/sierra/sierra.c:1211 camlibs/sierra/sierra.c:1540
-#: camlibs/sierra/sierra.c:1741
+#: camlibs/sierra/epson-desc.c:197 camlibs/sierra/nikon-desc.c:191
+#: camlibs/sierra/olympus-desc.c:265 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1217 camlibs/sierra/sierra.c:1546
+#: camlibs/sierra/sierra.c:1747
 msgid "Color Mode"
 msgstr "彩色模式"
 
 # camlibs/sierra/sierra.c:889 camlibs/sierra/sierra.c:899
 # camlibs/sierra/sierra.c:1196 camlibs/sierra/sierra.c:1399
 # camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/epson-desc.c:207 camlibs/sierra/sierra.c:935
-#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1242
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1681
+#: camlibs/sierra/epson-desc.c:209 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1248
+#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1460
+#: camlibs/sierra/sierra.c:1687
 msgid "Red-eye Reduction"
 msgstr "消红眼"
 
 # camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901
 # camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400
 # camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637
-#: camlibs/sierra/epson-desc.c:208 camlibs/sierra/sierra.c:936
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1244
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1683
+#: camlibs/sierra/epson-desc.c:210 camlibs/sierra/sierra.c:942
+#: camlibs/sierra/sierra.c:953 camlibs/sierra/sierra.c:1250
+#: camlibs/sierra/sierra.c:1452 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra.c:1689
 msgid "Slow Sync"
 msgstr "慢同步"
 
 # camlibs/polaroid/pdc700.c:161
-#: camlibs/sierra/epson-desc.c:213 camlibs/sierra/nikon-desc.c:209
-#: camlibs/sierra/olympus-desc.c:247
+#: camlibs/sierra/epson-desc.c:215 camlibs/sierra/nikon-desc.c:209
+#: camlibs/sierra/olympus-desc.c:282
 msgid "Flash Settings"
 msgstr "闪光灯设置"
 
 # camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433
 # camlibs/sierra/sierra.c:1653
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1472
-#: camlibs/sierra/sierra.c:1479 camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/epson-desc.c:226 camlibs/sierra/sierra.c:1478
+#: camlibs/sierra/sierra.c:1485 camlibs/sierra/sierra.c:1705
 msgid "Custom"
 msgstr "定制"
 
 # camlibs/canon/library.c:598
-#: camlibs/sierra/epson-desc.c:246 camlibs/sierra/olympus-desc.c:347
+#: camlibs/sierra/epson-desc.c:248 camlibs/sierra/olympus-desc.c:400
 #, fuzzy
 msgid "Host power save (seconds)"
 msgstr "%s (主机时间 %s%i 秒)"
 
 # camlibs/canon/library.c:811
-#: camlibs/sierra/epson-desc.c:262 camlibs/sierra/olympus-desc.c:332
+#: camlibs/sierra/epson-desc.c:264 camlibs/sierra/olympus-desc.c:385
 #, fuzzy
 msgid "Camera power save (seconds)"
 msgstr "相机型号 (只读)"
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/epson-desc.c:277 camlibs/sierra/sierra.c:1023
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1495
-#: camlibs/sierra/sierra.c:1708
+#: camlibs/sierra/epson-desc.c:279 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1302 camlibs/sierra/sierra.c:1501
+#: camlibs/sierra/sierra.c:1714
 msgid "Lens Mode"
 msgstr "镜头模式"
 
 # camlibs/sierra/sierra.c:1545 camlibs/sierra/sierra.c:1554
 # camlibs/sierra/sierra.c:1731
-#: camlibs/sierra/epson-desc.c:359 camlibs/sierra/sierra.c:1591
-#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1777
+#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/sierra.c:1597
+#: camlibs/sierra/sierra.c:1606 camlibs/sierra/sierra.c:1783
 msgid "Korean"
 msgstr "韩语"
 
 # camlibs/sierra/sierra.c:1546 camlibs/sierra/sierra.c:1556
 # camlibs/sierra/sierra.c:1733
-#: camlibs/sierra/epson-desc.c:360 camlibs/sierra/nikon-desc.c:384
-#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:1779
+#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:384
+#: camlibs/sierra/sierra.c:1598 camlibs/sierra/sierra.c:1608
+#: camlibs/sierra/sierra.c:1785
 msgid "English"
 msgstr "英语"
 
 # camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1558
 # camlibs/sierra/sierra.c:1735
-#: camlibs/sierra/epson-desc.c:361 camlibs/sierra/nikon-desc.c:385
-#: camlibs/sierra/sierra.c:1593 camlibs/sierra/sierra.c:1604
-#: camlibs/sierra/sierra.c:1781
+#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/nikon-desc.c:385
+#: camlibs/sierra/sierra.c:1599 camlibs/sierra/sierra.c:1610
+#: camlibs/sierra/sierra.c:1787
 msgid "French"
 msgstr "法语"
 
 # camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1560
 # camlibs/sierra/sierra.c:1737
-#: camlibs/sierra/epson-desc.c:362 camlibs/sierra/nikon-desc.c:386
-#: camlibs/sierra/sierra.c:1594 camlibs/sierra/sierra.c:1606
-#: camlibs/sierra/sierra.c:1783
+#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/nikon-desc.c:386
+#: camlibs/sierra/sierra.c:1600 camlibs/sierra/sierra.c:1612
+#: camlibs/sierra/sierra.c:1789
 msgid "German"
 msgstr "德语"
 
 # camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1562
 # camlibs/sierra/sierra.c:1739
-#: camlibs/sierra/epson-desc.c:363 camlibs/sierra/sierra.c:1595
-#: camlibs/sierra/sierra.c:1608 camlibs/sierra/sierra.c:1785
+#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1601
+#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
 msgid "Italian"
 msgstr "意大利语"
 
 # camlibs/sierra/sierra.c:1550 camlibs/sierra/sierra.c:1564
 # camlibs/sierra/sierra.c:1741
-#: camlibs/sierra/epson-desc.c:364 camlibs/sierra/sierra.c:1596
-#: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1787
+#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1602
+#: camlibs/sierra/sierra.c:1616 camlibs/sierra/sierra.c:1793
 msgid "Japanese"
 msgstr "日语"
 
 # camlibs/sierra/sierra.c:1551 camlibs/sierra/sierra.c:1566
 # camlibs/sierra/sierra.c:1743
-#: camlibs/sierra/epson-desc.c:365 camlibs/sierra/sierra.c:1597
-#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1789
+#: camlibs/sierra/epson-desc.c:367 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1618 camlibs/sierra/sierra.c:1795
 msgid "Spanish"
 msgstr "西班牙语"
 
 # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568
 # camlibs/sierra/sierra.c:1745
-#: camlibs/sierra/epson-desc.c:366 camlibs/sierra/sierra.c:1598
-#: camlibs/sierra/sierra.c:1614 camlibs/sierra/sierra.c:1791
+#: camlibs/sierra/epson-desc.c:368 camlibs/sierra/sierra.c:1604
+#: camlibs/sierra/sierra.c:1620 camlibs/sierra/sierra.c:1797
 msgid "Portugese"
 msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443
-#: camlibs/sierra/epson-desc.c:539 camlibs/sierra/nikon-desc.c:589
-#: camlibs/sierra/olympus-desc.c:546 camlibs/sierra/sierra.c:823
-#: camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/epson-desc.c:541 camlibs/sierra/nikon-desc.c:589
+#: camlibs/sierra/olympus-desc.c:620 camlibs/sierra/olympus-desc.c:631
+#: camlibs/sierra/sierra.c:829 camlibs/sierra/sierra.c:1495
 msgid "Picture Settings"
 msgstr "照片设置"
 
 # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510
-#: camlibs/sierra/epson-desc.c:543 camlibs/sierra/nikon-desc.c:593
-#: camlibs/sierra/olympus-desc.c:550 camlibs/sierra/sierra.c:1094
-#: camlibs/sierra/sierra.c:1556
+#: camlibs/sierra/epson-desc.c:545 camlibs/sierra/nikon-desc.c:593
+#: camlibs/sierra/olympus-desc.c:624 camlibs/sierra/olympus-desc.c:638
+#: camlibs/sierra/sierra.c:1100 camlibs/sierra/sierra.c:1562
 msgid "Camera Settings"
 msgstr "相机设置"
 
 # camlibs/sierra/sierra.c:1852
-#: camlibs/sierra/epson-desc.c:550 camlibs/sierra/sierra.c:1904
+#: camlibs/sierra/epson-desc.c:552
+#, fuzzy
 msgid ""
 "Some notes about Epson cameras:\n"
 "- Some parameters are not controllable remotely:\n"
@@ -4595,7 +4555,7 @@ msgid ""
 "  * custom white balance setup\n"
 "- Configuration has been reverse-engineered with\n"
 "  a PhotoPC 3000z, if your camera acts differently\n"
-"  please send a mail to <gphoto-devel@lists.sourceforge.net> (in English)\n"
+"  please send a mail to the gphoto developer mailing list (in English)\n"
 msgstr ""
 "关于爱普生相机的一些事项：\n"
 "- 有些参数无法远程控制：\n"
@@ -4607,7 +4567,7 @@ msgstr ""
 "  <gphoto-devel@lists.sourceforge.net> 发送电子邮件 (用英语)\n"
 
 # camlibs/konica/konica.c:80
-#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1352
+#: camlibs/sierra/library.c:144 camlibs/sierra/library.c:1353
 msgid "No memory card present"
 msgstr "未插内存卡"
 
@@ -4639,110 +4599,96 @@ msgid "The first byte received (0x%x) is not valid."
 msgstr "接收的第一个字节 (0x%x) 非法。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/sierra/library.c:713
-#, c-format
+#: camlibs/sierra/library.c:714
+#, fuzzy, c-format
 msgid ""
-"Transmission of packet timed out even after %i retries. Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"Transmission of packet timed out even after %i retries. Please contact %s."
 msgstr ""
 "在 %i 次重试后包传输仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/sierra/library.c:747 camlibs/sierra/library.c:771
+#: camlibs/sierra/library.c:748 camlibs/sierra/library.c:772
 msgid "Could not transmit packet even after several retries."
 msgstr "在几次重试后仍不能传输包。"
 
 # camlibs/sierra/library.c:657
-#: camlibs/sierra/library.c:762
-msgid ""
-"Packet got rejected by camera. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:763
+#, fuzzy, c-format
+msgid "Packet got rejected by camera. Please contact %s."
 msgstr "相机拒绝包。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:664
-#: camlibs/sierra/library.c:789
+#: camlibs/sierra/library.c:790
 #, fuzzy, c-format
-msgid ""
-"Could not transmit packet (error code %i). Please contact <gphoto-"
-"devel@lists.sourceforge.net>."
+msgid "Could not transmit packet (error code %i). Please contact %s."
 msgstr "无法传输包 (错误码 %i)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
-#: camlibs/sierra/library.c:881
+#: camlibs/sierra/library.c:882
 msgid "Transmission timed out even after 2 retries. Giving up..."
 msgstr "在两次重试后传输仍然超时。放弃..."
 
 # camlibs/sierra/library.c:744
-#: camlibs/sierra/library.c:900
-#, c-format
-msgid ""
-"Got unexpected result 0x%x. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:901
+#, fuzzy, c-format
+msgid "Got unexpected result 0x%x. Please contact %s."
 msgstr "得到意外的结果 0x%x。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:819
-#: camlibs/sierra/library.c:998
-#, c-format
-msgid ""
-"Received unexpected answer (%i). Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:999
+#, fuzzy, c-format
+msgid "Received unexpected answer (%i). Please contact %s."
 msgstr "收到意外的应答 (%i)。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:879
-#: camlibs/sierra/library.c:1060
-#, c-format
-msgid ""
-"Could not get register %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1061
+#, fuzzy, c-format
+msgid "Could not get register %i. Please contact %s."
 msgstr "无法读取寄存器 %i。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
-#: camlibs/sierra/library.c:1080 camlibs/sierra/library.c:1100
+#: camlibs/sierra/library.c:1081 camlibs/sierra/library.c:1101
 msgid "Too many retries failed."
 msgstr "重试失败过多。"
 
 # camlibs/sierra/library.c:923
-#: camlibs/sierra/library.c:1140
+#: camlibs/sierra/library.c:1141
 msgid "Sending data..."
 msgstr "正在发送数据..."
 
 # camlibs/sierra/library.c:657
-#: camlibs/sierra/library.c:1201
+#: camlibs/sierra/library.c:1202
+#, fuzzy, c-format
 msgid ""
-"recursive calls are not supported by the sierra driver! Please contact "
-"<gphoto-devel@lists.sourceforge.net>."
+"recursive calls are not supported by the sierra driver! Please contact %s."
 msgstr ""
 "Sierra 驱动程序不支持递归调用！请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:1010
-#: camlibs/sierra/library.c:1250
-#, c-format
-msgid ""
-"Could not get string register %i. Please contact <gphoto-devel@lists."
-"sourceforge.net>."
+#: camlibs/sierra/library.c:1251
+#, fuzzy, c-format
+msgid "Could not get string register %i. Please contact %s."
 msgstr "无法读取字符串寄存器 %i。请联系 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:1157
-#: camlibs/sierra/library.c:1483
-#, c-format
-msgid ""
-"Expected 32 bytes, got %i. Please contact <gphoto-devel@lists.sourceforge."
-"net>."
+#: camlibs/sierra/library.c:1484
+#, fuzzy, c-format
+msgid "Expected 32 bytes, got %i. Please contact %s."
 msgstr "需要 32 字节，得到 %i。请连线 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:141
+#: camlibs/sierra/nikon-desc.c:128 camlibs/sierra/olympus-desc.c:144
 msgid "Shutter Speed microseconds (0 auto)"
 msgstr "快门速度 (微秒，0 表示自动)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:180
+#: camlibs/sierra/nikon-desc.c:159 camlibs/sierra/olympus-desc.c:183
 msgid "Shutter Speed (in seconds)"
 msgstr "快门速度 (秒)"
 
-#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:222
+#: camlibs/sierra/nikon-desc.c:186 camlibs/sierra/olympus-desc.c:257
 msgid "B/W"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:242
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/olympus-desc.c:277
 msgid "Anti-redeye"
 msgstr ""
 
@@ -4756,15 +4702,15 @@ msgstr "慢同步"
 
 # camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:930
 # camlibs/sierra/sierra.c:1218
-#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:966
-#: camlibs/sierra/sierra.c:976 camlibs/sierra/sierra.c:1264
+#: camlibs/sierra/nikon-desc.c:220 camlibs/sierra/sierra.c:972
+#: camlibs/sierra/sierra.c:982 camlibs/sierra/sierra.c:1270
 msgid "Contrast+"
 msgstr "对比度+"
 
 # camlibs/sierra/sierra.c:921 camlibs/sierra/sierra.c:932
 # camlibs/sierra/sierra.c:1220
-#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:967
-#: camlibs/sierra/sierra.c:978 camlibs/sierra/sierra.c:1266
+#: camlibs/sierra/nikon-desc.c:221 camlibs/sierra/sierra.c:973
+#: camlibs/sierra/sierra.c:984 camlibs/sierra/sierra.c:1272
 msgid "Contrast-"
 msgstr "对比度-"
 
@@ -4793,9 +4739,9 @@ msgstr "葡萄牙语"
 
 # camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963
 # camlibs/sierra/sierra.c:1241
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:260
-#: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1009
-#: camlibs/sierra/sierra.c:1287
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/olympus-desc.c:295
+#: camlibs/sierra/olympus-desc.c:314 camlibs/sierra/sierra.c:1003
+#: camlibs/sierra/sierra.c:1015 camlibs/sierra/sierra.c:1293
 msgid "Cloudy"
 msgstr "多云"
 
@@ -4835,18 +4781,18 @@ msgid "Operation Mode"
 msgstr "操作模式"
 
 # camlibs/sierra/sierra.c:1083 camlibs/sierra/sierra.c:1322
-#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:318
-#: camlibs/sierra/sierra.c:1129 camlibs/sierra/sierra.c:1368
+#: camlibs/sierra/nikon-desc.c:357 camlibs/sierra/olympus-desc.c:371
+#: camlibs/sierra/sierra.c:1135 camlibs/sierra/sierra.c:1374
 msgid "LCD Brightness"
 msgstr "LCD 亮度"
 
 # camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:360
+#: camlibs/sierra/nikon-desc.c:372 camlibs/sierra/olympus-desc.c:413
 msgid "LCD Auto Shut Off (seconds)"
 msgstr "LCD 自动关闭 (秒)"
 
 #: camlibs/sierra/nikon-desc.c:424 camlibs/sierra/nikon-desc.c:447
-#: camlibs/sierra/olympus-desc.c:404
+#: camlibs/sierra/olympus-desc.c:457
 msgid "Exposure Compensation"
 msgstr "曝光补偿"
 
@@ -4854,11 +4800,11 @@ msgstr "曝光补偿"
 msgid "Center-Weighted"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/nikon-desc.c:457 camlibs/sierra/olympus-desc.c:466
 msgid "Spot"
 msgstr ""
 
-#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:414
+#: camlibs/sierra/nikon-desc.c:458 camlibs/sierra/olympus-desc.c:467
 msgid "Matrix"
 msgstr ""
 
@@ -4867,11 +4813,11 @@ msgid "Spot-AF"
 msgstr ""
 
 # camlibs/konica/library.c:770 camlibs/konica/library.c:1002
-#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:419
+#: camlibs/sierra/nikon-desc.c:464 camlibs/sierra/olympus-desc.c:472
 msgid "Exposure Metering"
 msgstr "曝光测定"
 
-#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:435
+#: camlibs/sierra/nikon-desc.c:482 camlibs/sierra/olympus-desc.c:488
 msgid "Zoom (in millimeters)"
 msgstr "缩放 (毫米)"
 
@@ -4956,29 +4902,30 @@ msgstr ""
 
 # camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:869
 # camlibs/sierra/sierra.c:1175
-#: camlibs/sierra/olympus-desc.c:224
+#: camlibs/sierra/olympus-desc.c:259
 #, fuzzy
 msgid "White board"
 msgstr "白板"
 
 # camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:871
 # camlibs/sierra/sierra.c:1177
-#: camlibs/sierra/olympus-desc.c:225
+#: camlibs/sierra/olympus-desc.c:260
 #, fuzzy
 msgid "Black board"
 msgstr "黑板"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/sierra/olympus-desc.c:257
+#: camlibs/sierra/olympus-desc.c:292 camlibs/sierra/olympus-desc.c:311
 #, fuzzy
 msgid "Daylight"
 msgstr "日光"
 
 # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960
 # camlibs/sierra/sierra.c:1239
-#: camlibs/sierra/olympus-desc.c:259 camlibs/sierra/sierra.c:996
-#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1285
+#: camlibs/sierra/olympus-desc.c:294 camlibs/sierra/olympus-desc.c:313
+#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1012
+#: camlibs/sierra/sierra.c:1291
 msgid "Tungsten"
 msgstr "钨"
 
@@ -4990,40 +4937,40 @@ msgstr "钨"
 # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256
 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455
 # camlibs/sierra/sierra.c:1668
-#: camlibs/sierra/olympus-desc.c:277
+#: camlibs/sierra/olympus-desc.c:330
 #, fuzzy
 msgid "Manual"
 msgstr "无手册"
 
-#: camlibs/sierra/olympus-desc.c:297
+#: camlibs/sierra/olympus-desc.c:350
 msgid "Monitor"
 msgstr ""
 
 # camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1250
 # camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1662
-#: camlibs/sierra/olympus-desc.c:303
+#: camlibs/sierra/olympus-desc.c:356
 msgid "LCD Mode"
 msgstr "LCD 模式"
 
-#: camlibs/sierra/olympus-desc.c:452
+#: camlibs/sierra/olympus-desc.c:505
 msgid "Digital zoom"
 msgstr "数字缩放"
 
-#: camlibs/sierra/olympus-desc.c:469
+#: camlibs/sierra/olympus-desc.c:522
 msgid "ISO Speed"
 msgstr "ISO 速度"
 
-#: camlibs/sierra/olympus-desc.c:485
+#: camlibs/sierra/olympus-desc.c:538
 msgid "Focus position"
 msgstr "聚焦位置"
 
 # camlibs/konica/library.c:729 camlibs/konica/library.c:960
-#: camlibs/sierra/olympus-desc.c:502
+#: camlibs/sierra/olympus-desc.c:555
 msgid "Time format"
 msgstr "时间格式"
 
 # camlibs/sierra/sierra.c:1864
-#: camlibs/sierra/olympus-desc.c:557
+#: camlibs/sierra/olympus-desc.c:645
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -5061,7 +5008,7 @@ msgstr ""
 "    该重新将相机连接到 PC 上并从 LCD 切换\n"
 "    到“关闭”。"
 
-#: camlibs/sierra/olympus-desc.c:578
+#: camlibs/sierra/olympus-desc.c:666
 msgid ""
 "Default sierra driver:\n"
 "\n"
@@ -5092,30 +5039,30 @@ msgstr ""
 "    gphoto-devel@gphoto.net\n"
 
 # camlibs/sierra/sierra.c:635
-#: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:685 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "要上载的文件具有空长度"
 
 # camlibs/sierra/sierra.c:649
-#: camlibs/sierra/sierra.c:693
+#: camlibs/sierra/sierra.c:699
 msgid "Not enough memory available on the memory card"
 msgstr "内存卡上没有足够的内存"
 
 # camlibs/sierra/sierra.c:656
-#: camlibs/sierra/sierra.c:700
+#: camlibs/sierra/sierra.c:706
 msgid "Cannot retrieve the name of the folder containing the pictures"
 msgstr "无法检索含有照片的文件夹名称"
 
 # camlibs/sierra/sierra.c:663
-#: camlibs/sierra/sierra.c:707
+#: camlibs/sierra/sierra.c:713
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "只支持上载到文件夹“%s”"
 
 # camlibs/sierra/sierra.c:790 camlibs/sierra/sierra.c:799
 # camlibs/sierra/sierra.c:1127
-#: camlibs/sierra/sierra.c:836 camlibs/sierra/sierra.c:845
-#: camlibs/sierra/sierra.c:1173
+#: camlibs/sierra/sierra.c:842 camlibs/sierra/sierra.c:851
+#: camlibs/sierra/sierra.c:1179
 msgid "Best"
 msgstr "最佳"
 
@@ -5127,113 +5074,113 @@ msgstr "最佳"
 # camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
 # camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
 # camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra.c:848 camlibs/sierra/sierra.c:888
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:950
-#: camlibs/sierra/sierra.c:981 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1058
-#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1431
-#: camlibs/sierra/sierra.c:1459 camlibs/sierra/sierra.c:1482
-#: camlibs/sierra/sierra.c:1504 camlibs/sierra/sierra.c:1530
-#: camlibs/sierra/sierra.c:1549 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:854 camlibs/sierra/sierra.c:894
+#: camlibs/sierra/sierra.c:926 camlibs/sierra/sierra.c:956
+#: camlibs/sierra/sierra.c:987 camlibs/sierra/sierra.c:1018
+#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1064
+#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1437
+#: camlibs/sierra/sierra.c:1465 camlibs/sierra/sierra.c:1488
+#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1536
+#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1623
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (未知)"
 
 # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1183
+#: camlibs/sierra/sierra.c:866 camlibs/sierra/sierra.c:1189
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "快门速度 (微秒，0 表示自动)"
 
 # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146
 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:1192
-#: camlibs/sierra/sierra.c:1407 camlibs/sierra/sierra.c:1648
+#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1198
+#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1654
 msgid "Aperture"
 msgstr "光圈"
 
 # camlibs/sierra/sierra.c:857 camlibs/sierra/sierra.c:865
 # camlibs/sierra/sierra.c:1171
-#: camlibs/sierra/sierra.c:903 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:1217
+#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:917
+#: camlibs/sierra/sierra.c:1223
 msgid "Black/White"
 msgstr "黑白"
 
 # camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:869
 # camlibs/sierra/sierra.c:1175
-#: camlibs/sierra/sierra.c:905 camlibs/sierra/sierra.c:915
-#: camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:911 camlibs/sierra/sierra.c:921
+#: camlibs/sierra/sierra.c:1227
 msgid "White Board"
 msgstr "白板"
 
 # camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:871
 # camlibs/sierra/sierra.c:1177
-#: camlibs/sierra/sierra.c:906 camlibs/sierra/sierra.c:917
-#: camlibs/sierra/sierra.c:1223
+#: camlibs/sierra/sierra.c:912 camlibs/sierra/sierra.c:923
+#: camlibs/sierra/sierra.c:1229
 msgid "Black Board"
 msgstr "黑板"
 
 # camlibs/sierra/sierra.c:915 camlibs/sierra/sierra.c:1208
-#: camlibs/sierra/sierra.c:961 camlibs/sierra/sierra.c:1254
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:1260
 msgid "Brightness/Contrast"
 msgstr "亮度/对比度"
 
 # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926
 # camlibs/sierra/sierra.c:1214
-#: camlibs/sierra/sierra.c:964 camlibs/sierra/sierra.c:972
-#: camlibs/sierra/sierra.c:1260
+#: camlibs/sierra/sierra.c:970 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1266
 msgid "Bright+"
 msgstr "亮度+"
 
 # camlibs/sierra/sierra.c:919 camlibs/sierra/sierra.c:928
 # camlibs/sierra/sierra.c:1216
-#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:974
-#: camlibs/sierra/sierra.c:1262
+#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1268
 msgid "Bright-"
 msgstr "亮度-"
 
 # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956
 # camlibs/sierra/sierra.c:1235
-#: camlibs/sierra/sierra.c:994 camlibs/sierra/sierra.c:1002
-#: camlibs/sierra/sierra.c:1281
+#: camlibs/sierra/sierra.c:1000 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1287
 msgid "Skylight"
 msgstr "日光"
 
 # camlibs/sierra/sierra.c:980 camlibs/sierra/sierra.c:987
 # camlibs/sierra/sierra.c:1258
-#: camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1039
+#: camlibs/sierra/sierra.c:1310
 msgid "Infinity/Fish-eye"
 msgstr "无限/鱼眼"
 
 # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1314
+#: camlibs/sierra/sierra.c:1053 camlibs/sierra/sierra.c:1320
 msgid "Spot Metering Mode"
 msgstr "场景测量模式"
 
 # camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1070 camlibs/sierra/sierra.c:1076
+#: camlibs/sierra/sierra.c:1076 camlibs/sierra/sierra.c:1082
 msgid "1x"
 msgstr "1x"
 
 # camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1035
-#: camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1081
+#: camlibs/sierra/sierra.c:1077 camlibs/sierra/sierra.c:1087
 msgid "1.6x"
 msgstr "1.6x"
 
 # camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1038
-#: camlibs/sierra/sierra.c:1073 camlibs/sierra/sierra.c:1084
+#: camlibs/sierra/sierra.c:1079 camlibs/sierra/sierra.c:1090
 msgid "2.5x"
 msgstr "2.5x"
 
 # camlibs/sierra/sierra.c:1055 camlibs/sierra/sierra.c:1302
 # camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1709
-#: camlibs/sierra/sierra.c:1101 camlibs/sierra/sierra.c:1348
-#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1755
+#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1354
+#: camlibs/sierra/sierra.c:1569 camlibs/sierra/sierra.c:1761
 msgid "Auto Off (host) (in seconds)"
 msgstr "自动关机 (连接) (秒)"
 
 # camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1519
-#: camlibs/sierra/sierra.c:1103 camlibs/sierra/sierra.c:1565
+#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1571
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -5241,171 +5188,193 @@ msgstr "在相机连接到计算机以后，须等待多长时间再自动关机
 
 # camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1312
 # camlibs/sierra/sierra.c:1531 camlibs/sierra/sierra.c:1719
-#: camlibs/sierra/sierra.c:1115 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1765
+#: camlibs/sierra/sierra.c:1121 camlibs/sierra/sierra.c:1364
+#: camlibs/sierra/sierra.c:1583 camlibs/sierra/sierra.c:1771
 msgid "Auto Off (field) (in seconds)"
 msgstr "自动关机 (未连接) (秒)"
 
 # camlibs/sierra/sierra.c:1071 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1579
+#: camlibs/sierra/sierra.c:1123 camlibs/sierra/sierra.c:1585
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
 msgstr "在未连接到计算机时，须等待多长时间再自动关机？"
 
 # camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1331
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1377
+#: camlibs/sierra/sierra.c:1145 camlibs/sierra/sierra.c:1383
 msgid "LCD Auto Off (in seconds)"
 msgstr "LCD 自动关闭 (以秒为单位)"
 
 # camlibs/sierra/sierra.c:1355
-#: camlibs/sierra/sierra.c:1401
+#: camlibs/sierra/sierra.c:1407
 msgid "Shot Settings"
 msgstr "拍摄设置"
 
 # camlibs/sierra/sierra.c:1362 camlibs/sierra/sierra.c:1370
 # camlibs/sierra/sierra.c:1605
-#: camlibs/sierra/sierra.c:1408 camlibs/sierra/sierra.c:1416
-#: camlibs/sierra/sierra.c:1651
+#: camlibs/sierra/sierra.c:1414 camlibs/sierra/sierra.c:1422
+#: camlibs/sierra/sierra.c:1657
 msgid "F2"
 msgstr "F2"
 
 # camlibs/sierra/sierra.c:1363 camlibs/sierra/sierra.c:1372
 # camlibs/sierra/sierra.c:1607
-#: camlibs/sierra/sierra.c:1409 camlibs/sierra/sierra.c:1418
-#: camlibs/sierra/sierra.c:1653
+#: camlibs/sierra/sierra.c:1415 camlibs/sierra/sierra.c:1424
+#: camlibs/sierra/sierra.c:1659
 msgid "F2.3"
 msgstr "F2.3"
 
 # camlibs/sierra/sierra.c:1364 camlibs/sierra/sierra.c:1374
 # camlibs/sierra/sierra.c:1609
-#: camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1420
-#: camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:1416 camlibs/sierra/sierra.c:1426
+#: camlibs/sierra/sierra.c:1661
 msgid "F2.8"
 msgstr "F2.8"
 
 # camlibs/sierra/sierra.c:1365 camlibs/sierra/sierra.c:1376
 # camlibs/sierra/sierra.c:1611
-#: camlibs/sierra/sierra.c:1411 camlibs/sierra/sierra.c:1422
-#: camlibs/sierra/sierra.c:1657
+#: camlibs/sierra/sierra.c:1417 camlibs/sierra/sierra.c:1428
+#: camlibs/sierra/sierra.c:1663
 msgid "F4"
 msgstr "F4"
 
 # camlibs/sierra/sierra.c:1366 camlibs/sierra/sierra.c:1378
 # camlibs/sierra/sierra.c:1613
-#: camlibs/sierra/sierra.c:1412 camlibs/sierra/sierra.c:1424
-#: camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1418 camlibs/sierra/sierra.c:1430
+#: camlibs/sierra/sierra.c:1665
 msgid "F5.6"
 msgstr "F5.6"
 
 # camlibs/sierra/sierra.c:1367 camlibs/sierra/sierra.c:1380
 # camlibs/sierra/sierra.c:1615
-#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1426
-#: camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1419 camlibs/sierra/sierra.c:1432
+#: camlibs/sierra/sierra.c:1667
 msgid "F8"
 msgstr "F8"
 
 # camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479
 # camlibs/sierra/sierra.c:1684
-#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1525
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/sierra.c:1523 camlibs/sierra/sierra.c:1531
+#: camlibs/sierra/sierra.c:1736
 msgid "SuperFine"
 msgstr "超精细"
 
 # camlibs/sierra/sierra.c:1472 camlibs/sierra/sierra.c:1481
 # camlibs/sierra/sierra.c:1686
-#: camlibs/sierra/sierra.c:1518 camlibs/sierra/sierra.c:1527
-#: camlibs/sierra/sierra.c:1732
+#: camlibs/sierra/sierra.c:1524 camlibs/sierra/sierra.c:1533
+#: camlibs/sierra/sierra.c:1738
 msgid "HyPict"
 msgstr "合成照片"
 
 # camlibs/sierra/sierra.c:1495 camlibs/sierra/sierra.c:1498
 # camlibs/sierra/sierra.c:1698
-#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1544
-#: camlibs/sierra/sierra.c:1744
+#: camlibs/sierra/sierra.c:1547 camlibs/sierra/sierra.c:1550
+#: camlibs/sierra/sierra.c:1750
 msgid "color"
 msgstr "彩色"
 
 # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500
 # camlibs/sierra/sierra.c:1700
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1546
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/sierra.c:1548 camlibs/sierra/sierra.c:1552
+#: camlibs/sierra/sierra.c:1752
 msgid "black & white"
 msgstr "黑白"
 
-#: camlibs/sierra/sierra.c:1850
+#: camlibs/sierra/sierra.c:1856
 msgid "Note: no memory card present, some values may be invalid\n"
 msgstr "注意：没有内存卡，有些值可能是无效的\n"
 
 # camlibs/sierra/sierra.c:1806
-#: camlibs/sierra/sierra.c:1858
+#: camlibs/sierra/sierra.c:1864
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%s相机型号：%s\n"
 
 # camlibs/sierra/sierra.c:1810
-#: camlibs/sierra/sierra.c:1860
+#: camlibs/sierra/sierra.c:1866
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%s制造商：%s\n"
 
 # camlibs/sierra/sierra.c:1814
-#: camlibs/sierra/sierra.c:1862
+#: camlibs/sierra/sierra.c:1868
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%s相机 ID：%s\n"
 
 # camlibs/sierra/sierra.c:1818
-#: camlibs/sierra/sierra.c:1864
+#: camlibs/sierra/sierra.c:1870
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%s序列号：%s\n"
 
 # camlibs/sierra/sierra.c:1822
-#: camlibs/sierra/sierra.c:1866
+#: camlibs/sierra/sierra.c:1872
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%s软件版本号：%s\n"
 
 # camlibs/sierra/sierra.c:1826
-#: camlibs/sierra/sierra.c:1870
+#: camlibs/sierra/sierra.c:1876
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%s已用帧：%i\n"
 
 # camlibs/sierra/sierra.c:1828
-#: camlibs/sierra/sierra.c:1872
+#: camlibs/sierra/sierra.c:1878
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%s剩余帧：%i\n"
 
 # camlibs/sierra/sierra.c:1830
-#: camlibs/sierra/sierra.c:1874
+#: camlibs/sierra/sierra.c:1880
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%s电池寿命：%i\n"
 
 # camlibs/sierra/sierra.c:1832
-#: camlibs/sierra/sierra.c:1876
+#: camlibs/sierra/sierra.c:1882
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%s内存剩余：%i 字节\n"
 
 # camlibs/sierra/sierra.c:1836
-#: camlibs/sierra/sierra.c:1881
+#: camlibs/sierra/sierra.c:1887
 #, c-format
 msgid "%sDate: %s"
 msgstr "%s日期：%s"
 
 # camlibs/canon/library.c:165 camlibs/canon/library.c:889
 # camlibs/canon/library.c:902
-#: camlibs/sierra/sierra.c:1897
+#: camlibs/sierra/sierra.c:1903
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "相机不可用"
 
+# camlibs/sierra/sierra.c:1852
+#: camlibs/sierra/sierra.c:1910
+#, fuzzy, c-format
+msgid ""
+"Some notes about Epson cameras:\n"
+"- Some parameters are not controllable remotely:\n"
+"  * zoom\n"
+"  * focus\n"
+"  * custom white balance setup\n"
+"- Configuration has been reverse-engineered with\n"
+"  a PhotoPC 3000z, if your camera acts differently\n"
+"  please send a mail to %s (in English)\n"
+msgstr ""
+"关于爱普生相机的一些事项：\n"
+"- 有些参数无法远程控制：\n"
+"  * 缩放\n"
+"  * 聚焦\n"
+"  * custom white balance setup\n"
+"- 配置是通过对 PhotoPC 3000z 进行反向工程\n"
+"  而得到的。如果您的相机于此不同，请向 \n"
+"  <gphoto-devel@lists.sourceforge.net> 发送电子邮件 (用英语)\n"
+
 # camlibs/sierra/sierra.c:1864
-#: camlibs/sierra/sierra.c:1916
+#: camlibs/sierra/sierra.c:1922
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -5444,7 +5413,7 @@ msgstr ""
 "    到“关闭”。"
 
 # camlibs/sierra/sierra.c:1887
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1951
 msgid ""
 "sierra SPARClite library\n"
 "Scott Fritzinger <scottf@unr.edu>\n"
@@ -5497,65 +5466,13 @@ msgstr ""
 "Marcus Meissner <marcus@jet.franken.de>\n"
 "用于访问 SiPix Web2 相机的驱动程序。"
 
-#: camlibs/smal/smal.c:163
+#: camlibs/smal/smal.c:168
 msgid ""
 "Smal Ultrapocket\n"
 "Lee Benfield <lee@benf.org>\n"
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
-#: camlibs/sonydscf1/dsc_f1.c:134
-msgid "Sorry, this function not implemented..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:140
-msgid "Sorry, nothing to configure..."
-msgstr ""
-
-#: camlibs/sonydscf1/dsc_f1.c:146
-msgid "Sorry, taking pictures is not implemented..."
-msgstr ""
-
-# libgphoto2/gphoto2-camera.c:662
-#: camlibs/sonydscf1/dsc_f1.c:152
-#, fuzzy
-msgid "Couldn't open camera.\n"
-msgstr "无法重置相机。\n"
-
-# camlibs/dimera/dimera3500.c:947
-#: camlibs/sonydscf1/dsc_f1.c:166
-#, fuzzy
-msgid "Error opening camera\n"
-msgstr "重置相机出问题"
-
-#: camlibs/sonydscf1/dsc_f1.c:171
-msgid "Picture number is too large.\n"
-msgstr ""
-
-# camlibs/sonydscf1/sonydscf1.c:133
-#: camlibs/sonydscf1/dsc_f1.c:182
-#, fuzzy
-msgid ""
-"Sony DSC-F1 Digital Camera Support\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"\n"
-"Based on the chotplay CLI interface from\n"
-"Ken-ichi Hayashi\n"
-"\n"
-"This lib may not work. YMMV\n"
-msgstr ""
-"索尼 DSC-F1 数码相机支持\n"
-"M. Adam Kendall <joker@penguinpub.com>\n"
-"基于 chotplay CLI 界面。该界面来自于\n"
-"Ken-ichi Hayashi\n"
-"由 Bart van Leeuwen <bart@netage.nl> 移植到 gphoto2"
-
-# camlibs/dimera/dimera3500.c:947
-#: camlibs/sonydscf1/dsc_f1.c:187 camlibs/sonydscf1/dsc_f1.c:188
-#, fuzzy
-msgid "Error opening camera.\n"
-msgstr "重置相机出问题"
-
 # camlibs/sonydscf1/sonydscf1.c:133
 #: camlibs/sonydscf1/sonydscf1.c:132
 msgid ""
@@ -5608,15 +5525,6 @@ msgstr ""
 "Soundvision 驱动程序\n"
 "Vince Weaver <vince@deater.net>\n"
 
-#: camlibs/spca504_flash/library.c:184
-msgid ""
-"spca504_flash camlib\n"
-" Authors: Till Adam\n"
-" <till@adam-lilienthal.de>\n"
-"based on work by Matthias Krauss\n"
-"and Mark A. Zimmerman <mark@foresthaven.com>"
-msgstr ""
-
 #: camlibs/spca50x/library.c:261
 #, c-format
 msgid ""
@@ -5656,6 +5564,11 @@ msgstr ""
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
+#: camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
+
 #: camlibs/stv0674/stv0674.c:207
 msgid ""
 "STV0674\n"
@@ -5918,37 +5831,37 @@ msgid "This camera can not capture previews."
 msgstr "该相机不能预览视频捕捉。"
 
 # libgphoto2/gphoto2-filesys.c:214
-#: libgphoto2/gphoto2-filesys.c:258
+#: libgphoto2/gphoto2-filesys.c:259
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "路径“%s”不是绝对路径。"
 
 # libgphoto2/gphoto2-filesys.c:335
-#: libgphoto2/gphoto2-filesys.c:379
+#: libgphoto2/gphoto2-filesys.c:380
 #, c-format
 msgid "Could not append folder '%s' as this folder already exists."
 msgstr "文件夹“%s”已存在，无法附加。"
 
 # libgphoto2/gphoto2-filesys.c:514
-#: libgphoto2/gphoto2-filesys.c:551
+#: libgphoto2/gphoto2-filesys.c:552
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "无法找到文件夹“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:531
-#: libgphoto2/gphoto2-filesys.c:568
+#: libgphoto2/gphoto2-filesys.c:569
 #, c-format
 msgid "Folder '%s' does not contain a folder '%s'."
 msgstr "文件夹“%s”不含有文件夹“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:594
-#: libgphoto2/gphoto2-filesys.c:632
+#: libgphoto2/gphoto2-filesys.c:633
 #, c-format
 msgid "Could not append '%s' to folder '%s' because this file already exists."
 msgstr "由于“%s”已存在，所以无法将其附加到文件夹“%s”中。"
 
 # libgphoto2/gphoto2-filesys.c:970
-#: libgphoto2/gphoto2-filesys.c:1009
+#: libgphoto2/gphoto2-filesys.c:1010
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -5956,25 +5869,25 @@ msgid ""
 msgstr "您试图从文件夹“%2$s”中删除“%1$s”，但文件系统不支持删除文件。"
 
 # libgphoto2/gphoto2-filesys.c:1077
-#: libgphoto2/gphoto2-filesys.c:1112
+#: libgphoto2/gphoto2-filesys.c:1113
 #, c-format
 msgid ""
 "There are still subfolders in folder '%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有子文件夹。"
 
 # libgphoto2/gphoto2-filesys.c:1071
-#: libgphoto2/gphoto2-filesys.c:1119
+#: libgphoto2/gphoto2-filesys.c:1120
 #, c-format
 msgid "There are still files in folder '%s' that you are trying to remove."
 msgstr "您正试图删除的文件夹“%s”中还有文件。"
 
 # libgphoto2/gphoto2-filesys.c:1117
-#: libgphoto2/gphoto2-filesys.c:1161
+#: libgphoto2/gphoto2-filesys.c:1162
 msgid "The filesystem does not support upload of files."
 msgstr "文件系统不支持上载文件。"
 
 # libgphoto2/gphoto2-filesys.c:1158
-#: libgphoto2/gphoto2-filesys.c:1202
+#: libgphoto2/gphoto2-filesys.c:1203
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -5982,74 +5895,74 @@ msgid ""
 msgstr "文件夹“%s”只含有 %i 个文件，但您请求编号为 %i 的文件。"
 
 # libgphoto2/gphoto2-filesys.c:1199
-#: libgphoto2/gphoto2-filesys.c:1247
+#: libgphoto2/gphoto2-filesys.c:1248
 #, c-format
 msgid "File '%s' could not be found in folder '%s'."
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # libgphoto2/gphoto2-filesys.c:1282
-#: libgphoto2/gphoto2-filesys.c:1334
+#: libgphoto2/gphoto2-filesys.c:1335
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "无法找到文件“%s”。"
 
 # libgphoto2/gphoto2-filesys.c:1407
-#: libgphoto2/gphoto2-filesys.c:1459
+#: libgphoto2/gphoto2-filesys.c:1460
 msgid "The filesystem doesn't support getting files"
 msgstr "文件系统不支持获取文件"
 
 # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764
-#: libgphoto2/gphoto2-filesys.c:1494 libgphoto2/gphoto2-filesys.c:2037
-#: libgphoto2/gphoto2-filesys.c:2190
+#: libgphoto2/gphoto2-filesys.c:1495 libgphoto2/gphoto2-filesys.c:2042
+#: libgphoto2/gphoto2-filesys.c:2195
 #, c-format
 msgid "Unknown file type %i."
 msgstr "未知的文件类型 %i。"
 
 # libgphoto2/gphoto2-filesys.c:1446
-#: libgphoto2/gphoto2-filesys.c:1498
+#: libgphoto2/gphoto2-filesys.c:1499
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "正在从文件夹“%2$s”下载“%1$s”..."
 
 # libgphoto2/gphoto2-filesys.c:1656
-#: libgphoto2/gphoto2-filesys.c:1708
+#: libgphoto2/gphoto2-filesys.c:1709
 msgid "The filesystem doesn't support getting file information"
 msgstr "文件系统不支持获取文件信息"
 
-#: libgphoto2/gphoto2-filesys.c:1883
+#: libgphoto2/gphoto2-filesys.c:1884
 #, c-format
 msgid ""
 "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
 "filesystem is mounted."
 msgstr "无法打开“/proc/meminfo”以便读入(“%m”)。确认加载了 proc 文件系统。"
 
-#: libgphoto2/gphoto2-filesys.c:1891
+#: libgphoto2/gphoto2-filesys.c:1892
 #, c-format
 msgid "An error occured while reading '/proc/meminfo' ('%m')."
 msgstr "读入“/proc/meminfo”时出错 (“%m”)。"
 
-#: libgphoto2/gphoto2-filesys.c:1926
+#: libgphoto2/gphoto2-filesys.c:1927
 #, c-format
 msgid "sysctl call failed ('%m')."
 msgstr "sysctl 调用失败 (“%m”)。"
 
-#: libgphoto2/gphoto2-filesys.c:1944
+#: libgphoto2/gphoto2-filesys.c:1945
 #, fuzzy, c-format
 msgid "sysconf call failed ('%m')."
 msgstr "sysctl 调用失败 (“%m”)。"
 
-#: libgphoto2/gphoto2-filesys.c:1952
+#: libgphoto2/gphoto2-filesys.c:1953
 #, fuzzy, c-format
 msgid "swapctl call failed ('%m')."
 msgstr "sysctl 调用失败 (“%m”)。"
 
 # libgphoto2/gphoto2-filesys.c:1867
-#: libgphoto2/gphoto2-filesys.c:2293
+#: libgphoto2/gphoto2-filesys.c:2298
 msgid "The filesystem doesn't support setting file information"
 msgstr "文件系统不支持设置文件信息"
 
 # libgphoto2/gphoto2-filesys.c:1890
-#: libgphoto2/gphoto2-filesys.c:2316
+#: libgphoto2/gphoto2-filesys.c:2321
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "无法改变像宽度和高度这样的只读文件属性。"
 
@@ -6104,30 +6017,96 @@ msgstr "未知的相机库错误"
 msgid "Unknown error"
 msgstr "未知的错误"
 
-# camlibs/minolta/dimagev/dimagev.c:299
+# libgphoto2/gphoto2-filesys.c:1199
 #, fuzzy
-#~ msgid "remove"
-#~ msgstr "远程"
+#~ msgid "No thumbnail could be found for %s"
+#~ msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
-# camlibs/canon/library.c:267
-#, fuzzy
-#~ msgid "Could not identify camera based on name \"%s\""
-#~ msgstr "无法获取磁盘名：%s"
+# camlibs/jamcam/jamcam.c:280
+#~ msgid "gsmart library v"
+#~ msgstr "gsmart 库 v"
 
-# camlibs/ricoh/ricoh.c:75
+#~ msgid ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "Support for the Mustek gSmart mini series of digital cameras based on "
+#~ "several other gphoto2 camlib modules and the windows driver source kindly "
+#~ "provided by Mustek.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Till Adam <till@adam-lilienthal.de>\n"
+#~ "根据一些其它 gphoto2 相机库和由 Mustek 友好提供的 Windows 驱动程序源代码编"
+#~ "制的支持 Mustek gSmart mini 系列数码相机的库。\n"
+#~ "\n"
+
+# camlibs/ptp/library.c:422
+#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+#~ msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
+
+# camlibs/ricoh/ricoh.c:66
+#~ msgid ""
+#~ "Expected %i, got %i. Please report this error to <gphoto-devel@lists."
+#~ "sourceforge.net>."
+#~ msgstr ""
+#~ "需要 %i，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge.net>。"
+
+# camlibs/ricoh/ricoh.c:66
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
 #~ msgstr ""
-#~ "需要 %i 字节，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge."
-#~ "net>。"
+#~ "需要 %i，得到 %i。请将此错误报告到 <gphoto-devel@lists.sourceforge.net>。"
 
 # camlibs/sierra/library.c:620
+#, fuzzy
 #~ msgid ""
 #~ "Communication error even after 2 retries. Please contact <gphoto-"
-#~ "devel@gphoto.org>."
+#~ "devel@lists.sourceforge.net>."
+#~ msgstr "两次重试后仍然超时。请联系 <gphoto-devel@lists.sourceforge.net>。"
+
+# libgphoto2/gphoto2-camera.c:662
+#, fuzzy
+#~ msgid "Couldn't open camera.\n"
+#~ msgstr "无法重置相机。\n"
+
+# camlibs/dimera/dimera3500.c:947
+#, fuzzy
+#~ msgid "Error opening camera\n"
+#~ msgstr "重置相机出问题"
+
+# camlibs/sonydscf1/sonydscf1.c:133
+#, fuzzy
+#~ msgid ""
+#~ "Sony DSC-F1 Digital Camera Support\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "\n"
+#~ "Based on the chotplay CLI interface from\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "\n"
+#~ "This lib may not work. YMMV\n"
 #~ msgstr ""
-#~ "两次重试后仍然通讯错误。请联系 <gphoto-devel@lists.sourceforge.net>。"
+#~ "索尼 DSC-F1 数码相机支持\n"
+#~ "M. Adam Kendall <joker@penguinpub.com>\n"
+#~ "基于 chotplay CLI 界面。该界面来自于\n"
+#~ "Ken-ichi Hayashi\n"
+#~ "由 Bart van Leeuwen <bart@netage.nl> 移植到 gphoto2"
+
+# camlibs/dimera/dimera3500.c:947
+#, fuzzy
+#~ msgid "Error opening camera.\n"
+#~ msgstr "重置相机出问题"
+
+# camlibs/minolta/dimagev/dimagev.c:299
+#, fuzzy
+#~ msgid "remove"
+#~ msgstr "远程"
+
+# camlibs/canon/library.c:267
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "无法获取磁盘名：%s"
 
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353