Merge commit 'upstream/0.1.2'

1 files changed, 271 insertions, 240 deletions

diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index 7d9e8c8..f514cda 100644
--- a/po/rapid-photo-downloader.pot
+++ b/po/rapid-photo-downloader.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -93,92 +93,100 @@ msgstr ""
 msgid "Stockholm"
 msgstr ""
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr ""
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr ""
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr ""
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr ""
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:486 rapid/rapid.py:1321
+#: rapid/rapid.py:487 rapid/rapid.py:1334
 msgid "Sorry,these preferences contain an error:\n"
 msgstr ""
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:568 rapid/renamesubfolderprefs.py:184
+#: rapid/rapid.py:569 rapid/renamesubfolderprefs.py:185
 msgid "Job code"
 msgstr ""
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr ""
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr ""
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr ""
 
 #. Translators: please do not modify or leave out html formatting tags like <i> and <b>. These are used to format the text the users sees
-#: rapid/rapid.py:960
+#: rapid/rapid.py:964
 msgid ""
 "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 "the name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:981
+#: rapid/rapid.py:985
 msgid ""
 "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:985
+#: rapid/rapid.py:989
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid "Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1045
+#: rapid/rapid.py:1053
 msgid ""
 "The subfolder preferences entered are invalid and cannot be used.\n"
 "They will be reset to their default values."
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1250
+#: rapid/rapid.py:1260
 msgid "externaldrive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1252
+#: rapid/rapid.py:1262
 msgid "externaldrive2"
 msgstr ""
 
@@ -186,21 +194,21 @@ msgstr ""
 #. looking for images. It is visible initially in the progress bar for each device
 #. (which normally holds "x of y images copied").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1310
+#: rapid/rapid.py:1323
 msgid "scanning..."
 msgstr ""
 
-#: rapid/rapid.py:1399 rapid/rapid.py:2592
+#: rapid/rapid.py:1412 rapid/rapid.py:2687
 msgid "There is an error in the program preferences."
 msgstr ""
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
 msgstr ""
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr ""
 
@@ -208,7 +216,7 @@ msgstr ""
 #. It refers to the actual number of images that can be copied. For example, the user might see the following:
 #. '0 of 512 images copied'.
 #. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1438 rapid/rapid.py:2059
+#: rapid/rapid.py:1451 rapid/rapid.py:2149
 #, python-format
 msgid "0 of %s images copied"
 msgstr ""
@@ -219,35 +227,35 @@ msgstr ""
 #. %(number)s should be left exactly as is: 'number' should not be translated. The same applies to %(device)s: 'device' should
 #. not be translated. Generally speaking, if translating the sentence requires it, you can move items like '%(xyz)s' around
 #. in a sentence, but you should never modify them or leave them out.
-#: rapid/rapid.py:1450
+#: rapid/rapid.py:1463
 #, python-format
 msgid "Device scan complete: found %(number)s images on %(device)s"
 msgstr ""
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr ""
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr ""
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1489
+#: rapid/rapid.py:1502
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
 msgstr ""
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -255,83 +263,98 @@ msgid ""
 "Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1503
-msgid "Could not open image"
-msgstr ""
-
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
 #, python-format
-msgid "Source: %s"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
 
-#: rapid/rapid.py:1522
-msgid "Image has no metadata"
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
 msgstr ""
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1526
 #, python-format
-msgid ""
-"Metadata is essential for generating subfolders / image names.\n"
-"Source: %s"
+msgid "Source: %(source)s"
 msgstr ""
 
 #: rapid/rapid.py:1533
-msgid ""
-"Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient image metadata."
+msgid "Download copying error"
 msgstr ""
 
 #: rapid/rapid.py:1534
 #, python-format
 msgid ""
-"Subfolder: %(subfolder)s\n"
-"Image: %(image)s\n"
-"Problem: %(problem)s"
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr ""
+
+#: rapid/rapid.py:1539
+msgid "Images detected with the same filenames, but taken at different times:"
+msgstr ""
+
+#: rapid/rapid.py:1540
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+
+#: rapid/rapid.py:1553
+msgid "Could not open image"
 msgstr ""
 
