update-po and update Lutz's email

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

13 files changed, 2133 insertions, 1590 deletions

diff --git a/po/da.po b/po/da.po
index 05e1272ac..07623f056 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2000-04-19 10:12+02:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,6 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -35,80 +43,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"Kunne ikke �bne:\n"
+"%s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -155,13 +193,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"Kunne ikke �bne:\n"
+"%s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Kunne ikke �bne:\n"
 "%s"
@@ -261,7 +301,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Konfiguration af kamera"
@@ -302,7 +342,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -336,7 +376,7 @@ msgstr "S�t tilbage"
 msgid "could not set time"
 msgstr "Kunne ikke gemme #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -728,9 +768,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Kunne ikke finde smugkig"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -920,8 +960,8 @@ msgid "Problem taking live image"
 msgstr "Finder levende billede..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Konfiguration af kamera"
 
@@ -1152,37 +1192,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke tage billede."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1190,20 +1222,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2585,24 +2625,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "Nedlastning stoppet."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s er ikke implementeret endnu"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2611,6 +2633,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s er ikke implementeret endnu"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2620,12 +2648,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "Nedlastning stoppet."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2637,8 +2677,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2791,177 +2831,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Gemning af indeks er ikke underst�ttet endnu"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ikke tilg�ngelig"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Nedlastning afbrudt."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2971,24 +3011,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "Nyt billede er #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3315,6 +3355,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4085,11 +4129,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4363,6 +4402,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4884,6 +4928,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunne ikke finde smugkig"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/de.po b/po/de.po
index 5e2317aa7..e20f4a3f4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
-"POT-Creation-Date: 2003-07-10 17:22-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2003-07-11 14:45-0400\n"
 "Last-Translator: Marcus Meissner <marcus@jet.franken.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -17,6 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -131,6 +139,33 @@ msgstr ""
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "K�nnte JPEG Vorschaubild von Daten nicht ausziehen: keine Anfang/Ende"
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -178,8 +213,8 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr "Interne Fehler nr.1 in get_file_func() (%s Zeile %i)"
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr "Kein Vorschaubild f�r %s gefunden"
 
 #: camlibs/canon/library.c:545
@@ -306,7 +341,7 @@ msgstr "Konnte Verzeichnis \\\\DCIM nicht anlegen."
 msgid "Could not create destination directory."
 msgstr "Konnte Zielverzeichnis nicht anlegen."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- und Treiber-Konfiguration"
 
@@ -343,7 +378,7 @@ msgstr "Setze Kameradatum auf das Datum des PCs"
 msgid "Firmware revision (readonly)"
 msgstr "Firmware-Revision (Nur-Lesen)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "Energie (Nur-Lesen)"
 
@@ -375,7 +410,7 @@ msgstr "Zeit gesetzt"
 msgid "could not set time"
 msgstr "Konnte Zeit nicht setzen"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -1018,8 +1053,8 @@ msgid "Problem taking live image"
 msgstr "Problem bei der Aufnahme eines Live-Bildes"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamera-Konfiguration"
 
@@ -1243,43 +1278,36 @@ msgstr "Modell:"
 msgid "Available memory: "
 msgstr "Verf�gbarer Speicher:"
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart-Bibliothek v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
-"\n"
+"gsmart300 Kamerabibliothek\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Unterst�tzung f�r die Mustek gSmart mini-Digitalkameras, basierend auf "
-"verschiedenen anderen gphoto2-Bibliotheken und dem Windows-Treiber, der "
+"J�r�me Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Unterst�tzung f�r die Mustek gSmart 300-Digitalkameras, basierend auf\n"
+"verschiedenen anderen gphoto2-Bibliotheken und den Spezifikationen, die\n"
 "freundlicherweise von Mustek zur Verf�gung gestellt wurde.\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Nichtunterst�tzter Porttyp: %d. Dieser Treiber unterst�tzt nur USB-Kameras.\n"
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Konnte Kamera nicht zur�cksetzen.\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1289,27 +1317,34 @@ msgstr ""
 "Diese Kamera kann nur die jeweils letzte Datei l�schen. In diesem Fall ist "
 "dies Datei �%s�."
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "gsmart-Bibliothek v"
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
-"gsmart300 Kamerabibliothek\n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"J�r�me Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Unterst�tzung f�r die Mustek gSmart 300-Digitalkameras, basierend auf\n"
-"verschiedenen anderen gphoto2-Bibliotheken und den Spezifikationen, die\n"
+"Unterst�tzung f�r die Mustek gSmart mini-Digitalkameras, basierend auf "
+"verschiedenen anderen gphoto2-Bibliotheken und dem Windows-Treiber, der "
 "freundlicherweise von Mustek zur Verf�gung gestellt wurde.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nichtunterst�tzter Porttyp: %d. Dieser Treiber unterst�tzt nur USB-Kameras.\n"
 
@@ -2825,25 +2860,6 @@ msgstr ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-Treiber\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "Lade Datei herunter..."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "Handbuch noch nicht implementiert"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"Creative PC-CAM600\n"
-" Autor: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2855,6 +2871,11 @@ msgstr ""
 " Freier Speicher: %8d Byte(s).\n"
 " Anzahl Dateien: %d"
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "Handbuch noch nicht implementiert"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2867,12 +2888,27 @@ msgstr ""
 "Autoren: Till Adam <till@adam-lilienthal.de>\n"
 "und: Miah Gregory <mace@darksilence.net>"
 
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "Lade Datei herunter..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"Creative PC-CAM600\n"
+" Autor: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
+#, fuzzy
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 "Bibliothek zum Zugriff auf verschiedene Polaroid Kameras.\n"
@@ -2887,18 +2923,19 @@ msgid "Model: %x, %x, %x, %x"
 msgstr "Modell: %x, %x, %x, %x"
 
 #: camlibs/polaroid/pdc640.c:887
+#, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 "Bibliothek zum Zugriff auf GrandTek 98x basierte Kameras.Original Author: "
 "Chris Byrne <adapt@ihug.co.nz>, Anpassung f�r gphoto2 durch Lutz M�ller "
-"<lutz@users.sf.net>. Verbesserung im Protokoll und Bild "
-"Nachbearbeitung f�r Jenoptik JD350e durch Michael Trawny <trawny99@users."
-"sourceforge.net>. Bugfixes von Marcus Mei�ner <marcus@jet.franken.de>."
+"<lutz@users.sf.net>. Verbesserung im Protokoll und Bild Nachbearbeitung f�r "
+"Jenoptik JD350e durch Michael Trawny <trawny99@users.sourceforge.net>. "
+"Bugfixes von Marcus Mei�ner <marcus@jet.franken.de>."
 
 #: camlibs/polaroid/pdc700.c:159
 msgid "Image Quality"
@@ -3016,7 +3053,7 @@ msgid ""
 msgstr ""
 "Bibliothek zum Zugriff auf die Polaroid DC700 Kamera. Originaler Author Ryan "
 "Lantzer <rlantzer@umr.edu> f�r gphoto 4.x. Angepa�t f�r gphoto2 durch Lutz "
-"M�ller <urc8.rz.uni-karlsruhe.de>."
+"M�ller <lutz@users.sf.net>."
 
 #: camlibs/polaroid/pdc700.c:997
 msgid "How long will it take until the camera powers off?"
@@ -3065,167 +3102,167 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Der angeforderte Port-Typ (%i) wird von diesem Treiber nicht unterst�tzt."
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "PTP- Undefinierter Fehler"
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP-OK!"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP-Allgemeiner Fehler"
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP-Sitzung nicht ge�ffnet"
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP-Fehlerhafte Transaktions-ID"
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "PTP-Operation nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "PTP-Parameter nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "PTP-Unvollst�ndiger Transfer"
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "PTP-Fehlerhafte Storage-ID"
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "PTP-Ung�ltiges Object Handle"
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP-Ger�teeigenschaft nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP-Ung�ltiger Object Formatcode"
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP-Speicher voll"
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP-Objekt schreibgesch�tzt"
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "PTP-Speicher-schreibgesch�tzt"
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP-Zugriff verweigert"
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "PTP-Kein Thumbnail vorhanden"
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP-Selbsttest fehlgeschlagen"
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP-Partiell gel�scht"
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "PTP- Speicher nicht verf�gbar"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP- Spezifikation durch Format nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "PTP-Keine g�ltige Object Information"
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "PTP-Ung�ltiges Codeformat"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP-Unbekannter H�ndlercode"
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "PTP-Aufnahme bereits beendet"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP-Device Bus"
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "PTP-Ung�ltiges Vaterobjekt"
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP-Ung�ltiges Ger�teeigenschaften Format"
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP-Ung�ltiger Ger�teeigenschaftswert"
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "PTP-Ung�ltiger Parameter"
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP- Sitzung bereits ge�ffnet."
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP-Transaktion abgebrochen"
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP-Spezifikation des Zieles nicht unterst�tzt"
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "PTP-EK-Filename erforderlich"
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP-EK Filenamenskonflikt"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "PTP-EK-Filename ung�ltig"
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP-Ein/Ausgabefehler"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP- Fehler: Ung�ltiger Parameter"
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP- Protokollfehler: Daten erwartet"
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP-Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3235,7 +3272,7 @@ msgstr ""
 "(c) 2001-2003 Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Viel Spa�!"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3250,23 +3287,23 @@ msgstr ""
 "H�ndler Kennung: 0x%08x\n"
 "H�ndler Beschreibung: %s\n"
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 msgid "Number of values"
 msgstr "Anzahl der Werte"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr "Unterst�tzte Werte"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr "Aktueller Wert"
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr "Initialisiere Kamera"
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP- Ist nur f�r USB Kameras implementiert."
 
@@ -3582,6 +3619,10 @@ msgstr "EK Stromsparmodus"
 msgid "EK UI Language"
 msgstr "EK Benutzerinterface Sprache"
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr "Entwickelt von Mariusz Woloszyn <emsi@ipartners.pl>. Viel Spass!"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4426,11 +4467,6 @@ msgstr ""
 "    haben, dann kontaktieren Sie bitte \n"
 "    <gphoto-devel@gphoto.net>.\n"
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (unbekannt)"
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "Die hochzuladende Datei hat eine Gr��e von null Bytes"
@@ -4734,6 +4770,11 @@ msgstr ""
 "Dank an Data Engines (www.dataengines.com) f�r die\n"
 "Freigabe ihrer Olympus C-3030Z for USB-Implementierung."
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (unbekannt)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -5339,9 +5380,6 @@ msgstr "Unbekannter Fehler"
 #~ msgid "Driver Configuration"
 #~ msgstr "Treiber Konfiguration"
 
-#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-#~ msgstr "Entwickelt von Mariusz Woloszyn <emsi@ipartners.pl>. Viel Spass!"
-
 #~ msgid "(ptp2) Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
 #~ msgstr ""
 #~ "(ptp2): Entwickelt von Mariusz Woloszyn <emsi@ipartners.pl>. Viel Spass!"
diff --git a/po/es.po b/po/es.po
index 03bcd4d15..364a1bc26 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-07-11 18:42+0200\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2003-07-11 14:03-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -336,7 +336,7 @@ msgstr "No se puede crear el directorio \\DCIM."
 msgid "Could not create destination directory."
 msgstr "No se puede crear el directorio de destino."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "Configuraci�n del controlador y la c�mara"
 
@@ -373,7 +373,7 @@ msgstr "Configurar la fecha de la c�mara con la de la PC"
 msgid "Firmware revision (readonly)"
 msgstr "Revisi�n del firmware (s�lo lectura)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "Energ�a (s�lo lectura)"
 
@@ -2907,17 +2907,18 @@ msgstr ""
 " correo-e: <pbk@odense.kollegienet.dk>\n"
 
 #: camlibs/polaroid/pdc320.c:455
+#, fuzzy
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 "Programa de descarga para varias c�maras Polaroid. Escrito originalmente por "
 "Peter Desnoyers <pjd@fred.cambridge.ma.us>, y adaptado para gphoto2 por "
-"Nathan Stenzel <nathanstenzel@users.sourceforge.net> y Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.\n"
+"Nathan Stenzel <nathanstenzel@users.sourceforge.net> y Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "La prueba con una Polaroid 640SE fue realizada por Michael Golden "
 "<naugrim@juno.com>."
 
@@ -2927,10 +2928,11 @@ msgid "Model: %x, %x, %x, %x"
 msgstr "Modelo: %x, %x, %x, %x"
 
 #: camlibs/polaroid/pdc640.c:887
+#, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -3265,7 +3267,7 @@ msgstr "PTP. Error de protocolo, se esperaban datos"
 msgid "PTP Protocol error, response expected"
 msgstr "PTP. Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3275,7 +3277,7 @@ msgstr ""
 "(c)2001-2003 por Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "�Disfrute!"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3290,23 +3292,23 @@ msgstr ""
 "ID extensi�n del fabricante: 0x%08x\n"
 "Descripci�n extensi�n del fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 msgid "Number of values"
 msgstr "Cantidad de valores"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr "Valores soportados"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr "Valor corriente"
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr "Inicializando la c�mara"
 
-#: camlibs/ptp2/library.c:1154 camlibs/ptp/library.c:1065
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP est� implementado s�lo para c�maras USB."
 
diff --git a/po/fr.po b/po/fr.po
index 970d31d10..fb2d1b515 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"POT-Creation-Date: 2003-07-11 14:53+0200\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2003-06-22 23:47+0200\n"
 "Last-Translator: Aur�lien Croc <aurelien@ap2c.com>\n"
 "Language-Team: Fran�ais\n"
@@ -16,6 +16,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.2beta3\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -132,6 +140,33 @@ msgstr ""
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr "Impossible d'extraire la vignette JPEG des donn�es: pas de d�but/fin"
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -306,7 +341,7 @@ msgstr "Impossible de cr�er le dossier \\DCIM."
 msgid "Could not create destination directory."
 msgstr "Impossible d'obtenir le contenu du r�pertoire destination."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "Configuration de l'appareil et du pilote"
 
@@ -343,7 +378,7 @@ msgstr "Mettre l'appareil � la date du PC"
 msgid "Firmware revision (readonly)"
 msgstr "R�vision de microcode (lecture seule)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "�nergie (lecture seule)"
 
@@ -990,8 +1025,8 @@ msgid "Problem taking live image"
 msgstr "Probl�me � la prise de vue en temps-r�el"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Configuration de l'appareil"
 
@@ -1219,44 +1254,37 @@ msgstr "Mod�le :"
 msgid "Available memory: "
 msgstr "M�moire disponible:"
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "Biblioth�que gsmart v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
-"\n"
+"Biblioth�que gsmart300\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support pour la mini-s�rie d'appareils photos  Mustek gSmart bas� sur divers "
-"autres modules d'appareils gphoto2 et les sources du pilote windows "
-"gentiment pass�es par Mustek.\n"
+"J�r�me Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support pour les appareils photos Mustek gSmart 300\n"
+"bas� sur divers autres modules d'appareils gphoto2 et les sp�cifications "
+"gentiment fournies par Mustek.\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Type de port non support�: %d. Ce pilote ne marche qu'avec des appareils "
 "USB.\n"
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Impossible de remettre l'appareil � z�ro.\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1266,27 +1294,34 @@ msgstr ""
 "Votre appareil ne supporte que la suppression du dernier fichier de "
 "l'appareil. Dans ce cas, il s'agit du fichier '%s'."
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "Biblioth�que gsmart v"
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
-"Biblioth�que gsmart300\n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"J�r�me Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support pour les appareils photos Mustek gSmart 300\n"
-"bas� sur divers autres modules d'appareils gphoto2 et les sp�cifications "
-"gentiment fournies par Mustek.\n"
+"Support pour la mini-s�rie d'appareils photos  Mustek gSmart bas� sur divers "
+"autres modules d'appareils gphoto2 et les sources du pilote windows "
+"gentiment pass�es par Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Type de port non support�: %d. Ce pilote ne marche qu'avec des appareils "
 "USB.\n"
@@ -2803,25 +2838,6 @@ msgstr ""
 "Pilote pour Panasonic PV-L859-K/PV-L779-K Palmcorder\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "T�l�chargement du fichier..."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "Le manuel n'est pas encore impl�ment�."
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"Creative PC-CAM600\n"
-" Auteur: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2833,6 +2849,11 @@ msgstr ""
 "L'espace m�moire libre est de %8d octets.\n"
 "Nombre de fichiers : %d"
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "Le manuel n'est pas encore impl�ment�."
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2847,18 +2868,33 @@ msgstr ""
 "et : Miah Gregory\n"
 " <mace@darksilence.net>"
 
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "T�l�chargement du fichier..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"Creative PC-CAM600\n"
+" Auteur: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
+#, fuzzy
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 "T�l�charg� le programme pour quelques appareils photos Polaro�d. "
 "Originellement �crit par Peter Desnoyers <pjd@fred.cambridge.ma.us>, et "
 "adapt� pour GPhoto2 par Nathan Stenzel <nathanstenzel@user.sourceforge.net> "
-"et Lutz M�eller <urc8rz.uni- karlsruhe.de>. \n"
+"et Lutz M�eller <lutz@users.sf.net>. \n"
 "Les tests du Polaro�d 640SE ont �t� effectu�s par Michael Golden "
 "<naugrim@juno.com>."
 
@@ -2868,19 +2904,20 @@ msgid "Model: %x, %x, %x, %x"
 msgstr "Mod�le : %x, %x, %x, %x"
 
 #: camlibs/polaroid/pdc640.c:887
+#, fuzzy
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
 "Programme de r�cup�ration pour les appareils photos bas�s sur le GrandTek "
 "98x. Originellement �crit par Chris Byrne <adapt@ihug.co.nz>, et adapt� pour "
-"gphoto2 par Lutz M�eller <lutz@users.sf.net>. Am�liorations du "
-"protocole et traitement post-op�ratoire pour les Jenoptik JD350e par Michael "
-"Trawny <trawny99@users.sourceforge.net>. R�solution de bugs par Marcus "
-"Meissner <marcus@jet.franken.de>."
+"gphoto2 par Lutz M�eller <lutz@users.sf.net>. Am�liorations du protocole et "
+"traitement post-op�ratoire pour les Jenoptik JD350e par Michael Trawny "
+"<trawny99@users.sourceforge.net>. R�solution de bugs par Marcus Meissner "
+"<marcus@jet.franken.de>."
 
 #: camlibs/polaroid/pdc700.c:159
 msgid "Image Quality"
@@ -2998,7 +3035,7 @@ msgid ""
 msgstr ""
 "T�l�charg� le programme des appareils photos Polaro�d DC700. Originellement "
 "�crit par Ryan Lantzer <rlantzer@umr.edu> pour GPhoto 4.X. Adapt� pour "
-"GPhoto2 by Lutz M�eller <urc8@rz-karlsruhe.de>."
+"GPhoto2 by Lutz M�eller <lutz@users.sf.net>."
 
 #: camlibs/polaroid/pdc700.c:997
 msgid "How long will it take until the camera powers off?"
@@ -3047,167 +3084,167 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 "Le type de port demand� (%i) n'est pas support� par ce pilote logiciel."
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "PTP Erreur non d�finie"
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP Erreur g�n�rale"
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP Session non-ouverte"
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ID de transaction invalide"
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "PTP Op�ration non support�e"
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "PTP Param�tre non support�"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "PTP Transfert incomplet"
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "PTP Storage ID invalide"
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "PTP identificateur d'objet invalide"
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP Propri�t� de p�riph�rique non support�e"
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP Code de format d'objet incorrect"
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP plus d'espace"
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP Objet prot�g� en �criture"
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "PTP M�moire en lecture seule"
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP Acc�s refus�"
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "Pas de miniature pr�sente"
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP Echec de l'autotest "
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP Effacement partiel"
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "PTP espace non disponible"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP Sp�cification de format non support�e"
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "PTP Pas d'information valide sur l'objet"
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "PTP Format de code incorrect"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP Mod�le inconnu"
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "PTP Capture d�j� termin�"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP Bus des p�riph�riques"
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "PTP Objet p�re incorrect"
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP Format de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP Valeur de propri�t� de p�riph�rique incorrect"
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "PTP Param�tre incorrect"
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP Session d�j� ouverte"
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP Op�ration annul�e"
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP Sp�cification de la destination non support�e "
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "PTP Nom de fichier EK n�cessaire"
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP Conflit de nom de fichier EK"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "PTP Nom de fichier EK incorrect"
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP erreur d'entr�e sortie"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP Erreur: mauvais param�tre"
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP Erreur de protocole, donn�es attendues"
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Errur de protocole, r�ponse attendue"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
@@ -3217,7 +3254,7 @@ msgstr ""
 "(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Bonne chance !"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3232,23 +3269,23 @@ msgstr ""
 "ID �tendue du vendeur : 0x%08x\n"
 "Description �tendue du vendeur : %s\n"
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 msgid "Number of values"
 msgstr "Nombre de valeurs"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr "Valeurs support�es"
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr "Valeur actuelle"
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr "Initialisation de l'appareil photo"
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP est impl�ment� uniquement pour les appareils USB."
 
@@ -3564,6 +3601,14 @@ msgstr "�conomie d'�nergie EK"
 msgid "EK UI Language"
 msgstr "Langue interface EK"
 
+#: camlibs/ptp/library.c:533
+#, fuzzy
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+"Pilote PTP2\n"
+"(c) 2001-2003 par Mariusz Woloszyn <emsi@ipartners.pl>.\n"
+"Bonne chance !"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4404,11 +4449,6 @@ msgstr ""
 "    pour supporter une configuration compl�te,\n"
 "    veuillez contacter gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (inconnu)"
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "Le fichier � envoyer est de longueur nulle"
@@ -4712,6 +4752,11 @@ msgstr ""
 "pour l'utilisation de leur Olympus C-3030Z\n"
 "pour le support de l'interface USB."
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (inconnu)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
diff --git a/po/hu.po b/po/hu.po
index c3ed14071..789db274d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgphoto2\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2003-02-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -14,6 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -47,47 +55,48 @@ msgstr ""
 "A weben talált dokumentáció alapján\n"
 "készült. A Vision engedélyével."
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 #, fuzzy
 msgid "remove"
 msgstr "távoli"
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not create directory %s."
 msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:422
+#, fuzzy, c-format
+msgid "Could not remove directory %s."
+msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
+
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -96,32 +105,59 @@ msgstr ""
 "A(z) '%s' név (%i karakter) túl hosszú (%i karakter), legfeljebb 30 "
 "karaktert lehet használni."
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr "Védett fájl."
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 #, fuzzy
 msgid ""
@@ -169,13 +205,13 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
+msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr "'%s' nevű fájl nem létezik a(z) '%s' könyvtárban."
 
 #: camlibs/canon/library.c:741
@@ -298,7 +334,7 @@ msgstr "Nem sikerült létrehozni a \\DCIM könyvtárat."
 msgid "Could not create destination directory."
 msgstr "Nem sikerült létrehozni a célkönyvtárat."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "A kamera és a meghajtóprogram beállításai"
 
@@ -335,7 +371,7 @@ msgstr "A kamera dátumának beállítása a számítógép dátumára"
 msgid "Firmware revision (readonly)"
 msgstr "A firmware revíziószáma (csak olvasható)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "Energia (csak olvasható)"
 
@@ -367,7 +403,7 @@ msgstr "az idő beállítva"
 msgid "could not set time"
 msgstr "az idő beállítása nem sikerült"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -757,9 +793,9 @@ msgid "Detected a '%s'."
 msgstr "Detektálva: '%s'."
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -974,8 +1010,8 @@ msgid "Problem taking live image"
 msgstr "Nem sikerült közvetlenül felvételt készíteni"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "A kamera beállításai"
 
@@ -1201,21 +1237,14 @@ msgstr "Típus:"
 msgid "Available memory: "
 msgstr "A rendelkezésre álló memória: "
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart programkönyvtár v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
+#, fuzzy
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1226,19 +1255,19 @@ msgstr ""
 "rendelkezésre).\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+#: camlibs/gsmart300/library.c:199
+#, fuzzy, c-format
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
 "működik.\n"
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "A kamerát nem sikerült alapállapotba hozni.\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1248,14 +1277,21 @@ msgstr ""
 "A kamera csak az utolsó felvétel törlését teszi lehetővé. Jelen pillanatban "
 "ennek neve: '%s'."
 
-#: camlibs/gsmart300/library.c:163
-#, fuzzy
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "gsmart programkönyvtár v"
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1266,9 +1302,9 @@ msgstr ""
 "rendelkezésre).\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Nem támogatott porttípus: %d. Ez a meghajtó csak USB-alapú kamerákkal "
 "működik.\n"
@@ -2765,25 +2801,6 @@ msgstr ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder-meghajtó\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "Fájl letöltése..."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "A kézikönyv még nem készült el"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"Creative PC-CAM600\n"
-" Szerző: Peter Kajberg\n"
-" E-mail: <pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2792,6 +2809,11 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "A kézikönyv még nem készült el"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2801,12 +2823,26 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "Fájl letöltése..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"Creative PC-CAM600\n"
+" Szerző: Peter Kajberg\n"
+" E-mail: <pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2818,8 +2854,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2985,167 +3021,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "A kért porttípust (%i) nem támogatja ez a meghajtó."
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "PTP - nem definiált hiba"
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP OK."
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP - általános hiba"
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP - a munkafolyamat nincs megnyitva"
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP - érvénytelen tranzakciós azonosító"
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "PTP - nem támogatott művelet"
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "PTP - nem támogatott paraméter"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "PTP - nem teljes transzfer"
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "PTP érvénytelen tárolóazonosító"
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "Érvénytelen PTP objektumazonosító"
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "Nem támogatott PTP eszköztulajdonság"
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP érvénytelen objektumformátum-kód"
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP - a tároló betelt"
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP - az objektum írásvédett"
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "PTP - a tároló csak olvasható"
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP - a hozzáférés megtagadva"
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "PTP - nem érhető el előnézeti kép"
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP - az önteszt nem sikerült"
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP - részleges törlés"
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "A PTP-tároló nem érhető el"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "Nem támogatott formátumú PTP-specifikáció"
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "PTP érvénytelen objektuminformáció"
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "PTP érvénytelen kódformátum"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "Ismeretlen PTP gyártókód"
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "A PTP-felvétel már befejeződött"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP eszközbusz"
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "PTP - érvénytelen szülőobjektum"
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP érvénytelen eszköztulajdonság-formátum"
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP érvénytelen eszköztulajdonság-érték"
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "PTP - érvénytelen paraméter"
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP - a munkafolyamat már meg van nyitva"
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP - a tranzakció félbeszakadt"
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "Nem támogatott PTP specifikáció vagy cél"
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "PTP EK fájlnév szükséges"
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK fájlnévütközés"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "Érvénytelen PTP EK fájlnév"
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP I/O-hiba"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP hiba: nem megfelelő paraméter"
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollhiba, nem érkezett adat"
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3153,7 +3189,7 @@ msgid ""
 "Enjoy!"
 msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3163,25 +3199,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "A PTP csak USB-csatolós kameráknál használható."
 
@@ -3553,6 +3589,11 @@ msgstr "NINCS energiajelző fény"
 msgid "EK UI Language"
 msgstr "Nyelv"
 
+#: camlibs/ptp/library.c:533
+#, fuzzy
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr "Készítette: Mariusz Woloszyn <emsi@ipartners.pl>. Sok sikert!"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4410,11 +4451,6 @@ msgstr ""
 "    a hiányzó opciók elkészítésében, kérjük\n"
 "    értesítsen minket a gphoto-devel@gphoto.net címen.\n"
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (ismeretlen)"
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "A feltöltendő fájl 0 hosszúságú"
@@ -4712,6 +4748,11 @@ msgstr ""
 "akik engedélyezték az Olympus C-3030Z for USB termékük\n"
 "felhasználását a program elkészítéséhez."
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (ismeretlen)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -5268,6 +5309,10 @@ msgstr "Ismeretlen hiba a kamerakezelő programkönyvtárban"
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Nem sikerült lekérdezni a lemez nevét: %s"
+
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/it.po b/po/it.po
index 03a583fe3..ee438a2ce 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: sab lug 22 11:35:36 CEST 2000\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -34,80 +42,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"Non � possibile aprire:\n"
+"%s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -154,13 +192,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"Non � possibile aprire:\n"
+"%s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Non � possibile aprire:\n"
 "%s"
@@ -260,7 +300,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Configurazione fotocamera"
@@ -301,7 +341,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -335,7 +375,7 @@ msgstr "Cancella"
 msgid "could not set time"
 msgstr "Non � possibile salvare #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -727,9 +767,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Non � possibile ricevere l'anteprima"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -919,8 +959,8 @@ msgid "Problem taking live image"
 msgstr "Ricezione immagini live..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Configurazione fotocamera"
 
@@ -1151,37 +1191,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Non � possibile ricevere un'immagine."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1189,20 +1221,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2584,24 +2624,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "Download interrotto."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s non � ancora implementato"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2610,6 +2632,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s non � ancora implementato"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2619,12 +2647,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "Download interrotto."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2636,8 +2676,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2789,177 +2829,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Il salvataggio dell'indice non � ancora implementato"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Non disponibile"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Download annullato."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2969,24 +3009,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "La nuova immagine � #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3313,6 +3353,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4068,11 +4112,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4346,6 +4385,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4867,6 +4911,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Non � possibile ricevere l'anteprima"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/ja.po b/po/ja.po
index f07caa0b0..e341ad1d8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2 2.1.1rc2\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2002-11-26 00:46+0900\n"
 "Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,6 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -48,47 +56,48 @@ msgstr ""
 "WEB ��˼����Ѥߤλ�����ˡ�Υɥ������\n"
 "������ޤ���Vison �ξ����Ѥߡ�"
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 #, fuzzy
 msgid "remove"
 msgstr "��⡼��"
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not create directory %s."
 msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:422
+#, fuzzy, c-format
+msgid "Could not remove directory %s."
+msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
+
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -97,32 +106,59 @@ msgstr ""
 "̾�� '%s' (%i �Ĥ�ʸ��) ��Ĺ�����ޤ� (%i �Ĥ�ʸ��)������ 30 ʸ���ޤ�ͭ����"
 "����"
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr "�ե����뤬�ݸ��Ƥ��ޤ���"
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 #, fuzzy
 msgid ""
@@ -170,13 +206,13 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
+msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr "�ե����� '%s' ���ե���� '%s' ����ˤ���ޤ���"
 
 #: camlibs/canon/library.c:741
@@ -296,7 +332,7 @@ msgstr "\\DCIM �ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 msgid "Could not create destination directory."
 msgstr "�оݤȤʤ�ǥ��쥯�ȥ��������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "�����ȥɥ饤�Ф�����"
 
@@ -333,7 +369,7 @@ msgstr "���������դ� PC �����դ˥��åȤ��ޤ�"
 msgid "Firmware revision (readonly)"
 msgstr "�ե����०�����Υ�ӥ���� (�ɤ߼��Τ�)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "�Ÿ� (�ɤ߼��Τ�)"
 
@@ -365,7 +401,7 @@ msgstr "����Υ��å�"
 msgid "could not set time"
 msgstr "����򥻥åȤ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -753,9 +789,9 @@ msgid "Detected a '%s'."
 msgstr "'%s' �򸡽Ф��ޤ�����"
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "�ǥ�����̾��������뤳�Ȥ�����ޤ���Ǥ���: %s"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -969,8 +1005,8 @@ msgid "Problem taking live image"
 msgstr "�ꥢ�륿��������μ���������꤬ȯ�����ޤ���"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "����������"
 
