update svn:ignore, po/*.po

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8605 67ed7778-7388-44ab-90cf-0a291f65f57c
author: Hans Ulrich Niedermann <gp@n-dimensional.de> 2006-03-15 08:02:03 +0000
committer: Hans Ulrich Niedermann <gp@n-dimensional.de> 2006-03-15 08:02:03 +0000
commit: f0af2f5421195e65e0b0a9702b2505c6e21973e8 (patch)
tree: 15187e81a106da62cbe9c2d3c371c12e7ae05b87 /po/sv.po
parent: b92c4c93dedb5f5b4aa9d9ce549ad8e719c87d4d (diff)
download: libgphoto2-f0af2f5421195e65e0b0a9702b2505c6e21973e8.tar.gz
1 files changed, 1703 insertions, 948 deletions
diff --git a/po/sv.po b/po/sv.po
index 5544d5f93..b1f8f72a9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2005-06-12 17:07+0200\n"
+"POT-Creation-Date: 2006-03-14 20:29+0100\n"
 "PO-Revision-Date: 2003-01-09 08:13+0100\n"
 "Last-Translator: Stefan Björnelund <stefanb@update.uu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -78,75 +78,75 @@ msgstr ""
 "Implementerat med hjälp av dokument från\n"
 "nätet. Med tillstånd från Vision."
 
-#: camlibs/canon/canon.c:580
+#: camlibs/canon/canon.c:604
 #, fuzzy, c-format
 msgid "Could not create directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:583
+#: camlibs/canon/canon.c:607
 #, fuzzy, c-format
 msgid "Could not remove directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:956 camlibs/canon/canon.c:1294
-#: camlibs/canon/usb.c:513
+#: camlibs/canon/canon.c:980 camlibs/canon/canon.c:1320
+#: camlibs/canon/usb.c:514
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1020 camlibs/canon/canon.c:1021
+#: camlibs/canon/canon.c:1044 camlibs/canon/canon.c:1045
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:1191
+#: camlibs/canon/canon.c:1216
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
-"status %i"
+"status %li"
 msgstr ""
 
-#: camlibs/canon/canon.c:1328
+#: camlibs/canon/canon.c:1354
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1435
+#: camlibs/canon/canon.c:1461
 #, fuzzy, c-format
 msgid "Name '%s' (%li characters) too long, maximum 30 characters are allowed."
 msgstr ""
 "Namnet '%s' (%i tecken) är för långt (%i tecken), maximalt 30 tecken tillåts."
 
-#: camlibs/canon/canon.c:1850
+#: camlibs/canon/canon.c:1878
 #, c-format
 msgid "Lower case letters in %s not allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:2030
+#: camlibs/canon/canon.c:2058
 #, c-format
 msgid ""
 "canon_int_list_directory: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:2052
+#: camlibs/canon/canon.c:2080
 msgid ""
 "canon_int_list_directory: Reached end of packet while examining the first "
 "dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:2137
+#: camlibs/canon/canon.c:2165
 msgid "canon_int_list_directory: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2496
+#: camlibs/canon/canon.c:2526
 msgid "File protected."
 msgstr "Filen skyddad."
 
-#: camlibs/canon/canon.c:2588
+#: camlibs/canon/canon.c:2618
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
-#: camlibs/canon/canon.c:2675
+#: camlibs/canon/canon.c:2705
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
@@ -357,8 +357,8 @@ msgstr "Kunde inte skapa \\DCIM-katalogen."
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:2586
-#: camlibs/ptp2/library.c:2677
+#: camlibs/canon/library.c:1263 camlibs/ptp2/library.c:3231
+#: camlibs/ptp2/library.c:3322
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
@@ -395,8 +395,8 @@ msgstr "Sätt kamerans datum till datorns datum"
 msgid "Firmware revision (readonly)"
 msgstr "Fastvarurevision (skrivskyddad)"
 
-#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:2624
-#: camlibs/ptp2/library.c:2653
+#: camlibs/canon/library.c:1320 camlibs/ptp2/library.c:3269
+#: camlibs/ptp2/library.c:3298
 msgid "Power (readonly)"
 msgstr "Kraft (skrivskyddad)"
 
@@ -657,148 +657,148 @@ msgid ""
 "operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:336 camlibs/canon/usb.c:377
+#: camlibs/canon/usb.c:337 camlibs/canon/usb.c:378
 #, c-format
 msgid "Step #4 failed: \"%s\" on read of %i. Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:343 camlibs/canon/usb.c:384
+#: camlibs/canon/usb.c:344 camlibs/canon/usb.c:385
 #, c-format
 msgid "Step #4 failed! (returned %i, expected %i) Camera not operational"
 msgstr ""
 
-#: camlibs/canon/usb.c:466
+#: camlibs/canon/usb.c:467
 #, c-format
 msgid "Camera not ready, multiple 'Identify camera' requests failed: %s"
 msgstr ""
 "Kamera ej redo, flera 'Identifiera kamera'-förfrågningar misslyckades: %s\""
 
-#: camlibs/canon/usb.c:504 camlibs/canon/usb.c:520
+#: camlibs/canon/usb.c:505 camlibs/canon/usb.c:521
 #, fuzzy, c-format
 msgid "Camera not ready, get_battery failed: %s"
 msgstr ""
 "Kamera ej redo, flera 'Identifiera kamera'-förfrågningar misslyckades: %s\""
 
-#: camlibs/canon/usb.c:584
+#: camlibs/canon/usb.c:585
 #, c-format
 msgid ""
 "canon_usb_lock_keys: Unexpected length returned from \"lock keys\" function "
 "(%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:606 camlibs/canon/usb.c:632 camlibs/canon/usb.c:672
+#: camlibs/canon/usb.c:607 camlibs/canon/usb.c:633 camlibs/canon/usb.c:673
 #, c-format
 msgid "canon_usb_lock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:715 camlibs/canon/usb.c:731
+#: camlibs/canon/usb.c:716 camlibs/canon/usb.c:732
 #, c-format
 msgid ""
 "canon_usb_unlock_keys: Unexpected length returned (%i bytes, expected %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:786 camlibs/canon/usb.c:804
+#: camlibs/canon/usb.c:787 camlibs/canon/usb.c:805
 #, c-format
 msgid ""
 "canon_usb_get_body_id: Unexpected data length returned (%i bytes, expected %"
 "i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:858
+#: camlibs/canon/usb.c:859
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_pipe: interrupt read failed after %i tries, %6.3f "
 "sec \"%s\""
 msgstr ""
 
-#: camlibs/canon/usb.c:913
+#: camlibs/canon/usb.c:914
 #, c-format
 msgid ""
 "canon_usb_poll_interrupt_multiple: interrupt read failed after %i tries, \"%s"
 "\""
 msgstr ""
 
-#: camlibs/canon/usb.c:1035
+#: camlibs/canon/usb.c:1036
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for thumbnail size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1051
+#: camlibs/canon/usb.c:1052
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: bogus length 0x%04x for full image size packet"
 msgstr ""
 
-#: camlibs/canon/usb.c:1076
+#: camlibs/canon/usb.c:1077
 msgid "canon_usb_capture_dialogue: first interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1084
+#: camlibs/canon/usb.c:1085
 msgid "canon_usb_capture_dialogue: second interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1094
+#: camlibs/canon/usb.c:1095
 #, c-format
 msgid ""
 "canon_usb_capture_dialogue: photographic failure signaled, code = 0x%08x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1112
+#: camlibs/canon/usb.c:1113
 msgid "canon_usb_capture_dialogue: third EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1147
+#: camlibs/canon/usb.c:1148
 msgid "canon_usb_capture_dialogue: fourth EOS interrupt read out of sequence"
 msgstr ""
 
-#: camlibs/canon/usb.c:1332
+#: camlibs/canon/usb.c:1333
 #, c-format
 msgid "canon_usb_dialogue: payload too big, won't fit into buffer (%i > %i)"
 msgstr ""
 
-#: camlibs/canon/usb.c:1438
+#: camlibs/canon/usb.c:1439
 #, c-format
 msgid "canon_usb_dialogue: expected 0x%x bytes, but camera reports 0x%x"
 msgstr ""
 
-#: camlibs/canon/usb.c:1560
+#: camlibs/canon/usb.c:1561
 msgid "Receiving data..."
 msgstr "Tar emot data..."
 
-#: camlibs/canon/usb.c:1893 camlibs/canon/usb.c:2029
+#: camlibs/canon/usb.c:1894 camlibs/canon/usb.c:2030
 #, c-format
 msgid "Out of memory: %d bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:1958
+#: camlibs/canon/usb.c:1959
 msgid "canon_usb_set_file_attributes: canon_usb_dialogue failed"
 msgstr ""
 
-#: camlibs/canon/usb.c:1965
+#: camlibs/canon/usb.c:1966
 #, c-format
 msgid ""
 "Warning in canon_usb_set_file_attributes: canon_usb_dialogue returned error "
 "status 0x%08x from camera"
 msgstr ""
 
-#: camlibs/canon/usb.c:2040
+#: camlibs/canon/usb.c:2041
 #, fuzzy, c-format
 msgid "Couldn't read from file \"%s\""
 msgstr "Kunde inte få tag på disk info: %s"
 
-#: camlibs/canon/usb.c:2050
+#: camlibs/canon/usb.c:2051
 #, c-format
 msgid "Out of memory: %ld bytes needed."
 msgstr ""
 
-#: camlibs/canon/usb.c:2083 camlibs/canon/usb.c:2094 camlibs/canon/usb.c:2130
-#: camlibs/canon/usb.c:2144 camlibs/canon/usb.c:2158
+#: camlibs/canon/usb.c:2084 camlibs/canon/usb.c:2095 camlibs/canon/usb.c:2131
+#: camlibs/canon/usb.c:2145 camlibs/canon/usb.c:2159
 #, fuzzy
 msgid "File upload failed."
 msgstr "Laddar upp fil..."
 
-#: camlibs/canon/usb.c:2184
+#: camlibs/canon/usb.c:2185
 msgid ""
 "File was too big. You may have to turn your camera off and back on before "
 "uploading more files."
@@ -806,97 +806,161 @@ 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:2230
+#: camlibs/canon/usb.c:2231
 #, c-format
 msgid ""
 "canon_usb_get_dirents: Couldn't fit payload into buffer, '%.96s' (truncated) "
 "too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2247
+#: camlibs/canon/usb.c:2248
 #, c-format
 msgid ""
 "canon_usb_get_dirents: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2298
+#: camlibs/canon/usb.c:2299
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: Couldn't fit payload into buffer, "
 "'%.96s' (truncated) too long."
 msgstr ""
 
-#: camlibs/canon/usb.c:2317
+#: camlibs/canon/usb.c:2318
 #, c-format
 msgid ""
 "canon_usb_list_all_dirs: canon_usb_long_dialogue failed to fetch direntries, "
 "returned %i"
 msgstr ""
 
-#: camlibs/canon/usb.c:2393
+#: camlibs/canon/usb.c:2394
 #, c-format
 msgid "Detected a '%s'."
 msgstr "Detekterade ett '%s'."
 
-#: camlibs/canon/usb.c:2399
+#: camlibs/canon/usb.c:2400
 #, c-format
 msgid "Name \"%s\" from camera does not match any known camera"
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:149
+#: camlibs/casio/casio-qv.c:151
 #, fuzzy, c-format
 msgid "Image type %d not supported"
 msgstr "Bildtypen stöds ej"
 
-#: camlibs/casio/casio-qv.c:174 camlibs/konica/qm150.c:442
+#: camlibs/casio/casio-qv.c:176 camlibs/konica/qm150.c:442
 #, fuzzy, c-format
 msgid "Image %s is delete protected."
 msgstr "Filen skyddad."
 
-#: camlibs/casio/casio-qv.c:187
+#: camlibs/casio/casio-qv.c:189
 msgid ""
-"Download program for Casio QV cameras. Originally written for gphoto-0.4. "
-"Adapted for gphoto2 by Lutz Mueller <lutz@users.sf.net>."
+"Driver framework written by Lutz Mueller <lutz@users.sf.net>.\n"
+"This software has QVplay's source code, written by Ken-ichi HAYASHI <xg2k-"
+"hys@asahi-net.or.jp> and Jun-ichiro \"itojun\" Itoh <itojun@itojun.org>.\n"
+"Integration of QVplay by Michael Haardt <michael@moria.de>."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:203
+#: camlibs/casio/casio-qv.c:208
 #, c-format
 msgid "Battery level: %.1f Volts. Revision: %08x."
 msgstr ""
 
-#: camlibs/casio/casio-qv.c:261 camlibs/dimera/dimera3500.c:771
-#: camlibs/kodak/dc210/dc210.c:168 camlibs/polaroid/pdc700.c:980
-#: camlibs/sierra/sierra.c:859 camlibs/sierra/sierra.c:1437
-#: camlibs/sierra/sierra-desc.c:203
+#: camlibs/casio/casio-qv.c:266 camlibs/dimera/dimera3500.c:771
+#: camlibs/kodak/dc210/dc210.c:172 camlibs/polaroid/pdc700.c:980
+#: camlibs/sierra/sierra.c:884 camlibs/sierra/sierra.c:1462
+#: camlibs/sierra/sierra-desc.c:205
 msgid "Camera Configuration"
 msgstr "Kamerakonfiguration"
 
-#: camlibs/casio/casio-qv.c:264 camlibs/konica/qm150.c:1140
+#: camlibs/casio/casio-qv.c:269 camlibs/konica/qm150.c:1140
 #, fuzzy, c-format
 msgid "Battery"
 msgstr "batteri"
 
-#: camlibs/casio/casio-qv.c:271
+#: camlibs/casio/casio-qv.c:276
 #, fuzzy
 msgid "Brightness"
 msgstr "LCD Ljusstyrka"
 
-#: camlibs/casio/casio-qv.c:273 camlibs/casio/casio-qv.c:276
+#: camlibs/casio/casio-qv.c:278 camlibs/casio/casio-qv.c:281
 #, fuzzy
 msgid "Too bright"
 msgstr "Copyright"
 
-#: camlibs/casio/casio-qv.c:274 camlibs/casio/casio-qv.c:277
+#: camlibs/casio/casio-qv.c:279 camlibs/casio/casio-qv.c:282
 #, fuzzy
 msgid "Too dark"
 msgstr "Ljuset för mörkt"
 
-#: camlibs/casio/casio-qv.c:275 camlibs/casio/casio-qv.c:278
+#: camlibs/casio/casio-qv.c:280 camlibs/casio/casio-qv.c:283
 #: camlibs/kodak/dc240/library.c:570
 msgid "OK"
 msgstr "OK"
 
+#: camlibs/clicksmart310/library.c:99
+#, c-format
+msgid ""
+"Your Logitech Clicksmart 310\n"
+"has  %i pictures in it.\n"
+msgstr ""
+
+#: camlibs/clicksmart310/library.c:113
+msgid ""
+"Two resolution settings, 352x288 and 176x144. Photo data \n"
+"is in JPEG format when downloaded and thus has no predetermined\n"
+"size. Therefore, the advertised maximum number of photos the\n"
+"camera can hold must be understood as an approximation.\n"
+"All gphoto2 options will work, except for the following which\n"
+"the hardware will not support:\n"
+"\tDeletion of individual or selected photos (gphoto2 -d)\n"
+"\tCapture (gphoto2 --capture or --capture-image)\n"
+"However, capture is possible using the webcam interface,\n"
+"supported by the spca50x kernel module.\n"
+"GUI access using gtkam has been tested, and works. However,\n"
+"the camera does not produce separate thumbnails. Since the images\n"
+"are in any event already small and of low resolution, the driver\n"
+"merely downloads the actual images to use as thumbnails.\n"
+"The camera can shoot in 'video clip' mode. The resulting frames\n"
+"are saved here as a succession of still photos. The user can \n"
+"animate them using (for example) ImageMagick's 'animate' function.\n"
+"For more details on the camera's functions, please consult\n"
+"libgphoto2/camlibs/README.\n"
+msgstr ""
+
+#: camlibs/clicksmart310/library.c:140
+msgid ""
+"Logitech Clicksmart 310 driver\n"
+"Theodore Kilgore <kilgota@auburn.edu>\n"
+msgstr ""
+
+#: camlibs/digigr8/library.c:105
+#, c-format
+msgid ""
+"Your USB camera has an SQ905C chipset.\n"
+"The total number of pictures in it is %i\n"
+msgstr ""
+
+#: camlibs/digigr8/library.c:118
+msgid ""
+"For cameras with SQ905C Technologies chip.\n"
+"Should work with gtkam. Photos will be saved in PPM format.\n"
+"\n"
+"IMPORTANT: CAMERA DOES NOT SUPPORT PHOTO SELECTION!\n"
+"YOU MUST DOWNLOAD ALL PHOTOS AND CULL THEM LATER !!!\n"
+"These cameras do not allow deletion of all photos.\n"
+"Uploading of data to the camera is not supported.\n"
+"Compression mode is UNSUPPORTED. A compressed photo\n"
+"is guaranteed to download as pure junk.\n"
+msgstr ""
+
+#: camlibs/digigr8/library.c:136
+msgid ""
+"sq905C generic driver\n"
+"Theodore Kilgore <kilgota@auburn.edu>\n"
+msgstr ""
+
 #: camlibs/digita/digita.c:333
 msgid "Unsupported image type"
 msgstr "Ej bildformatet stöds ej."
@@ -960,11 +1024,11 @@ msgstr ""
 "Kamera är %s kraft%s\n"
 
 #: camlibs/dimera/dimera3500.c:399 camlibs/dimera/dimera3500.c:785
-#: camlibs/kodak/dc210/dc210.c:253 camlibs/kodak/dc210/dc210.c:421
+#: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:425
 #: camlibs/konica/library.c:778 camlibs/konica/library.c:1019
-#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:1599
-#: camlibs/ptp2/library.c:2568 camlibs/ptp2/ptp.c:1959
-#: camlibs/ricoh/library.c:500 camlibs/sierra/nikon-desc.c:286
+#: camlibs/konica/qm150.c:854 camlibs/ptp2/library.c:2324
+#: camlibs/ptp2/ptp.c:2348 camlibs/ricoh/library.c:500
+#: camlibs/sierra/nikon-desc.c:286
 msgid "Flash"
 msgstr "Blixt"
 
@@ -1091,7 +1155,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/ricoh/g3.c:321 camlibs/samsung/samsung.c:214
+#: camlibs/ricoh/g3.c:346 camlibs/samsung/samsung.c:214
 #: camlibs/sipix/web2.c:175 camlibs/smal/ultrapocket.c:127
 #: camlibs/smal/ultrapocket.c:173
 msgid "Downloading image..."
@@ -1144,65 +1208,47 @@ msgstr "Problem att sätta kamerans kommunikationshastighet"
 msgid "Looks like a modem, not a camera"
 msgstr "Ser ut som ett modem, inte en kamera"
 
-#: camlibs/directory/directory.c:168
+#: camlibs/directory/directory.c:192
 #, c-format
 msgid "Listing files in '%s'..."
 msgstr "Listar filer i '%s'..."
 
-#: camlibs/directory/directory.c:215
-#, c-format
-msgid "Could not get information about '%s' (%m)."
-msgstr "Kunde inte hämta information om '%s' (%m)."
-
-#: camlibs/directory/directory.c:224
-#, c-format
-msgid "Could not follow the link '%s' (%m)."
-msgstr "Kunde inte följa länken '%s' (%m)."
-
-#: camlibs/directory/directory.c:252
+#: camlibs/directory/directory.c:265
 #, c-format
 msgid "Listing folders in '%s'..."
 msgstr "Listar mappar i '%s'..."
 
-#: camlibs/directory/directory.c:304
+#: camlibs/directory/directory.c:282
 #, c-format
-msgid "Could not get information about '%s' in '%s' (%m)."
-msgstr "Kunde inte hämta information om '%s' i '%s' (%m)."
+msgid "Could not get information about '%s' (%m)."
+msgstr "Kunde inte hämta information om '%s' (%m)."
 
-#: camlibs/directory/directory.c:312
+#: camlibs/directory/directory.c:322
 #, c-format
-msgid "Could not follow the link '%s' in '%s' (%m)."
-msgstr "Kunde inte följa länken '%s' i '%s' (%m)."
+msgid "Could not get information about '%s' in '%s' (%m)."
+msgstr "Kunde inte hämta information om '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:378
+#: camlibs/directory/directory.c:380
 #, c-format
 msgid "Could not change time of file '%s' in '%s' (%m)."
 msgstr "Kunde inte ändra tiden på fil '%s' i '%s' (%m)."
 
-#: camlibs/directory/directory.c:459
+#: camlibs/directory/directory.c:471
 #, c-format
 msgid "Could not open '%s'."
 msgstr "Kunde inte öppna '%s'."
 
-#: camlibs/directory/directory.c:500
-msgid "Directory Browse"
-msgstr "Katalogbläddring"
-
-#: camlibs/directory/directory.c:501 camlibs/directory/directory.c:532
-msgid "View hidden directories"
-msgstr "Visa dolda kataloger"
-
-#: camlibs/directory/directory.c:545
+#: camlibs/directory/directory.c:505
 msgid ""
 "The Directory Browse \"camera\" lets you index photos on your hard drive."
 msgstr ""
 "Katalogbläddring \"camera\" låter dig indexera bilderna på din hårddisk."
 
-#: camlibs/directory/directory.c:554
+#: camlibs/directory/directory.c:514
 msgid "Directory Browse Mode - written by Scott Fritzinger <scottf@unr.edu>."
 msgstr "Katalogbläddring - skrivet av Scott Fritzinger <scottf@unr.edu>."
 
-#: camlibs/directory/directory.c:601
+#: camlibs/directory/directory.c:589
 #, c-format
 msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)."
 msgstr "Kunde inte radera filen '%s' i mappen '%s' (felkod %i: %m)."
@@ -1262,7 +1308,8 @@ msgid "Camera sent unexpected byte 0x%02x."
 msgstr "Kameran skickade oväntad byte 0x%02x."
 
 #: camlibs/fuji/fuji.c:317 camlibs/konica/lowlevel.c:382
-#: camlibs/polaroid/pdc700.c:314 camlibs/ricoh/g3.c:315
+#: camlibs/polaroid/pdc700.c:314 camlibs/ptp2/library.c:693
+#: camlibs/ricoh/g3.c:340
 msgid "Downloading..."
 msgstr "Nerladdning..."
 
@@ -1315,7 +1362,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:1665 camlibs/sierra/sierra.c:1838
+#: camlibs/sierra/sierra.c:1690 camlibs/sierra/sierra.c:1863
 msgid "Date & Time"
 msgstr "Datum & Tid"
 
@@ -1372,6 +1419,25 @@ msgstr ""
 "Din kamera stödjer radering av den senaste filen på kameran. I detta fall, "
 "denhär filen '%s'."
 
+#: camlibs/hp215/hp215.c:440
+#, c-format
+msgid ""
+"Current camera time:  %04d-%02d-%02d  %02d:%02d\n"
+"Free card memory: %d\n"
+"Images on card: %d\n"
+"Images free on card: %d\n"
+"Battery level: %d %%"
+msgstr ""
+
+#: camlibs/hp215/hp215.c:464
+msgid ""
+"hp215\n"
+"Marcus Meissner <marcus@jet.franken.de>\n"
+"Driver to access the HP Photosmart 215 camera.\n"
+"Merged from the standalone hp215 program.\n"
+"This driver allows download of images and previews, and deletion of images.\n"
+msgstr ""
+
 #: camlibs/iclick/library.c:102
 #, c-format
 msgid ""
@@ -1529,99 +1595,99 @@ msgstr "Hämtar data..."
 msgid "Waiting for completion..."
 msgstr "Väntar på att bli klar..."
 
-#: camlibs/kodak/dc210/dc210.c:170
+#: camlibs/kodak/dc210/dc210.c:174
 msgid "File"
 msgstr "Fil:"
 
-#: camlibs/kodak/dc210/dc210.c:173 camlibs/kodak/dc210/dc210.c:342
+#: camlibs/kodak/dc210/dc210.c:177 camlibs/kodak/dc210/dc210.c:346
 msgid "File type"
 msgstr "Filtyp"
 
-#: camlibs/kodak/dc210/dc210.c:175 camlibs/kodak/dc210/dc210.c:180
+#: camlibs/kodak/dc210/dc210.c:179 camlibs/kodak/dc210/dc210.c:184
 msgid "JPEG"
 msgstr "JPEG"
 
-#: camlibs/kodak/dc210/dc210.c:176 camlibs/kodak/dc210/dc210.c:182
+#: camlibs/kodak/dc210/dc210.c:180 camlibs/kodak/dc210/dc210.c:186
 msgid "FlashPix"
 msgstr "FlashPix"
 
-#: camlibs/kodak/dc210/dc210.c:186 camlibs/kodak/dc210/dc210.c:351
+#: camlibs/kodak/dc210/dc210.c:190 camlibs/kodak/dc210/dc210.c:355
 msgid "File resolution"
 msgstr "Fil upplösning"
 
-#: camlibs/kodak/dc210/dc210.c:188 camlibs/kodak/dc210/dc210.c:193
+#: camlibs/kodak/dc210/dc210.c:192 camlibs/kodak/dc210/dc210.c:197
 #: camlibs/ricoh/library.c:318
 msgid "640 x 480"
 msgstr "640 x 480"
 
-#: camlibs/kodak/dc210/dc210.c:189 camlibs/kodak/dc210/dc210.c:195
+#: camlibs/kodak/dc210/dc210.c:193 camlibs/kodak/dc210/dc210.c:199
 msgid "1152 x 864"
 msgstr "1152 x 864"
 
-#: camlibs/kodak/dc210/dc210.c:201 camlibs/kodak/dc210/dc210.c:364
+#: camlibs/kodak/dc210/dc210.c:205 camlibs/kodak/dc210/dc210.c:368
 msgid "File compression"
 msgstr "Fil kompression"
 
-#: camlibs/kodak/dc210/dc210.c:203 camlibs/kodak/dc210/dc210.c:209
+#: camlibs/kodak/dc210/dc210.c:207 camlibs/kodak/dc210/dc210.c:213
 msgid "Low (best quality)"
 msgstr "Låg (bäst kvalité)"
 
-#: camlibs/kodak/dc210/dc210.c:204 camlibs/kodak/dc210/dc210.c:211
+#: camlibs/kodak/dc210/dc210.c:208 camlibs/kodak/dc210/dc210.c:215
 msgid "Medium (better quality)"
 msgstr "Medium (bättre kvalité)"
 
-#: camlibs/kodak/dc210/dc210.c:205 camlibs/kodak/dc210/dc210.c:213
+#: camlibs/kodak/dc210/dc210.c:209 camlibs/kodak/dc210/dc210.c:217
 msgid "High (good quality)"
 msgstr "Hög (god kvalité)"
 
-#: camlibs/kodak/dc210/dc210.c:217 camlibs/konica/qm150.c:1053
-#: camlibs/ptp2/library.c:2542
+#: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1053
+#: camlibs/ptp2/library.c:3172
 msgid "Capture"
 msgstr "Foto"
 
-#: camlibs/kodak/dc210/dc210.c:220 camlibs/kodak/dc210/dc210.c:379
-#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:2565
-#: camlibs/ptp2/ptp.c:1634 camlibs/ricoh/library.c:499
-#: camlibs/sierra/sierra.c:1107 camlibs/sierra/sierra.c:1367
+#: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383
+#: camlibs/konica/qm150.c:1039 camlibs/ptp2/library.c:3192
+#: camlibs/ptp2/ptp.c:2021 camlibs/ricoh/library.c:499
+#: camlibs/sierra/sierra.c:1132 camlibs/sierra/sierra.c:1392
 msgid "Zoom"
 msgstr "Zoom"
 
-#: camlibs/kodak/dc210/dc210.c:227 camlibs/kodak/dc210/dc210.c:241
-#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2187
-#: camlibs/ptp2/ptp.c:1987 camlibs/ricoh/library.c:498
-#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324
-#: camlibs/sierra/olympus-desc.c:488 camlibs/sierra/sierra.c:1062
-#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1338
-#: camlibs/sierra/sierra.c:1534 camlibs/sierra/sierra.c:1537
-#: camlibs/sierra/sierra.c:1750
+#: camlibs/kodak/dc210/dc210.c:231 camlibs/kodak/dc210/dc210.c:245
+#: camlibs/konica/qm150.c:1025 camlibs/ptp2/library.c:2708
+#: camlibs/ptp2/library.c:2879 camlibs/ptp2/ptp.c:2376
+#: camlibs/ricoh/library.c:498 camlibs/sierra/epson-desc.c:218
+#: camlibs/sierra/nikon-desc.c:324 camlibs/sierra/olympus-desc.c:488
+#: camlibs/sierra/sierra.c:1087 camlibs/sierra/sierra.c:1092
+#: camlibs/sierra/sierra.c:1363 camlibs/sierra/sierra.c:1559
+#: camlibs/sierra/sierra.c:1562 camlibs/sierra/sierra.c:1775
 msgid "Macro"
 msgstr "Makro"
 
-#: camlibs/kodak/dc210/dc210.c:231
+#: camlibs/kodak/dc210/dc210.c:235
 msgid "58 mm"
 msgstr "58 mm"
 
-#: camlibs/kodak/dc210/dc210.c:233
+#: camlibs/kodak/dc210/dc210.c:237
 msgid "51 mm"
 msgstr "51 mm"
 
-#: camlibs/kodak/dc210/dc210.c:235
+#: camlibs/kodak/dc210/dc210.c:239
 msgid "41 mm"
 msgstr "41 mm"
 
-#: camlibs/kodak/dc210/dc210.c:237
+#: camlibs/kodak/dc210/dc210.c:241
 msgid "34 mm"
 msgstr "34 mm"
 
-#: camlibs/kodak/dc210/dc210.c:239
+#: camlibs/kodak/dc210/dc210.c:243
 msgid "29 mm"
 msgstr "29 mm"
 
-#: camlibs/kodak/dc210/dc210.c:245 camlibs/kodak/dc210/dc210.c:404
+#: camlibs/kodak/dc210/dc210.c:249 camlibs/kodak/dc210/dc210.c:408
 msgid "Exposure compensation"
 msgstr "Exponerings kompensation"
 
-#: camlibs/kodak/dc210/dc210.c:255 camlibs/kodak/dc210/dc210.c:261
+#: camlibs/kodak/dc210/dc210.c:259 camlibs/kodak/dc210/dc210.c:265
 #: camlibs/konica/library.c:783 camlibs/konica/library.c:799
 #: camlibs/konica/library.c:814 camlibs/konica/library.c:817
 #: camlibs/konica/library.c:1028 camlibs/konica/library.c:1058
@@ -1630,51 +1696,53 @@ msgstr "Exponerings kompensation"
 #: camlibs/konica/qm150.c:967 camlibs/konica/qm150.c:970
 #: camlibs/konica/qm150.c:985 camlibs/konica/qm150.c:988
 #: camlibs/konica/qm150.c:1005 camlibs/konica/qm150.c:1008
-#: camlibs/ptp2/library.c:2147 camlibs/ptp2/library.c:2227
-#: camlibs/ptp2/ptp.c:1955 camlibs/ptp2/ptp.c:1984 camlibs/ptp2/ptp.c:2000
-#: camlibs/ricoh/library.c:311 camlibs/ricoh/library.c:326
-#: camlibs/ricoh/library.c:367 camlibs/sierra/epson-desc.c:151
-#: camlibs/sierra/epson-desc.c:169 camlibs/sierra/nikon-desc.c:168
-#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234
-#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282
-#: camlibs/sierra/olympus-desc.c:167 camlibs/sierra/olympus-desc.c:213
-#: camlibs/sierra/olympus-desc.c:290 camlibs/sierra/olympus-desc.c:322
-#: camlibs/sierra/olympus-desc.c:352 camlibs/sierra/olympus-desc.c:394
-#: camlibs/sierra/olympus-desc.c:411 camlibs/sierra/olympus-desc.c:430
-#: camlibs/sierra/olympus-desc.c:449 camlibs/sierra/olympus-desc.c:468
-#: camlibs/sierra/olympus-desc.c:489 camlibs/sierra/olympus-desc.c:690
-#: camlibs/sierra/olympus-desc.c:707 camlibs/sierra/sierra.c:870
-#: camlibs/sierra/sierra.c:876 camlibs/sierra/sierra.c:910
-#: camlibs/sierra/sierra.c:916 camlibs/sierra/sierra.c:970
-#: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1031
-#: camlibs/sierra/sierra.c:1038 camlibs/sierra/sierra.c:1205
-#: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1274
-#: camlibs/sierra/sierra.c:1317 camlibs/sierra/sierra.c:1480
-#: camlibs/sierra/sierra.c:1486 camlibs/sierra/sierra.c:1508
-#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1713
-#: camlibs/sierra/sierra.c:1733
+#: camlibs/ptp2/library.c:2552 camlibs/ptp2/library.c:2573
+#: camlibs/ptp2/library.c:2705 camlibs/ptp2/library.c:2836
+#: camlibs/ptp2/library.c:2896 camlibs/ptp2/ptp.c:2344 camlibs/ptp2/ptp.c:2373
+#: camlibs/ptp2/ptp.c:2389 camlibs/ricoh/library.c:311
+#: camlibs/ricoh/library.c:326 camlibs/ricoh/library.c:367
+#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169
+#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202
+#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252
+#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:167
+#: camlibs/sierra/olympus-desc.c:213 camlibs/sierra/olympus-desc.c:290
+#: camlibs/sierra/olympus-desc.c:322 camlibs/sierra/olympus-desc.c:352
+#: camlibs/sierra/olympus-desc.c:394 camlibs/sierra/olympus-desc.c:411
+#: camlibs/sierra/olympus-desc.c:430 camlibs/sierra/olympus-desc.c:449
+#: camlibs/sierra/olympus-desc.c:468 camlibs/sierra/olympus-desc.c:489
+#: camlibs/sierra/olympus-desc.c:690 camlibs/sierra/olympus-desc.c:707
+#: camlibs/sierra/sierra.c:895 camlibs/sierra/sierra.c:901
+#: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:941
+#: camlibs/sierra/sierra.c:995 camlibs/sierra/sierra.c:1002
+#: camlibs/sierra/sierra.c:1056 camlibs/sierra/sierra.c:1063
+#: camlibs/sierra/sierra.c:1230 camlibs/sierra/sierra.c:1259
+#: camlibs/sierra/sierra.c:1299 camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1505 camlibs/sierra/sierra.c:1511
+#: camlibs/sierra/sierra.c:1533 camlibs/sierra/sierra.c:1538
+#: camlibs/sierra/sierra.c:1738 camlibs/sierra/sierra.c:1758
 msgid "Auto"
 msgstr "Auto"
 
-#: camlibs/kodak/dc210/dc210.c:256 camlibs/kodak/dc210/dc210.c:263
+#: camlibs/kodak/dc210/dc210.c:260 camlibs/kodak/dc210/dc210.c:267
 #: camlibs/sierra/epson-desc.c:152 camlibs/sierra/nikon-desc.c:235
 #: camlibs/sierra/olympus-desc.c:395 camlibs/sierra/olympus-desc.c:412
-#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:979
-#: camlibs/sierra/sierra.c:1276 camlibs/sierra/sierra.c:1481
-#: camlibs/sierra/sierra.c:1488 camlibs/sierra/sierra.c:1715
+#: camlibs/sierra/sierra.c:996 camlibs/sierra/sierra.c:1004
+#: camlibs/sierra/sierra.c:1301 camlibs/sierra/sierra.c:1506
+#: camlibs/sierra/sierra.c:1513 camlibs/sierra/sierra.c:1740
 msgid "Force"
 msgstr "Tvinga"
 
-#: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:265
+#: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
+#: camlibs/ptp2/library.c:1827 camlibs/ptp2/library.c:1831
 #: camlibs/ricoh/library.c:346
 msgid "None"
 msgstr "Ingen"
 
-#: camlibs/kodak/dc210/dc210.c:269 camlibs/kodak/dc210/dc210.c:422
+#: camlibs/kodak/dc210/dc210.c:273 camlibs/kodak/dc210/dc210.c:426
 msgid "Red eye flash"
 msgstr "Röda ögon reduktion"
 
-#: camlibs/kodak/dc210/dc210.c:271 camlibs/kodak/dc210/dc210.c:275
+#: camlibs/kodak/dc210/dc210.c:275 camlibs/kodak/dc210/dc210.c:279
 #: camlibs/konica/library.c:683 camlibs/konica/library.c:690
 #: camlibs/konica/library.c:781 camlibs/konica/library.c:790
 #: camlibs/konica/library.c:1024 camlibs/konica/qm150.c:797
@@ -1682,20 +1750,21 @@ msgstr "Röda ögon reduktion"
 #: camlibs/konica/qm150.c:815 camlibs/konica/qm150.c:857
 #: camlibs/konica/qm150.c:870 camlibs/konica/qm150.c:1027
 #: camlibs/konica/qm150.c:1034 camlibs/konica/qm150.c:1041
-#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:1552
-#: camlibs/ptp2/library.c:1554 camlibs/ptp2/library.c:1566
-#: camlibs/ptp2/library.c:1759 camlibs/ptp2/library.c:1761
-#: camlibs/ptp2/library.c:1773 camlibs/ptp2/library.c:1792
-#: camlibs/ptp2/library.c:1794 camlibs/ptp2/library.c:1806
-#: camlibs/ptp2/ptp.c:1904 camlibs/ptp2/ptp.c:1905 camlibs/ptp2/ptp.c:2002
-#: camlibs/ricoh/library.c:338 camlibs/ricoh/library.c:369
-#: camlibs/sierra/nikon-desc.c:305 camlibs/sierra/sierra.c:1087
-#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1356
+#: camlibs/konica/qm150.c:1048 camlibs/ptp2/library.c:2276
+#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2290
+#: camlibs/ptp2/library.c:2383 camlibs/ptp2/library.c:2385
+#: camlibs/ptp2/library.c:2397 camlibs/ptp2/library.c:2416
+#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2430
+#: camlibs/ptp2/library.c:2838 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
+#: camlibs/ptp2/ptp.c:2391 camlibs/ricoh/library.c:338
+#: camlibs/ricoh/library.c:369 camlibs/sierra/nikon-desc.c:305
+#: camlibs/sierra/sierra.c:1112 camlibs/sierra/sierra.c:1118
+#: camlibs/sierra/sierra.c:1381
 msgid "On"
 msgstr "På"
 
-#: camlibs/kodak/dc210/dc210.c:272 camlibs/kodak/dc210/dc210.c:277
-#: camlibs/kodak/dc210/dc210.c:437 camlibs/konica/library.c:684
+#: camlibs/kodak/dc210/dc210.c:276 camlibs/kodak/dc210/dc210.c:281
+#: camlibs/kodak/dc210/dc210.c:441 camlibs/konica/library.c:684
 #: camlibs/konica/library.c:687 camlibs/konica/library.c:780
 #: camlibs/konica/library.c:787 camlibs/konica/library.c:898
 #: camlibs/konica/library.c:1022 camlibs/konica/qm150.c:798
@@ -1703,60 +1772,60 @@ msgstr "På"
 #: camlibs/konica/qm150.c:818 camlibs/konica/qm150.c:856
 #: camlibs/konica/qm150.c:863 camlibs/konica/qm150.c:1028
 #: camlibs/konica/qm150.c:1031 camlibs/konica/qm150.c:1042
-#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:1553
-#: camlibs/ptp2/library.c:1554 camlibs/ptp2/library.c:1570
-#: camlibs/ptp2/library.c:1760 camlibs/ptp2/library.c:1761
-#: camlibs/ptp2/library.c:1777 camlibs/ptp2/library.c:1793
-#: camlibs/ptp2/library.c:1794 camlibs/ptp2/library.c:1810
-#: camlibs/ptp2/library.c:2186 camlibs/ptp2/library.c:2324
-#: camlibs/ptp2/ptp.c:1904 camlibs/ptp2/ptp.c:1905 camlibs/ptp2/ptp.c:2001
-#: camlibs/ricoh/library.c:339 camlibs/ricoh/library.c:368
-#: camlibs/ricoh/library.c:376 camlibs/sierra/epson-desc.c:153
-#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304
-#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:396
-#: camlibs/sierra/olympus-desc.c:413 camlibs/sierra/olympus-desc.c:509
-#: camlibs/sierra/olympus-desc.c:673 camlibs/sierra/olympus-desc.c:757
-#: camlibs/sierra/sierra.c:972 camlibs/sierra/sierra.c:981
-#: camlibs/sierra/sierra.c:1088 camlibs/sierra/sierra.c:1091
-#: camlibs/sierra/sierra.c:1278 camlibs/sierra/sierra.c:1358
-#: camlibs/sierra/sierra.c:1482 camlibs/sierra/sierra.c:1490
-#: camlibs/sierra/sierra.c:1717
+#: camlibs/konica/qm150.c:1045 camlibs/ptp2/library.c:2277
+#: camlibs/ptp2/library.c:2278 camlibs/ptp2/library.c:2294
+#: camlibs/ptp2/library.c:2384 camlibs/ptp2/library.c:2385
+#: camlibs/ptp2/library.c:2401 camlibs/ptp2/library.c:2417
+#: camlibs/ptp2/library.c:2418 camlibs/ptp2/library.c:2434
+#: camlibs/ptp2/library.c:2837 camlibs/ptp2/library.c:2878
+#: camlibs/ptp2/library.c:2927 camlibs/ptp2/ptp.c:2293 camlibs/ptp2/ptp.c:2294
+#: camlibs/ptp2/ptp.c:2390 camlibs/ricoh/library.c:339
+#: camlibs/ricoh/library.c:368 camlibs/ricoh/library.c:376
+#: camlibs/sierra/epson-desc.c:153 camlibs/sierra/nikon-desc.c:236
+#: camlibs/sierra/nikon-desc.c:304 camlibs/sierra/nikon-desc.c:359
+#: camlibs/sierra/olympus-desc.c:396 camlibs/sierra/olympus-desc.c:413
+#: camlibs/sierra/olympus-desc.c:509 camlibs/sierra/olympus-desc.c:673
+#: camlibs/sierra/olympus-desc.c:757 camlibs/sierra/sierra.c:997
+#: camlibs/sierra/sierra.c:1006 camlibs/sierra/sierra.c:1113
+#: camlibs/sierra/sierra.c:1116 camlibs/sierra/sierra.c:1303
+#: camlibs/sierra/sierra.c:1383 camlibs/sierra/sierra.c:1507
+#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1742
 msgid "Off"
 msgstr "Av"
 
-#: camlibs/kodak/dc210/dc210.c:280
+#: camlibs/kodak/dc210/dc210.c:284
 msgid "Other"
 msgstr "Övrigt"
 
-#: camlibs/kodak/dc210/dc210.c:286
+#: camlibs/kodak/dc210/dc210.c:290
 msgid "Set clock in camera"
 msgstr "Sätt kamerans klocka."
 
-#: camlibs/kodak/dc210/dc210.c:290 camlibs/kodak/dc210/dc210.c:415
+#: camlibs/kodak/dc210/dc210.c:294 camlibs/kodak/dc210/dc210.c:419
 msgid "Port speed"
 msgstr "Porthastighet"
 
-#: camlibs/kodak/dc210/dc210.c:300 camlibs/kodak/dc210/library.c:697
+#: camlibs/kodak/dc210/dc210.c:304 camlibs/kodak/dc210/library.c:697
 msgid "Album name"
 msgstr "Albumnamn"
 
-#: camlibs/kodak/dc210/dc210.c:303
+#: camlibs/kodak/dc210/dc210.c:307
 msgid "Name to set on card when formatting."
 msgstr "Namn att sätta på kortet vid formatering."
 
-#: camlibs/kodak/dc210/dc210.c:305
+#: camlibs/kodak/dc210/dc210.c:309
 msgid "Format compact flash"
 msgstr "Formatera CompactFlash"
 
-#: camlibs/kodak/dc210/dc210.c:308
+#: camlibs/kodak/dc210/dc210.c:312
 msgid "Format card and set album name."
 msgstr "Formatera kort och sätt albumnamn"
 
-#: camlibs/kodak/dc210/dc210.c:311
+#: camlibs/kodak/dc210/dc210.c:315
 msgid "Debug"
 msgstr "Avlusning"
 
-#: camlibs/kodak/dc210/dc210.c:329
+#: camlibs/kodak/dc210/dc210.c:333
 msgid ""
 "Execute predefined command\n"
 "with parameter values."
@@ -1764,7 +1833,172 @@ msgstr ""
 "Exekvera fördefinierat kommando\n"
 "med parametervärden."
 
-#: camlibs/kodak/dc210/dc210.c:625
+#: camlibs/kodak/dc210/dc210.c:493
+#, fuzzy, c-format
+msgid "Pictures in camera: %d\n"
+msgstr "Minne i kameran: %d Mbit.\n"
+
+#: camlibs/kodak/dc210/dc210.c:497
+#, c-format
+msgid ""
+"There is space for another\n"
+"   %d low compressed\n"
+"   %d medium compressed or\n"
+"   %d high compressed pictures\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:501
+#, fuzzy, c-format
+msgid "Total pictures taken: %d\n"
+msgstr "Totalt bilder tagna: %d, Blixtar avfyrade: %d\n"
+
+#: camlibs/kodak/dc210/dc210.c:505
+#, fuzzy, c-format
+msgid "Total flashes fired: %d\n"
+msgstr "Totalt bilder tagna: %d, Blixtar avfyrade: %d\n"
+
+#: camlibs/kodak/dc210/dc210.c:509
+#, fuzzy, c-format
+msgid "Firmware: %d.%d\n"
+msgstr "Fastvaru-revision: %d.%d\n"
+
+#: camlibs/kodak/dc210/dc210.c:514
+#, fuzzy, c-format
+msgid "Filetype: JPEG ("
+msgstr "Filtyp"
+
+#: camlibs/kodak/dc210/dc210.c:516
+#, c-format
+msgid "Filetype: FlashPix ("
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:522
+#, fuzzy, c-format
+msgid "low compression, "
+msgstr "Fil kompression"
+
+#: camlibs/kodak/dc210/dc210.c:524
+#, fuzzy, c-format
+msgid "medium compression, "
+msgstr "Fil kompression"
+
+#: camlibs/kodak/dc210/dc210.c:526
+#, fuzzy, c-format
+msgid "high compression, "
+msgstr "Fil kompression"
+
+#: camlibs/kodak/dc210/dc210.c:528
+#, fuzzy, c-format
+msgid "unknown compression %d, "
+msgstr "Fil kompression"
+
+#: camlibs/kodak/dc210/dc210.c:538
+#, c-format
+msgid "unknown resolution %d)\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:551
+#, fuzzy, c-format
+msgid "AC adapter is connected.\n"
+msgstr "Linsen är inte ansluten\n"
+
+#: camlibs/kodak/dc210/dc210.c:553
+#, fuzzy, c-format
+msgid "AC adapter is not connected.\n"
+msgstr "Linsen är inte ansluten\n"
+
+#: camlibs/kodak/dc210/dc210.c:557
+msgid "Time: %a, %d %b %Y %T\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:563
+#, c-format
+msgid "Zoom: 58 mm\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:565
+#, c-format
+msgid "Zoom: 51 mm\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:567
+#, c-format
+msgid "Zoom: 41 mm\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:569
+#, c-format
+msgid "Zoom: 34 mm\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:571
+#, c-format
+msgid "Zoom: 29 mm\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:573
+#, c-format
+msgid "Zoom: macro\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:575
+#, fuzzy, c-format
+msgid "Unknown zoom mode %d\n"
+msgstr "Okänd modell"
+
+#: camlibs/kodak/dc210/dc210.c:581
+#, fuzzy, c-format
+msgid "Exposure compensation: %s\n"
+msgstr "Exponerings kompensation"
+
+#: camlibs/kodak/dc210/dc210.c:583
+#, fuzzy, c-format
+msgid "Exposure compensation: %d\n"
+msgstr "Exponerings kompensation"
+
+#: camlibs/kodak/dc210/dc210.c:588
+#, fuzzy, c-format
+msgid "Flash mode: auto, "
+msgstr "Blixt Läge"
+
+#: camlibs/kodak/dc210/dc210.c:590
+#, fuzzy, c-format
+msgid "Flash mode: force, "
+msgstr "Blixt Läge"
+
+#: camlibs/kodak/dc210/dc210.c:592
+#, fuzzy, c-format
+msgid "Flash mode: off\n"
+msgstr "Blixt Läge"
+
+#: camlibs/kodak/dc210/dc210.c:594
+#, fuzzy, c-format
+msgid "Unknown flash mode %d, "
+msgstr "Okänd modell"
+
+#: camlibs/kodak/dc210/dc210.c:602
+#, fuzzy, c-format
+msgid "red eye flash on.\n"
+msgstr "Röda ögon reduktion"
+
+#: camlibs/kodak/dc210/dc210.c:605
+#, fuzzy, c-format
+msgid "red eye flash off.\n"
+msgstr "Röda ögon reduktion"
+
+#: camlibs/kodak/dc210/dc210.c:610
+#, fuzzy, c-format
+msgid "No card in camera.\n"
+msgstr "Fel vid öppning av kameran.\n"
+
+#: camlibs/kodak/dc210/dc210.c:612
+#, c-format
+msgid ""
+"Card name: %s\n"
+"Free space on card: %d kB\n"
+msgstr ""
+
+#: camlibs/kodak/dc210/dc210.c:632
 msgid ""
 "This library has been tested with a Kodak DC 215 Zoom camera. It might work "
 "also with DC 200 and DC 210 cameras. If you happen to have such a camera, "
@@ -1778,7 +2012,7 @@ msgstr ""
 "du\n"
 "har några problem med detta drivrutinsbibliotek eller om allt fungerar bra."
 
-#: camlibs/kodak/dc210/dc210.c:637
+#: camlibs/kodak/dc210/dc210.c:644
 msgid ""
 "Camera Library for the Kodak DC215 Zoom camera.\n"
 "Michael Koltan <koltan@gmx.de>\n"
@@ -2151,8 +2385,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:869 camlibs/sierra/sierra.c:1201
-#: camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1761
+#: camlibs/sierra/sierra.c:894 camlibs/sierra/sierra.c:1226
+#: camlibs/sierra/sierra.c:1577 camlibs/sierra/sierra.c:1786
 msgid "Resolution"
 msgstr "Upplösning"
 
@@ -2177,7 +2411,7 @@ msgstr "Lokalisering"
 
 #: camlibs/konica/library.c:744 camlibs/konica/library.c:951
 #: camlibs/sierra/epson-desc.c:246 camlibs/sierra/nikon-desc.c:434
-#: camlibs/sierra/sierra.c:1628 camlibs/sierra/sierra.c:1812
+#: camlibs/sierra/sierra.c:1653 camlibs/sierra/sierra.c:1837
 msgid "Language"
 msgstr "Språk"
 
@@ -2245,8 +2479,8 @@ msgid "Focus"
 msgstr "Fokus"
 
 #: camlibs/konica/library.c:813 camlibs/konica/library.c:820
-#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1509
-#: camlibs/sierra/sierra.c:1515 camlibs/sierra/sierra.c:1735
+#: camlibs/sierra/epson-desc.c:170 camlibs/sierra/sierra.c:1534
+#: camlibs/sierra/sierra.c:1540 camlibs/sierra/sierra.c:1760
 msgid "Fixed"
 msgstr "Fast"
 
@@ -2270,13 +2504,13 @@ msgstr "Självutlösare (endast nästa bild)"
 #: camlibs/minolta/dimagev/dimagev.c:405 camlibs/ricoh/library.c:348
 #: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253
 #: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:376
-#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:940
-#: camlibs/sierra/sierra.c:947 camlibs/sierra/sierra.c:1001
-#: camlibs/sierra/sierra.c:1008 camlibs/sierra/sierra.c:1063
-#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1253
-#: camlibs/sierra/sierra.c:1296 camlibs/sierra/sierra.c:1340
-#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1539
-#: camlibs/sierra/sierra.c:1752
+#: camlibs/sierra/olympus-desc.c:511 camlibs/sierra/sierra.c:965
+#: camlibs/sierra/sierra.c:972 camlibs/sierra/sierra.c:1026
+#: camlibs/sierra/sierra.c:1033 camlibs/sierra/sierra.c:1088
+#: camlibs/sierra/sierra.c:1094 camlibs/sierra/sierra.c:1278
+#: camlibs/sierra/sierra.c:1321 camlibs/sierra/sierra.c:1365
+#: camlibs/sierra/sierra.c:1560 camlibs/sierra/sierra.c:1564
+#: camlibs/sierra/sierra.c:1777
 #, c-format
 msgid "Normal"
 msgstr "Normal"
@@ -2343,21 +2577,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:203 camlibs/sierra/sierra.c:911
-#: camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:1236
+#: camlibs/sierra/nikon-desc.c:203 camlibs/sierra/sierra.c:936
+#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:1261
 msgid "Low"
 msgstr "Låg"
 
 #: camlibs/konica/qm150.c:780 camlibs/konica/qm150.c:790
-#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:912
-#: camlibs/sierra/sierra.c:920 camlibs/sierra/sierra.c:1238
+#: camlibs/sierra/nikon-desc.c:204 camlibs/sierra/sierra.c:937
+#: camlibs/sierra/sierra.c:945 camlibs/sierra/sierra.c:1263
 msgid "Medium"
 msgstr "Medium"
 
 #: camlibs/konica/qm150.c:781 camlibs/konica/qm150.c:784
-#: camlibs/sierra/sierra.c:872 camlibs/sierra/sierra.c:880
-#: camlibs/sierra/sierra.c:913 camlibs/sierra/sierra.c:922
-#: camlibs/sierra/sierra.c:1209 camlibs/sierra/sierra.c:1240
+#: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:905
+#: camlibs/sierra/sierra.c:938 camlibs/sierra/sierra.c:947
+#: camlibs/sierra/sierra.c:1234 camlibs/sierra/sierra.c:1265
 msgid "High"
 msgstr "Hög"
 
@@ -2398,7 +2632,7 @@ msgstr "Av"
 msgid "Day-lt"
 msgstr "Dagsljus"
 
-#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1588
+#: camlibs/konica/qm150.c:981 camlibs/ptp2/ptp.c:1976
 msgid "Sharpness"
 msgstr ""
 
@@ -2432,9 +2666,10 @@ msgid "Black and White"
 msgstr "Svartvit"
 
 #: camlibs/konica/qm150.c:1004 camlibs/konica/qm150.c:1020
-#: camlibs/ptp2/library.c:2328 camlibs/ricoh/library.c:331
-#: camlibs/sierra/olympus-desc.c:378 camlibs/sierra/sierra.c:942
-#: camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:1257
+#: camlibs/ptp2/library.c:2762 camlibs/ptp2/library.c:2931
+#: camlibs/ricoh/library.c:331 camlibs/sierra/olympus-desc.c:378
+#: camlibs/sierra/sierra.c:967 camlibs/sierra/sierra.c:976
+#: camlibs/sierra/sierra.c:1282
 msgid "Sepia"
 msgstr "Sepiabrunt"
 
@@ -2558,35 +2793,49 @@ msgstr ""
 "\n"
 "Hanterar Largan Lmini kamror.\n"
 
-#: camlibs/mars/library.c:112
+#: camlibs/lg_gsm/library.c:102
+#, c-format
+msgid ""
+"Your USB camera seems to be a LG GSM.\n"
+"Firmware         = %s\n"
+"Firmware Version = %s\n"
+msgstr ""
+
+#: camlibs/lg_gsm/library.c:114
+msgid ""
+"LG GSM generic driver\n"
+"Guillaume Bedot <littletux@zarb.org>\n"
+msgstr ""
+
+#: camlibs/mars/library.c:116
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
 "There is %i photo in it. \n"
 msgstr ""
 
-#: camlibs/mars/library.c:116
+#: camlibs/mars/library.c:120
 #, c-format
 msgid ""
 "Mars MR97310 camera.\n"
 "There are %i photos in it. \n"
 msgstr ""
 
-#: camlibs/mars/library.c:128
+#: camlibs/mars/library.c:132
 msgid ""
 "This driver supports cameras with Mars MR97310 chip (and direct\n"
 "equivalents ??Pixart PACx07??) and should work with gtkam.\n"
-"The driver allows you to get\n"
-"   - thumbnails for gtkam\n"
-"   - full images (640x480 or 320x240PPM format) (??352x288 & 176x144??)\n"
 "The camera does not support deletion of photos, nor uploading\n"
-"of data. This driver does not support the optional photo\n"
-"compression mode.\n"
+"of data. \n"
+"Decoding of compressed photos may or may not work well\n"
+"and does not work equally well for all supported cameras.\n"
+"Photo data processing for Argus QuickClix is NOT SUPPORTED.\n"
 "If present on the camera, video clip frames are downloaded \n"
 "as consecutive still photos.\n"
+"For further details please consult libgphoto2/camlibs/README.\n"
 msgstr ""
 
-#: camlibs/mars/library.c:149
+#: camlibs/mars/library.c:153
 msgid ""
 "Mars MR97310 camera library\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -2630,7 +2879,8 @@ msgstr ""
 "Kort-ID:\t\t%d\n"
 "Blixtläge:\t\t"
 
-#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/ptp.c:1994
+#: camlibs/minolta/dimagev/dimagev.c:297 camlibs/ptp2/library.c:2721
+#: camlibs/ptp2/ptp.c:2383
 msgid "Remote"
 msgstr "Fjärr"
 
@@ -2640,26 +2890,26 @@ msgstr "Lokal"
 
 #: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
 #: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2295
 msgid "Yes"
 msgstr "Ja"
 
 #: camlibs/minolta/dimagev/dimagev.c:298 camlibs/minolta/dimagev/dimagev.c:300
 #: camlibs/minolta/dimagev/dimagev.c:304 camlibs/minolta/dimagev/dimagev.c:307
-#: camlibs/ptp2/ptp.c:1906
+#: camlibs/ptp2/ptp.c:2295
 msgid "No"
 msgstr "Nej"
 
 #: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/nikon-desc.c:283
-#: camlibs/sierra/sierra.c:1554 camlibs/sierra/sierra.c:1561
-#: camlibs/sierra/sierra.c:1766
+#: camlibs/sierra/sierra.c:1579 camlibs/sierra/sierra.c:1586
+#: camlibs/sierra/sierra.c:1791
 msgid "Fine"
 msgstr "Fin"
 
-#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/sierra/sierra.c:871
-#: camlibs/sierra/sierra.c:878 camlibs/sierra/sierra.c:1207
-#: camlibs/sierra/sierra.c:1553 camlibs/sierra/sierra.c:1559
-#: camlibs/sierra/sierra.c:1764
+#: camlibs/minolta/dimagev/dimagev.c:305 camlibs/ptp2/library.c:2760
+#: camlibs/sierra/sierra.c:896 camlibs/sierra/sierra.c:903
+#: camlibs/sierra/sierra.c:1232 camlibs/sierra/sierra.c:1578
+#: camlibs/sierra/sierra.c:1584 camlibs/sierra/sierra.c:1789
 msgid "Standard"
 msgstr "Standard"
 
@@ -2705,7 +2955,7 @@ msgid "Not Full"
 msgstr "Inte full"
 
 #: camlibs/minolta/dimagev/dimagev.c:365 camlibs/minolta/dimagev/dimagev.c:408
-#: camlibs/ptp2/ptp.c:2008
+#: camlibs/ptp2/ptp.c:2397
 #, c-format
 msgid "Full"
 msgstr "Full"
@@ -2888,7 +3138,7 @@ msgstr ""
 "Filstorleken är %i bytes. Den största fil som kan laddas upp är: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:474 camlibs/panasonic/dc1580.c:597
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ptp2/library.c:736 camlibs/ricoh/ricoh.c:837
 msgid "Uploading..."
 msgstr "Uppladdning..."
 
@@ -3057,7 +3307,7 @@ msgstr ""
 msgid "Model: %x, %x, %x, %x"
 msgstr ""
 
-#: camlibs/polaroid/pdc640.c:896
+#: camlibs/polaroid/pdc640.c:903
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
 "Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
@@ -3066,13 +3316,13 @@ msgid ""
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 
-#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:2548
-#: camlibs/ptp2/library.c:2549 camlibs/ptp2/ptp.c:1621
+#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/library.c:3178
+#: camlibs/ptp2/library.c:3179 camlibs/ptp2/ptp.c:2009
 msgid "Image Quality"
 msgstr "Bildkvalitet"
 
-#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:2550
-#: camlibs/ptp2/library.c:2551 camlibs/ptp2/ptp.c:1568 camlibs/ptp2/ptp.c:1622
+#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/library.c:3180
+#: camlibs/ptp2/library.c:3181 camlibs/ptp2/ptp.c:1956 camlibs/ptp2/ptp.c:2010
 msgid "Image Size"
 msgstr "Bildstorlek"
 
@@ -3088,11 +3338,11 @@ msgstr "Automatisk avstängning (minuter)"
 msgid "Information"
 msgstr "Information"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1848
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2472
 msgid "normal"
 msgstr "normal"
 
-#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:1849
+#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/library.c:2473
 msgid "fine"
 msgstr "fin"
 
@@ -3100,21 +3350,21 @@ msgstr "fin"
 msgid "superfine"
 msgstr "extrafin"
 
-#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:1891
-#: camlibs/ptp2/library.c:2060 camlibs/ptp2/library.c:2368
-#: camlibs/sierra/epson-desc.c:116 camlibs/sierra/sierra.c:1452
-#: camlibs/sierra/sierra.c:1466 camlibs/sierra/sierra.c:1701
+#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/library.c:2482
+#: camlibs/ptp2/library.c:2938 camlibs/sierra/epson-desc.c:116
+#: camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1491
+#: camlibs/sierra/sierra.c:1726
 msgid "auto"
 msgstr "auto"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:1892 camlibs/sierra/nikon-desc.c:565
+#: camlibs/ptp2/library.c:2483 camlibs/sierra/nikon-desc.c:565
 #: camlibs/sierra/nikon-desc.c:570
 msgid "on"
 msgstr "på"
 
 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170
-#: camlibs/ptp2/library.c:1890 camlibs/sierra/nikon-desc.c:564
+#: camlibs/ptp2/library.c:2481 camlibs/sierra/nikon-desc.c:564
 #: camlibs/sierra/nikon-desc.c:569
 msgid "off"
 msgstr "av"
@@ -3232,168 +3482,168 @@ 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:148
+#: camlibs/ptp2/library.c:147
 msgid "PTP Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/library.c:149
+#: camlibs/ptp2/library.c:148
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:150
+#: camlibs/ptp2/library.c:149
 msgid "PTP General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/library.c:151
+#: camlibs/ptp2/library.c:150
 msgid "PTP Session Not Open"
 msgstr "PTP sessionen inte öppen"
 
-#: camlibs/ptp2/library.c:152
+#: camlibs/ptp2/library.c:151
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/library.c:153
+#: camlibs/ptp2/library.c:152
 msgid "PTP Operation Not Supported"
 msgstr "PTP operationen stöds ej"
 
-#: camlibs/ptp2/library.c:154
+#: camlibs/ptp2/library.c:153
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter stöds ej"
 
-#: camlibs/ptp2/library.c:155
+#: camlibs/ptp2/library.c:154
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ofullständig överföring"
 
-#: camlibs/ptp2/library.c:156
+#: camlibs/ptp2/library.c:155
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/library.c:157
+#: camlibs/ptp2/library.c:156
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/library.c:158
+#: camlibs/ptp2/library.c:157
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhet egenskap stöds ej"
 
-#: camlibs/ptp2/library.c:159
+#: camlibs/ptp2/library.c:158
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/library.c:160
+#: camlibs/ptp2/library.c:159
 msgid "PTP Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/library.c:161
+#: camlibs/ptp2/library.c:160
 msgid "PTP Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/library.c:162
+#: camlibs/ptp2/library.c:161
 msgid "PTP Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/library.c:163
+#: camlibs/ptp2/library.c:162
 msgid "PTP Access Denied"
 msgstr "PTP åtkomst nekad"
 
-#: camlibs/ptp2/library.c:164
+#: camlibs/ptp2/library.c:163
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen minibild tillgänglig"
 
-#: camlibs/ptp2/library.c:165
+#: camlibs/ptp2/library.c:164
 msgid "PTP Self Test Failed"
 msgstr "PTP självtest misslyckades"
 
-#: camlibs/ptp2/library.c:166
+#: camlibs/ptp2/library.c:165
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/library.c:167
+#: camlibs/ptp2/library.c:166
 msgid "PTP Store Not Available"
 msgstr "PTP lagring inte tillgänglig"
 
-#: camlibs/ptp2/library.c:169
+#: camlibs/ptp2/library.c:168
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation av format stöds ej"
 
-#: camlibs/ptp2/library.c:170
+#: camlibs/ptp2/library.c:169
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/library.c:171
+#: camlibs/ptp2/library.c:170
 msgid "PTP Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/library.c:172
+#: camlibs/ptp2/library.c:171
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP okänd tillvekarkod"
 
-#: camlibs/ptp2/library.c:174
+#: camlibs/ptp2/library.c:173
 msgid "PTP Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/library.c:175
+#: camlibs/ptp2/library.c:174
 #, fuzzy
 msgid "PTP Device Busy"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/library.c:176
+#: camlibs/ptp2/library.c:175
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ogiltigt förändra objekt"
 
-#: camlibs/ptp2/library.c:177
+#: camlibs/ptp2/library.c:176
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/library.c:178
+#: camlibs/ptp2/library.c:177
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter värde"
 
-#: camlibs/ptp2/library.c:179
+#: camlibs/ptp2/library.c:178
 msgid "PTP Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/library.c:180
+#: camlibs/ptp2/library.c:179
 msgid "PTP Session Already Opened"
 msgstr "PTP sessionen redan öppen"
 
-#: camlibs/ptp2/library.c:181
+#: camlibs/ptp2/library.c:180
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/library.c:183
+#: camlibs/ptp2/library.c:182
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare stöds ej"
 
-#: camlibs/ptp2/library.c:184
+#: camlibs/ptp2/library.c:183
 msgid "PTP EK Filename Required"
 msgstr "PTP EK filnamn krävs"
 
-#: camlibs/ptp2/library.c:185
+#: camlibs/ptp2/library.c:184
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/library.c:186
+#: camlibs/ptp2/library.c:185
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/library.c:188
+#: camlibs/ptp2/library.c:187
 msgid "PTP I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/library.c:189
+#: camlibs/ptp2/library.c:188
 msgid "PTP Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/library.c:190
+#: camlibs/ptp2/library.c:189
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollfel, data föråldrat"
 
-#: camlibs/ptp2/library.c:191
+#: camlibs/ptp2/library.c:190
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollfel, svar förväntat"
 
-#: camlibs/ptp2/library.c:767
+#: camlibs/ptp2/library.c:916
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3401,71 +3651,76 @@ msgid ""
 "Enjoy!"
 msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
 
-#: camlibs/ptp2/library.c:838 camlibs/ptp2/library.c:927
+#: camlibs/ptp2/library.c:986 camlibs/ptp2/library.c:1075
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon capture"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:963
+#: camlibs/ptp2/library.c:1109
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:968
+#: camlibs/ptp2/library.c:1114
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:973
+#: camlibs/ptp2/library.c:1119
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:983
+#: camlibs/ptp2/library.c:1129
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1038
+#: camlibs/ptp2/library.c:1231
+#, fuzzy
+msgid "Sorry, your camera does not support Nikon capture"
+msgstr "Din kamera stödjer inte ändring av filnamn."
+
+#: camlibs/ptp2/library.c:1292
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Captureinitiation"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1052
+#: camlibs/ptp2/library.c:1306
 #, c-format
 msgid "Canon Capture failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1111
+#: camlibs/ptp2/library.c:1400
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Din kamera stödjer inte ändring av filnamn."
 
-#: camlibs/ptp2/library.c:1159
+#: camlibs/ptp2/library.c:1448
 msgid "Capture command completed, but no confirmation received"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1166
+#: camlibs/ptp2/library.c:1455
 #, c-format
 msgid "Received event 0x%04x"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1258
+#: camlibs/ptp2/library.c:1547
 #, fuzzy
 msgid "read only"
 msgstr "redo"
 
-#: camlibs/ptp2/library.c:1259
+#: camlibs/ptp2/library.c:1548
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1260 camlibs/ptp2/library.c:1262
-#: camlibs/ptp2/ptp.c:2031
+#: camlibs/ptp2/library.c:1549 camlibs/ptp2/library.c:1551
+#: camlibs/ptp2/ptp.c:2420
 #, fuzzy
 msgid "Unknown"
 msgstr "%i (okänd)"
 
-#: camlibs/ptp2/library.c:1304
+#: camlibs/ptp2/library.c:1679
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3475,1361 +3730,1820 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1461 camlibs/ptp2/library.c:1478
-#: camlibs/ptp2/library.c:1584
+#: camlibs/ptp2/library.c:1697
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Capture Formats: "
+msgstr "Datumformat"
+
+#: camlibs/ptp2/library.c:1711
+#, fuzzy, c-format
+msgid "Display Formats: "
+msgstr "Datumformat"
+
+#: camlibs/ptp2/library.c:1727
+#, c-format
+msgid "Supported MTP Object Properties:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1743
+#, c-format
+msgid " PTP error %04x on query"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1760
+#, c-format
+msgid ""
+"\n"
+"Device Capabilities:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1764
+#, c-format
+msgid "\tFile Download, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1767
+#, fuzzy, c-format
+msgid "File Deletion, "
+msgstr "Fil upplösning"
+
+#: camlibs/ptp2/library.c:1769
+#, fuzzy, c-format
+msgid "No File Deletion, "
+msgstr "Fil upplösning"
+
+#: camlibs/ptp2/library.c:1773
+#, fuzzy, c-format
+msgid "File Upload\n"
+msgstr "Laddar upp fil..."
+
+#: camlibs/ptp2/library.c:1775
+#, c-format
+msgid "No File Upload\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1780
+#, c-format
+msgid "\tGeneric Image Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1782
+#, c-format
+msgid "\tNo Image Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1785
+#, fuzzy, c-format
+msgid "Open Capture, "
+msgstr "Foto"
+
+#: camlibs/ptp2/library.c:1787
+#, c-format
+msgid "No Open Capture, "
+msgstr ""
+
+#: camlibs/ptp2/library.c:1793
+#, fuzzy, c-format
+msgid "Canon Capture\n"
+msgstr "Foto"
+
+#: camlibs/ptp2/library.c:1797
+#, fuzzy, c-format
+msgid "Nikon Capture\n"
+msgstr "Foto"
+
+#: camlibs/ptp2/library.c:1799
+#, c-format
+msgid "No vendor specific capture\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1811
+#, c-format
+msgid ""
+"\n"
+"Storage Devices Summary:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1826
+#, c-format
+msgid "\tStorageDescription: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1830
+#, c-format
+msgid "\tVolumeLabel: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1836 camlibs/ptp2/library.c:1850
+#: camlibs/ptp2/library.c:2887
+#, fuzzy
+msgid "Undefined"
+msgstr "PTP odefinierat fel"
+
+#: camlibs/ptp2/library.c:1837
+msgid "Builtin ROM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1838
+msgid "Removable ROM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1839
+msgid "Builtin RAM"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1840
+msgid "Removable RAM (memory card)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1842 camlibs/ptp2/library.c:1855
+#: camlibs/ptp2/library.c:1867
+#, fuzzy, c-format
+msgid "Unknown: 0x%04x\n"
+msgstr "okänd  (0x%02x)"
+
+#: camlibs/ptp2/library.c:1846
+#, c-format
+msgid "\tStorage Type: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1851
+#, fuzzy
+msgid "Generic Flat"
+msgstr "Generellt"
+
+#: camlibs/ptp2/library.c:1852
+msgid "Generic Hierarchical"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1853
+msgid "Digital Camera Layout (DCIM)"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1859
+#, c-format
+msgid "\tFilesystemtype: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1863
+msgid "Read-Write"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1864
+#, fuzzy
+msgid "Read-Only"
+msgstr "Klar"
+
+#: camlibs/ptp2/library.c:1865
+msgid "Read Only with Object deletion"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1871
+#, c-format
+msgid "\tAccess Capability: %s\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1873
+#, c-format
+msgid "\tMaximum Capability: %llu (%lu MB)\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1878
+#, c-format
+msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:1883
+#, fuzzy, c-format
+msgid "\tFree Space (Images): %d\n"
+msgstr "Antal bilder: %d\n"
+
+#: camlibs/ptp2/library.c:1888
+#, c-format
+msgid ""
+"\n"
+"Device Property Summary:\n"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2056 camlibs/ptp2/library.c:2082
+#: camlibs/ptp2/library.c:2130 camlibs/ptp2/library.c:2156
+#, fuzzy, c-format
+msgid "Unknown value %04x"
+msgstr "Okänd filtyp %i."
+
+#: camlibs/ptp2/library.c:2185 camlibs/ptp2/library.c:2202
+#: camlibs/ptp2/library.c:2308
 #, fuzzy, c-format
 msgid "unexpected datatype %i"
 msgstr "FEL: oväntad pakettyp."
 
-#: camlibs/ptp2/library.c:1593 camlibs/ptp2/ptp.c:2006
-#: camlibs/sierra/olympus-desc.c:490
+#: camlibs/ptp2/library.c:2318 camlibs/ptp2/library.c:2888
+#: camlibs/ptp2/ptp.c:2395 camlibs/sierra/olympus-desc.c:490
 #, fuzzy
 msgid "Manual"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/library.c:1594
+#: camlibs/ptp2/library.c:2319 camlibs/ptp2/library.c:2889
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:1595
+#: camlibs/ptp2/library.c:2320
 #, fuzzy
 msgid "One-push Automatic"
 msgstr "Automatisk\n"
 
-#: camlibs/ptp2/library.c:1596 camlibs/ptp2/library.c:2228
-#: camlibs/ptp2/ptp.c:1958 camlibs/sierra/olympus-desc.c:431
+#: camlibs/ptp2/library.c:2321 camlibs/ptp2/library.c:2897
+#: camlibs/ptp2/ptp.c:2347 camlibs/sierra/olympus-desc.c:431
 #: camlibs/sierra/olympus-desc.c:450 camlibs/sierra/olympus-desc.c:469
 #, fuzzy
 msgid "Daylight"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:1597 camlibs/ptp2/library.c:2231
-#: camlibs/ptp2/ptp.c:1957 camlibs/ricoh/library.c:328
+#: camlibs/ptp2/library.c:2322 camlibs/ptp2/library.c:2900
+#: camlibs/ptp2/ptp.c:2346 camlibs/ricoh/library.c:328
 #: camlibs/sierra/nikon-desc.c:285 camlibs/sierra/olympus-desc.c:432
-#: camlibs/sierra/olympus-desc.c:451 camlibs/sierra/sierra.c:1033
-#: camlibs/sierra/sierra.c:1042 camlibs/sierra/sierra.c:1321
+#: camlibs/sierra/olympus-desc.c:451 camlibs/sierra/sierra.c:1058
+#: camlibs/sierra/sierra.c:1067 camlibs/sierra/sierra.c:1346
 msgid "Fluorescent"
 msgstr "Lysrör"
 
-#: camlibs/ptp2/library.c:1598 camlibs/ptp2/library.c:2230
+#: camlibs/ptp2/library.c:2323 camlibs/ptp2/library.c:2899
 #: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:452
-#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1034
-#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1323
+#: camlibs/sierra/olympus-desc.c:470 camlibs/sierra/sierra.c:1059
+#: camlibs/sierra/sierra.c:1069 camlibs/sierra/sierra.c:1348
 msgid "Tungsten"
 msgstr "Glödlampa"
 
-#: camlibs/ptp2/library.c:1600 camlibs/ptp2/library.c:2229
-#: camlibs/ptp2/ptp.c:1960 camlibs/sierra/nikon-desc.c:288
+#: camlibs/ptp2/library.c:2325 camlibs/ptp2/library.c:2898
+#: camlibs/ptp2/ptp.c:2349 camlibs/sierra/nikon-desc.c:288
 #: camlibs/sierra/olympus-desc.c:434 camlibs/sierra/olympus-desc.c:453
-#: camlibs/sierra/olympus-desc.c:474 camlibs/sierra/sierra.c:1035
-#: camlibs/sierra/sierra.c:1047 camlibs/sierra/sierra.c:1325
+#: camlibs/sierra/olympus-desc.c:474 camlibs/sierra/sierra.c:1060
+#: camlibs/sierra/sierra.c:1072 camlibs/sierra/sierra.c:1350
 msgid "Cloudy"
 msgstr "Mulet"
 
-#: camlibs/ptp2/library.c:1601 camlibs/ptp2/ptp.c:1961
+#: camlibs/ptp2/library.c:2326 camlibs/ptp2/ptp.c:2350
 msgid "Shade"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1602 camlibs/ptp2/ptp.c:1962
+#: camlibs/ptp2/library.c:2327 camlibs/ptp2/ptp.c:2351
 #: camlibs/sierra/nikon-desc.c:287
 #, fuzzy
 msgid "Preset"
 msgstr "Portugiska"
 
-#: camlibs/ptp2/library.c:1661 camlibs/ptp2/ptp.c:1950
+#: camlibs/ptp2/library.c:2335 camlibs/ptp2/ptp.c:2339
 msgid "JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1662
+#: camlibs/ptp2/library.c:2336
 #, fuzzy
 msgid "JPEG Normal"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:1663 camlibs/ptp2/ptp.c:1952
+#: camlibs/ptp2/library.c:2337 camlibs/ptp2/ptp.c:2341
 #, fuzzy
 msgid "JPEG Fine"
 msgstr "JPEG"
 
-#: camlibs/ptp2/library.c:1664
+#: camlibs/ptp2/library.c:2338
 msgid "NEF (Raw)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1665
+#: camlibs/ptp2/library.c:2339
 msgid "NEF+BASIC"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1850
+#: camlibs/ptp2/library.c:2474
 #, fuzzy
 msgid "super fine"
 msgstr "extrafin"
 
-#: camlibs/ptp2/library.c:1893
+#: camlibs/ptp2/library.c:2484
 msgid "auto red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1894
+#: camlibs/ptp2/library.c:2485
 msgid "on red eye"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1934
+#: camlibs/ptp2/library.c:2492
 msgid "spot"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2059
+#: camlibs/ptp2/library.c:2551
 #, fuzzy
-msgid "center"
+msgid "Center"
 msgstr "Foto"
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2558
 #, fuzzy
 msgid "large"
 msgstr "Bild"
 
-#: camlibs/ptp2/library.c:2100
+#: camlibs/ptp2/library.c:2559
 #, fuzzy
 msgid "medium 1"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2101
+#: camlibs/ptp2/library.c:2560
 #, fuzzy
 msgid "medium 2"
 msgstr "Medium"
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2561
 msgid "small"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2142 camlibs/ptp2/library.c:2272
+#: camlibs/ptp2/library.c:2568 camlibs/ptp2/library.c:2908
 #, fuzzy
 msgid "Factory Default"
 msgstr "Dagsljus"
 
-#: camlibs/ptp2/library.c:2188
+#: camlibs/ptp2/library.c:2702
+msgid "Creative"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2703
+#, fuzzy
+msgid "Action"
+msgstr "Auto"
+
+#: camlibs/ptp2/library.c:2704 camlibs/ptp2/library.c:2706
+#: camlibs/ptp2/ptp.c:2374
+#, fuzzy
+msgid "Portrait"
+msgstr "Kontrast-"
+
+#: camlibs/ptp2/library.c:2707 camlibs/ptp2/ptp.c:2375
+msgid "Landscape"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2709 camlibs/ptp2/ptp.c:2377
+msgid "Sports"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2710 camlibs/ptp2/ptp.c:2379
+msgid "Night Portrait"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2711 camlibs/ptp2/ptp.c:2378
+msgid "Night Landscape"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2717 camlibs/ptp2/ptp.c:2380
+msgid "Single Shot"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2718
+#, fuzzy
+msgid "Burst"
+msgstr "Bäst"
+
+#: camlibs/ptp2/library.c:2719
+msgid "Timelapse"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2720 camlibs/ptp2/ptp.c:2382
+#, fuzzy
+msgid "Timer"
+msgstr "Självutlösare"
+
+#: camlibs/ptp2/library.c:2722 camlibs/ptp2/ptp.c:2384
+#, fuzzy
+msgid "Timer + Remote"
+msgstr "Fjärr"
+
+#: camlibs/ptp2/library.c:2728 camlibs/ptp2/ptp.c:2357
+msgid "Dynamic Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2729 camlibs/ptp2/ptp.c:2358
+msgid "Single Area"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2730 camlibs/ptp2/ptp.c:2359
+msgid "Closest Subject"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2736
+msgid "Average"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2737 camlibs/ptp2/ptp.c:2366
+msgid "Center Weighted"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2738
+msgid "Multi Spot"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2739
+msgid "Center Spot"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2745
+#, fuzzy
+msgid "Automatic Flash"
+msgstr "Automatisk\n"
+
+#: camlibs/ptp2/library.c:2746
+#, fuzzy
+msgid "Flash off"
+msgstr "Blixt Läge"
+
+#: camlibs/ptp2/library.c:2747
+#, fuzzy
+msgid "Fill flash"
+msgstr "Blixt"
+
+#: camlibs/ptp2/library.c:2748
+#, fuzzy
+msgid "Red-eye automatic"
+msgstr "Röda-Ögon Reduktion"
+
+#: camlibs/ptp2/library.c:2749
+#, fuzzy
+msgid "Red-eye fill"
+msgstr "Röda ögon reduktion"
+
+#: camlibs/ptp2/library.c:2750
+#, fuzzy
+msgid "External sync"
+msgstr "externt"
+
+#: camlibs/ptp2/library.c:2751 camlibs/ptp2/ptp.c:2352
+#, fuzzy
+msgid "Default"
+msgstr "Dagsljus"
+
+#: camlibs/ptp2/library.c:2752 camlibs/ptp2/ptp.c:2355
+#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:999
+#: camlibs/sierra/sierra.c:1010 camlibs/sierra/sierra.c:1307
+#: camlibs/sierra/sierra.c:1509 camlibs/sierra/sierra.c:1519
+#: camlibs/sierra/sierra.c:1746
+msgid "Slow Sync"
+msgstr "Långsam Synk"
+
+#: camlibs/ptp2/library.c:2753 camlibs/ptp2/ptp.c:2356
+msgid "Rear Curtain Sync + Slow Sync"
+msgstr ""
+
+#: camlibs/ptp2/library.c:2754 camlibs/ptp2/ptp.c:2354
+#, fuzzy
+msgid "Red-eye Reduction + Slow Sync"
+msgstr "Röda-Ögon Reduktion"
+
+#: camlibs/ptp2/library.c:2761 camlibs/ricoh/library.c:330
+#: camlibs/sierra/epson-desc.c:137
+msgid "Black & White"
+msgstr "Svartvit"
+
+#: camlibs/ptp2/library.c:2880
 #, fuzzy
 msgid "Long distance"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:2232
+#: camlibs/ptp2/library.c:2890
+#, fuzzy
+msgid "Automatic Macro"
+msgstr "Automatisk\n"
+
+#: camlibs/ptp2/library.c:2901
 #, fuzzy
 msgid "Fluorescent H"
 msgstr "Lysrör"
 
-#: camlibs/ptp2/library.c:2233 camlibs/sierra/epson-desc.c:171
-#: camlibs/sierra/sierra.c:1510 camlibs/sierra/sierra.c:1517
-#: camlibs/sierra/sierra.c:1737
+#: camlibs/ptp2/library.c:2902 camlibs/sierra/epson-desc.c:171
+#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1542
+#: camlibs/sierra/sierra.c:1762
 msgid "Custom"
 msgstr "Annan"
 
-#: camlibs/ptp2/library.c:2325
+#: camlibs/ptp2/library.c:2928
 msgid "Vivid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2326
+#: camlibs/ptp2/library.c:2929
 #, fuzzy
 msgid "Neutral"
 msgstr "Normal"
 
-#: camlibs/ptp2/library.c:2327
+#: camlibs/ptp2/library.c:2930
 #, fuzzy
 msgid "Low sharpening"
 msgstr "Laddar"
 
-#: camlibs/ptp2/library.c:2329
+#: camlibs/ptp2/library.c:2932
 #, fuzzy
 msgid "Black & white"
 msgstr "Svartvit"
 
-#: camlibs/ptp2/library.c:2533 camlibs/ptp2/ptp.c:1638
+#: camlibs/ptp2/library.c:3121
+#, fuzzy
+msgid "Internal RAM"
+msgstr "internt"
+
+#: camlibs/ptp2/library.c:3122
+#, fuzzy
+msgid "Memory card"
+msgstr "Inget kort"
+
+#: camlibs/ptp2/library.c:3160 camlibs/ptp2/ptp.c:2025
 #, fuzzy
 msgid "Camera Owner"
 msgstr "Kamera OK.\n"
 
-#: camlibs/ptp2/library.c:2534 camlibs/ptp2/ptp.c:1637
+#: camlibs/ptp2/library.c:3161 camlibs/ptp2/ptp.c:2024
 #, fuzzy
 msgid "Camera Model"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/ptp2/library.c:2535 camlibs/ptp2/ptp.c:1636
+#: camlibs/ptp2/library.c:3162 camlibs/ptp2/ptp.c:2023
 #, fuzzy
-msgid "Flash Memory"
-msgstr "Blixt Läge"
+msgid "Firmware Version"
+msgstr "Fastvaru-revision: %d.%d\n"
 
-#: camlibs/ptp2/library.c:2536 camlibs/ptp2/library.c:2537
+#: camlibs/ptp2/library.c:3163 camlibs/ptp2/library.c:3164
 #, fuzzy
 msgid "Camera Time"
 msgstr "Kamera"
 
-#: camlibs/ptp2/library.c:2538 camlibs/ptp2/ptp.c:1608 camlibs/ptp2/ptp.c:1619
+#: camlibs/ptp2/library.c:3165 camlibs/ptp2/ptp.c:1996 camlibs/ptp2/ptp.c:2007
 #, fuzzy
 msgid "Beep Mode"
 msgstr "LED-läge"
 
-#: camlibs/ptp2/library.c:2539
+#: camlibs/ptp2/library.c:3166
 #, fuzzy
 msgid "Image Comment"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/library.c:2547
-msgid "Long Exp Noise Reduction"
+#: camlibs/ptp2/library.c:3169
+msgid "Fast Filesystem"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2552 camlibs/ptp2/ptp.c:1630
-#: camlibs/sierra/olympus-desc.c:698 camlibs/sierra/olympus-desc.c:716
+#: camlibs/ptp2/library.c:3170 camlibs/ptp2/library.c:3171
+#, fuzzy
+msgid "Capture Target"
+msgstr "Bildinställningar"
+
+#: camlibs/ptp2/library.c:3182 camlibs/ptp2/library.c:3201
+#: camlibs/ptp2/ptp.c:2017 camlibs/sierra/olympus-desc.c:698
+#: camlibs/sierra/olympus-desc.c:716
 msgid "ISO Speed"
 msgstr "ISO hastighet"
 
-#: camlibs/ptp2/library.c:2553 camlibs/ptp2/ptp.c:1627
+#: camlibs/ptp2/library.c:3183 camlibs/ptp2/library.c:3184
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Vitbalans"
+
+#: camlibs/ptp2/library.c:3185 camlibs/ptp2/ptp.c:2028
+msgid "Photo Effect"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3190
+msgid "Long Exp Noise Reduction"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3191
+#, fuzzy
+msgid "Auto Focus Mode"
+msgstr "Fokusläge"
+
+#: camlibs/ptp2/library.c:3193 camlibs/ptp2/ptp.c:2029
+msgid "Assist Light"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3194 camlibs/ptp2/ptp.c:2020 camlibs/ptp2/ptp.c:2102
+#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
+#: camlibs/sierra/olympus-desc.c:617
+msgid "Exposure Compensation"
+msgstr "Exponeringskompensation"
+
+#: camlibs/ptp2/library.c:3195 camlibs/ptp2/library.c:3208
+#: camlibs/ptp2/ptp.c:1965 camlibs/ptp2/ptp.c:2011 camlibs/ptp2/ptp.c:2136
+#: camlibs/ptp2/ptp.c:2202 camlibs/sierra/sierra.c:994
+#: camlibs/sierra/sierra.c:1295 camlibs/sierra/sierra.c:1504
+#: camlibs/sierra/sierra.c:1735
+msgid "Flash Mode"
+msgstr "Blixt Läge"
+
+#: camlibs/ptp2/library.c:3196 camlibs/ptp2/ptp.c:2200
+msgid "AF Area Illumination"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3197 camlibs/ptp2/ptp.c:2188
+#, fuzzy
+msgid "AF Beep Mode"
+msgstr "LED-läge"
+
+#: camlibs/ptp2/library.c:3198
+msgid "F Number"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3199 camlibs/ptp2/ptp.c:1961
+msgid "Focal Length"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3200 camlibs/ptp2/ptp.c:1963
+#: camlibs/sierra/nikon-desc.c:331 camlibs/sierra/olympus-desc.c:495
+msgid "Focus Mode"
+msgstr "Fokusläge"
+
+#: camlibs/ptp2/library.c:3202 camlibs/ptp2/ptp.c:1966
+#, fuzzy
+msgid "Exposure Time"
+msgstr "Exponering med bollslutare"
+
+#: camlibs/ptp2/library.c:3203 camlibs/ptp2/ptp.c:1978
 #, fuzzy
-msgid "Macro Mode"
+msgid "Effect Mode"
 msgstr "Inspelningsläge"
 
-#: camlibs/ptp2/library.c:2554 camlibs/ptp2/library.c:2556
+#: camlibs/ptp2/library.c:3204
 #, fuzzy
-msgid "WhiteBalance"
-msgstr "Vitbalans"
+msgid "Exposure Program"
+msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/library.c:2555 camlibs/ptp2/ptp.c:1626
+#: camlibs/ptp2/library.c:3205 camlibs/ptp2/ptp.c:1974
+msgid "Still Capture Mode"
+msgstr ""
+
+#: camlibs/ptp2/library.c:3206 camlibs/ptp2/ptp.c:1983
 #, fuzzy
-msgid "Metering Mode"
+msgid "Focus Metering Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/ptp2/library.c:2557 camlibs/ptp2/ptp.c:1641
-msgid "Photo Effect"
-msgstr ""
+#: camlibs/ptp2/library.c:3207 camlibs/ptp2/ptp.c:1964
+#, fuzzy
+msgid "Exposure Metering Mode"
+msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/library.c:2558 camlibs/ptp2/ptp.c:1631
-#: camlibs/sierra/sierra.c:909 camlibs/sierra/sierra.c:1230
-#: camlibs/sierra/sierra.c:1445 camlibs/sierra/sierra.c:1686
+#: camlibs/ptp2/library.c:3209 camlibs/ptp2/ptp.c:2018
+#: camlibs/sierra/sierra.c:934 camlibs/sierra/sierra.c:1255
+#: camlibs/sierra/sierra.c:1470 camlibs/sierra/sierra.c:1711
 msgid "Aperture"
 msgstr "Bländare"
 
-#: camlibs/ptp2/library.c:2559 camlibs/ptp2/ptp.c:1628
+#: camlibs/ptp2/library.c:3210 camlibs/ptp2/ptp.c:2015
 #, fuzzy
 msgid "Focusing Point"
 msgstr "Fokuseringsfel."
 
-#: camlibs/ptp2/library.c:2560
+#: camlibs/ptp2/library.c:3211
 #, fuzzy
 msgid "Shutter Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/library.c:2566 camlibs/ptp2/ptp.c:1642
-msgid "Assist Light"
-msgstr ""
+#: camlibs/ptp2/library.c:3212 camlibs/ptp2/ptp.c:2013
+#, fuzzy
+msgid "Metering Mode"
+msgstr "Punktmätningsläge"
 
-#: camlibs/ptp2/library.c:2567 camlibs/ptp2/ptp.c:1633 camlibs/ptp2/ptp.c:1715
-#: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482
-#: camlibs/sierra/olympus-desc.c:617
-msgid "Exposure Compensation"
-msgstr "Exponeringskompensation"
+#: camlibs/ptp2/library.c:3213 camlibs/ptp2/ptp.c:2014
+#, fuzzy
+msgid "AF Distance"
+msgstr "Fokusläge"
 
-#: camlibs/ptp2/library.c:2574 camlibs/sierra/epson-desc.c:282
+#: camlibs/ptp2/library.c:3219 camlibs/sierra/epson-desc.c:282
 #: camlibs/sierra/nikon-desc.c:662 camlibs/sierra/nikon-desc.c:673
 #: camlibs/sierra/olympus-desc.c:834 camlibs/sierra/olympus-desc.c:889
-#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1132
-#: camlibs/sierra/sierra.c:1594
+#: camlibs/sierra/olympus-desc.c:903 camlibs/sierra/sierra.c:1157
+#: camlibs/sierra/sierra.c:1619
 msgid "Camera Settings"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/library.c:2575
+#: camlibs/ptp2/library.c:3220
 #, fuzzy
 msgid "Image Settings"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/library.c:2576
+#: camlibs/ptp2/library.c:3221
 #, fuzzy
 msgid "Capture Settings"
 msgstr "Bildinställningar"
 
-#: camlibs/ptp2/library.c:2633
+#: camlibs/ptp2/library.c:3278
 #, fuzzy
 msgid "Number of values"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:2637
+#: camlibs/ptp2/library.c:3282
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2645
+#: camlibs/ptp2/library.c:3290
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3276
+#: camlibs/ptp2/library.c:4116
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "Stänger av kameran"
 
-#: camlibs/ptp2/library.c:3379
+#: camlibs/ptp2/library.c:4215
+#, fuzzy, c-format
+msgid ""
+"PTP is only implemented for USB and PTP/IP cameras currently, port type %x"
+msgstr "PTP endast implementerat för USB kamror."
+
+#: camlibs/ptp2/library.c:4222
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP endast implementerat för USB kamror."
 
-#: camlibs/ptp2/ptp.c:1504
+#: camlibs/ptp2/ptp.c:1892
 #, fuzzy
 msgid "PTP: Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:1505
+#: camlibs/ptp2/ptp.c:1893
 #, fuzzy
 msgid "PTP: OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/ptp.c:1506
+#: camlibs/ptp2/ptp.c:1894
 #, fuzzy
 msgid "PTP: General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/ptp.c:1507
+#: camlibs/ptp2/ptp.c:1895
 #, fuzzy
 msgid "PTP: Session Not Open"
 msgstr "PTP sessionen inte öppen"
 
-#: camlibs/ptp2/ptp.c:1508
+#: camlibs/ptp2/ptp.c:1896
 #, fuzzy
 msgid "PTP: Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/ptp.c:1509
+#: camlibs/ptp2/ptp.c:1897
 #, fuzzy
 msgid "PTP: Operation Not Supported"
 msgstr "PTP operationen stöds ej"
 
-#: camlibs/ptp2/ptp.c:1510
+#: camlibs/ptp2/ptp.c:1898
 #, fuzzy
 msgid "PTP: Parameter Not Supported"
 msgstr "PTP parameter stöds ej"
 
-#: camlibs/ptp2/ptp.c:1511
+#: camlibs/ptp2/ptp.c:1899
 #, fuzzy
 msgid "PTP: Incomplete Transfer"
 msgstr "PTP ofullständig överföring"
 
-#: camlibs/ptp2/ptp.c:1512
+#: camlibs/ptp2/ptp.c:1900
 #, fuzzy
 msgid "PTP: Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/ptp.c:1513
+#: camlibs/ptp2/ptp.c:1901
 #, fuzzy
 msgid "PTP: Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/ptp.c:1514
+#: camlibs/ptp2/ptp.c:1902
 #, fuzzy
 msgid "PTP: Device Prop Not Supported"
 msgstr "PTP enhet egenskap stöds ej"
 
-#: camlibs/ptp2/ptp.c:1515
+#: camlibs/ptp2/ptp.c:1903
 #, fuzzy
 msgid "PTP: Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/ptp.c:1516
+#: camlibs/ptp2/ptp.c:1904
 #, fuzzy
 msgid "PTP: Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/ptp.c:1517
+#: camlibs/ptp2/ptp.c:1905
 #, fuzzy
 msgid "PTP: Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/ptp.c:1518
+#: camlibs/ptp2/ptp.c:1906
 #, fuzzy
 msgid "PTP: Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/ptp.c:1519
+#: camlibs/ptp2/ptp.c:1907
 #, fuzzy
 msgid "PTP: Access Denied"
 msgstr "PTP åtkomst nekad"
 
-#: camlibs/ptp2/ptp.c:1520
+#: camlibs/ptp2/ptp.c:1908
 #, fuzzy
 msgid "PTP: No Thumbnail Present"
 msgstr "PTP ingen minibild tillgänglig"
 
-#: camlibs/ptp2/ptp.c:1521
+#: camlibs/ptp2/ptp.c:1909
 #, fuzzy
 msgid "PTP: Self Test Failed"
 msgstr "PTP självtest misslyckades"
 
-#: camlibs/ptp2/ptp.c:1522
+#: camlibs/ptp2/ptp.c:1910
 #, fuzzy
 msgid "PTP: Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/ptp.c:1523
+#: camlibs/ptp2/ptp.c:1911
 #, fuzzy
 msgid "PTP: Store Not Available"
 msgstr "PTP lagring inte tillgänglig"
 
-#: camlibs/ptp2/ptp.c:1525
+#: camlibs/ptp2/ptp.c:1913
 #, fuzzy
 msgid "PTP: Specification By Format Unsupported"
 msgstr "PTP specifikation av format stöds ej"
 
-#: camlibs/ptp2/ptp.c:1526
+#: camlibs/ptp2/ptp.c:1914
 #, fuzzy
 msgid "PTP: No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/ptp.c:1527
+#: camlibs/ptp2/ptp.c:1915
 #, fuzzy
 msgid "PTP: Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/ptp.c:1528
+#: camlibs/ptp2/ptp.c:1916
 #, fuzzy
 msgid "PTP: Unknown Vendor Code"
 msgstr "PTP okänd tillvekarkod"
 
-#: camlibs/ptp2/ptp.c:1530
+#: camlibs/ptp2/ptp.c:1918
 #, fuzzy
 msgid "PTP: Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/ptp.c:1531
+#: camlibs/ptp2/ptp.c:1919
 #, fuzzy
 msgid "PTP: Device Busy"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/ptp.c:1532
+#: camlibs/ptp2/ptp.c:1920
 #, fuzzy
 msgid "PTP: Invalid Parent Object"
 msgstr "PTP ogiltigt förändra objekt"
 
-#: camlibs/ptp2/ptp.c:1533
+#: camlibs/ptp2/ptp.c:1921
 #, fuzzy
 msgid "PTP: Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/ptp.c:1534
+#: camlibs/ptp2/ptp.c:1922
 #, fuzzy
 msgid "PTP: Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter värde"
 
-#: camlibs/ptp2/ptp.c:1535
+#: camlibs/ptp2/ptp.c:1923
 #, fuzzy
 msgid "PTP: Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/ptp.c:1536
+#: camlibs/ptp2/ptp.c:1924
 #, fuzzy
 msgid "PTP: Session Already Opened"
 msgstr "PTP sessionen redan öppen"
 
-#: camlibs/ptp2/ptp.c:1537
+#: camlibs/ptp2/ptp.c:1925
 #, fuzzy
 msgid "PTP: Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/ptp.c:1539
+#: camlibs/ptp2/ptp.c:1927
 #, fuzzy
 msgid "PTP: Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare stöds ej"
 
-#: camlibs/ptp2/ptp.c:1540
+#: camlibs/ptp2/ptp.c:1928
 #, fuzzy
 msgid "PTP: EK Filename Required"
 msgstr "PTP EK filnamn krävs"
 
-#: camlibs/ptp2/ptp.c:1541
+#: camlibs/ptp2/ptp.c:1929
 #, fuzzy
 msgid "PTP: EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/ptp.c:1542
+#: camlibs/ptp2/ptp.c:1930
 #, fuzzy
 msgid "PTP: EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/ptp.c:1544
+#: camlibs/ptp2/ptp.c:1932
 #, fuzzy
 msgid "PTP: I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/ptp.c:1545
+#: camlibs/ptp2/ptp.c:1933
 #, fuzzy
 msgid "PTP: Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/ptp.c:1546
+#: camlibs/ptp2/ptp.c:1934
 #, fuzzy
 msgid "PTP: Protocol error, data expected"
 msgstr "PTP protokollfel, data föråldrat"
 
-#: camlibs/ptp2/ptp.c:1547
+#: camlibs/ptp2/ptp.c:1935
 #, fuzzy
 msgid "PTP: Protocol error, response expected"
 msgstr "PTP protokollfel, svar förväntat"
 
-#: camlibs/ptp2/ptp.c:1565
+#: camlibs/ptp2/ptp.c:1953
 #, fuzzy
 msgid "Undefined PTP Property"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/ptp.c:1566
+#: camlibs/ptp2/ptp.c:1954
 #, fuzzy
 msgid "Battery Level"
 msgstr "%sBatteritid: %i\n"
 
-#: camlibs/ptp2/ptp.c:1567
+#: camlibs/ptp2/ptp.c:1955
 #, fuzzy
 msgid "Functional Mode"
 msgstr "Operationsläge."
 
-#: camlibs/ptp2/ptp.c:1569
+#: camlibs/ptp2/ptp.c:1957
 #, fuzzy
 msgid "Compression Setting"
 msgstr "Kompression"
 
-#: camlibs/ptp2/ptp.c:1570 camlibs/ptp2/ptp.c:1629
+#: camlibs/ptp2/ptp.c:1958 camlibs/ptp2/ptp.c:2016
 #: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293
 #: camlibs/sierra/olympus-desc.c:439 camlibs/sierra/olympus-desc.c:458
-#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1030
-#: camlibs/sierra/sierra.c:1313 camlibs/sierra/sierra.c:1507
-#: camlibs/sierra/sierra.c:1730
+#: camlibs/sierra/olympus-desc.c:479 camlibs/sierra/sierra.c:1055
+#: camlibs/sierra/sierra.c:1338 camlibs/sierra/sierra.c:1532
+#: camlibs/sierra/sierra.c:1755
 msgid "White Balance"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1571
+#: camlibs/ptp2/ptp.c:1959
 msgid "RGB Gain"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1572
+#: camlibs/ptp2/ptp.c:1960
 msgid "F-Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1573
-msgid "Focal Length"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1574
+#: camlibs/ptp2/ptp.c:1962
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/ptp.c:1575 camlibs/sierra/nikon-desc.c:331
-#: camlibs/sierra/olympus-desc.c:495
-msgid "Focus Mode"
-msgstr "Fokusläge"
-
-#: camlibs/ptp2/ptp.c:1576
-#, fuzzy
-msgid "Exposure Metering Mode"
-msgstr "Exponeringsmätning"
-
-#: camlibs/ptp2/ptp.c:1577 camlibs/ptp2/ptp.c:1623 camlibs/ptp2/ptp.c:1749
-#: camlibs/ptp2/ptp.c:1815 camlibs/sierra/sierra.c:969
-#: camlibs/sierra/sierra.c:1270 camlibs/sierra/sierra.c:1479
-#: camlibs/sierra/sierra.c:1710
-msgid "Flash Mode"
-msgstr "Blixt Läge"
-
-#: camlibs/ptp2/ptp.c:1578
-#, fuzzy
-msgid "Exposure Time"
-msgstr "Exponering med bollslutare"
-
-#: camlibs/ptp2/ptp.c:1579
+#: camlibs/ptp2/ptp.c:1967
 #, fuzzy
 msgid "Exposure Program Mode"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1581
+#: camlibs/ptp2/ptp.c:1969
 msgid "Exposure Index (film speed ISO)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1583
+#: camlibs/ptp2/ptp.c:1971
 #, fuzzy
 msgid "Exposure Bias Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1584
+#: camlibs/ptp2/ptp.c:1972
 #, fuzzy
 msgid "Date Time"
 msgstr "Datum & Tid"
 
-#: camlibs/ptp2/ptp.c:1585
+#: camlibs/ptp2/ptp.c:1973
 msgid "Pre-Capture Delay"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1586
-msgid "Still Capture Mode"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1587
+#: camlibs/ptp2/ptp.c:1975
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast-"
 
-#: camlibs/ptp2/ptp.c:1589 camlibs/sierra/nikon-desc.c:553
+#: camlibs/ptp2/ptp.c:1977 camlibs/sierra/nikon-desc.c:553
 #: camlibs/sierra/nikon-desc.c:576
 msgid "Digital Zoom"
 msgstr "Digital Zoom"
 
-#: camlibs/ptp2/ptp.c:1590
-#, fuzzy
-msgid "Effect Mode"
-msgstr "Inspelningsläge"
-
-#: camlibs/ptp2/ptp.c:1591
+#: camlibs/ptp2/ptp.c:1979
 msgid "Burst Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1592
+#: camlibs/ptp2/ptp.c:1980
 msgid "Burst Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1593
+#: camlibs/ptp2/ptp.c:1981
 msgid "Timelapse Number"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1594
+#: camlibs/ptp2/ptp.c:1982
 msgid "Timelapse Interval"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1595
-#, fuzzy
-msgid "Focus Metering Mode"
-msgstr "Punktmätningsläge"
-
-#: camlibs/ptp2/ptp.c:1596
+#: camlibs/ptp2/ptp.c:1984
 msgid "Upload URL"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1597
+#: camlibs/ptp2/ptp.c:1985
 msgid "Artist"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1598
+#: camlibs/ptp2/ptp.c:1986
 #, fuzzy
 msgid "Copyright Info"
 msgstr "Copyright"
 
-#: camlibs/ptp2/ptp.c:1605
+#: camlibs/ptp2/ptp.c:1993
 msgid "Color Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1607
+#: camlibs/ptp2/ptp.c:1995
 #, fuzzy
 msgid "Date Time Stamp Format"
 msgstr "Datumformat"
 
-#: camlibs/ptp2/ptp.c:1609
+#: camlibs/ptp2/ptp.c:1997
 msgid "Video Out"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1610
+#: camlibs/ptp2/ptp.c:1998
 #, fuzzy
 msgid "Power Saving"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptp.c:1611
+#: camlibs/ptp2/ptp.c:1999
 #, fuzzy
 msgid "UI Language"
 msgstr "Språk"
 
-#: camlibs/ptp2/ptp.c:1620
+#: camlibs/ptp2/ptp.c:2008
 msgid "Viewfinder Mode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1625
-msgid "TV A/V Setting"
-msgstr ""
+#: camlibs/ptp2/ptp.c:2012
+#, fuzzy
+msgid "Shooting Mode"
+msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:1632
+#: camlibs/ptp2/ptp.c:2019
 #, fuzzy
 msgid "ShutterSpeed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:1635
+#: camlibs/ptp2/ptp.c:2022
 #, fuzzy
 msgid "Size Quality Mode"
 msgstr "Bildkvalitet"
 
-#: camlibs/ptp2/ptp.c:1639
+#: camlibs/ptp2/ptp.c:2026
 msgid "UNIX Time"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1640
+#: camlibs/ptp2/ptp.c:2027
 #, fuzzy
-msgid "Real Image Width"
-msgstr "Bildbredd: %d\n"
+msgid "Digital Zoom Magnification"
+msgstr "Digital Zoom"
 
-#: camlibs/ptp2/ptp.c:1651
+#: camlibs/ptp2/ptp.c:2038
 #, fuzzy
 msgid "Auto White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1653
+#: camlibs/ptp2/ptp.c:2040
 #, fuzzy
 msgid "Tungsten White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1655
+#: camlibs/ptp2/ptp.c:2042
 #, fuzzy
 msgid "Flourescent White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1657
+#: camlibs/ptp2/ptp.c:2044
 #, fuzzy
 msgid "Daylight White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1659
+#: camlibs/ptp2/ptp.c:2046
 #, fuzzy
 msgid "Flash White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1661
+#: camlibs/ptp2/ptp.c:2048
 #, fuzzy
 msgid "Cloudy White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1663
+#: camlibs/ptp2/ptp.c:2050
 #, fuzzy
 msgid "Shady White Balance Bias"
 msgstr "Vitbalans"
 
-#: camlibs/ptp2/ptp.c:1665
+#: camlibs/ptp2/ptp.c:2052
 msgid "White Balance Colour Temperature"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1667
+#: camlibs/ptp2/ptp.c:2054
 #, fuzzy
 msgid "Sharpening"
 msgstr "Laddar"
 
-#: camlibs/ptp2/ptp.c:1669
+#: camlibs/ptp2/ptp.c:2056
 #, fuzzy
 msgid "Tone Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1671
-#, fuzzy
-msgid "Colour Mode"
+#: camlibs/ptp2/ptp.c:2058 camlibs/sierra/epson-desc.c:142
+#: camlibs/sierra/nikon-desc.c:225 camlibs/sierra/sierra.c:964
+#: camlibs/sierra/sierra.c:1274 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1804
+msgid "Color Mode"
 msgstr "Färgläge"
 
-#: camlibs/ptp2/ptp.c:1673
+#: camlibs/ptp2/ptp.c:2060
 #, fuzzy
 msgid "Hue Adjustment"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/ptp.c:1675
+#: camlibs/ptp2/ptp.c:2062
 msgid "Lens Focal Length (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1677
+#: camlibs/ptp2/ptp.c:2064
 msgid "Lens Max. Aperture (Non CPU)"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1679
+#: camlibs/ptp2/ptp.c:2066
 msgid "PTP_DPC_NIKON_CSMMenuBankSelect"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1681
+#: camlibs/ptp2/ptp.c:2068
 msgid "PTP_DPC_NIKON_MenuBankNameA"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1683
+#: camlibs/ptp2/ptp.c:2070
 msgid "PTP_DPC_NIKON_MenuBankNameB"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1685
+#: camlibs/ptp2/ptp.c:2072
 msgid "PTP_DPC_NIKON_MenuBankNameC"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1687
+#: camlibs/ptp2/ptp.c:2074
 msgid "PTP_DPC_NIKON_MenuBankNameD"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1689
+#: camlibs/ptp2/ptp.c:2076
 msgid "PTP_DPC_NIKON_A1AFCModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1691
+#: camlibs/ptp2/ptp.c:2078
 msgid "PTP_DPC_NIKON_A2AFSModePriority"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1693
+#: camlibs/ptp2/ptp.c:2080
 msgid "PTP_DPC_NIKON_A3GroupDynamicAF"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1695
+#: camlibs/ptp2/ptp.c:2082
 msgid "PTP_DPC_NIKON_A4AFActivation"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1697
+#: camlibs/ptp2/ptp.c:2084
 msgid "PTP_DPC_NIKON_A5FocusAreaIllumManualFocus"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1699
+#: camlibs/ptp2/ptp.c:2086
 msgid "PTP_DPC_NIKON_FocusAreaIllumContinuous"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1701
+#: camlibs/ptp2/ptp.c:2088
 msgid "PTP_DPC_NIKON_FocusAreaIllumWhenSelected"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1703
+#: camlibs/ptp2/ptp.c:2090
 #, fuzzy
-msgid "Focus Area"
+msgid "Focus Area Wrap"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/ptp.c:1705
+#: camlibs/ptp2/ptp.c:2092
 msgid "Vertical AF On"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1707
+#: camlibs/ptp2/ptp.c:2094
 #, fuzzy
 msgid "Auto ISO"
 msgstr "Auto"
 
-#: camlibs/ptp2/ptp.c:1709
+#: camlibs/ptp2/ptp.c:2096
 #, fuzzy
 msgid "ISO Step"
 msgstr "ISO hastighet"
 
-#: camlibs/ptp2/ptp.c:1711
+#: camlibs/ptp2/ptp.c:2098
 #, fuzzy
 msgid "Exposure Step"
 msgstr "Exponering med bollslutare"
 
-#: camlibs/ptp2/ptp.c:1713
+#: camlibs/ptp2/ptp.c:2100
 #, fuzzy
 msgid "Exposure Compensation (EV)"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1717
+#: camlibs/ptp2/ptp.c:2104
 msgid "Centre Weight Area"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1719
+#: camlibs/ptp2/ptp.c:2106
 #, fuzzy
 msgid "Exposure Lock"
 msgstr "Exponering"
 
-#: camlibs/ptp2/ptp.c:1721
+#: camlibs/ptp2/ptp.c:2108
 #, fuzzy
 msgid "Focus Lock"
 msgstr "Fokusläge"
 
-#: camlibs/ptp2/ptp.c:1723
+#: camlibs/ptp2/ptp.c:2110
 #, fuzzy
 msgid "Auto Meter Off Time"
 msgstr "Auto Av tid"
 
-#: camlibs/ptp2/ptp.c:1725
+#: camlibs/ptp2/ptp.c:2112
 #, fuzzy
 msgid "Self Timer Delay"
 msgstr "Självutlösningstid"
 
-#: camlibs/ptp2/ptp.c:1727
+#: camlibs/ptp2/ptp.c:2114
 #, fuzzy
 msgid "LCD Off Time"
 msgstr "Auto Av tid"
 
-#: camlibs/ptp2/ptp.c:1729
+#: camlibs/ptp2/ptp.c:2116
 #, fuzzy
 msgid "Shooting Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:1731
+#: camlibs/ptp2/ptp.c:2118
 msgid "Max. Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1733
+#: camlibs/ptp2/ptp.c:2120
 msgid "PTP_DPC_NIKON_D3ExpDelayMode"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1735
+#: camlibs/ptp2/ptp.c:2122
 #, fuzzy
 msgid "Long Exposure Noise Reduction"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1737
+#: camlibs/ptp2/ptp.c:2124
 msgid "File Number Sequencing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1739
+#: camlibs/ptp2/ptp.c:2126
 msgid "PTP_DPC_NIKON_D6ControlPanelFinderRearControl"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1741
+#: camlibs/ptp2/ptp.c:2128
 msgid "PTP_DPC_NIKON_ControlPanelFinderViewfinder"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1743
+#: camlibs/ptp2/ptp.c:2130
 msgid "PTP_DPC_NIKON_D7Illumination"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1745
+#: camlibs/ptp2/ptp.c:2132
 msgid "Flash Sync. Speed"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1747
+#: camlibs/ptp2/ptp.c:2134
 #, fuzzy
 msgid "Flash Shutter Speed"
 msgstr "Slutartid sekunder (0 auto)"
 
-#: camlibs/ptp2/ptp.c:1751
+#: camlibs/ptp2/ptp.c:2138
 #, fuzzy
 msgid "Modeling Flash"
 msgstr "Alltid blixt\n"
 
-#: camlibs/ptp2/ptp.c:1753
-msgid "Auto Bracket Set"
-msgstr ""
+#: camlibs/ptp2/ptp.c:2140
+#, fuzzy
+msgid "Bracket Set"
+msgstr "Auto, röda-ögon reduktion"
 
-#: camlibs/ptp2/ptp.c:1755
+#: camlibs/ptp2/ptp.c:2142
 msgid "Manual Mode Bracketing"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1757
-msgid "Auto Bracket Order"
+#: camlibs/ptp2/ptp.c:2144
+msgid "Bracket Order"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1759
+#: camlibs/ptp2/ptp.c:2146
 #, fuzzy
 msgid "Auto Bracket Selection"
 msgstr "Auto, röda-ögon reduktion"
 
-#: camlibs/ptp2/ptp.c:1761
+#: camlibs/ptp2/ptp.c:2148
 #, fuzzy
 msgid "Center Button Shooting Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/ptp2/ptp.c:1763
+#: camlibs/ptp2/ptp.c:2150
 #, fuzzy
 msgid "Center Button Playback Mode"
 msgstr "Nuvarande läge: Uppspelningsläge\n"
 
-#: camlibs/ptp2/ptp.c:1765
+#: camlibs/ptp2/ptp.c:2152
 msgid "Multiselector"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1767
+#: camlibs/ptp2/ptp.c:2154
 msgid "Photo Info. Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1769
+#: camlibs/ptp2/ptp.c:2156
 msgid "Assign Func. Button"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1771
+#: camlibs/ptp2/ptp.c:2158
 msgid "Customise Command Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1773
-msgid "Reverse Command Dials"
+#: camlibs/ptp2/ptp.c:2160
+msgid "Reverse Command Dial"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1775
+#: camlibs/ptp2/ptp.c:2162
 #, fuzzy
 msgid "Aperture Setting"
 msgstr "Bildinställningar"
 
-#: camlibs/ptp2/ptp.c:1777
+#: camlibs/ptp2/ptp.c:2164
 msgid "Menus and Playback"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1779
+#: camlibs/ptp2/ptp.c:2166
 msgid "Buttons and Dials"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1781
+#: camlibs/ptp2/ptp.c:2168
 msgid "No CF Card Release"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1783
+#: camlibs/ptp2/ptp.c:2170
 #, fuzzy
-msgid "Auto Image Rotation"
+msgid "Image Rotation"
 msgstr "Kamerainställningar"
 
-#: camlibs/ptp2/ptp.c:1785
+#: camlibs/ptp2/ptp.c:2172
 #, fuzzy
 msgid "Exposure Bracketing"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1787
+#: camlibs/ptp2/ptp.c:2174
 #, fuzzy
 msgid "Exposure Bracketing Distance"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1789
+#: camlibs/ptp2/ptp.c:2176
 #, fuzzy
 msgid "Exposure Bracketing Number"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1791
+#: camlibs/ptp2/ptp.c:2178
 #, fuzzy
 msgid "AF LCD Top Mode 2"
 msgstr "LCD-läge"
 
-#: camlibs/ptp2/ptp.c:1793
+#: camlibs/ptp2/ptp.c:2180
 msgid "Active AF Sensor"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1795
+#: camlibs/ptp2/ptp.c:2182
 #, fuzzy
 msgid "Exposure Meter"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1797
+#: camlibs/ptp2/ptp.c:2184
 #, fuzzy
 msgid "Exposure Aperture Lock"
 msgstr "Exponeringsmätning"
 
-#: camlibs/ptp2/ptp.c:1799
+#: camlibs/ptp2/ptp.c:2186
 msgid "Maximum Shots"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1801
+#: camlibs/ptp2/ptp.c:2190
 #, fuzzy
-msgid "AF Beep Mode"
-msgstr "LED-läge"
-
-#: camlibs/ptp2/ptp.c:1803
-msgid "??? AF Related"
-msgstr ""
+msgid "Autofocus Mode"
+msgstr "Fokusläge"
 
-#: camlibs/ptp2/ptp.c:1805
-msgid "AF Lamp"
+#: camlibs/ptp2/ptp.c:2192
+msgid "AF Assist Lamp"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1807
+#: camlibs/ptp2/ptp.c:2194
 msgid "Auto ISO P/A/DVP Setting"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1809
+#: camlibs/ptp2/ptp.c:2196
 #, fuzzy
 msgid "Image Review"
 msgstr "Bildstorlek"
 
-#: camlibs/ptp2/ptp.c:1811
+#: camlibs/ptp2/ptp.c:2198
 msgid "Viewfinder Grid Display"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1813
-msgid "AF Area Illumination"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1817
+#: camlibs/ptp2/ptp.c:2204
 #, fuzzy
-msgid "Flash Power"
+msgid "Flash Mode Manual Power"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/ptp.c:1819
+#: camlibs/ptp2/ptp.c:2206
 #, fuzzy
 msgid "Flash Sign"
 msgstr "Blixtinställning"
 
-#: camlibs/ptp2/ptp.c:1821
+#: camlibs/ptp2/ptp.c:2208
 #, fuzzy
 msgid "Flash Exposure Compensation"
 msgstr "Exponeringskompensation"
 
-#: camlibs/ptp2/ptp.c:1823
+#: camlibs/ptp2/ptp.c:2210
 #, fuzzy
 msgid "Remote Timeout"
 msgstr "Datum & Tid"
 
-#: camlibs/ptp2/ptp.c:1825
+#: camlibs/ptp2/ptp.c:2212
 #, fuzzy
 msgid "Image Comment String"
 msgstr "Bildjustering"
 
-#: camlibs/ptp2/ptp.c:1827
+#: camlibs/ptp2/ptp.c:2214
 #, fuzzy
 msgid "Flash Open"
 msgstr "Blixt Läge"
 
-#: camlibs/ptp2/ptp.c:1829
+#: camlibs/ptp2/ptp.c:2216
 #, fuzzy
 msgid "Flash Charged"
 msgstr "CompactFlash kort"
 
-#: camlibs/ptp2/ptp.c:1831
+#: camlibs/ptp2/ptp.c:2218
 #, fuzzy
 msgid "Lens ID"
 msgstr "Linsläge"
 
-#: camlibs/ptp2/ptp.c:1833
+#: camlibs/ptp2/ptp.c:2220
 msgid "Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1835
+#: camlibs/ptp2/ptp.c:2222
 msgid "Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1837
+#: camlibs/ptp2/ptp.c:2224
 msgid "Max. Aperture at Min. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1839
+#: camlibs/ptp2/ptp.c:2226
 msgid "Max. Aperture at Max. Focal Length"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1841
+#: camlibs/ptp2/ptp.c:2228
 #, fuzzy
 msgid "Low Light"
 msgstr "Hög"
 
-#: camlibs/ptp2/ptp.c:1934 camlibs/ptp2/ptp.c:1935 camlibs/ptp2/ptp.c:1936
+#: camlibs/ptp2/ptp.c:2323 camlibs/ptp2/ptp.c:2324 camlibs/ptp2/ptp.c:2325
 #, c-format
 msgid "%.1f stops"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1937
+#: camlibs/ptp2/ptp.c:2326
 #, c-format
 msgid "%.0f mm"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1951
+#: camlibs/ptp2/ptp.c:2340
 #, fuzzy
 msgid "JPEG Norm"
 msgstr "JPEG"
 
-#: camlibs/ptp2/ptp.c:1953
+#: camlibs/ptp2/ptp.c:2342
 msgid "RAW"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1954
+#: camlibs/ptp2/ptp.c:2343
 msgid "RAW + JPEG Basic"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1956
-#, fuzzy
-msgid "Incadescent"
+#: camlibs/ptp2/ptp.c:2345 camlibs/ricoh/library.c:329
+#: camlibs/sierra/nikon-desc.c:284
+msgid "Incandescent"
 msgstr "Bländande"
 
-#: camlibs/ptp2/ptp.c:1963
-#, fuzzy
-msgid "Default"
-msgstr "Dagsljus"
-
-#: camlibs/ptp2/ptp.c:1964 camlibs/sierra/epson-desc.c:154
-#: camlibs/sierra/sierra.c:973 camlibs/sierra/sierra.c:983
-#: camlibs/sierra/sierra.c:1280 camlibs/sierra/sierra.c:1483
-#: camlibs/sierra/sierra.c:1492 camlibs/sierra/sierra.c:1719
+#: camlibs/ptp2/ptp.c:2353 camlibs/sierra/epson-desc.c:154
+#: camlibs/sierra/sierra.c:998 camlibs/sierra/sierra.c:1008
+#: camlibs/sierra/sierra.c:1305 camlibs/sierra/sierra.c:1508
+#: camlibs/sierra/sierra.c:1517 camlibs/sierra/sierra.c:1744
 msgid "Red-eye Reduction"
 msgstr "Röda-Ögon Reduktion"
 
-#: camlibs/ptp2/ptp.c:1965
-#, fuzzy
-msgid "Red-eye Reduction + Slow Sync"
-msgstr "Röda-Ögon Reduktion"
-
-#: camlibs/ptp2/ptp.c:1966 camlibs/sierra/epson-desc.c:155
-#: camlibs/sierra/sierra.c:974 camlibs/sierra/sierra.c:985
-#: camlibs/sierra/sierra.c:1282 camlibs/sierra/sierra.c:1484
-#: camlibs/sierra/sierra.c:1494 camlibs/sierra/sierra.c:1721
-msgid "Slow Sync"
-msgstr "Långsam Synk"
-
-#: camlibs/ptp2/ptp.c:1967
-msgid "Rear Curtain Sync + Slow Sync"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1968
-msgid "Dynamic Area"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1969
-msgid "Single Area"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1970
-msgid "Closest Subject"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1971
+#: camlibs/ptp2/ptp.c:2360
 #, fuzzy
 msgid "Manual Focus"
 msgstr "Ingen manual"
 
-#: camlibs/ptp2/ptp.c:1977
-msgid "Center Weighted"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1978 camlibs/sierra/nikon-desc.c:493
+#: camlibs/ptp2/ptp.c:2367 camlibs/sierra/nikon-desc.c:493
 #: camlibs/sierra/olympus-desc.c:627
 msgid "Matrix"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1979 camlibs/sierra/nikon-desc.c:492
+#: camlibs/ptp2/ptp.c:2368 camlibs/sierra/nikon-desc.c:492
 #: camlibs/sierra/olympus-desc.c:626
 msgid "Spot"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:1985
-#, fuzzy
-msgid "Portrait"
-msgstr "Kontrast-"
-
-#: camlibs/ptp2/ptp.c:1986
-msgid "Landscape"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1988
-msgid "Sports"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1989
-msgid "Night Landscape"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1990
-msgid "Night Portrait"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1991
-msgid "Single Shot"
-msgstr ""
-
-#: camlibs/ptp2/ptp.c:1992
+#: camlibs/ptp2/ptp.c:2381
 #, fuzzy
 msgid "Power Wind"
 msgstr "EJ extraljus"
 
-#: camlibs/ptp2/ptp.c:1993
-#, fuzzy
-msgid "Timer"
-msgstr "Självutlösare"
-
-#: camlibs/ptp2/ptp.c:1995
-#, fuzzy
-msgid "Timer + Remote"
-msgstr "Fjärr"
-
-#: camlibs/ptp2/ptp.c:2007
+#: camlibs/ptp2/ptp.c:2396
 #, fuzzy
 msgid "Commander"
 msgstr "Kommando ordnings fel."
 
-#: camlibs/ptp2/ptp.c:2014
+#: camlibs/ptp2/ptp.c:2403
 #, fuzzy
 msgid "1 min"
 msgstr "41 mm"
 
-#: camlibs/ptp2/ptp.c:2015
+#: camlibs/ptp2/ptp.c:2404
 msgid "5 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2016
+#: camlibs/ptp2/ptp.c:2405
 msgid "10 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2017
+#: camlibs/ptp2/ptp.c:2406
 msgid "15 mins"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2026
+#: camlibs/ptp2/ptp.c:2415
 #, fuzzy
 msgid "Centre"
 msgstr "Foto"
 
-#: camlibs/ptp2/ptp.c:2027
+#: camlibs/ptp2/ptp.c:2416
 msgid "Top"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2028
+#: camlibs/ptp2/ptp.c:2417
 #, fuzzy
 msgid "Bottom"
 msgstr "Zoom"
 
-#: camlibs/ptp2/ptp.c:2029
+#: camlibs/ptp2/ptp.c:2418
 msgid "Left"
 msgstr ""
 
-#: camlibs/ptp2/ptp.c:2030
+#: camlibs/ptp2/ptp.c:2419
 #, fuzzy
 msgid "Right"
 msgstr "Hög"
 
-#: camlibs/ricoh/g3.c:317
+#: camlibs/ptp2/ptp.c:2504
+msgid "Firmware"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2505
+msgid "WindowsImageFormat"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2506
+#, fuzzy
+msgid "Undefined Audio"
+msgstr "PTP odefinierat fel"
+
+#: camlibs/ptp2/ptp.c:2509
+#, fuzzy
+msgid "Undefined Video"
+msgstr "PTP odefinierat fel"
+
+#: camlibs/ptp2/ptp.c:2512
+#, fuzzy
+msgid "Undefined Collection"
+msgstr "PTP odefinierat fel"
+
+#: camlibs/ptp2/ptp.c:2513
+msgid "Abstract Multimedia Album"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2514
+msgid "Abstract Image Album"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2515
+msgid "Abstract Audio Album"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2516
+msgid "Abstract Video Album"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2517
+msgid "Abstract Audio Video Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2518
+msgid "Abstract Contact Group"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2519
+msgid "Abstract Message Folder"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2520
+msgid "Abstract Chaptered Production"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2521
+msgid "WPL Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2522
+msgid "M3U Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2523
+msgid "MPL Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2524
+msgid "ASX Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2525
+msgid "PLS Playlist"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2526
+#, fuzzy
+msgid "UndefinedDocument"
+msgstr "PTP odefinierat fel"
+
+#: camlibs/ptp2/ptp.c:2527
+msgid "AbstractDocument"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2528
+msgid "UndefinedMessage"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2529
+msgid "AbstractMessage"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2530
+msgid "UndefinedContact"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2531
+msgid "AbstractContact"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2532
+msgid "vCard2"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2533
+msgid "vCard3"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2534
+msgid "UndefinedCalendarItem"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2535
+msgid "AbstractCalendarItem"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2536
+msgid "vCalendar1"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2537
+msgid "vCalendar2"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2538
+msgid "Undefined Windows Executable"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2555
+#, c-format
+msgid "M3U"
+msgstr ""
+
+#: camlibs/ptp2/ptp.c:2568
+#, fuzzy, c-format
+msgid "Unknown(%04x)"
+msgstr "okänd  (0x%02x)"
+
+#: camlibs/ricoh/g3.c:342
 #, fuzzy
 msgid "Downloading movie..."
 msgstr "Nerladdning av fil..."
 
-#: camlibs/ricoh/g3.c:323
+#: camlibs/ricoh/g3.c:348
 #, fuzzy
 msgid "Downloading audio..."
 msgstr "Nerladdning..."
 
-#: camlibs/ricoh/g3.c:338
+#: camlibs/ricoh/g3.c:363
 #, fuzzy
 msgid "Downloading EXIF data..."
 msgstr "Nerladdning av data..."
 
-#: camlibs/ricoh/g3.c:340 camlibs/ricoh/g3.c:359
+#: camlibs/ricoh/g3.c:365 camlibs/ricoh/g3.c:384
 #, fuzzy, c-format
 msgid "No EXIF data available for %s."
 msgstr "ej tillgänglig: %s"
 
-#: camlibs/ricoh/g3.c:445
+#: camlibs/ricoh/g3.c:470
 #, fuzzy
 msgid "Could not delete file."
 msgstr "Kunde inte hitta filen '%s'."
 
-#: camlibs/ricoh/g3.c:472
+#: camlibs/ricoh/g3.c:497
 #, fuzzy
 msgid "Could not remove directory."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/ricoh/g3.c:499
+#: camlibs/ricoh/g3.c:524
 #, fuzzy
 msgid "Could not create directory."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/ricoh/g3.c:518
+#: camlibs/ricoh/g3.c:543
 #, fuzzy, c-format
 msgid "Version: %s\n"
 msgstr "Version: "
 
-#: camlibs/ricoh/g3.c:523
+#: camlibs/ricoh/g3.c:548
 #, fuzzy, c-format
 msgid "RTC Status: %d\n"
 msgstr "Kortstatus:\t\t"
 
-#: camlibs/ricoh/g3.c:529
+#: camlibs/ricoh/g3.c:554
 #, fuzzy, c-format
 msgid "Camera time: %s %s\n"
 msgstr "%sKamera ID: %s\n"
 
-#: camlibs/ricoh/g3.c:535
+#: camlibs/ricoh/g3.c:560
 #, fuzzy, c-format
 msgid "Camera ID: %s\n"
 msgstr "%sKamera ID: %s\n"
 
-#: camlibs/ricoh/g3.c:541
+#: camlibs/ricoh/g3.c:566
 #, fuzzy, c-format
 msgid "No SD Card inserted.\n"
 msgstr "Kort stöds ej."
 
-#: camlibs/ricoh/g3.c:544
+#: camlibs/ricoh/g3.c:569
 #, fuzzy, c-format
 msgid "SD Card ID: %s\n"
 msgstr "%sKamera ID: %s\n"
 
-#: camlibs/ricoh/g3.c:552
+#: camlibs/ricoh/g3.c:577
 #, fuzzy, c-format
 msgid "Photos on camera: %d\n"
 msgstr "Minne i kameran: %d Mbit.\n"
 
-#: camlibs/ricoh/g3.c:558
+#: camlibs/ricoh/g3.c:583
 #, c-format
 msgid "SD memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:565
+#: camlibs/ricoh/g3.c:590
 #, c-format
 msgid "Internal memory: %d MB total, %d MB free.\n"
 msgstr ""
 
-#: camlibs/ricoh/g3.c:575
+#: camlibs/ricoh/g3.c:600
 msgid ""
 "Ricoh Caplio G3.\n"
 "Marcus Meissner <marcus@jet.franken.de>\n"
@@ -4907,14 +5621,6 @@ msgstr "128 x 960"
 msgid "Outdoor"
 msgstr "Utomhus"
 
-#: camlibs/ricoh/library.c:329 camlibs/sierra/nikon-desc.c:284
-msgid "Incandescent"
-msgstr "Bländande"
-
-#: camlibs/ricoh/library.c:330 camlibs/sierra/epson-desc.c:137
-msgid "Black & White"
-msgstr "Svartvit"
-
 #: camlibs/ricoh/library.c:347
 msgid "Maximal"
 msgstr "Maximal"
@@ -4939,8 +5645,8 @@ msgstr "Bild & Ljud"
 msgid "Character & Sound"
 msgstr "Karaktär & Ljud"
 
-#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1110
-#: camlibs/sierra/sierra.c:1116
+#: camlibs/ricoh/library.c:377 camlibs/sierra/sierra.c:1135
+#: camlibs/sierra/sierra.c:1141
 msgid "2x"
 msgstr "2x"
 
@@ -5114,12 +5820,6 @@ msgstr "Datum och Tid (GMT)"
 msgid "Aperature Settings"
 msgstr "Bildinställningar"
 
-#: camlibs/sierra/epson-desc.c:142 camlibs/sierra/nikon-desc.c:225
-#: camlibs/sierra/sierra.c:939 camlibs/sierra/sierra.c:1249
-#: camlibs/sierra/sierra.c:1578 camlibs/sierra/sierra.c:1779
-msgid "Color Mode"
-msgstr "Färgläge"
-
 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243
 #: camlibs/sierra/olympus-desc.c:402 camlibs/sierra/olympus-desc.c:421
 msgid "Flash Settings"
@@ -5133,59 +5833,59 @@ msgstr "Värd kraft besparing (sekunder)"
 msgid "Camera power save (seconds)"
 msgstr "Kamera kraft besparing (skrivskyddad)"
 
-#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1061
-#: camlibs/sierra/sierra.c:1334 camlibs/sierra/sierra.c:1533
-#: camlibs/sierra/sierra.c:1746
+#: camlibs/sierra/epson-desc.c:224 camlibs/sierra/sierra.c:1086
+#: camlibs/sierra/sierra.c:1359 camlibs/sierra/sierra.c:1558
+#: camlibs/sierra/sierra.c:1771
 msgid "Lens Mode"
 msgstr "Linsläge"
 
-#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1629
-#: camlibs/sierra/sierra.c:1638 camlibs/sierra/sierra.c:1815
+#: camlibs/sierra/epson-desc.c:233 camlibs/sierra/sierra.c:1654
+#: camlibs/sierra/sierra.c:1663 camlibs/sierra/sierra.c:1840
 msgid "Korean"
 msgstr "Koreanska"
 
 #: camlibs/sierra/epson-desc.c:234 camlibs/sierra/nikon-desc.c:419
-#: camlibs/sierra/sierra.c:1630 camlibs/sierra/sierra.c:1640
-#: camlibs/sierra/sierra.c:1817
+#: camlibs/sierra/sierra.c:1655 camlibs/sierra/sierra.c:1665
+#: camlibs/sierra/sierra.c:1842
 msgid "English"
 msgstr "Engelska"
 
 #: camlibs/sierra/epson-desc.c:235 camlibs/sierra/nikon-desc.c:420
-#: camlibs/sierra/sierra.c:1631 camlibs/sierra/sierra.c:1642
-#: camlibs/sierra/sierra.c:1819
+#: camlibs/sierra/sierra.c:1656 camlibs/sierra/sierra.c:1667
+#: camlibs/sierra/sierra.c:1844
 msgid "French"
 msgstr "Franska"
 
 #: camlibs/sierra/epson-desc.c:236 camlibs/sierra/nikon-desc.c:421
-#: camlibs/sierra/sierra.c:1632 camlibs/sierra/sierra.c:1644
-#: camlibs/sierra/sierra.c:1821
+#: camlibs/sierra/sierra.c:1657 camlibs/sierra/sierra.c:1669
+#: camlibs/sierra/sierra.c:1846
 msgid "German"
 msgstr "Tyska"
 
-#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1633
-#: camlibs/sierra/sierra.c:1646 camlibs/sierra/sierra.c:1823
+#: camlibs/sierra/epson-desc.c:237 camlibs/sierra/sierra.c:1658
+#: camlibs/sierra/sierra.c:1671 camlibs/sierra/sierra.c:1848
 msgid "Italian"
 msgstr "Italienska"
 
-#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1634
-#: camlibs/sierra/sierra.c:1648 camlibs/sierra/sierra.c:1825
+#: camlibs/sierra/epson-desc.c:238 camlibs/sierra/sierra.c:1659
+#: camlibs/sierra/sierra.c:1673 camlibs/sierra/sierra.c:1850
 msgid "Japanese"
 msgstr "Japanska"
 
-#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1635
-#: camlibs/sierra/sierra.c:1650 camlibs/sierra/sierra.c:1827
+#: camlibs/sierra/epson-desc.c:239 camlibs/sierra/sierra.c:1660
+#: camlibs/sierra/sierra.c:1675 camlibs/sierra/sierra.c:1852
 msgid "Spanish"
 msgstr "Spanska"
 
-#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1636
-#: camlibs/sierra/sierra.c:1652 camlibs/sierra/sierra.c:1829
+#: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1661
+#: camlibs/sierra/sierra.c:1677 camlibs/sierra/sierra.c:1854
 msgid "Portugese"
 msgstr "Portugiska"
 
 #: camlibs/sierra/epson-desc.c:278 camlibs/sierra/nikon-desc.c:658
 #: camlibs/sierra/nikon-desc.c:669 camlibs/sierra/olympus-desc.c:830
 #: camlibs/sierra/olympus-desc.c:885 camlibs/sierra/olympus-desc.c:896
-#: camlibs/sierra/sierra.c:860 camlibs/sierra/sierra.c:1527
+#: camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1552
 msgid "Picture Settings"
 msgstr "Bildinställningar"
 
@@ -5342,13 +6042,13 @@ msgstr ""
 msgid "Slow-sync"
 msgstr "Långsam Synk"
 
-#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1004
-#: camlibs/sierra/sierra.c:1014 camlibs/sierra/sierra.c:1302
+#: camlibs/sierra/nikon-desc.c:254 camlibs/sierra/sierra.c:1029
+#: camlibs/sierra/sierra.c:1039 camlibs/sierra/sierra.c:1327
 msgid "Contrast+"
 msgstr "Kontrast+"
 
-#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1005
-#: camlibs/sierra/sierra.c:1016 camlibs/sierra/sierra.c:1304
+#: camlibs/sierra/nikon-desc.c:255 camlibs/sierra/sierra.c:1030
+#: camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1329
 msgid "Contrast-"
 msgstr "Kontrast-"
 
@@ -5396,7 +6096,7 @@ msgid "Operation Mode"
 msgstr "Operationsläge."
 
 #: camlibs/sierra/nikon-desc.c:392 camlibs/sierra/olympus-desc.c:531
-#: camlibs/sierra/sierra.c:1167 camlibs/sierra/sierra.c:1406
+#: camlibs/sierra/sierra.c:1192 camlibs/sierra/sierra.c:1431
 msgid "LCD Brightness"
 msgstr "LCD Ljusstyrka"
 
@@ -5550,6 +6250,7 @@ msgid "Time format"
 msgstr "Tidsformat"
 
 #: camlibs/sierra/olympus-desc.c:910
+#, fuzzy
 msgid ""
 "Some notes about Olympus cameras:\n"
 "(1) Camera Configuration:\n"
@@ -5564,7 +6265,7 @@ msgid ""
 "    camera control menu appears. Set it to ON.\n"
 "(3) If you switch the 'LCD mode' to 'Monitor' or\n"
 "    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnectig. Otherwise you cannot use\n"
+"    before disconnecting. Otherwise you cannot use\n"
 "    the camera's buttons. If you end up with this\n"
 "    state, you should reconnect the camera to the\n"
 "    PC and switch LCD to 'Off'."
@@ -5598,7 +6299,7 @@ msgid ""
 "    camera control menu appears. Set it to control mode.\n"
 "(2) If you switch the 'LCD mode' to 'Monitor' or\n"
 "    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnectig. Otherwise you cannot use\n"
+"    before disconnecting. Otherwise you cannot use\n"
 "    the camera's buttons. If you end up with this\n"
 "    state, you should reconnect the camera to the\n"
 "    PC and switch LCD to 'Off'."
@@ -5650,105 +6351,105 @@ msgstr ""
 "    kod för att stödja en komplett konfiguration,\n"
 "    vänligen kontakta gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra.c:717 camlibs/soundvision/soundvision.c:411
+#: camlibs/sierra/sierra.c:742 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:731
+#: camlibs/sierra/sierra.c:756
 msgid "Not enough memory available on the memory card"
 msgstr "Inte tillräckligt med minne tillgängligt på minneskortet"
 
-#: camlibs/sierra/sierra.c:738
+#: camlibs/sierra/sierra.c:763
 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:745
+#: camlibs/sierra/sierra.c:770
 #, c-format
 msgid "Upload is supported into the '%s' folder only"
 msgstr "Uppladdning stöds endast till '%s' mappen."
 
-#: camlibs/sierra/sierra.c:873 camlibs/sierra/sierra.c:882
-#: camlibs/sierra/sierra.c:1211
+#: camlibs/sierra/sierra.c:898 camlibs/sierra/sierra.c:907
+#: camlibs/sierra/sierra.c:1236
 msgid "Best"
 msgstr "Bäst"
 
-#: camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:925
-#: camlibs/sierra/sierra.c:958 camlibs/sierra/sierra.c:988
-#: camlibs/sierra/sierra.c:1019 camlibs/sierra/sierra.c:1050
-#: camlibs/sierra/sierra.c:1074 camlibs/sierra/sierra.c:1096
-#: camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1469
-#: camlibs/sierra/sierra.c:1497 camlibs/sierra/sierra.c:1520
-#: camlibs/sierra/sierra.c:1542 camlibs/sierra/sierra.c:1568
-#: camlibs/sierra/sierra.c:1587 camlibs/sierra/sierra.c:1655
+#: camlibs/sierra/sierra.c:910 camlibs/sierra/sierra.c:950
+#: camlibs/sierra/sierra.c:983 camlibs/sierra/sierra.c:1013
+#: camlibs/sierra/sierra.c:1044 camlibs/sierra/sierra.c:1075
+#: camlibs/sierra/sierra.c:1099 camlibs/sierra/sierra.c:1121
+#: camlibs/sierra/sierra.c:1150 camlibs/sierra/sierra.c:1494
+#: camlibs/sierra/sierra.c:1522 camlibs/sierra/sierra.c:1545
+#: camlibs/sierra/sierra.c:1567 camlibs/sierra/sierra.c:1593
+#: camlibs/sierra/sierra.c:1612 camlibs/sierra/sierra.c:1680
 #, c-format
 msgid "%i (unknown)"
 msgstr "%i (okänd)"
 
-#: camlibs/sierra/sierra.c:897 camlibs/sierra/sierra.c:1221
+#: camlibs/sierra/sierra.c:922 camlibs/sierra/sierra.c:1246
 msgid "Shutter Speed (microseconds, 0 auto)"
 msgstr "Slutartid (mikrosekunder, 0 auto)"
 
-#: camlibs/sierra/sierra.c:941 camlibs/sierra/sierra.c:949
-#: camlibs/sierra/sierra.c:1255
+#: camlibs/sierra/sierra.c:966 camlibs/sierra/sierra.c:974
+#: camlibs/sierra/sierra.c:1280
 msgid "Black/White"
 msgstr "Svartvitt"
 
-#: camlibs/sierra/sierra.c:943 camlibs/sierra/sierra.c:953
-#: camlibs/sierra/sierra.c:1259
+#: camlibs/sierra/sierra.c:968 camlibs/sierra/sierra.c:978
+#: camlibs/sierra/sierra.c:1284
 msgid "White Board"
 msgstr "Vit tavla"
 
-#: camlibs/sierra/sierra.c:944 camlibs/sierra/sierra.c:955
-#: camlibs/sierra/sierra.c:1261
+#: camlibs/sierra/sierra.c:969 camlibs/sierra/sierra.c:980
+#: camlibs/sierra/sierra.c:1286
 msgid "Black Board"
 msgstr "Svart tavla"
 
-#: camlibs/sierra/sierra.c:999 camlibs/sierra/sierra.c:1292
+#: camlibs/sierra/sierra.c:1024 camlibs/sierra/sierra.c:1317
 msgid "Brightness/Contrast"
 msgstr "Ljusstyrka/Kontrast"
 
-#: camlibs/sierra/sierra.c:1002 camlibs/sierra/sierra.c:1010
-#: camlibs/sierra/sierra.c:1298
+#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1035
+#: camlibs/sierra/sierra.c:1323
 msgid "Bright+"
 msgstr "Ljus+"
 
-#: camlibs/sierra/sierra.c:1003 camlibs/sierra/sierra.c:1012
-#: camlibs/sierra/sierra.c:1300
+#: camlibs/sierra/sierra.c:1028 camlibs/sierra/sierra.c:1037
+#: camlibs/sierra/sierra.c:1325
 msgid "Bright-"
 msgstr "Ljus-"
 
-#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1040
-#: camlibs/sierra/sierra.c:1319
+#: camlibs/sierra/sierra.c:1057 camlibs/sierra/sierra.c:1065
+#: camlibs/sierra/sierra.c:1344
 msgid "Skylight"
 msgstr "Dagsljus"
 
-#: camlibs/sierra/sierra.c:1064 camlibs/sierra/sierra.c:1071
-#: camlibs/sierra/sierra.c:1342
+#: camlibs/sierra/sierra.c:1089 camlibs/sierra/sierra.c:1096
+#: camlibs/sierra/sierra.c:1367
 msgid "Infinity/Fish-eye"
 msgstr "Oändlighet/fiskögeobjektiv"
 
-#: camlibs/sierra/sierra.c:1085 camlibs/sierra/sierra.c:1352
+#: camlibs/sierra/sierra.c:1110 camlibs/sierra/sierra.c:1377
 msgid "Spot Metering Mode"
 msgstr "Punktmätningsläge"
 
-#: camlibs/sierra/sierra.c:1108 camlibs/sierra/sierra.c:1114
+#: camlibs/sierra/sierra.c:1133 camlibs/sierra/sierra.c:1139
 msgid "1x"
 msgstr "1x"
 
-#: camlibs/sierra/sierra.c:1109 camlibs/sierra/sierra.c:1119
+#: camlibs/sierra/sierra.c:1134 camlibs/sierra/sierra.c:1144
 msgid "1.6x"
 msgstr "1.6x"
 
-#: camlibs/sierra/sierra.c:1111 camlibs/sierra/sierra.c:1122
+#: camlibs/sierra/sierra.c:1136 camlibs/sierra/sierra.c:1147
 msgid "2.5x"
 msgstr "2.5x"
 
-#: camlibs/sierra/sierra.c:1139 camlibs/sierra/sierra.c:1386
-#: camlibs/sierra/sierra.c:1601 camlibs/sierra/sierra.c:1793
+#: camlibs/sierra/sierra.c:1164 camlibs/sierra/sierra.c:1411
+#: camlibs/sierra/sierra.c:1626 camlibs/sierra/sierra.c:1818
 msgid "Auto Off (host) (in seconds)"
 msgstr "Auto av (värd) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1141 camlibs/sierra/sierra.c:1603
+#: camlibs/sierra/sierra.c:1166 camlibs/sierra/sierra.c:1628
 msgid ""
 "How long will it take until the camera powers off when connected to the "
 "computer?"
@@ -5756,12 +6457,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:1153 camlibs/sierra/sierra.c:1396
-#: camlibs/sierra/sierra.c:1615 camlibs/sierra/sierra.c:1803
+#: camlibs/sierra/sierra.c:1178 camlibs/sierra/sierra.c:1421
+#: camlibs/sierra/sierra.c:1640 camlibs/sierra/sierra.c:1828
 msgid "Auto Off (field) (in seconds)"
 msgstr "Auto av (fält) (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1155 camlibs/sierra/sierra.c:1617
+#: camlibs/sierra/sierra.c:1180 camlibs/sierra/sierra.c:1642
 msgid ""
 "How long will it take until the camera powers off when not connected to the "
 "computer?"
@@ -5769,125 +6470,125 @@ msgstr ""
 "Hur lång tid tar det tills kameran stänger av sig när den inte ansluten till "
 "datorn?"
 
-#: camlibs/sierra/sierra.c:1177 camlibs/sierra/sierra.c:1415
+#: camlibs/sierra/sierra.c:1202 camlibs/sierra/sierra.c:1440
 msgid "LCD Auto Off (in seconds)"
 msgstr "Auto av (i sekunder)"
 
-#: camlibs/sierra/sierra.c:1439
+#: camlibs/sierra/sierra.c:1464
 msgid "Shot Settings"
 msgstr "Foto-inställningar"
 
-#: camlibs/sierra/sierra.c:1446 camlibs/sierra/sierra.c:1454
-#: camlibs/sierra/sierra.c:1689
+#: camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479
+#: camlibs/sierra/sierra.c:1714
 msgid "F2"
 msgstr "F2"
 
-#: camlibs/sierra/sierra.c:1447 camlibs/sierra/sierra.c:1456
-#: camlibs/sierra/sierra.c:1691
+#: camlibs/sierra/sierra.c:1472 camlibs/sierra/sierra.c:1481
+#: camlibs/sierra/sierra.c:1716
 msgid "F2.3"
 msgstr "F2.3"
 
-#: camlibs/sierra/sierra.c:1448 camlibs/sierra/sierra.c:1458
-#: camlibs/sierra/sierra.c:1693
+#: camlibs/sierra/sierra.c:1473 camlibs/sierra/sierra.c:1483
+#: camlibs/sierra/sierra.c:1718
 msgid "F2.8"
 msgstr "F2.8"
 
-#: camlibs/sierra/sierra.c:1449 camlibs/sierra/sierra.c:1460
-#: camlibs/sierra/sierra.c:1695
+#: camlibs/sierra/sierra.c:1474 camlibs/sierra/sierra.c:1485
+#: camlibs/sierra/sierra.c:1720
 msgid "F4"
 msgstr "F4"
 
-#: camlibs/sierra/sierra.c:1450 camlibs/sierra/sierra.c:1462
-#: camlibs/sierra/sierra.c:1697
+#: camlibs/sierra/sierra.c:1475 camlibs/sierra/sierra.c:1487
+#: camlibs/sierra/sierra.c:1722
 msgid "F5.6"
 msgstr "F5.6"
 
-#: camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1464
-#: camlibs/sierra/sierra.c:1699
+#: camlibs/sierra/sierra.c:1476 camlibs/sierra/sierra.c:1489
+#: camlibs/sierra/sierra.c:1724
 msgid "F8"
 msgstr "F8"
 
-#: camlibs/sierra/sierra.c:1555 camlibs/sierra/sierra.c:1563
-#: camlibs/sierra/sierra.c:1768
+#: camlibs/sierra/sierra.c:1580 camlibs/sierra/sierra.c:1588
+#: camlibs/sierra/sierra.c:1793
 msgid "SuperFine"
 msgstr "SuperFin"
 
-#: camlibs/sierra/sierra.c:1556 camlibs/sierra/sierra.c:1565
-#: camlibs/sierra/sierra.c:1770
+#: camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1590
+#: camlibs/sierra/sierra.c:1795
 msgid "HyPict"
 msgstr "HyPict"
 
-#: camlibs/sierra/sierra.c:1579 camlibs/sierra/sierra.c:1582
-#: camlibs/sierra/sierra.c:1782
+#: camlibs/sierra/sierra.c:1604 camlibs/sierra/sierra.c:1607
+#: camlibs/sierra/sierra.c:1807
 msgid "color"
 msgstr "färger"
 
-#: camlibs/sierra/sierra.c:1580 camlibs/sierra/sierra.c:1584
-#: camlibs/sierra/sierra.c:1784
+#: camlibs/sierra/sierra.c:1605 camlibs/sierra/sierra.c:1609
+#: camlibs/sierra/sierra.c:1809
 msgid "black & white"
 msgstr "svartvitt"
 
-#: camlibs/sierra/sierra.c:1886
+#: camlibs/sierra/sierra.c:1911
 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:1894
+#: camlibs/sierra/sierra.c:1919
 #, c-format
 msgid "%sCamera Model: %s\n"
 msgstr "%sKameramodell: %s\n"
 
-#: camlibs/sierra/sierra.c:1896
+#: camlibs/sierra/sierra.c:1921
 #, c-format
 msgid "%sManufacturer: %s\n"
 msgstr "%sTillverkare: %s\n"
 
-#: camlibs/sierra/sierra.c:1898
+#: camlibs/sierra/sierra.c:1923
 #, c-format
 msgid "%sCamera ID: %s\n"
 msgstr "%sKamera ID: %s\n"
 
-#: camlibs/sierra/sierra.c:1900
+#: camlibs/sierra/sierra.c:1925
 #, c-format
 msgid "%sSerial Number: %s\n"
 msgstr "%sSerienummer: %s\n"
 
-#: camlibs/sierra/sierra.c:1902
+#: camlibs/sierra/sierra.c:1927
 #, c-format
 msgid "%sSoftware Rev.: %s\n"
 msgstr "%sMjukvaru-revision: %s\n"
 
-#: camlibs/sierra/sierra.c:1907 camlibs/sierra/sierra.c:1910
+#: camlibs/sierra/sierra.c:1932 camlibs/sierra/sierra.c:1935
 #, c-format
 msgid "%sFrames Taken: %i\n"
 msgstr "%sbilder tagna: %i\n"
 
-#: camlibs/sierra/sierra.c:1913
+#: camlibs/sierra/sierra.c:1938
 #, c-format
 msgid "%sFrames Left: %i\n"
 msgstr "%sbilder kvar: %i\n"
 
-#: camlibs/sierra/sierra.c:1915
+#: camlibs/sierra/sierra.c:1940
 #, c-format
 msgid "%sBattery Life: %i\n"
 msgstr "%sBatteritid: %i\n"
 
-#: camlibs/sierra/sierra.c:1917
+#: camlibs/sierra/sierra.c:1942
 #, c-format
 msgid "%sMemory Left: %i bytes\n"
 msgstr "%sMinne kvar: %i byte\n"
 
-#: camlibs/sierra/sierra.c:1922
+#: camlibs/sierra/sierra.c:1947
 #, c-format
 msgid "%sDate: %s"
 msgstr "%sDatum: %s"
 
-#: camlibs/sierra/sierra.c:1938
+#: camlibs/sierra/sierra.c:1963
 #, fuzzy
 msgid "No camera manual available.\n"
 msgstr "Kameran ej tillgänglig"
 
-#: camlibs/sierra/sierra.c:1945
+#: camlibs/sierra/sierra.c:1970
 #, fuzzy, c-format
 msgid ""
 "Some notes about Epson cameras:\n"
@@ -5909,7 +6610,8 @@ msgstr ""
 "  vanligen skriv ett brev till <gphoto-devel@lists.sourceforge.net> (på "
 "Engelska)\n"
 
-#: camlibs/sierra/sierra.c:1957
+#: camlibs/sierra/sierra.c:1982
+#, fuzzy
 msgid ""
 "Some notes about Olympus cameras (and others?):\n"
 "(1) Camera Configuration:\n"
@@ -5924,7 +6626,7 @@ msgid ""
 "    camera control menu appears. Set it to ON.\n"
 "(3) If you switch the 'LCD mode' to 'Monitor' or\n"
 "    'Normal', don't forget to switch it back to 'Off'\n"
-"    before disconnectig. Otherwise you cannot use\n"
+"    before disconnecting. Otherwise you cannot use\n"
 "    the camera's buttons. If you end up with this\n"
 "    state, you should reconnect the camera to the\n"
 "    PC and switch LCD to 'Off'."
@@ -5945,7 +6647,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:1986
+#: camlibs/sierra/sierra.c:2011
 #, fuzzy
 msgid ""
 "sierra SPARClite library\n"
@@ -5965,7 +6667,7 @@ msgstr ""
 "Tack till Data Engines (www.dataengines.com)\n"
 "för användingen av deras Olympus C-3030Z för USB-stödet."
 
-#: camlibs/sierra/sierra-desc.c:184
+#: camlibs/sierra/sierra-desc.c:186
 #, c-format
 msgid "%lld (unknown)"
 msgstr "%lld (okänd)"
@@ -6001,6 +6703,35 @@ msgid ""
 "Driver for accessing the Smal Ultrapocket camera, and OEM versions (slimshot)"
 msgstr ""
 
+#: camlibs/sonix/library.c:98
+#, c-format
+msgid ""
+"Sonix camera.\n"
+"There is %i photo in it.\n"
+msgid_plural ""
+"Sonix camera.\n"
+"There are %i photos in it.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: camlibs/sonix/library.c:109
+msgid ""
+"This driver supports cameras with Sonix chip\n"
+"and should work with gtkam.\n"
+"The driver allows you to get\n"
+"   - thumbnails for gtkam\n"
+"   - full images in PPM format\n"
+"If present on the camera, video clip frames are downloaded \n"
+"as consecutive still photos.\n"
+"Capture not supported"
+msgstr ""
+
+#: camlibs/sonix/library.c:125
+msgid ""
+"Sonix camera library\n"
+"Theodore Kilgore <kilgota@auburn.edu>\n"
+msgstr ""
+
 #: camlibs/sonydscf1/dsc_f1.c:134
 msgid "Sorry, this function not implemented..."
 msgstr "Ledsen, denna funktion är inte implementerad..."
@@ -6144,7 +6875,7 @@ msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Porttypen stöds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
 
-#: camlibs/sq905/library.c:124
+#: camlibs/sq905/library.c:127
 #, c-format
 msgid ""
 "Your USB camera has a S&Q chipset.\n"
@@ -6153,7 +6884,7 @@ msgid ""
 "several frames\n"
 msgstr ""
 
-#: camlibs/sq905/library.c:138
+#: camlibs/sq905/library.c:141
 msgid ""
 "For cameras with S&Q Technologies chip.\n"
 "Should work with gtkam. Photos will be saved in PPM format.\n"
@@ -6175,7 +6906,7 @@ msgid ""
 "choose to save clip frames in separate directories. or not.\n"
 msgstr ""
 
-#: camlibs/sq905/library.c:166
+#: camlibs/sq905/library.c:169
 msgid ""
 "sq905 generic driver\n"
 "Theodore Kilgore <kilgota@auburn.edu>\n"
@@ -6332,102 +7063,102 @@ msgid ""
 "Toshiba pdr-m11 driver.\n"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:173
+#: libgphoto2/gphoto2-abilities-list.c:190
 msgid "Internal error looking for camlibs. (path names too long?)"
 msgstr ""
 
-#: libgphoto2/gphoto2-abilities-list.c:182
+#: libgphoto2/gphoto2-abilities-list.c:199
 #, c-format
 msgid "Loading camera drivers from '%s'..."
 msgstr "Laddar kamera-drivrutiner från '%s'..."
 
-#: libgphoto2/gphoto2-abilities-list.c:576
+#: libgphoto2/gphoto2-abilities-list.c:617
 #, c-format
 msgid "Could not find any driver for '%s'"
 msgstr "Kunde inte finna någon drivrutin för '%s'"
 
-#: libgphoto2/gphoto2-camera.c:79
+#: libgphoto2/gphoto2-camera.c:81
 #, c-format
 msgid "An error occurred in the io-library ('%s'): %s"
 msgstr "Ett fel uppstod i io-biblioteket ('%s'): %s"
 
-#: libgphoto2/gphoto2-camera.c:83
+#: libgphoto2/gphoto2-camera.c:85
 msgid "No additional information available."
 msgstr "Ingen ytterligare information tillgänglig."
 
-#: libgphoto2/gphoto2-camera.c:676
+#: libgphoto2/gphoto2-camera.c:674
 msgid "Could not detect any camera"
 msgstr "Kunde inte finna någon kamera."
 
-#: libgphoto2/gphoto2-camera.c:698
+#: libgphoto2/gphoto2-camera.c:696
 msgid "You have to set the port prior initialization of the camera."
 msgstr "Du måste sätta porten innan du initialiserar kameran."
 
-#: libgphoto2/gphoto2-camera.c:723
+#: libgphoto2/gphoto2-camera.c:721
 #, c-format
 msgid "Could not load required camera driver '%s' (%s)."
 msgstr "Kunde inte ladda nödvändig kameradrivrutin '%s' (%s)."
 
-#: libgphoto2/gphoto2-camera.c:736
+#: libgphoto2/gphoto2-camera.c:734
 #, c-format
 msgid "Camera driver '%s' is missing the 'camera_init' function."
 msgstr "Kameradrivrutinen '%s' saknar 'camera_init' funktionen."
 
-#: libgphoto2/gphoto2-camera.c:788
+#: libgphoto2/gphoto2-camera.c:785
 msgid "This camera does not offer any configuration options."
 msgstr "Denna kamera erbjuder inga konfigurationsalternativ."
 
-#: libgphoto2/gphoto2-camera.c:820
+#: libgphoto2/gphoto2-camera.c:818
 msgid "This camera does not support setting configuration options."
 msgstr "Denna kamera stödjer inte sättning av konfigurationsparametrar."
 
-#: libgphoto2/gphoto2-camera.c:852
+#: libgphoto2/gphoto2-camera.c:850
 msgid "This camera does not support summaries."
 msgstr "Denna kamera stödjer inte sammanfattningar."
 
-#: libgphoto2/gphoto2-camera.c:883
+#: libgphoto2/gphoto2-camera.c:881
 msgid "This camera does not offer a manual."
 msgstr "Denna kamera erbjuder inte en bruksanvisning."
 
-#: libgphoto2/gphoto2-camera.c:914
+#: libgphoto2/gphoto2-camera.c:912
 msgid "This camera does not provide information about the driver."
 msgstr "Denna kamera erbjuder inte information om drivrutinen."
 
-#: libgphoto2/gphoto2-camera.c:948
+#: libgphoto2/gphoto2-camera.c:946
 msgid "This camera can not capture."
 msgstr "Denna kamera kan inte ta bilder."
 
-#: libgphoto2/gphoto2-camera.c:981
+#: libgphoto2/gphoto2-camera.c:979
 msgid "This camera can not capture previews."
 msgstr "Denna kamera kan inte ta förgranskningsbilder."
 
-#: libgphoto2/gphoto2-filesys.c:284
+#: libgphoto2/gphoto2-filesys.c:279
 #, c-format
 msgid "The path '%s' is not absolute."
 msgstr "Sökvägen '%s' är inte absolut."
 
-#: libgphoto2/gphoto2-filesys.c:417
+#: libgphoto2/gphoto2-filesys.c:411
 #, 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:599
+#: libgphoto2/gphoto2-filesys.c:591
 #, c-format
 msgid "Could not find folder '%s'."
 msgstr "Kunde inte hitta mapp '%s'"
 
-#: libgphoto2/gphoto2-filesys.c:616
+#: libgphoto2/gphoto2-filesys.c:608
 #, 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:680
+#: libgphoto2/gphoto2-filesys.c:672
 #, 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:1057
+#: libgphoto2/gphoto2-filesys.c:1050
 #, c-format
 msgid ""
 "You have been trying to delete '%s' from folder '%s', but the filesystem "
@@ -6436,23 +7167,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:1160
+#: libgphoto2/gphoto2-filesys.c:1153
 #, 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:1167
+#: libgphoto2/gphoto2-filesys.c:1160
 #, 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:1209
+#: libgphoto2/gphoto2-filesys.c:1202
 msgid "The filesystem does not support upload of files."
 msgstr "Filsystemet stödjer inte uppladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1250
+#: libgphoto2/gphoto2-filesys.c:1243
 #, c-format
 msgid ""
 "Folder '%s' does only contain %i files, but you requested a file with number "
@@ -6460,69 +7191,40 @@ msgid ""
 msgstr ""
 "Mappen '%s' innehåller endast %i filer, men du begärde en fil med nummer %i."
 
-#: libgphoto2/gphoto2-filesys.c:1295
+#: libgphoto2/gphoto2-filesys.c:1288
 #, 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:1382
+#: libgphoto2/gphoto2-filesys.c:1375
 #, c-format
 msgid "Could not find file '%s'."
 msgstr "Kunde inte hitta filen '%s'."
 
-#: libgphoto2/gphoto2-filesys.c:1507
+#: libgphoto2/gphoto2-filesys.c:1500
 msgid "The filesystem doesn't support getting files"
 msgstr "Filsystemet stödjer inte nerladdning av filer."
 
-#: libgphoto2/gphoto2-filesys.c:1542 libgphoto2/gphoto2-filesys.c:2089
-#: libgphoto2/gphoto2-filesys.c:2242
+#: libgphoto2/gphoto2-filesys.c:1535 libgphoto2/gphoto2-filesys.c:1994
+#: libgphoto2/gphoto2-filesys.c:2147
 #, c-format
 msgid "Unknown file type %i."
 msgstr "Okänd filtyp %i."
 
-#: libgphoto2/gphoto2-filesys.c:1546
+#: libgphoto2/gphoto2-filesys.c:1539
 #, c-format
 msgid "Downloading '%s' from folder '%s'..."
 msgstr "Laddar ner '%s' från mappen '%s'..."
 
-#: libgphoto2/gphoto2-filesys.c:1756
+#: libgphoto2/gphoto2-filesys.c:1749
 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:1931
-#, c-format
-msgid ""
-"Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
-"filesystem is mounted."
-msgstr ""
-"Kunde inte öppna '/proc/meminfo' för läsning ('%m'). Se till att proc-"
-"filsystemet är monterat."
-
-#: libgphoto2/gphoto2-filesys.c:1939
-#, 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:1974
-#, c-format
-msgid "sysctl call failed ('%m')."
-msgstr "sysctl anropet misslyckades ('%m')."
-
-#: libgphoto2/gphoto2-filesys.c:1992
-#, fuzzy, c-format
-msgid "sysconf call failed ('%m')."
-msgstr "sysctl anropet misslyckades ('%m')."
-
-#: libgphoto2/gphoto2-filesys.c:2000
-#, fuzzy, c-format
-msgid "swapctl call failed ('%m')."
-msgstr "sysctl anropet misslyckades ('%m')."
-
-#: libgphoto2/gphoto2-filesys.c:2345
+#: libgphoto2/gphoto2-filesys.c:2250
 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:2368
+#: libgphoto2/gphoto2-filesys.c:2273
 msgid "Read-only file attributes like width and height can not be changed."
 msgstr "Skrivskyddade filattribut som bredd och höjd kan inte ändras."
 
@@ -6579,6 +7281,59 @@ msgstr "Okänt kamerabiblioteksfel"
 msgid "Unknown error"
 msgstr "Okänt fel"
 
+#~ msgid "Could not follow the link '%s' (%m)."
+#~ msgstr "Kunde inte följa länken '%s' (%m)."
+
+#~ msgid "Could not follow the link '%s' in '%s' (%m)."
+#~ msgstr "Kunde inte följa länken '%s' i '%s' (%m)."
+
+#~ msgid "Directory Browse"
+#~ msgstr "Katalogbläddring"
+
+#~ msgid "View hidden directories"
+#~ msgstr "Visa dolda kataloger"
+
+#, fuzzy
+#~ msgid "Flash Memory"
+#~ msgstr "Blixt Läge"
+
+#, fuzzy
+#~ msgid "Macro Mode"
+#~ msgstr "Inspelningsläge"
+
+#, fuzzy
+#~ msgid "Real Image Width"
+#~ msgstr "Bildbredd: %d\n"
+
+#, fuzzy
+#~ msgid "Colour Mode"
+#~ msgstr "Färgläge"
+
+#, fuzzy
+#~ msgid "Incadescent"
+#~ msgstr "Bländande"
+
+#~ msgid ""
+#~ "Could not open '/proc/meminfo' for reading ('%m'). Make sure the proc "
+#~ "filesystem is mounted."
+#~ msgstr ""
+#~ "Kunde inte öppna '/proc/meminfo' för läsning ('%m'). Se till att proc-"
+#~ "filsystemet är monterat."
+
+#~ msgid "An error occured while reading '/proc/meminfo' ('%m')."
+#~ msgstr "Ett fel uppstod vid läsning av '/proc/meminfo' ('%m')."
+
+#~ msgid "sysctl call failed ('%m')."
+#~ msgstr "sysctl anropet misslyckades ('%m')."
+
+#, fuzzy
+#~ msgid "sysconf call failed ('%m')."
+#~ msgstr "sysctl anropet misslyckades ('%m')."
+
+#, fuzzy
+#~ msgid "swapctl call failed ('%m')."
+#~ msgstr "sysctl anropet misslyckades ('%m')."
+
 #~ msgid "Could not open '%s'"
 #~ msgstr "Kunde inte öppna '%s'"
author	Hans Ulrich Niedermann <gp@n-dimensional.de>	2006-03-15 08:02:03 +0000
committer	Hans Ulrich Niedermann <gp@n-dimensional.de>	2006-03-15 08:02:03 +0000
commit	f0af2f5421195e65e0b0a9702b2505c6e21973e8 (patch)
tree	15187e81a106da62cbe9c2d3c371c12e7ae05b87 /po/sv.po
parent	b92c4c93dedb5f5b4aa9d9ce549ad8e719c87d4d (diff)
download	libgphoto2-f0af2f5421195e65e0b0a9702b2505c6e21973e8.tar.gz