-#: rapid/rapid.py:1634
+#: rapid/rapid.py:1554
 #, python-format
-msgid "Unique identifier '%s' added"
+msgid "Source: %s"
 msgstr ""
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+#: rapid/rapid.py:1572
+msgid "Image has no metadata"
 msgstr ""
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
+#: rapid/rapid.py:1573
+#, python-format
+msgid ""
+"Metadata is essential for generating subfolders / image names.\n"
+"Source: %s"
 msgstr ""
 
-#: rapid/rapid.py:1657
+#: rapid/rapid.py:1583
+msgid ""
+"Subfolder name could not be properly generated. Check to ensure there is "
+"sufficient image metadata."
+msgstr ""
+
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
+"Subfolder: %(subfolder)s\n"
+"Image: %(image)s\n"
+"Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
+#. A new day, according the user's preferences of what time a day begins, has started
+#: rapid/rapid.py:1746
+msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr ""
 
-#: rapid/rapid.py:1721 rapid/rapid.py:1729 rapid/rapid.py:1735
+#: rapid/rapid.py:1811 rapid/rapid.py:1819 rapid/rapid.py:1825
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -339,7 +362,7 @@ msgid ""
 "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -348,233 +371,233 @@ msgid ""
 msgstr ""
 
 #. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:1749
+#: rapid/rapid.py:1839
 msgid "The device can now be safely removed"
 msgstr ""
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr ""
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr ""
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr ""
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr ""
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr ""
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr ""
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr ""
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr ""
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr ""
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr ""
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr ""
 
-#: rapid/rapid.py:1950 rapid/rapid.py:1954
+#: rapid/rapid.py:2040 rapid/rapid.py:2044
 msgid "Could not delete image from image device"
 msgstr ""
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr ""
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr ""
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2043
+#: rapid/rapid.py:2133
 msgid "Device"
 msgstr ""
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2048
+#: rapid/rapid.py:2138
 msgid "Size"
 msgstr ""
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr ""
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr ""
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2209
+#: rapid/rapid.py:2299
 msgid "Should this device or partition be used to download images from?"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2228
+#: rapid/rapid.py:2318
 msgid "_Remember this choice"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2265
+#: rapid/rapid.py:2355
 #, python-format
 msgid "%s selected for downloading from"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2268
+#: rapid/rapid.py:2358
 msgid "This device or partition will always be used to download from"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2271
+#: rapid/rapid.py:2361
 #, python-format
 msgid "%s rejected as a download device"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2274
+#: rapid/rapid.py:2364
 msgid "This device or partition will never be used to download from"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2284
+#: rapid/rapid.py:2374
 msgid "Enter a Job Code"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2302
+#: rapid/rapid.py:2392
 msgid "Enter a new job code, or select a previous one."
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2305
+#: rapid/rapid.py:2395
 msgid "Enter a new job code."
 msgstr ""
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr ""
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr ""
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr ""
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr ""
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr ""
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr ""
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
 msgstr ""
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr ""
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr ""
 
-#: rapid/rapid.py:2726
+#: rapid/rapid.py:2821
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -582,508 +605,512 @@ msgid ""
 "Please check them to ensure correct operation."
 msgstr ""
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr ""
 
-#: rapid/rapid.py:2732
+#: rapid/rapid.py:2827
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Some of your previous preferences were invalid, and could not be updated. "
 "They will be reset."
 msgstr ""
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr ""
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr ""
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2853 rapid/rapid.py:3008
+#: rapid/rapid.py:2948 rapid/rapid.py:3104
 #, python-format
 msgid "Device %(device)s (%(path)s) ignored"
 msgstr ""
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr ""
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr ""
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr ""
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr ""
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr ""
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:3177
+#: rapid/rapid.py:3273
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr ""
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
 #. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:3289
+#: rapid/rapid.py:3386
 msgid "_Download "
 msgstr ""
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr ""
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr ""
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr ""
 
 #. Translators: this text is displayed to the user when they request information on the command line options.
 #. The text %default should not be modified or left out.