@@ -1203,21 +1239,14 @@ msgstr "����: "
 msgid "Available memory: "
 msgstr "ͭ���ʥ���: "
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart �饤�֥�� Ver"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
+#, fuzzy
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1228,19 +1257,19 @@ msgstr ""
 "���ݡ��ȡ�\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+#: camlibs/gsmart300/library.c:199
+#, fuzzy, c-format
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "���ݡ��Ȥ��Ƥ��ʤ��ݡ��Ȥμ���: %d �ڤ��Υɥ饤�Ф� USB �����ǤΤ�ư���"
 "����\n"
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "������ꥻ�åȤ��뤳�Ȥ�����ޤ���Ǥ�����\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1250,14 +1279,21 @@ msgstr ""
 "���Ȥ��Υ����ǤϺǸ�Υե�����κ���Τߥ��ݡ��Ȥ��Ƥ��ޤ������ߤ��Υե���"
 "��� '%s' �˳������ޤ���"
 
-#: camlibs/gsmart300/library.c:163
-#, fuzzy
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "gsmart �饤�֥�� Ver"
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1268,9 +1304,9 @@ msgstr ""
 "���ݡ��ȡ�\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "���ݡ��Ȥ��Ƥ��ʤ��ݡ��Ȥμ���: %d �ڤ��Υɥ饤�Ф� USB �����ǤΤ�ư���"
 "����\n"
@@ -2764,25 +2800,6 @@ msgstr ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder �ɥ饤��\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "�ե�����Υ������������..."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "��갷���������̤����������Ƥ��ޤ���"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"Creative PC-CAM600\n"
-" ���: Peter Kajberg\n"
-" E-�᡼��: <pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2791,6 +2808,11 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "��갷���������̤����������Ƥ��ޤ���"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2800,12 +2822,26 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "�ե�����Υ������������..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"Creative PC-CAM600\n"
+" ���: Peter Kajberg\n"
+" E-�᡼��: <pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2817,8 +2853,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2984,167 +3020,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "���Υɥ饤�ФǤ��׵ᤷ���ݡ��ȷ��� (%i) �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "PTP �������ʥ��顼"
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP �ΰ���Ū�ʥ��顼"
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP �Υ��å���󤬳�����Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP �������ʥȥ�󥶥������ ID"
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP ���"
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP �ѥ�᡼��"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ��ž������λ���Ƥ��ޤ���"
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "PTP �������ʥ��ȥ졼�� ID"
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "PTP �����ʥ��֥����������"
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ� PTP �ǥХ��� Prop"
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP �������ʥ��֥������Ƚ񼰥�����"
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP �ζ������̤�����ޤ���"
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP ���֥������Ȥؤν񤭹����ݸͭ���Ǥ�"
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "PTP ���ɤ߹������ѤǤ�"
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP �ؤΥ������������ݤ���ޤ���"
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "PTP �ˤϥ���ͥ��뤬����ޤ���"
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP �μ��ʿ��Ǥ˼��Ԥ��ޤ���"
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP ����ʬŪ�ʺ��"
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "PTP �˳�Ǽ�Ǥ��ޤ���"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "���ݡ��Ȥ��Ƥ��ʤ� PTP �񼰤λ���"
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "PTP �������ʥ��֥������Ⱦ���"
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "PTP �������ʥ����ɽ�"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP �������ʥ٥���������ɤǤ�"
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "PTP �Υ���ץ�������Ǥ��ޤ���"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP �ΥǥХ������Х�"
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "PTP �����ʥ��֥�������"
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP �������ʥǥХ��� Prop ��"
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP �������ʥǥХ��� Prop ��"
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "PTP �������ʥѥ�᡼��"
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP �Υ��å����ϥ����ץ󤷤Ƥ��ޤ�"
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP �ȥ�󥶥�����󤬥���󥻥뤵��ޤ���"
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "���ݡ��Ȥ��Ƥ��ʤ� PTP ž����λ���"
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "PTP EK �ե�����̾��ɬ�פǤ�"
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK �ե�����̾����ʣ���Ƥ��ޤ�"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK �����ʥե�����̾�Ǥ�"
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP I/O ���顼�Ǥ�"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP ���顼: �ѥ�᡼��������������ޤ���"
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP �ץ��ȥ��롦���顼 (������: �ǡ���)"
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP �ץ��ȥ��롦���顼 (������: ����)"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3152,7 +3188,7 @@ msgid ""
 "Enjoy!"
 msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3162,25 +3198,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "�̿��ο�: %d\n"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "������ OFF �ˤ��ޤ�"
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP �� USB �����Τߥ��ݡ��Ȥ��Ƥ��ޤ���"
 
@@ -3552,6 +3588,10 @@ msgstr "�Ÿ����פʤ�"
 msgid "EK UI Language"
 msgstr "����"
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4400,11 +4440,6 @@ msgstr ""
 "    ���굡ǽ�����ˤ��뤿��˳�ȯ�˶��Ϥ��Ƥ����Τʤ��\n"
 "    gphoto-devel@gphoto.net �γ�ȯ�Ԥ�Ϣ�����Ʋ�������\n"
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (����)"
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr "���åץ����ɤ����ե�����Υ������� NULL �Ǥ�"
@@ -4699,6 +4734,11 @@ msgstr ""
 "Data Engines �� (www.dataengines.com)\n"
 "�˴��դ��ޤ���"
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (����)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -5246,6 +5286,10 @@ msgstr "�����饤�֥��������ʥ��顼"
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�ǥ�����̾��������뤳�Ȥ�����ޤ���Ǥ���: %s"
+
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
@@ -5264,9 +5308,6 @@ msgstr "�����ʥ��顼"
 #~ msgid "Driver Configuration"
 #~ msgstr "����������"
 
-#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-#~ msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
-
 #, fuzzy
 #~ msgid "(ptp2) Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
 #~ msgstr "Mariusz Woloszyn �� <emsi@ipartners.pl> ��ô�����ޤ�����Enjoy!"
diff --git a/po/no.po b/po/no.po
index 6c1867f3d..ca88051d6 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2000-04-11 10:12+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -34,80 +42,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"Kunne ikke �pne:\n"
+"%s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -154,13 +192,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"Kunne ikke �pne:\n"
+"%s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Kunne ikke �pne:\n"
 "%s"
@@ -260,7 +300,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Kamerakonfigurasjon"
@@ -301,7 +341,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -335,7 +375,7 @@ msgstr "Nullstill"
 msgid "could not set time"
 msgstr "Kunne ikke lagre #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -727,9 +767,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Kunne ikke hente forh�ndsvisning"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -919,8 +959,8 @@ msgid "Problem taking live image"
 msgstr "Henter sanntidsbilde..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamerakonfigurasjon"
 
@@ -1151,37 +1191,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Kunne ikke ta bilde."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1189,20 +1221,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2584,24 +2624,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "Nedlasting stoppet."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s er ikke implementert enn�"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2610,6 +2632,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s er ikke implementert enn�"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2619,12 +2647,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "Nedlasting stoppet."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2636,8 +2676,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2790,177 +2830,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Lagring av indeks er ikke st�ttet enn�"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Nedlasting abrutt."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2970,24 +3010,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "Nytt bilde er #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3314,6 +3354,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4084,11 +4128,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4362,6 +4401,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4883,6 +4927,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunne ikke hente forh�ndsvisning"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/ru.po b/po/ru.po
index 8a4e4d6e0..eb0902281 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2000-05-23 22:02+00:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,6 +12,14 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -33,80 +41,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"�� ������� �������:\n"
+"%s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "�� ������� �������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -153,13 +191,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"�� ������� �������:\n"
+"%s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "�� ������� �������:\n"
 "%s"
@@ -259,7 +299,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "������������ ������"
@@ -300,7 +340,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -334,7 +374,7 @@ msgstr "��������"
 msgid "could not set time"
 msgstr "�� ������� ��������� #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -726,9 +766,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "�� ������� �������� ��������"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -918,8 +958,8 @@ msgid "Problem taking live image"
 msgstr "��������� ������ �����������..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "������������ ������"
 
@@ -1150,37 +1190,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "�� ������� �������� �����������."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1188,20 +1220,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2583,24 +2623,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "���������� �����������."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s ��� �� �����������"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2609,6 +2631,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s ��� �� �����������"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2618,12 +2646,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "���������� �����������."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2635,8 +2675,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2790,177 +2830,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "���������� ������� ��� �� ��������������"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "�� ��������"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "���������� ��������."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2970,24 +3010,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "����� ����������� #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3314,6 +3354,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4099,11 +4143,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4377,6 +4416,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4898,6 +4942,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�� ������� �������� ��������"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/sl.po b/po/sl.po
index 14fad62be..e4dff4097 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2002-01-04 19:25+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -34,80 +42,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"Ne morem odpreti:\n"
+" %s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -154,13 +192,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"Ne morem odpreti:\n"
+" %s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "Ne morem odpreti:\n"
 " %s"
@@ -260,7 +300,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "Nastaviteve fotoaparata"
@@ -301,7 +341,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -335,7 +375,7 @@ msgstr "Ponastavi"
 msgid "could not set time"
 msgstr "Ne morem shraniti #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -727,9 +767,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Ne morem dobiti vzorca"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -919,8 +959,8 @@ msgid "Problem taking live image"
 msgstr "Dobivam �ivo sliko..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Nastaviteve fotoaparata"
 
@@ -1151,37 +1191,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "Nisem uspel slikati."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1189,20 +1221,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2584,24 +2624,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "Prena�anje ustavljeno."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s �e ni implementiran"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2610,6 +2632,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s �e ni implementiran"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2619,12 +2647,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "Prena�anje ustavljeno."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2636,8 +2676,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2791,177 +2831,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "Shranjevanje kazala �e ni podprto"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "Ni na voljo"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "Prena�anje preklicano."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2971,24 +3011,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "Nova slika je #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3315,6 +3355,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4100,11 +4144,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4378,6 +4417,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4899,6 +4943,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Ne morem dobiti vzorca"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/sv.po b/po/sv.po
index 2be9b828a..c77cbd61f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2003-01-09 08:13+0100\n"
 "Last-Translator: Stefan Bj�rnelund <stefanb@update.uu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,6 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -48,47 +56,48 @@ msgstr ""
 "Implementerat med hj�lp av dokument fr�n\n"
 "n�tet. Med tillst�nd fr�n Vision."
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 #, fuzzy
 msgid "remove"
 msgstr "Fj�rr"
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not create directory %s."
 msgstr "Kunde inte skapa \\DCIM-katalogen."
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:422
+#, fuzzy, c-format
+msgid "Could not remove directory %s."
+msgstr "Kunde inte skapa \\DCIM-katalogen."
+
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
@@ -96,32 +105,59 @@ msgid ""
 msgstr ""
 "Namnet '%s' (%i tecken) �r f�r l�ngt (%i tecken), maximalt 30 tecken till�ts."
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr "Filen skyddad."
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 #, fuzzy
 msgid ""
@@ -169,13 +205,13 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
+msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr "Filen '%s' kunde inte hittas i mappen '%s'."
 
 #: camlibs/canon/library.c:741
@@ -295,7 +331,7 @@ msgstr "Kunde inte skapa \\DCIM-katalogen."
 msgid "Could not create destination directory."
 msgstr "Kunde inte skapa destinationskatalogen."
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "Kamera- och drivrutinskonfiguration"
 
@@ -332,7 +368,7 @@ msgstr "S�tt kamerans datum till datorns datum"
 msgid "Firmware revision (readonly)"
 msgstr "Fastvarurevision (skrivskyddad)"
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "Kraft (skrivskyddad)"
 
@@ -364,7 +400,7 @@ msgstr "tiden inst�lld"
 msgid "could not set time"
 msgstr "kunde inte st�lla in tiden"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "Ej st�dd port typ %i = 0x%x given. Initialisering om�jlig."
@@ -751,9 +787,9 @@ msgid "Detected a '%s'."
 msgstr "Detekterade ett '%s'."
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "Kunde inte f� tag p� disk namn: %s"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -966,8 +1002,8 @@ msgid "Problem taking live image"
 msgstr "Problem med att ta aktuell bild"
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "Kamerakonfiguration"
 
@@ -1190,21 +1226,14 @@ msgstr "Modell: "
 msgid "Available memory: "
 msgstr "Tillg�ngligt Minne: "
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart bibliotek v"
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr "�"
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
+#, fuzzy
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1215,18 +1244,18 @@ msgstr ""
 "v�nligen tillhandah�llen av Mustek.\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+#: camlibs/gsmart300/library.c:199
+#, fuzzy, c-format
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 "Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "Kunde inte nollst�lla kameran.\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1236,14 +1265,21 @@ msgstr ""
 "Din kamera st�djer radering av den senaste filen p� kameran. I detta fall, "
 "denh�r filen '%s'."
 
-#: camlibs/gsmart300/library.c:163
-#, fuzzy
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "gsmart bibliotek v"
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr "�"
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1254,9 +1290,9 @@ msgstr ""
 "v�nligen tillhandah�llen av Mustek.\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 "Porttypen st�ds ej: %d. Denna drivrutin fungerar bara med USB kamror.\n"
 
@@ -2757,25 +2793,6 @@ msgstr ""
 "Panasonic PV-L859-K/PV-L779-K Palmcorder dirvrutin\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "Nerladdning av fil..."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "Manual inte implementerat �nnu"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"Creative PC-CAM600\n"
-" F�rfattare: Peter Kajberg\n"
-" e-post: <pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2784,6 +2801,11 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "Manual inte implementerat �nnu"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2793,12 +2815,26 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "Nerladdning av fil..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"Creative PC-CAM600\n"
+" F�rfattare: Peter Kajberg\n"
+" e-post: <pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2810,8 +2846,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2977,167 +3013,167 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr "Den beg�rda porttypen (%i) st�ds ej av denna drivrutin."
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "PTP odefinierat fel"
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP OK!"
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP generellt fel"
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP sessionen inte �ppen"
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "PTP ogiltig transaktion"
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "PTP operationen st�ds ej"
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "PTP parameter st�ds ej"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "PTP ofullst�ndig �verf�ring"
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "PTP ogiltig lagrings ID"
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "PTP ogiltigt objekt hantag"
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "PTP enhet egenskap st�ds ej"
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "PTP ogiltigt objektformatkod"
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP lagring full"
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP objekt skrivskyddat"
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "PTP lagring skrivskyddad"
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP �tkomst nekad"
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "PTP ingen minibild tillg�nglig"
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP sj�lvtest misslyckades"
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP delvis radering"
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "PTP lagring inte tillg�nglig"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "PTP specifikation av format st�ds ej"
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "PTP ingen giltig objekt information"
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "PTP ogiltig format kod"
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "PTP ok�nd tillvekarkod"
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "PTP fotografering redan avslutad"
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP enhets buss"
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "PTP ogiltigt f�r�ndra objekt"
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "PTP ogiltig enhets parameter format"
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "PTP ogiltigt enhets parameter v�rde"
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "PTP ogiltig parameter"
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP sessionen redan �ppen"
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP transaktionen avbruten"
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "PTP specifikationen av mottagare st�ds ej"
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "PTP EK filnamn kr�vs"
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK filnamns konflikt"
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "PTP EK filnamn ogiltigt"
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP I/O fel"
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP fel: felaktig parameter"
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP protokollfel, data f�r�ldrat"
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollfel, svar f�rv�ntat"
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3145,7 +3181,7 @@ msgid ""
 "Enjoy!"
 msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3155,25 +3191,25 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "Antal bilder: %d\n"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "St�nger av kameran"
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP endast implementerat f�r USB kamror."
 
@@ -3545,6 +3581,10 @@ msgstr "EJ extraljus"
 msgid "EK UI Language"
 msgstr "Spr�k"
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4396,11 +4436,6 @@ msgstr ""
 "    kod f�r att st�dja en komplett konfiguration,\n"
 "    v�nligen kontakta gphoto-devel@gphoto.net\n"
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (ok�nd)"
-
 #: camlibs/sierra/sierra.c:679 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"
@@ -4698,6 +4733,11 @@ 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:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (ok�nd)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -5246,6 +5286,10 @@ msgstr "Ok�nt kamerabiblioteksfel"
 msgid "Unknown error"
 msgstr "Ok�nt fel"
 
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "Kunde inte f� tag p� disk namn: %s"
+
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
@@ -5264,9 +5308,6 @@ msgstr "Ok�nt fel"
 #~ msgid "Driver Configuration"
 #~ msgstr "Kamerakonfiguration"
 
-#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-#~ msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
-
 #, fuzzy
 #~ msgid "(ptp2) Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
 #~ msgstr "Skrivet av Mariusz Woloszyn <emsi@ipartners.pl>. Njut!"
diff --git a/po/uk.po b/po/uk.po
index 526e81cd4..dfe39554a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2000-06-27 16:33+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <ru@li.org>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 #: camlibs/barbie/barbie.c:149
 #, c-format
 msgid ""
@@ -34,80 +42,110 @@ msgid ""
 "the web. Permission given by Vision."
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "remove"
 msgstr ""
 
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
+#, fuzzy, c-format
+msgid "Could not create directory %s."
+msgstr ""
+"�� ������� צ������:\n"
+"%s"
+
+#: camlibs/canon/canon.c:422
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not remove directory %s."
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
 
-#: camlibs/canon/canon.c:761
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
 "i"
 msgstr ""
 
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr ""
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr ""
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 #: camlibs/canon/library.c:134
 msgid ""
 "For the A50, 115200 may not be faster than 57600\n"
@@ -154,13 +192,15 @@ msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
 msgstr ""
+"�� ������� צ������:\n"
+"%s"
 
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr ""
 "�� ������� צ������:\n"
 "%s"
@@ -260,7 +300,7 @@ msgstr ""
 msgid "Could not create destination directory."
 msgstr ""
 
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 #, fuzzy
 msgid "Camera and Driver Configuration"
 msgstr "���Ʀ����æ� ������"
@@ -301,7 +341,7 @@ msgstr ""
 msgid "Firmware revision (readonly)"
 msgstr ""
 
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr ""
 
@@ -335,7 +375,7 @@ msgstr "���������"
 msgid "could not set time"
 msgstr "�� ������� �������� #%i"
 
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr ""
@@ -727,9 +767,9 @@ msgid "Detected a '%s'."
 msgstr ""
 
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "�� ������� �������� ��������"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 #: camlibs/digita/digita.c:331
 msgid "Unsupported image type"
@@ -919,8 +959,8 @@ msgid "Problem taking live image"
 msgstr "��������� ������ ����������..."
 
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "���Ʀ����æ� ������"
 
@@ -1151,37 +1191,29 @@ msgstr ""
 msgid "Available memory: "
 msgstr ""
 
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr ""
-
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr ""
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#: camlibs/gsmart300/library.c:199
 #, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr ""
 
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 #, fuzzy
 msgid "Could not reset camera.\n"
 msgstr "�� ������� �������� ����������."
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1189,20 +1221,28 @@ msgid ""
 "case, this is file '%s'."
 msgstr ""
 
-#: camlibs/gsmart300/library.c:163
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr ""
+
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr ""
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
 
-#: camlibs/gsmart300/library.c:199
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
 #, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr ""
 
 #: camlibs/jamcam/jamcam.c:284
@@ -2584,24 +2624,6 @@ msgid ""
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 msgstr ""
 
-#: camlibs/pccam600/library.c:199
-#, fuzzy
-msgid "Downloading file..."
-msgstr "������ ��������."
-
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-#, fuzzy
-msgid "Manual Not Implemented Yet"
-msgstr "%s �� �� ���̦������"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -2610,6 +2632,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+#, fuzzy
+msgid "Manual Not Implemented Yet"
+msgstr "%s �� �� ���̦������"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -2619,12 +2647,24 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+#: camlibs/pccam600/library.c:199
+#, fuzzy
+msgid "Downloading file..."
+msgstr "������ ��������."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -2636,8 +2676,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -2790,177 +2830,177 @@ msgstr ""
 msgid "The requested port type (%i) is not supported by this driver."
 msgstr ""
 
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr ""
 
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 #, fuzzy
 msgid "PTP Parameter Not Supported"
 msgstr "���������� ��������� �� �� Ц�����դ����"
 
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr ""
 
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr ""
 
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr ""
 
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr ""
 
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr ""
 
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr ""
 
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr ""
 
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr ""
 
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 #, fuzzy
 msgid "PTP Store Not Available"
 msgstr "�� ��������"
 
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr ""
 
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr ""
 
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr ""
 
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr ""
 
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr ""
 
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr ""
 
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr ""
 
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 #, fuzzy
 msgid "PTP Transaction Canceled"
 msgstr "������ צ�ͦ����."
 
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr ""
 
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr ""
 
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr ""
 
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr ""
 
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr ""
 
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr ""
 
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr ""
 
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 msgid ""
 "PTP2 driver\n"
 "(c)2001-2003 by Mariusz Woloszyn <emsi@ipartners.pl>.\n"
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -2970,24 +3010,24 @@ msgid ""
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "���� ���������� #%03i"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 msgid "Initializing Camera"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr ""
 
@@ -3314,6 +3354,10 @@ msgstr ""
 msgid "EK UI Language"
 msgstr ""
 
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr ""
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -4084,11 +4128,6 @@ msgid ""
 "    please contact gphoto-devel@gphoto.net\n"
 msgstr ""
 
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr ""
-
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
 msgstr ""
@@ -4362,6 +4401,11 @@ msgid ""
 "support implementation."
 msgstr ""
 
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr ""
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -4883,6 +4927,10 @@ msgid "Unknown error"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "�� ������� �������� ��������"
+
+#, fuzzy
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
 #~ "devel@gphoto.org>."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 269a3a768..3c7eef2b8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
-"POT-Creation-Date: 2003-07-10 16:46-0400\n"
+"POT-Creation-Date: 2003-07-13 10:18+0200\n"
 "PO-Revision-Date: 2002-11-21 11:02+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -13,6 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: camlibs/agfa-cl20/agfa_cl20.c:540
+msgid ""
+"agfa_cl20\n"
+"The Agfa CL20 Linux Driver People!\n"
+"     Email us at cl20@poeml.de    \n"
+" Visit us at http://cl20.poeml.de "
+msgstr ""
+
 # camlibs/barbie/barbie.c:149
 #: camlibs/barbie/barbie.c:149
 #, c-format
@@ -48,42 +56,44 @@ msgstr ""
 "根据网上找到的文档实现。由 Vision\n"
 " 授权。"
 
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 msgid "create"
 msgstr ""
 
 # camlibs/minolta/dimagev/dimagev.c:299
-#: camlibs/canon/canon.c:391 camlibs/canon/canon.c:420
+#: camlibs/canon/canon.c:391
 #, fuzzy
 msgid "remove"
 msgstr "远程"
 
 # camlibs/canon/library.c:774
-#: camlibs/canon/canon.c:418
+#: camlibs/canon/canon.c:419
 #, fuzzy, c-format
-msgid "Could not %s directory %s."
+msgid "Could not create directory %s."
 msgstr "无法创建目录 \\DCIM。"
 
-#: camlibs/canon/canon.c:761
+# camlibs/canon/library.c:774
+#: camlibs/canon/canon.c:422
+#, fuzzy, c-format
+msgid "Could not remove directory %s."
+msgstr "无法创建目录 \\DCIM。"
+
+#: camlibs/canon/canon.c:764 camlibs/canon/canon.c:986 camlibs/canon/usb.c:229
 msgid "lock keys failed."
 msgstr ""
 
-#: camlibs/canon/canon.c:824 camlibs/canon/canon.c:825
+#: camlibs/canon/canon.c:827 camlibs/canon/canon.c:828
 msgid "*UNKNOWN*"
 msgstr ""
 
-#: camlibs/canon/canon.c:932
+#: camlibs/canon/canon.c:935
 #, c-format
 msgid ""
 "canon_int_capture_image: initial canon_usb_list_all_dirs() failed with "
 "status %i"
 msgstr ""
 
-#: camlibs/canon/canon.c:983 camlibs/canon/usb.c:229
-msgid "lock keys failed.\n"
-msgstr ""
-
-#: camlibs/canon/canon.c:1013
+#: camlibs/canon/canon.c:1016
 #, c-format
 msgid ""
 "canon_int_capture_image: final canon_usb_list_all_dirs() failed with status %"
@@ -91,40 +101,67 @@ msgid ""
 msgstr ""
 
 # camlibs/canon/canon.c:651
-#: camlibs/canon/canon.c:1132
+#: camlibs/canon/canon.c:1135
 #, fuzzy, c-format
 msgid ""
 "Name '%s' (%i characters) too long (%i chars), maximum 30 characters are "
 "allowed."
 msgstr "名称“%s”(%i 个字符)太长(%i 个字符)，最多允许 30 个字符。"
 
-#: camlibs/canon/canon.c:1653
+#: camlibs/canon/canon.c:1656
 #, c-format
 msgid "canon_int_list_dir: ERROR: initial message too short (%i < minimum %i)"
 msgstr ""
 
-#: camlibs/canon/canon.c:1675
+#: camlibs/canon/canon.c:1678
 msgid ""
 "canon_int_list_dir: Reached end of packet while examining the first dirent"
 msgstr ""
 
-#: camlibs/canon/canon.c:1760
+#: camlibs/canon/canon.c:1763
 msgid "canon_int_list_dir: truncated directory entry encountered"
 msgstr ""
 
 # camlibs/canon/canon.c:1490
-#: camlibs/canon/canon.c:2071
+#: camlibs/canon/canon.c:2074
 msgid "File protected."
 msgstr "文件已受到保护。"
 
-#: camlibs/canon/canon.c:2142
+#: camlibs/canon/canon.c:2145
 msgid "Could not extract JPEG thumbnail from data: Data is not JFIF"
 msgstr ""
 
-#: camlibs/canon/canon.c:2167
+#: camlibs/canon/canon.c:2170
 msgid "Could not extract JPEG thumbnail from data: No beginning/end"
 msgstr ""
 
+#: camlibs/canon/canon.h:180 camlibs/canon/canon.h:194
+#, c-format
+msgid "NULL parameter \"%s\" in %s line %i"
+msgstr ""
+
+#: camlibs/canon/canon.h:376
+#, c-format
+msgid ""
+"Don't know how to handle camera->port->type value %i aka 0x%xin %s line %i."
+msgstr ""
+
+#: camlibs/canon/crc.c:221
+#, c-format
+msgid "FATAL ERROR: initial CRC value for length %d unknown\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:234
+msgid "unable to guess initial CRC value\n"
+msgstr ""
+
+#: camlibs/canon/crc.c:261
+#, c-format
+msgid ""
+"warning: CRC not checked (add len %d, value 0x%04x) "
+"#########################\n"
+msgstr ""
+
 # camlibs/canon/library.c:89
 #: camlibs/canon/library.c:134
 #, fuzzy
@@ -178,15 +215,16 @@ msgstr "无法获取磁盘信息：%s"
 msgid "Internal error #1 in get_file_func() (%s line %i)"
 msgstr ""
 
+# libgphoto2/gphoto2-filesys.c:1199
 #: camlibs/canon/library.c:501
-#, c-format
-msgid "No thumbnail could be fould for %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "No thumbnail could be found for %s"
+msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # libgphoto2/gphoto2-filesys.c:1199
 #: camlibs/canon/library.c:545
 #, fuzzy, c-format
-msgid "No audio file could be fould for %s"
+msgid "No audio file could be found for %s"
 msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。"
 
 # camlibs/canon/library.c:568
@@ -325,7 +363,7 @@ msgid "Could not create destination directory."
 msgstr "无法创建目标目录。"
 
 # camlibs/canon/library.c:806
-#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:616
+#: camlibs/canon/library.c:1221 camlibs/ptp2/library.c:617
 msgid "Camera and Driver Configuration"
 msgstr "相机及驱动器配置"
 
@@ -372,7 +410,7 @@ msgid "Firmware revision (readonly)"
 msgstr "固件版本 (只读)"
 
 # camlibs/canon/library.c:863
-#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:618
+#: camlibs/canon/library.c:1278 camlibs/ptp2/library.c:619
 msgid "Power (readonly)"
 msgstr "电源 (只读)"
 
@@ -411,7 +449,7 @@ msgid "could not set time"
 msgstr "无法设置时间"
 
 # camlibs/canon/library.c:1107
-#: camlibs/canon/library.c:1543
+#: camlibs/canon/library.c:1545
 #, c-format
 msgid "Unsupported port type %i = 0x%x given. Initialization impossible."
 msgstr "给出未知端口类型 %i = 0x%x。不可能初始化。"
@@ -831,11 +869,10 @@ msgstr ""
 msgid "Detected a '%s'."
 msgstr "已监测到一个“%s”。"
 
-# camlibs/canon/library.c:267
 #: camlibs/canon/usb.c:1839
-#, fuzzy, c-format
-msgid "Could not identify camera based on name \"%s\""
-msgstr "无法获取磁盘名：%s"
+#, c-format
+msgid "Name \"%s\" from camera does not match any known camera"
+msgstr ""
 
 # camlibs/konica/konica.c:125
 #: camlibs/digita/digita.c:331
@@ -1088,8 +1125,8 @@ msgstr "获取现场图像有问题"
 # camlibs/polaroid/pdc700.c:981 camlibs/sierra/sierra.c:776
 # camlibs/sierra/sierra.c:1353
 #: camlibs/dimera/dimera3500.c:771 camlibs/kodak/dc210/dc210.c:168
-#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra-desc.c:192
-#: camlibs/sierra/sierra.c:822 camlibs/sierra/sierra.c:1399
+#: camlibs/polaroid/pdc700.c:982 camlibs/sierra/sierra.c:822
+#: camlibs/sierra/sierra.c:1399 camlibs/sierra/sierra-desc.c:192
 msgid "Camera Configuration"
 msgstr "相机配置"
 
@@ -1344,23 +1381,14 @@ msgstr "型号："
 msgid "Available memory: "
 msgstr "可用的内存："
 
-# camlibs/jamcam/jamcam.c:280
-#: camlibs/gsmart/library.c:213
-msgid "gsmart library v"
-msgstr "gsmart 库 v"
-
-# camlibs/jamcam/jamcam.c:281 camlibs/panasonic/coolshot/coolshot.c:265
-#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
-#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
-msgid " "
-msgstr " "
-
-#: camlibs/gsmart/library.c:214
+#: camlibs/gsmart300/library.c:163
+#, fuzzy
 msgid ""
-"\n"
+"gsmart300 library \n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Support for the Mustek gSmart mini series of digital cameras based on "
-"several other gphoto2 camlib modules and the windows driver source kindly "
+"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
+"Support for Mustek gSmart 300 digital cameras\n"
+"based on several other gphoto2 camlib modules and the specifications kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1370,18 +1398,18 @@ msgstr ""
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
-#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
-#, c-format
-msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
+#: camlibs/gsmart300/library.c:199
+#, fuzzy, c-format
+msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
 msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
 
 # libgphoto2/gphoto2-camera.c:662
-#: camlibs/gsmart/library.c:284 camlibs/gsmart300/library.c:216
+#: camlibs/gsmart300/library.c:216 camlibs/gsmart/library.c:284
 #: camlibs/spca50x/library.c:604
 msgid "Could not reset camera.\n"
 msgstr "无法重置相机。\n"
 
-#: camlibs/gsmart/library.c:431 camlibs/gsmart300/library.c:346
+#: camlibs/gsmart300/library.c:346 camlibs/gsmart/library.c:431
 #: camlibs/spca50x/library.c:508
 #, c-format
 msgid ""
@@ -1389,14 +1417,23 @@ msgid ""
 "case, this is file '%s'."
 msgstr "您的相机只支持删除相机中的最后一个文件。在此情况下，这是文件“%s”。"
 
-#: camlibs/gsmart300/library.c:163
-#, fuzzy
+# camlibs/jamcam/jamcam.c:280
+#: camlibs/gsmart/library.c:213
+msgid "gsmart library v"
+msgstr "gsmart 库 v"
+
+# camlibs/jamcam/jamcam.c:281 camlibs/panasonic/coolshot/coolshot.c:265
+#: camlibs/gsmart/library.c:214 camlibs/jamcam/jamcam.c:296
+#: camlibs/panasonic/coolshot/coolshot.c:265 camlibs/spca50x/library.c:295
+msgid " "
+msgstr " "
+
+#: camlibs/gsmart/library.c:214
 msgid ""
-"gsmart300 library \n"
+"\n"
 "Till Adam <till@adam-lilienthal.de>\n"
-"Jerome Lodewyck <jerome.lodewyck@ens.fr>\n"
-"Support for Mustek gSmart 300 digital cameras\n"
-"based on several other gphoto2 camlib modules and the specifications kindly "
+"Support for the Mustek gSmart mini series of digital cameras based on "
+"several other gphoto2 camlib modules and the windows driver source kindly "
 "provided by Mustek.\n"
 "\n"
 msgstr ""
@@ -1406,9 +1443,9 @@ msgstr ""
 "的支持 Mustek gSmart mini 系列数码相机的库。\n"
 "\n"
 
-#: camlibs/gsmart300/library.c:199
-#, fuzzy, c-format
-msgid "Unsupported port type: %d.This driver only works with USBcameras.\n"
+#: camlibs/gsmart/library.c:255 camlibs/spca50x/library.c:563
+#, c-format
+msgid "Unsupported port type: %d. This driver only works with USB cameras.\n"
 msgstr "不支持的端口类型：%d。该驱动程序只支持 USB 照相机。\n"
 
 # camlibs/sierra/sierra.c:1826
@@ -3173,28 +3210,6 @@ msgstr ""
 "松下 PV-L859-K/PV-L779-K Palmcorder 驱动程序\n"
 "Andrew Selkirk <aselkirk@mailandnews.com>"
 
-# camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
-# camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
-#: camlibs/pccam600/library.c:199
-msgid "Downloading file..."
-msgstr "正在下载文件..."
-
-# camlibs/sierra/library.c:1187
-#: camlibs/pccam600/library.c:259 camlibs/pccam300/library.c:250
-#: camlibs/spca504_flash/library.c:174
-msgid "Manual Not Implemented Yet"
-msgstr "手册尚未实现！"
-
-#: camlibs/pccam600/library.c:266
-msgid ""
-"Creative PC-CAM600\n"
-" Author: Peter Kajberg\n"
-" email: <pbk@odense.kollegienet.dk>\n"
-msgstr ""
-"创新 PC-CAM600\n"
-" 作者：Peter Kajberg\n"
-" 电子邮件：<pbk@odense.kollegienet.dk>\n"
-
 #: camlibs/pccam300/library.c:239
 #, c-format
 msgid ""
@@ -3203,6 +3218,12 @@ msgid ""
 " Filecount: %d"
 msgstr ""
 
+# camlibs/sierra/library.c:1187
+#: camlibs/pccam300/library.c:250 camlibs/pccam600/library.c:259
+#: camlibs/spca504_flash/library.c:174
+msgid "Manual Not Implemented Yet"
+msgstr "手册尚未实现！"
+
 #: camlibs/pccam300/library.c:258
 msgid ""
 "Creative PC-CAM 300\n"
@@ -3212,12 +3233,28 @@ msgid ""
 " <mace@darksilence.net>"
 msgstr ""
 
+# camlibs/dimera/dimera3500.c:701 camlibs/dimera/dimera3500.c:737
+# camlibs/panasonic/coolshot/library.c:375 camlibs/samsung/samsung.c:211
+#: camlibs/pccam600/library.c:199
+msgid "Downloading file..."
+msgstr "正在下载文件..."
+
+#: camlibs/pccam600/library.c:266
+msgid ""
+"Creative PC-CAM600\n"
+" Author: Peter Kajberg\n"
+" email: <pbk@odense.kollegienet.dk>\n"
+msgstr ""
+"创新 PC-CAM600\n"
+" 作者：Peter Kajberg\n"
+" 电子邮件：<pbk@odense.kollegienet.dk>\n"
+
 #: camlibs/polaroid/pdc320.c:455
 msgid ""
 "Download program for several Polaroid cameras. Originally written by Peter "
 "Desnoyers <pjd@fred.cambridge.ma.us>, and adapted for gphoto2 by Nathan "
-"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <urc8@rz.uni-"
-"karlsruhe.de>.\n"
+"Stenzel <nathanstenzel@users.sourceforge.net> and Lutz Mueller <lutz@users."
+"sf.net>.\n"
 "Polaroid 640SE testing was done by Michael Golden <naugrim@juno.com>."
 msgstr ""
 
@@ -3229,8 +3266,8 @@ msgstr ""
 #: camlibs/polaroid/pdc640.c:887
 msgid ""
 "Download program for GrandTek 98x based cameras. Originally written by Chris "
-"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller <urc8@rz."
-"uni-karlsruhe.de>.Protocol enhancements and postprocessing  for Jenoptik "
+"Byrne <adapt@ihug.co.nz>, and adapted for gphoto2 by Lutz Mueller "
+"<lutz@users.sf.net>.Protocol enhancements and postprocessing  for Jenoptik "
 "JD350e by Michael Trawny <trawny99@users.sourceforge.net>.Bugfixes by Marcus "
 "Meissner <marcus@jet.franken.de>."
 msgstr ""
@@ -3423,207 +3460,207 @@ msgid "The requested port type (%i) is not supported by this driver."
 msgstr "该驱动程序不支持请求的端口类型 (%i)。"
 
 # camlibs/ptp/library.c:90
-#: camlibs/ptp2/library.c:102
+#: camlibs/ptp2/library.c:102 camlibs/ptp/library.c:99
 msgid "PTP Undefined Error"
 msgstr "未定义的 PTP 错误"
 
 # camlibs/ptp/library.c:91
-#: camlibs/ptp2/library.c:103
+#: camlibs/ptp2/library.c:103 camlibs/ptp/library.c:100
 msgid "PTP OK!"
 msgstr "PTP OK！"
 
 # camlibs/ptp/library.c:92
-#: camlibs/ptp2/library.c:104
+#: camlibs/ptp2/library.c:104 camlibs/ptp/library.c:101
 msgid "PTP General Error"
 msgstr "PTP 通用错误"
 
 # camlibs/ptp/library.c:93
-#: camlibs/ptp2/library.c:105
+#: camlibs/ptp2/library.c:105 camlibs/ptp/library.c:102
 msgid "PTP Session Not Open"
 msgstr "PTP 会话未打开"
 
 # camlibs/ptp/library.c:94
-#: camlibs/ptp2/library.c:106
+#: camlibs/ptp2/library.c:106 camlibs/ptp/library.c:103
 msgid "PTP Invalid Transaction ID"
 msgstr "非法的 PTP 传输 ID"
 
 # camlibs/ptp/library.c:95
-#: camlibs/ptp2/library.c:107
+#: camlibs/ptp2/library.c:107 camlibs/ptp/library.c:104
 msgid "PTP Operation Not Supported"
 msgstr "不支持的 PTP 操作"
 
 # camlibs/ptp/library.c:96
-#: camlibs/ptp2/library.c:108
+#: camlibs/ptp2/library.c:108 camlibs/ptp/library.c:105
 msgid "PTP Parameter Not Supported"
 msgstr "不支持的 PTP 参数"
 
 # camlibs/ptp/library.c:97
-#: camlibs/ptp2/library.c:109
+#: camlibs/ptp2/library.c:109 camlibs/ptp/library.c:106
 msgid "PTP Incomplete Transfer"
 msgstr "未完成的 PTP 传输"
 
 # camlibs/ptp/library.c:98
-#: camlibs/ptp2/library.c:110
+#: camlibs/ptp2/library.c:110 camlibs/ptp/library.c:107
 msgid "PTP Invalid Storage ID"
 msgstr "非法的 PTP 存储 ID"
 
 # camlibs/ptp/library.c:99
-#: camlibs/ptp2/library.c:111
+#: camlibs/ptp2/library.c:111 camlibs/ptp/library.c:108
 msgid "PTP Invalid Object Handle"
 msgstr "非法的 PTP 对象句柄"
 
 # camlibs/ptp/library.c:100
-#: camlibs/ptp2/library.c:112
+#: camlibs/ptp2/library.c:112 camlibs/ptp/library.c:109
 msgid "PTP Device Prop Not Supported"
 msgstr "不支持的 PTP 设备属性"
 
 # camlibs/ptp/library.c:101
-#: camlibs/ptp2/library.c:113
+#: camlibs/ptp2/library.c:113 camlibs/ptp/library.c:110
 msgid "PTP Invalid Object Format Code"
 msgstr "非法的 PTP 对象格式代码"
 
 # camlibs/ptp/library.c:102
-#: camlibs/ptp2/library.c:114
+#: camlibs/ptp2/library.c:114 camlibs/ptp/library.c:111
 msgid "PTP Store Full"
 msgstr "PTP 存储已满"
 
 # camlibs/ptp/library.c:103
-#: camlibs/ptp2/library.c:115
+#: camlibs/ptp2/library.c:115 camlibs/ptp/library.c:112
 msgid "PTP Object Write Protected"
 msgstr "PTP 对象已写保护"
 
 # camlibs/ptp/library.c:104
-#: camlibs/ptp2/library.c:116
+#: camlibs/ptp2/library.c:116 camlibs/ptp/library.c:113
 msgid "PTP Store Read Only"
 msgstr "只读的 PTP 存储"
 
 # camlibs/ptp/library.c:105
-#: camlibs/ptp2/library.c:117
+#: camlibs/ptp2/library.c:117 camlibs/ptp/library.c:114
 msgid "PTP Access Denied"
 msgstr "PTP 访问遭拒绝"
 
 # camlibs/ptp/library.c:106
-#: camlibs/ptp2/library.c:118
+#: camlibs/ptp2/library.c:118 camlibs/ptp/library.c:115
 msgid "PTP No Thumbnail Present"
 msgstr "不存在 PTP 缩略图"
 
 # camlibs/ptp/library.c:107
-#: camlibs/ptp2/library.c:119
+#: camlibs/ptp2/library.c:119 camlibs/ptp/library.c:116
 msgid "PTP Self Test Failed"
 msgstr "PTP 自检失败"
 
 # camlibs/ptp/library.c:108
-#: camlibs/ptp2/library.c:120
+#: camlibs/ptp2/library.c:120 camlibs/ptp/library.c:117
 msgid "PTP Partial Deletion"
 msgstr "PTP 部分删除"
 
 # camlibs/ptp/library.c:109
-#: camlibs/ptp2/library.c:121
+#: camlibs/ptp2/library.c:121 camlibs/ptp/library.c:118
 msgid "PTP Store Not Available"
 msgstr "PTP 存储不可用"
 
 # camlibs/ptp/library.c:111
-#: camlibs/ptp2/library.c:123
+#: camlibs/ptp2/library.c:123 camlibs/ptp/library.c:120
 msgid "PTP Specification By Format Unsupported"
 msgstr "不支持的 PTP 格式规范"
 
 # camlibs/ptp/library.c:112
-#: camlibs/ptp2/library.c:124
+#: camlibs/ptp2/library.c:124 camlibs/ptp/library.c:121
 msgid "PTP No Valid Object Info"
 msgstr "没有合法的 PTP 对象信息"
 
 # camlibs/ptp/library.c:113
-#: camlibs/ptp2/library.c:125
+#: camlibs/ptp2/library.c:125 camlibs/ptp/library.c:122
 msgid "PTP Invalid Code Format"
 msgstr "非法的 PTP 代码格式"
 
 # camlibs/ptp/library.c:114
-#: camlibs/ptp2/library.c:126
+#: camlibs/ptp2/library.c:126 camlibs/ptp/library.c:123
 msgid "PTP Unknown Vendor Code"
 msgstr "未知的 PTP 厂家代码"
 
 # camlibs/ptp/library.c:116
-#: camlibs/ptp2/library.c:128
+#: camlibs/ptp2/library.c:128 camlibs/ptp/library.c:125
 msgid "PTP Capture Already Terminated"
 msgstr "PTP 捕获已终止"
 
 # camlibs/ptp/library.c:117
-#: camlibs/ptp2/library.c:129
+#: camlibs/ptp2/library.c:129 camlibs/ptp/library.c:126
 msgid "PTP Device Bus"
 msgstr "PTP 设备总线"
 
 # camlibs/ptp/library.c:118
-#: camlibs/ptp2/library.c:130
+#: camlibs/ptp2/library.c:130 camlibs/ptp/library.c:127
 msgid "PTP Invalid Parent Object"
 msgstr "非法的 PTP 父对象"
 
 # camlibs/ptp/library.c:119
-#: camlibs/ptp2/library.c:131
+#: camlibs/ptp2/library.c:131 camlibs/ptp/library.c:128
 msgid "PTP Invalid Device Prop Format"
 msgstr "非法的 PTP 设备属性格式"
 
 # camlibs/ptp/library.c:120
-#: camlibs/ptp2/library.c:132
+#: camlibs/ptp2/library.c:132 camlibs/ptp/library.c:129
 msgid "PTP Invalid Device Prop Value"
 msgstr "非法的 PTP 设备属性值"
 
 # camlibs/ptp/library.c:121
-#: camlibs/ptp2/library.c:133
+#: camlibs/ptp2/library.c:133 camlibs/ptp/library.c:130
 msgid "PTP Invalid Parameter"
 msgstr "非法的 PTP 参数"
 
 # camlibs/ptp/library.c:122
-#: camlibs/ptp2/library.c:134
+#: camlibs/ptp2/library.c:134 camlibs/ptp/library.c:131
 msgid "PTP Session Already Opened"
 msgstr "PTP 会话已打开"
 
 # camlibs/ptp/library.c:123
-#: camlibs/ptp2/library.c:135
+#: camlibs/ptp2/library.c:135 camlibs/ptp/library.c:132
 msgid "PTP Transaction Canceled"
 msgstr "PTP 传输已取消"
 
 # camlibs/ptp/library.c:125
-#: camlibs/ptp2/library.c:137
+#: camlibs/ptp2/library.c:137 camlibs/ptp/library.c:134
 msgid "PTP Specification Of Destination Unsupported"
 msgstr "不支持的 PTP 目标规范"
 
 # camlibs/ptp/library.c:126
-#: camlibs/ptp2/library.c:138
+#: camlibs/ptp2/library.c:138 camlibs/ptp/library.c:135
 msgid "PTP EK Filename Required"
 msgstr "需要 PTP EK 文件名"
 
 # camlibs/ptp/library.c:127
-#: camlibs/ptp2/library.c:139
+#: camlibs/ptp2/library.c:139 camlibs/ptp/library.c:136
 msgid "PTP EK Filename Conflicts"
 msgstr "PTP EK 文件名冲突"
 
 # camlibs/ptp/library.c:128
-#: camlibs/ptp2/library.c:140
+#: camlibs/ptp2/library.c:140 camlibs/ptp/library.c:137
 msgid "PTP EK Filename Invalid"
 msgstr "非法的 PTP EK 文件名"
 
 # camlibs/ptp/library.c:130
-#: camlibs/ptp2/library.c:142
+#: camlibs/ptp2/library.c:142 camlibs/ptp/library.c:139
 msgid "PTP I/O error"
 msgstr "PTP I/O 错误"
 
 # camlibs/ptp/library.c:131
-#: camlibs/ptp2/library.c:143
+#: camlibs/ptp2/library.c:143 camlibs/ptp/library.c:140
 msgid "PTP Error: bad parameter"
 msgstr "PTP 错误：错误的参数"
 
 # camlibs/ptp/library.c:132
-#: camlibs/ptp2/library.c:144
+#: camlibs/ptp2/library.c:144 camlibs/ptp/library.c:141
 msgid "PTP Protocol error, data expected"
 msgstr "PTP 协议错误，需要数据"
 
 # camlibs/ptp/library.c:133
-#: camlibs/ptp2/library.c:145
+#: camlibs/ptp2/library.c:145 camlibs/ptp/library.c:142
 msgid "PTP Protocol error, response expected"
 msgstr "PTP 协议错误，需要响应"
 
 # camlibs/ptp/library.c:422
-#: camlibs/ptp2/library.c:547
+#: camlibs/ptp2/library.c:548
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -3631,7 +3668,7 @@ msgid ""
 "Enjoy!"
 msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
 
-#: camlibs/ptp2/library.c:583
+#: camlibs/ptp2/library.c:584
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -3642,27 +3679,27 @@ msgid ""
 msgstr ""
 
 # camlibs/stv0680/library.c:572
-#: camlibs/ptp2/library.c:623
+#: camlibs/ptp2/library.c:624
 #, fuzzy
 msgid "Number of values"
 msgstr "图像数量：%d\n"
 
-#: camlibs/ptp2/library.c:627
+#: camlibs/ptp2/library.c:628
 msgid "Supported values"
 msgstr ""
 
-#: camlibs/ptp2/library.c:640
+#: camlibs/ptp2/library.c:641
 msgid "Current value"
 msgstr ""
 
 # camlibs/canon/library.c:176
-#: camlibs/ptp2/library.c:1082
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "关闭相机"
 
 # camlibs/ptp/library.c:918
-#: camlibs/ptp2/library.c:1154
+#: camlibs/ptp2/library.c:1155 camlibs/ptp/library.c:1065
 msgid "PTP is implemented for USB cameras only."
 msgstr "PTP 仅为 USB 相机实现。"
 
@@ -4099,6 +4136,11 @@ msgstr "无电源指示灯"
 msgid "EK UI Language"
 msgstr "语言"
 
+# camlibs/ptp/library.c:422
+#: camlibs/ptp/library.c:533
+msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
+msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
+
 #: camlibs/ricoh/library.c:215
 msgid ""
 "Ricoh / Philips driver by\n"
@@ -5059,19 +5101,6 @@ msgstr ""
 "    配置作出贡献，请联络\n"
 "    gphoto-devel@gphoto.net\n"
 
-# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
-# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
-# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
-# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
-# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
-# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
-# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
-# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
-#: camlibs/sierra/sierra-desc.c:173
-#, c-format
-msgid "%lld (unknown)"
-msgstr "%lld (未知)"
-
 # camlibs/sierra/sierra.c:635
 #: camlibs/sierra/sierra.c:679 camlibs/soundvision/soundvision.c:411
 msgid "The file to be uploaded has a null length"
@@ -5445,6 +5474,19 @@ msgstr ""
 "因为使用了他们的奥林巴斯 C-3030Z\n"
 "以实现 USB 支持。"
 
+# camlibs/sierra/sierra.c:802 camlibs/sierra/sierra.c:842
+# camlibs/sierra/sierra.c:874 camlibs/sierra/sierra.c:904
+# camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:966
+# camlibs/sierra/sierra.c:990 camlibs/sierra/sierra.c:1012
+# camlibs/sierra/sierra.c:1041 camlibs/sierra/sierra.c:1385
+# camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1436
+# camlibs/sierra/sierra.c:1458 camlibs/sierra/sierra.c:1484
+# camlibs/sierra/sierra.c:1503 camlibs/sierra/sierra.c:1571
+#: camlibs/sierra/sierra-desc.c:173
+#, c-format
+msgid "%lld (unknown)"
+msgstr "%lld (未知)"
+
 #: camlibs/sipix/blink.c:911
 msgid ""
 "Sipix StyleCam Blink Driver\n"
@@ -6062,6 +6104,11 @@ msgstr "未知的相机库错误"
 msgid "Unknown error"
 msgstr "未知的错误"
 
+# camlibs/canon/library.c:267
+#, fuzzy
+#~ msgid "Could not identify camera based on name \"%s\""
+#~ msgstr "无法获取磁盘名：%s"
+
 # camlibs/ricoh/ricoh.c:75
 #~ msgid ""
 #~ "Expected %i bytes, got %i. Please report this error to <gphoto-"
@@ -6084,10 +6131,6 @@ msgstr "未知的错误"
 #~ msgstr "相机配置"
 
 # camlibs/ptp/library.c:422
-#~ msgid "Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
-#~ msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"
-
-# camlibs/ptp/library.c:422
 #, fuzzy
 #~ msgid "(ptp2) Written by Mariusz Woloszyn <emsi@ipartners.pl>. Enjoy!"
 #~ msgstr "由 Mariusz Woloszyn <emsi@ipartners.pl> 编写。请享用！"