-#: rapid/rapid.py:3543
+#: rapid/rapid.py:3676
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3546
+#: rapid/rapid.py:3679
 msgid "list image file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr ""
 
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3564 rapid/rapid.py:3567
+#: rapid/rapid.py:3697 rapid/rapid.py:3700
 msgid "Using"
 msgstr ""
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:189
+#: rapid/renamesubfolderprefs.py:190
 msgid "Name + extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:191
+#: rapid/renamesubfolderprefs.py:192
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/renamesubfolderprefs.py:194
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:195
+#: rapid/renamesubfolderprefs.py:196
 msgid "Image number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:197
+#: rapid/renamesubfolderprefs.py:198
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:199
+#: rapid/renamesubfolderprefs.py:200
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/renamesubfolderprefs.py:202
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:203
+#: rapid/renamesubfolderprefs.py:204
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:205
+#: rapid/renamesubfolderprefs.py:206
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:207
+#: rapid/renamesubfolderprefs.py:208
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:209
+#: rapid/renamesubfolderprefs.py:210
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/renamesubfolderprefs.py:212
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/renamesubfolderprefs.py:214
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
+#: rapid/renamesubfolderprefs.py:216
 msgid "Shutter count"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
+#: rapid/renamesubfolderprefs.py:218
 msgid "Owner name"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:219
+#: rapid/renamesubfolderprefs.py:220
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:221
+#: rapid/renamesubfolderprefs.py:222
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:223
+#: rapid/renamesubfolderprefs.py:224
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:225
+#: rapid/renamesubfolderprefs.py:226
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:227
+#: rapid/renamesubfolderprefs.py:228
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:229
+#: rapid/renamesubfolderprefs.py:230
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:231
+#: rapid/renamesubfolderprefs.py:232
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:233
+#: rapid/renamesubfolderprefs.py:234
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:235
+#: rapid/renamesubfolderprefs.py:236
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/renamesubfolderprefs.py:238
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/renamesubfolderprefs.py:240
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:241
+#: rapid/renamesubfolderprefs.py:242
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:243
+#: rapid/renamesubfolderprefs.py:244
 msgid "lowercase"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
-msgid "Subseconds"
+msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:253
-msgid "YYYYMMDD"
+msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:255
-msgid "YYYY-MM-DD"
+msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:257
-msgid "YYMMDD"
+msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:259
-msgid "YY-MM-DD"
+msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:261
-msgid "MMDDYYYY"
+msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:263
-msgid "MMDDYY"
+msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:265
-msgid "MMDD"
+msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:267
-msgid "DDMMYYYY"
+msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:269
-msgid "DDMMYY"
+msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:271
-msgid "YYYY"
+msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:273
-msgid "YY"
+msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:275
-msgid "MM"
+msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:277
-msgid "DD"
+msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:279
-msgid "HHMMSS"
+msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:281
-msgid "HHMM"
+msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:283
-msgid "HH-MM-SS"
+msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:285
-msgid "HH-MM"
+msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:287
-msgid "HH"
+msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:289
-msgid "MM (minutes)"
+msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:291
+msgid "MM (minutes)"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
 "Expected one of %(value)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:831 rapid/renamesubfolderprefs.py:971
+#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
 #, python-format
 msgid "%s metadata is not present in image"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:856 rapid/renamesubfolderprefs.py:863
+#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
 #, python-format
 msgid "Error in date time component. Value %s appears invalid"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1252,7 +1279,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:42
@@ -1440,61 +1467,65 @@ msgid "Strip incompatible characters"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:91
-msgid "Unmount (\"eject\") image device upon download completion"
+msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:92
+msgid "Unmount (\"eject\") image device upon download completion"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:93
 msgid ""
 "When backing up, choose whether to overwrite an image on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:94
 msgid ""
 "You can have your photos backed up to multiple locations as they are "
 "downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr ""