Imported Upstream version 0.1.2upstream/0.1.2

23 files changed, 5865 insertions, 3509 deletions

diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/05_removed-empty-directory.diff/setup.py b/.pc/05_removed-empty-directory.diff/setup.py
deleted file mode 100644
index 2af92b4..0000000
--- a/.pc/05_removed-empty-directory.diff/setup.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: latin1 -*-
-
-from distutils.core import setup
-from distutils.command.install_data import install_data
-from distutils.dep_util import newer
-from distutils.log import info
-
-from rapid.config import version
-import glob
-import os
-
-name = 'rapid-photo-downloader'
-
-class InstallData(install_data):
-    """ This class is largely copied from setup.py in Terminator 0.8.1 by Chris Jones <cmsj@tenshu.net>"""
-    def run (self):
-        self.data_files.extend (self._compile_po_files ())
-        install_data.run (self)
-
-    def _compile_po_files (self):
-        data_files = []
-
-        PO_DIR = 'po'
-        for po in glob.glob (os.path.join (PO_DIR,'*.po')):
-            lang = os.path.basename(po[:-3])
-            mo = os.path.join('build', 'mo', lang, '%s.mo' % name)
-
-            directory = os.path.dirname(mo)
-            if not os.path.exists(directory):
-                info('creating %s' % directory)
-                os.makedirs(directory)
-
-            if newer(po, mo):
-                # True if mo doesn't exist
-                cmd = 'msgfmt -o %s %s' % (mo, po)
-                info('compiling %s -> %s' % (po, mo))
-                if os.system(cmd) != 0:
-                    raise SystemExit('Error while running msgfmt')
-
-                dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', '%s.mo' % name))
-                data_files.append((dest, [mo]))
-
-        return data_files
-
-package_data={'rapid': ['glade3/rapid.glade', 'glade3/rapid-photo-downloader-about.png', 'glade3/image-missing.svg']}
-
-setup(name=name,
-    version=version,
-    description='Rapid Photo Downloader for Linux',
-    license='GPL',
-    author='Damon Lynch',
-    author_email='damonlynch@gmail.com',
-    maintainer='Damon Lynch',
-    url='http://www.damonlynch.net/rapid',
-    long_description=
-"""Rapid Photo Downloader is written by a photographer for
-professional and amateur photographers. It can download photos
-from multiple cameras, memory cards and Portable Storage Devices
-simultaneously. It provides many options for subfolder creation,
-image renaming and backup.""",
-    packages = ['rapid'], 
-    package_data=package_data, 
-    scripts=['rapid-photo-downloader'],
-    platforms=['linux'],
-    data_files=[
-        ('share/applications', ['data/rapid-photo-downloader.desktop']),
-        ('share/pixmaps', ['data/icons/48x48/apps/rapid-photo-downloader.png', 'data/icons/rapid-photo-downloader.xpm']),
-        ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
-        ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
-        ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')),
-        ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),
-        ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
-    ],      
-    cmdclass={'install_data': InstallData}     
-)
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index bff31eb..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1 +0,0 @@
-05_removed-empty-directory.diff
diff --git a/PKG-INFO b/PKG-INFO
index 3f26c95..91abcb8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rapid-photo-downloader
-Version: 0.1.1
+Version: 0.1.2
 Summary: Rapid Photo Downloader for Linux
 Home-page: http://www.damonlynch.net/rapid
 Author: Damon Lynch
diff --git a/po/cs.po b/po/cs.po
index c633412..5050b52 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-03 21:58+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 19:18+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-04 20:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Hodnota dnešní stahování je invalidní.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Resetování hodnoty na nulu.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Hodnota nastavení 'Začátek dne' je poškozena.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Resetování do půlnoci.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Chyba v nastavení přejmenovávání obrázků."
 
-#: 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 "Promiňte, v nastavení je chyba:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Resetování na výchozí hodnoty."
 
 #. 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 "Pracovní kód"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Chyba v nastavení stahovací podsložky"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Vyberte složku do které mají být obrázky staženy"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Vyberte složku obrázků"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Vyberte složku do které má být uložena záloha obrázků"
 
 #. 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>"
@@ -153,7 +153,7 @@ msgstr ""
 "lze vygenerovat název. Pokud chcete obrázek přejmenovat použijte nastavení "
 "přejmenování.</i>"
 
-#: 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>"
@@ -162,18 +162,31 @@ msgstr ""
 "podsložek. Pokud chcete podsložky přejmenovat použijte nastavení jmen.</i>"
 
 #. 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 "<i>Příklad: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Hodnota Dnešní stahování není aktualizována, v současné době dochází ke "
+"stažení"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Hodnota Skladované číslo není aktualizována, v současné době dochází ke "
+"stažení"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Některé hodnoty v nastavení podsložky jsou nepodstatné a proto byly smazány."
 
 #. 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."
@@ -182,12 +195,12 @@ msgstr ""
 "Bylo tedy resetováno na výchozí hodnoty."
 
 #. 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 "externídisk1"
 
 #. 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 "externídisk2"
 
@@ -195,15 +208,15 @@ msgstr "externídisk2"
 #. 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 "skenování..."
 
-#: 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 "Vyskytla se chyba v nastavení programu."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -211,7 +224,7 @@ msgstr ""
 "\n"
 "Prosím zkontrolujte nastavení, restartujte program a zkuste to znovu."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Stahování nemůže pokračovat"
 
@@ -219,7 +232,7 @@ msgstr "Stahování nemůže pokračovat"
 #. 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 "0 z %s obrázků okopírováno"
@@ -230,22 +243,22 @@ msgstr "0 z %s obrázků okopírováno"
 #. %(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 "Sken zařízení kompletní: nalezeno %(number)s obrázků na %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Skenování zařízení kompletní: žádné obrázky nebyly na %s nalezeny"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Název obrázku nemohl být vygenerován"
 
 #. '%(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"
@@ -254,7 +267,7 @@ msgstr ""
 "Zdroj: %(source)s\n"
 "Problém: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -262,7 +275,7 @@ msgstr ""
 "Název obrázku se nepodařilo vygenerovat. Prosím zkontrolujte, zda existují "
 "dostatečná metadata."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -273,20 +286,73 @@ msgstr ""
 "Destinace: %(destination)s\n"
 "Problém: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Zdroj: %(source)s\n"
+"Destinace: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Unikátní identifikátor '%s' přidán"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Zdroj: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Chyba kopírování obrázků"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Zdroj: %(source)s\n"
+"Destinace: %(destination)s\n"
+"Chyba: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Obrázek nebyl okopírován."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Detekovány obrázky se stejnými názvy, ale pořízenými v jiném časovém období:"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"První obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Nelze otevřít obrázek"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Obrázek nemá metadata"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -295,7 +361,7 @@ msgstr ""
 "Metadata jsou základy pro generování podsložek / jmen obrázků.\n"
 "Zdroj: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -303,7 +369,7 @@ msgstr ""
 "Jméno podsložky nemohlo být řádně vygenerováno. Zkontrolujte, kde jsou "
 "dostatečná metadata."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -314,54 +380,20 @@ msgstr ""
 "Obrázek: %(image)s\n"
 "Problém: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Zdroj: %(source)s\n"
-"Destinace: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Unikátní identifikátor '%s' přidán"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Nový den začal - resetování 'Dnešní stahování' sekvenční číslo"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Chyba kopírování obrázků"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Zdroj: %(source)s\n"
-"Destinace: %(destination)s\n"
-"Chyba: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "Obrázek nebyl okopírován."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Záloha obrázku neexistuje"
 
-#: 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 "Chyba zálohování"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -372,7 +404,7 @@ msgstr ""
 "%(directory)s\n"
 "Chyba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -384,71 +416,71 @@ msgstr ""
 "Chyba: %(errno)s %(strerror)s"
 
 #. 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 "Zařízení nyní nemůže být bezpečně vymazáno"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s obrázků staženo"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s obrázků přeskočeno"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "varování"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "chyby"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Zálohovací zařízení chybí"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Zálohovací zařízení nebylo detekováno."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Toto zařízení nemá žádné obrázky pro stažení."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Stahování začalo z %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Obrázek přeskočen"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Obrázek přepsán"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Obrázek neexistuje"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Obrázek nemá náhled"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s z %(total)s obrázků okopírováno"
 
-#: 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 "Nelze odstranit obrázky z obrázkového zařízení"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -457,132 +489,132 @@ msgstr ""
 "Obrázek: %(source)s\n"
 "Chyba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Chyba: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "Z obrázkového zařízení odstraněno %i obrázků"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Stahování kompletní z %s"
 
 #. 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 "Zařízení"
 
 #. 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 "Velikost"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Průběh stahování"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Náhled nemůže být zobrazen"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Toto může být poškozeno"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Zařízení detekováno"
 
 #. 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 "Máte zařízení či oddíl určený ke stažení?"
 
 #. 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 "_Zapamatovat si tuto volbu"
 
 #. 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 "%s vybráno pro stažení"
 
 #. 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 "Toto zařízení či oddíl bude vždy použito pro stažení"
 
 #. 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 "%s odmítnuto jako stahovací zařízení"
 
 #. 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 "Toto zařízení či oddíl nebude použito pro stažení"
 
 #. 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 "Vložte pracovní kód"
 
 #. 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 "Vložte nový pracovní kód, nebo vyberte předchozí."
 
 #. 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 "Vložte nový pracovní kód."
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Pracovní kód:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Pracovní kód vložen"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Pracovní kód nebyl vložen"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Některé nastavení bylo resetováno."
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Výzva pro použití %s"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Výzva pro pracovní kód"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Výzva k pracovnímu kódu již existuje, nevyzívejte znovu"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Stahování začne po vložení pracovního kódu"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Stahování začíná"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -590,7 +622,7 @@ msgstr ""
 "Novější verze této aplikace na tomto počítači již byla spuštěna.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -598,15 +630,15 @@ msgstr ""
 "Nastavení programu se zdá být validní, ale zkontrolujte bezpečnou opravnou "
 "operaci."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Promiňte, nastavení je invalidní a muselo být resetováno."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Varování:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -614,11 +646,11 @@ msgstr ""
 "Tato verze tohoto programu již na tomto počítači byla nainstalována. "
 "Kontrola nastavení."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Nastavení bylo modifikováno."
 
-#: 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"
@@ -630,11 +662,11 @@ msgstr ""
 "\n"
 "Prosím zkontrolujte bezpečnou opravnou operaci."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Žádné nastavení nebylo změněno."
 
-#: 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. "
@@ -643,444 +675,448 @@ msgstr ""
 "Tato verze programu využívá uživatelsky jiné nastavení než ta předchozí. "
 "Některé nastavení je invalidní a nelze aktualizovat. Je tedy resetováno."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Problém používání pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Přijetí schopností pynotify serveru selhalo."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "a"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
-msgstr "Používám zálohovací zařízení"
+msgstr "Používání zálohovacích zařízení"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
-msgstr "Používám zálohovací zařízení"
+msgstr "Používání zálohovacího zařízení"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Zálohovací zařízení nebylo detekováno"
 
-#: 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 "Zařízení %(device)s (%(path)s) ignorováno"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detekováno %(device)s s %(path)s cestami"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Automatický start stahování je povolen"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Automatický start stahování je zakázán"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
-msgstr "Používám manuálně specifikovanou cestu"
+msgstr "Používání manuálně specifikované cesty"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Všechna stahování kompletní"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Zbývá 1 sekunda"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Zbývá %i sekund"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Zbývá 1 minuta"
 
 #. 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 "Zbývá %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "obrázky staženy"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "obrázky přeskočeny"
 
 #. 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 "_Stažení "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pozastavit"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Nastavení změněno"
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Hezký den"
 
 #. 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 "zobrazit informace o programu na příkazové řádce (default: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "pouze výstup chyb do příkazové řádky"
 
 #. 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 "program rozpozná typy obrázkových souborů a ukončí"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "a %s"
 
 #. 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 "Používání"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s není připraven k používání"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Datum a čas"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sekvence"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Datum obrázku"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Dnes"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Včerejšek"
 
 #. 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 "Jméno + koncovka"
 
 #. 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 "Název"
 
 #. 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 "Koncovka"
 
 #. 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 "Číslo obrázku"
 
 #. 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 "Clona"
 
 #. 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 "ISO"
 
 #. 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 "Čas expozice"
 
 #. 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 "Vzdálenost ohniska"
 
 #. 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 "Vytvoření fotoaparátu"
 
 #. 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 "Druh fotoaparátu"
 
 #. 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 "Krátký druh kamery"
 
 #. 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 "Model kamery v označení odděleném pomlčkou"
 
 #. 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 "Sériové číslo"
 
 #. 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 "Číslo snímku"
 
 #. 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 "Vlastníkovo jméno"
 
 #. 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 "Dnešní stahování"
 
 #. 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 "Číslo této relace"
 
 #. 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 "Číslo podsložky"
 
 #. 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 "Uskladněné číslo"
 
 #. 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 "Zpráva sekvence"
 
 #. 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 "Všechny číslice"
 
 #. 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 "Poslední číslice"
 
 #. 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 "Poslední 2 číslice"
 
 #. 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 "Poslední 3 číslice"
 
 #. 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 "Poslední 4 číslice"
 
 #. 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 "Originální obal"
 
 #. 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 "Velká písmena (ABCDEFG)"
 
 #. 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 "Malá písmena (abcdefg)"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Jedna číslice"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Dvě číslice"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Tři číslice"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Čtyři číslice"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Pět číslic"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Šest číslic"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Sedm číslic"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Milisekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1089,53 +1125,53 @@ msgstr ""
 "Klíč nastavení '%(key)s' je invalidní\n"
 "Předpokládáno %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Hodnota nastavení '%(value)s' je invalidní"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Tato nastavení nejsou správně utvořena:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Metadata subsekund neprezentují obrázek"
 
-#: 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 "%s metadata nejsou v obrázku"
 
-#: 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 "Chyba v časovém komponentu. Hodnota %s se zdá invalidní"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr "typ souboru byl rozeznán, ale obrázek nemá označení typu souboru"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr "číslo obrázku bylo rozeznáno, ale obrázek nemá číslo"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "chyba vygenerování jména s komponentem %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Nastavení podsložky nemělo začít %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Nastavení podsložky nemělo končit %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Nastavení podsložky by nemělo obsahovat dvě %s za sebou"
@@ -1308,8 +1344,8 @@ msgstr ""
 "identifikátor."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1533,10 +1569,14 @@ msgid "Strip incompatible characters"
 msgstr "Odstranit nekompatibilní znaky"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synchronizovat sekvenční čísla RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Odpojit (\"vysunout\") obrázkové zařízení po dokončení stahování"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1544,7 +1584,7 @@ msgstr ""
 "Při zálohování vyberte zda chcete přepsat obrázek který má schodné jméno s "
 "jiným, či zda ho chcete nezálohovat."
 
-#: 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."
@@ -1552,46 +1592,49 @@ msgstr ""
 "Vy můžete vaše fotografie zálohovat do různých umístění a můžete je stahovat "
 "na různé externí disky."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Vyčistit kompletní stahování"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Záznam chyb"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Nápověda online..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Dejte příspěvek..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Ohlásit problém..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Náhledy"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Přeložit tuto aplikaci..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Zobrazení"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/de.po b/po/de.po
index 0a776a0..5f444d2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-05 05:56+0000\n"
-"Last-Translator: groovy <Unknown>\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 02:27+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-05 06:00+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,58 +94,58 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Anzahl der ungültigen Downloads von heute.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Wert wird auf Null zurückgesetzt.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Der Vorgabewert für 'Start des Tages' ist ungültig.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Die Zeit wird auf Mitternacht zurückgesetzt.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Fehler in den Einstellungen zum Umbenennen der Dateien"
 
-#: 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 "Entschuldigung, diese Einstellungen enthalten einen Fehler:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Die Einstellungen werden auf die Standardwerte zurückgesetzt."
 
 #. 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 "Auftragsbezeichnung"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Fehler in den Download-Unterordner Einstellungen"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Wählen Sie einen Ordner für den Download der Bilder"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Wählen Sie einen Bilder Ordner"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr ""
 "Wählen Sie einen Ordner zur Speicherung der Sicherungskopien der Bilder"
 
 #. 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>"
@@ -153,7 +153,7 @@ msgstr ""
 "<i><b>Warnung:</b> Die Bilder enthalten ungenügende Metadaten um den "
 "Dateinamen zu erzeugen. Bitte verwenden Sie eine Option zur Umbenennung.</i>"
 
-#: 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>"
@@ -162,19 +162,32 @@ msgstr ""
 "Unterordner zu erzeugen. Bitte verwenden Sie eine Option zur Umbenennung.</i>"
 
 #. 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 "<i>Beispiel: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Der Wert für heutige Downloads wurde nicht aktualisiert, da gerade ein "
+"Download stattfindet"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Der Wert für gespeicherte Anzahl wurde nicht aktualisiert, da gerade ein "
+"Download stattfindet"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Es wurden einige unnötige Werte in den Einstellungen für Unterordner "
 "entfernt."
 
 #. 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."
@@ -184,12 +197,12 @@ msgstr ""
 "Sie werden auf Standardwerte zurückgesetzt."
 
 #. 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 "ExternesLaufwerk1"
 
 #. 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 "ExternesLaufwerk2"
 
@@ -197,15 +210,15 @@ msgstr "ExternesLaufwerk2"
 #. 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 "Überprüfe Laufwerke ..."
 
-#: 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 "Fehler in den Programmeinstellungen."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -214,7 +227,7 @@ msgstr ""
 "Bitte überprüfen Sie die Einstellungen, starten Sie das Programm neu und "
 "versuchen es erneut."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Der Download kann nicht weitergeführt werden"
 
@@ -222,7 +235,7 @@ msgstr "Der Download kann nicht weitergeführt werden"
 #. 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 "0 von %s Bildern kopiert"
@@ -233,25 +246,25 @@ msgstr "0 von %s Bildern kopiert"
 #. %(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 ""
 "Überprüfung der Laufwerke abgeschlossen: %(number)s Bilder auf %(device)s "
 "gefunden"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr ""
 "Überprüfung der Laufwerke abgeschlossen: Keine Bilder gefunden auf %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Der Dateiname konnte nicht erzeugt werden"
 
 #. '%(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"
@@ -260,7 +273,7 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -268,7 +281,7 @@ msgstr ""
 "Der Dateiname konnte nicht erzeugt werden. Bitte überprüfen Sie die "
 "Metadaten der Bilddatei."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -279,20 +292,73 @@ msgstr ""
 "Ziel: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Quelle: %(source)s\n"
+"Ziel: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Die eindeutige Bezeichnung '%s' wurde hinzugefügt"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Quelle: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Fehler beim Kopieren"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Quelle: %(source)s\n"
+"Ziel: %(destination)s\n"
+"Fehler: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Die Datei wurde nicht kopiert."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Fotos mit gleichem Dateinamen aber abweichender Aufnahmezeit gefunden:"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Erstes Foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Zweites Foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Das Bild konnte nicht geöffnet werden"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Quelle: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Das Bild enthält keine Metadaten"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -302,7 +368,7 @@ msgstr ""
 "Dateinamen\n"
 "Quelle: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -310,7 +376,7 @@ msgstr ""
 "Der Unterordner konnte nicht erzeugt werden. Bitte überprüfen Sie die "
 "Metadaten der Bilddatei."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -321,56 +387,22 @@ msgstr ""
 "Bild: %(image)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Quelle: %(source)s\n"
-"Ziel: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Die eindeutige Bezeichnung '%s' wurde hinzugefügt"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Ein neuer Tag hat begonnen - die Anzahl der 'Downloads Heute' wird "
 "zurückgesetzt"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Fehler beim Kopieren"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Quelle: %(source)s\n"
-"Ziel: %(destination)s\n"
-"Fehler: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "Die Datei wurde nicht kopiert."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Die Sicherungskopie besteht bereits"
 
-#: 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 "Fehler beim Erstellen der Sicherungskopie"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -381,7 +413,7 @@ msgstr ""
 "%(directory)s\n"
 "Fehler: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -393,71 +425,71 @@ msgstr ""
 "Fehler: %(errno)s %(strerror)s"
 
 #. 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 "Das Laufwerk kann nun entfernt werden"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s Bilder heruntergeladen"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s Bilder übersprungen"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "Fehler"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Das Laufwerk für die Sicherungskopien fehlt"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Das Laufwerk für die Sicherungskopien konnte nicht gefunden werden."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Das Laufwerk enthält keine Bilddateien."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Der Download von %s hat begonnen"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Bild übersprungen"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Bilddatei überschrieben"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Bilddatei existiert bereits"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Die Datei enthält kein Vorschaubild"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s von %(total)s Bildern kopiert"
 
-#: 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 "Das Bild konnte auf dem Gerät nicht gelöscht werden."
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -466,135 +498,135 @@ msgstr ""
 "Bild: %(source)s\n"
 "Fehler: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Bild: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "%i Bilder auf dem Gerät gelöscht"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download von %s abgeschlossen"
 
 #. 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 "Laufwerk"
 
 #. 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 "Grösse"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Fortschritt im Download"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Vorschaubild kann nicht angezeigt werden"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Es könnte defekt sein"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Gerät erkannt"
 
 #. 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 ""
 "Sollen Fotos von diesem Gerät oder dieser Partition heruntergeladen werden?"
 
 #. 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 "_Auswahl merken"
 
 #. 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 "%s wurde zum Herunterladen ausgewählt"
 
 #. 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 "Von diesem Gerät oder dieser Partition wird immer heruntergeladen"
 
 #. 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 "%s wurde als Gerät zum Herunterladen abgelehnt"
 
 #. 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 "Von diesem Gerät oder dieser Partition wird nie heruntergeladen"
 
 #. 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 "Geben Sie eine Auftragsbezeichnung ein"
 
 #. 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 ""
 "Geben Sie eine neue Auftragsbezeichnung an oder wählen Sie eine vorhandene"
 
 #. 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 "Geben Sie eine neue Auftragsbezeichnung an"
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Auftragsbezeichnung:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Auftragsbezeichnung eingegeben"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Keine Auftragsbezeichnung angegeben"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Einige Einstellungen werden zurückgesetzt."
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Abfrage, ob %s zu benutzen ist"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Frage nach der Auftragsbezeichnung"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Auftragsbezeichnung wurde schon abgefragt, nicht wieder fragen"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr ""
 "Beginne mit den Dowaloads welche auf eine Auftragsbezeichnung gewartet haben"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Beginne mit den Downloads"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -603,7 +635,7 @@ msgstr ""
 "aufgerufen.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -611,17 +643,17 @@ msgstr ""
 "Die Programmeinstellungen scheinen gültig zu sein, aber bitte überprüfen Sie "
 "diese, um einen problemlosen Programmablauf zu gewährleisten."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Einige Voreinstellungen sind ungültig, sie werden auf die Standardwerte "
 "zurückgesetzt."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Warnung:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -629,11 +661,11 @@ msgstr ""
 "Diese Version des Programms ist neuer als bis bisherige. Die "
 "Voreinstellungen werden überprüft."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Die Voreinstellungen wurden geändert."
 
-#: 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"
@@ -644,11 +676,11 @@ msgstr ""
 "Voreinstellungen wurden angepasst\n"
 "Bitte überprüfen Sie diese."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Es mussten keine Voreinstellungen angepasst werden."
 
-#: 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. "
@@ -658,111 +690,111 @@ msgstr ""
 "bisherige Version. Einige der bestehenden Einstellungen sind ungültig und "
 "werden auf die Standardwerte zurückgesetzt."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Bei der Verwendung von pynotify ist ein Problem aufgetreten."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Die Werte des pynotify Servers konnten nicht abgefragt werden."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: 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 "Gerät %(device)s (%(path)s) ignoriert"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Die %(device)s gefunden auf Pfad %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Der automatische Downloadbeginn ist eingeschaltet"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Der automatische Downloadbeginn ist ausgeschaltet"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Verwende den manuell eingegebenen Pfad"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Etwa 1 Minute verbleibend"
 
 #. 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 "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "Bilder heruntergeladen"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "Bilder übersprungen"
 
 #. 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 "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pause"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Die Voreinstellungen wurden geändert."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Auf Wiedersehen"
 
 #. 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 "
@@ -771,333 +803,337 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "Zeige Fehlermeldungen nur auf der Kommandozeile an"
 
 #. 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 "Anzeigen der gültigen Deteiendungen und beenden"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
 #. 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 "Verwende"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s wird bereits ausgeführt"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Datum Zeit"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Dateiname"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sequenzen"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Heute"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. 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 "Name + Erweiterung"
 
 #. 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 "Name"
 
 #. 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 "Erweiterung"
 
 #. 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 "Bildnummer"
 
 #. 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 "Blende"
 
 #. 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 "ISO-Wert"
 
 #. 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 "Belichtungszeit"
 
 #. 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 "Brennweite"
 
 #. 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 "Kamerahersteller"
 
 #. 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 "Kameramodell"
 
 #. 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 "Kameramodell (kurz)"
 
 #. 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 "Kameramodell (kurz, Bindestriche)"
 
 #. 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 "Seriennummer"
 
 #. 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 "Anzahl der Auslösungen"
 
 #. 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 "Name des Eigentümers"
 
 #. 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 "Downloads heute"
 
 #. 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 "Sitzungsnummer"
 
 #. 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 "Nummer des Unterverzeichnisses"
 
 #. 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 "Gespeicherte Nummer"
 
 #. 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 "Vorlaufender Buchstabe"
 
 #. 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 "Alle Ziffern"
 
 #. 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 "Letzte Ziffer"
 
 #. 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 "Letzte 2 Ziffern"
 
 #. 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 "Letzte 3 Ziffern"
 
 #. 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 "Letze 4 Ziffern"
 
 #. 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 "Ursprüngliche Schreibweise"
 
 #. 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 "GROSSBUCHSTABEN"
 
 #. 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 "kleinschreibung"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Eine Ziffer"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Zwei Ziffern"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Drei Ziffern"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Vier Ziffern"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Fünf Ziffern"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Sechs Ziffern"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Siebenstellig"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Hundertstelsekunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "JJJJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "JJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "JJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMTTJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMTTJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "TTMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "TTMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (Minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1106,56 +1142,56 @@ msgstr ""
 "Voreinstellung '%(key)s' ist ungültig.\n"
 "Erwarteter Wert %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Vorgaben für Wert '%(value)s' ist ungültig"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Diese Voreinstellungen sind falsch formatiert:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Das Bild enthält keine Hunderstelsekunden-Informationen"
 
-#: 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 "%s Metadaten sind im Bild nicht vorhanden"
 
-#: 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 ""
 "Fehler in den Datum/Zeit Informationen. Der Wert %s scheint ungültig zu sein"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "Erweiterung wurde angegeben, aber der Dateiname enthält keine Erweiterung"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "Eine Bildnummer wurde angegeben, aber der Dateiname enthält keine Nummer"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Ein Fehler ist aufgetreten bei der Erstellung des Namens mit %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Die Unterordnereinstellungen sollten nicht mit %s beginnen"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Die Unterordnereinstellungen sollten nicht mit %s enden"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1203,7 +1239,7 @@ msgstr "<b>Laufwerke mit Bilddaten</b>"
 
 #: rapid/glade3/rapid.glade.h:11
 msgid "<b>Image Name Conflicts</b>"
-msgstr "<b>Konfilkte der Bildernamen</b>"
+msgstr "<b>Konflikte der Bildernamen</b>"
 
 #: rapid/glade3/rapid.glade.h:12
 msgid "<b>Image Rename</b>"
@@ -1331,8 +1367,8 @@ msgstr ""
 "einzufügen"
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch Oktober 2007"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1561,10 +1597,14 @@ msgid "Strip incompatible characters"
 msgstr "Entferne nicht kompatible Zeichen"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synchronisiere RAW + JPEG Satznummern"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Aufwerfen des Bildlaufwerks nach Beendigung des Downloads"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1572,7 +1612,7 @@ msgstr ""
 "Während der Datensicherung können bestehende Bilder auf dem "
 "Sicherungslaufwerk überschrieben oder übersprungen werden."
 
-#: 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."
@@ -1580,46 +1620,49 @@ msgstr ""
 "Sie können Bilder während des Herunterladens an mehrere Orten sichern, z.B. "
 "auf externe Festplatten."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Hinzufügen …"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Heruntergeladene Dateien nicht mehr anzeigen"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Fehlerprotokoll"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Online Hilfe ..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Machen Sie eine Spende"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fotos"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Problemmeldung"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Vorschaubilder"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Übersetzung der Applikation"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Ansicht"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/es.po b/po/es.po
index 88a52da..f7dd0e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-04 16:23+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-16 22:21+0000\n"
 "Last-Translator: Jose Luis Navarro <jlnavarro111@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-04 19:48+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 23:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Estocolmo"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Valor inválido de descargas de hoy.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Restableciendo valor a cero.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Valor preferencial de 'Inicio del día' corrupto.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Restableciendo a medianoche.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Error en las preferencias de Renombrar Imagen"
 
-#: 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 "Lo siento, pero estas preferencias contienen un error:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Restableciendo a los valores por defecto."
 
 #. 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 "Código de trabajo"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Error en las preferencias de la Subcarpeta de Descargas"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Seleccionar una carpeta para descargar las fotos"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Seleccionar una carpeta de imágenes"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Seleccione una carpeta para respaldar las imágenes"
 
 #. 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Advertencia:</b> No hay suficientes metadatos de imagen para generar "
 "completamente el nombre. Por favor,  use otras opciones de renombre.</i>"
 
-#: 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>"
@@ -162,19 +162,28 @@ msgstr ""
 "subcarpetas.</i>"
 
 #. 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 "<i>Ejemplo: %s</i>"
 
-#: 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 ""
 "Se han removido innecesariamente algunos valores de las preferencias de la "
 "subcarpeta."
 
 #. 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."
@@ -184,12 +193,12 @@ msgstr ""
 "Estas serán restablecidas a los valores por defecto."
 
 #. 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 "dispositivoexterno1"
 
 #. 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 "dispositivoexterno2"
 
@@ -197,15 +206,15 @@ msgstr "dispositivoexterno2"
 #. 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 "explorando..."
 
-#: 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 "Hay un error en las preferencis del programa."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -213,7 +222,7 @@ msgstr ""
 "\n"
 "Por favor, revise las preferencias, reinicie el programa e intente de nuevo."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "No se puede proceder con la descarga"
 
@@ -221,7 +230,7 @@ msgstr "No se puede proceder con la descarga"
 #. 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 "0 de %s imagenes copiadas"
@@ -232,25 +241,25 @@ msgstr "0 de %s imagenes copiadas"
 #. %(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 ""
 "Exploración del dispositivo completada: encontradas %(number)s imágenes en "
 "%(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr ""
 "Exploración del dispositivo completada: no se han encontrado imágenes en %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Archivo de imagen no se ha generado"
 
 #. '%(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"
@@ -259,7 +268,7 @@ msgstr ""
 "Origen: %(source)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -267,7 +276,7 @@ msgstr ""
 "No se pudo generar correctamente el nombre del archivo de imagen. Compruebe "
 "que existan suficientes meta-datos."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -278,20 +287,74 @@ msgstr ""
 "Destino: %(destination)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Origen: %(source)s\n"
+"Destino: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Identificador único '%s' agregado"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Origen: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Error al copiar la descarga"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Origen: %(source)s\n"
+"Destino: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "La imagen no fue copiada."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Imágenes detectadas con el mismo nombre de archivo, pero tomadas en "
+"diferentes momentos"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Primera imagen: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Segunda imagen: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "No se pudo abrir la imagen"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Origen: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "La imagen no tiene metadatos"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -300,7 +363,7 @@ msgstr ""
 "Los metadatos son esenciales para generar subcarpetas/nombres de imagen.\n"
 "Destino: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -308,7 +371,7 @@ msgstr ""
 "El nombre de la subcarpeta no pudo ser generado correctamente. Compruebe que "
 "existan suficientes metadatos."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -319,56 +382,22 @@ msgstr ""
 "Imagen: %(image)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Origen: %(source)s\n"
-"Destino: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Identificador único '%s' agregado"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Ha empezado un nuevo día - restableciendo los números de secuencia de "
 "'Descargas del día'"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Error al copiar la descarga"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Origen: %(source)s\n"
-"Destino: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "La imagen no fue copiada."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "La copia de seguridad de la imagen ya existe"
 
-#: 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 "Error en copia de seguridad"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -379,7 +408,7 @@ msgstr ""
 "%(directory)s\n"
 "Error: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -391,71 +420,71 @@ msgstr ""
 "Error: %(errno)s %(strerror)s"
 
 #. 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 "El dispositivo ya se puede extraer de forma segura"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s imágenes descargadas"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s imagenes saltadas"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "errores"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Dispositivo de respaldo perdido"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "No se detectó un dispositivo de respaldo."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "El dispositivo no tiene imágenes para descargar."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "La descarga empezó desde %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Imagen saltada"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Imagen sobreescrita"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "La imagen ya existe"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "La imagen no tiene miniatura"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s de %(total)s imágenes copiadas"
 
-#: 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 "No se pudo eliminar la imagen del dispositivo de imágenes"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -464,132 +493,132 @@ msgstr ""
 "Imagen: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Imagen: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "Se eliminaron %i imágenes del dispositivo de imágenes"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Descarga completa desde %s"
 
 #. 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 "Dispositivo"
 
 #. 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 "Tamaño"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Progreso de descarga"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Miniatura no puede mostrarse"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Puede estar corrupta"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Dispositivo detectado"
 
 #. 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 "¿Deberían bajarse imágenes de este dispositivo o partición?"
 
 #. 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 "_Recordar esta elección"
 
 #. 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 "%s seleccionado para descargar de"
 
 #. 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 "Siempre se descargará de este dispositivo o partición"
 
 #. 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 "%s rechazado como dispositivo de descarga"
 
 #. 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 "Jamás se descargará de este dispositivo o partición"
 
 #. 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 "Ingrese un Código de trabajo"
 
 #. 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 "Entre un nuevo código de trabajo o seleccione uno previo."
 
 #. 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 "Entre un nuevo código de trabajo."
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Código de trabajo:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Código de trabajo ingresado"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Código de trabajo no introducido"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Algunas preferencias serán restablecidas."
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Preguntando si usar o no %s"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Pidiendo un Código de trabajo"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Preguntando por código de trabajo, no volver a preguntar"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Iniciando descargas que han sido esperadas por un Código de trabajo"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Iniciando descargas"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -597,7 +626,7 @@ msgstr ""
 "Una versión mas nueva de este programa fue ejecutada antes en este equipo.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -605,15 +634,15 @@ msgstr ""
 "Las preferencias del programa parecen ser válidas, pero por favor revise a "
 "fin de garantizar el correcto funcionamiento."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Lo siento, algunas preferencias son invalidas y serán restablecidas"
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -621,11 +650,11 @@ msgstr ""
 "Esta versión del programa es más reciente que la versión previamente "
 "ejecutada. Compruebe las preferencias."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Las preferencias fueron modificadas."
 
-#: 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"
@@ -637,11 +666,11 @@ msgstr ""
 "\n"
 "Por favor, compruebe el correcto funcionamiento."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Ninguna preferencia necesita ser cambiada."
 
-#: 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. "
@@ -651,111 +680,111 @@ msgstr ""
 "Algunas de sus preferencias anteriores no eran válidas, y no pueden ser "
 "actualizadas, por lo que serán restablecidas."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Problema usando pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Fallo al recibir capacidades del servidor pynotify"
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "y"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Dispositivos de copia de seguridad no detectados"
 
-#: 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 "Dispositivo %(device)s (%(path)s) ignorado"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detectado %(device)s con ruta %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Iniciar automaticamente la descarga está activa"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Iniciar automaticamente la descarga está desactivada"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Usando manualmente la ruta especifica"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Todas las descargas completadas"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Aproximadamente 1 segundo restante"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Aproximadamente %i segundos restantes"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Aproximadamente 1 minuto restante"
 
 #. 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 "Resta cerca de %(minutes)i:%(seconds)02i minutos"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "imagenes descargadas"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "Imágenes saltadas"
 
 #. 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 "_Descargar "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Las preferencias fueron cambiadas."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Adiós"
 
 #. 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 "
@@ -764,334 +793,338 @@ msgstr ""
 "mostrar la información del programa en la línea de comandos de como se "
 "ejecuta el programa (por defecto: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "solo errores de salida en la línea de comando"
 
 #. 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 ""
 "lista de extensiones de archivo de imagen que el programa reconoce y salir"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "y %s"
 
 #. 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 "Usando"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s ya se está ejecutando"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Fecha"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Texto"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Secuencias"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Fecha de la imagen"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Hoy"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. 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 "Nombre + extensión"
 
 #. 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 "Nombre"
 
 #. 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 "Extensión"
 
 #. 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 "Número de imagen"
 
 #. 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 "Apertura"
 
 #. 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 "ISO"
 
 #. 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 "Tiempo de exposición"
 
 #. 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 "Longitud focal"
 
 #. 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 "Marca cámara"
 
 #. 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 "Modelo de la camara"
 
 #. 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 "Modelo corto de cámara"
 
 #. 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 "Modelo de cámara con guión corto"
 
 #. 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 "Número de serie"
 
 #. 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 "Obturador contador"
 
 #. 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 "Nombre propietario"
 
 #. 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 "Descargas de hoy"
 
 #. 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 "Número de sesión"
 
 #. 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 "Número de subcarpeta"
 
 #. 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 "Número almacenado"
 
 #. 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 "Letra de secuencia"
 
 #. 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 "Todos los digitos"
 
 #. 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 "Último dígito"
 
 #. 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 "Últimos 2 dígitos"
 
 #. 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 "Últimos 3 dígitos"
 
 #. 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 "Últimos 4 dígitos"
 
 #. 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 "Mantener original"
 
 #. 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 "MAYÚSCULAS"
 
 #. 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 "minúsculas"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Un dígito"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Dos dígitos"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Tres dígitos"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Cuatro dígitos"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Siete digitos"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Sub-segundos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "AAAA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "AA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1100,55 +1133,55 @@ msgstr ""
 "Clave preferida '%(key)s' es inválida.\n"
 "Esperado uno de %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Valor '%(value)s' es inválido"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Estas preferencias no están bien formadas:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Metadato de sub-segundos no esta presente en la imagen"
 
-#: 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 "metadato %s no está presente en la imagen"
 
-#: 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 "Error en el campo de fecha. El valor %s parece inválido"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "La extensión fue especificada, pero el nombre de la imagen no tiene extensión"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "Número de imagen fue especificado, pero el nombre de la imagen no lo tiene"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Error generando nombre con componente %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencias de subcarpeta no debería empezar con una %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencias de subcarpeta no debería terminar con una %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1323,8 +1356,8 @@ msgstr ""
 "identificador único."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright © Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1554,12 +1587,16 @@ msgid "Strip incompatible characters"
 msgstr "Quitar carácteres incompatibles"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Sincronizar números de secuencia de RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr ""
 "Desmontar (\"expulsar\") el dispositivo de imagenes una vez completada la "
 "descarga"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1567,7 +1604,7 @@ msgstr ""
 "Cuando respalde, elegir si desea sobreescribir la imagen en el dispositivo "
 "de seguridad que tiene el mismo nombre, o de saltar su respaldo."
 
-#: 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."
@@ -1575,46 +1612,49 @@ msgstr ""
 "Puede tener respaldos de sus fotos en múltiples locaciones, por ejemplo: "
 "discos duros externos."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Añadir…"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Limpiar descargas completadas"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Registro de errores"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Conseguir ayuda online"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Hacer una donación"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fotos"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Informar de un problema"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniaturas"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Traducir esta aplicación"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Ver"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright © Damon Lynch 2007-09"
diff --git a/po/fi.po b/po/fi.po
index f06eb1f..dcbae9f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,144 +7,144 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-11 10:25-0600\n"
-"PO-Revision-Date: 2009-08-28 08:14+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 02:27+0000\n"
 "Last-Translator: Mikko Ruohola <polarfox@polarfox.net>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-14 21:20+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:68
+#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
 msgid "Rapid Photo Downloader"
 msgstr "Nopea kuvien lataus"
 
-#: rapid/rapid.py:374
+#: rapid/rapid.py:377
 msgid "New York"
-msgstr ""
+msgstr "New York"
 
-#: rapid/rapid.py:375
+#: rapid/rapid.py:378
 msgid "Manila"
-msgstr ""
+msgstr "Manila"
 
-#: rapid/rapid.py:375
+#: rapid/rapid.py:378
 msgid "Prague"
-msgstr ""
+msgstr "Praha"
 
-#: rapid/rapid.py:375
+#: rapid/rapid.py:378
 msgid "Helsinki"
-msgstr ""
+msgstr "Helsinki"
 
-#: rapid/rapid.py:375
+#: rapid/rapid.py:378
 msgid "Wellington"
-msgstr ""
+msgstr "Wellington"
 
-#: rapid/rapid.py:376
+#: rapid/rapid.py:379
 msgid "Tehran"
-msgstr ""
+msgstr "Teheran"
 
-#: rapid/rapid.py:376
+#: rapid/rapid.py:379
 msgid "Kampala"
-msgstr ""
+msgstr "Guatemala"
 
-#: rapid/rapid.py:376
+#: rapid/rapid.py:379
 msgid "Paris"
-msgstr ""
+msgstr "Pariisi"
 
-#: rapid/rapid.py:376
+#: rapid/rapid.py:379
 msgid "Berlin"
-msgstr ""
+msgstr "Berliini"
 
-#: rapid/rapid.py:376
+#: rapid/rapid.py:379
 msgid "Sydney"
-msgstr ""
+msgstr "Sydney"
 
-#: rapid/rapid.py:377
+#: rapid/rapid.py:380
 msgid "Budapest"
-msgstr ""
+msgstr "Budapest"
 
-#: rapid/rapid.py:377
+#: rapid/rapid.py:380
 msgid "Rome"
-msgstr ""
+msgstr "Rooma"
 
-#: rapid/rapid.py:377
+#: rapid/rapid.py:380
 msgid "Moscow"
-msgstr ""
+msgstr "Moskova"
 
-#: rapid/rapid.py:377
+#: rapid/rapid.py:380
 msgid "Delhi"
-msgstr ""
+msgstr "Delhi"
 
-#: rapid/rapid.py:377
+#: rapid/rapid.py:380
 msgid "Warsaw"
-msgstr ""
+msgstr "Varsova"
 
-#: rapid/rapid.py:378
+#: rapid/rapid.py:381
 msgid "Jakarta"
-msgstr ""
+msgstr "Jakarta"
 
-#: rapid/rapid.py:378
+#: rapid/rapid.py:381
 msgid "Madrid"
-msgstr ""
+msgstr "Madrid"
 
-#: rapid/rapid.py:378
+#: rapid/rapid.py:381
 msgid "Stockholm"
-msgstr ""
+msgstr "Tukholma"
 
-#: rapid/rapid.py:404
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Virheelliset lataukset tänään\n"
 
-#: rapid/rapid.py:405
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Palautetaan arvo nollaan.\n"
 
-#: rapid/rapid.py:444
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "'Päivän alku' asetuksen arvo on virheellinen\n"
 
-#: rapid/rapid.py:445
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
-msgstr "Palautuu keskiyöhön.\n"
+msgstr "Palautetaan keskiyöhön.\n"
 
-#: rapid/rapid.py:474
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Virhe kuvan nimeämisasetuksissa"
 
-#: rapid/rapid.py:483 rapid/rapid.py:1304
+#: rapid/rapid.py:487 rapid/rapid.py:1334
 msgid "Sorry,these preferences contain an error:\n"
 msgstr "Anteeksi, näissä asetuksissa on virhe:\n"
 
-#: rapid/rapid.py:494
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Palautetaan oletusarvot."
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:565 rapid/renamesubfolderprefs.py:184
+#: rapid/rapid.py:569 rapid/renamesubfolderprefs.py:185
 msgid "Job code"
 msgstr "Työkoodi"
 
-#: rapid/rapid.py:633
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Virhe latauksen alikansioasetuksissa"
 
-#: rapid/rapid.py:768
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Valitse kansio johon kuvat ladataan"
 
-#: rapid/rapid.py:839
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Valitse kuvakansio"
 
-#: rapid/rapid.py:861
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Valitse kansio johon varmuuskopio tehdään"
 
 #. 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:951
+#: 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Varoitus:</b> Kuvassa ei ole riittäviä metadata tietoja kuvan "
 "nimeämiseen. Ole hyvä ja vaihda nimeämisasetuksia.</i>"
 
-#: rapid/rapid.py:972
+#: 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>"
@@ -161,17 +161,27 @@ msgstr ""
 "luomiseen. Ole hyvä ja vaihda alikansioidenluontiasetukstia.</i>"
 
 #. 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:976
+#: rapid/rapid.py:989
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esimerkki: %s</i>"
 
-#: rapid/rapid.py:1031
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Latauksia tänään arvoa ei päivitetty, koska lataus on edelleen kesken"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr "Tallennettua numeroa ei päivitetty, koska lataus on edelleen kesken"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr "Alikansioasetuksista poistettiin tarpeettomia arvoja."
 
 #. Preferences list is now empty
-#: rapid/rapid.py:1036
+#: rapid/rapid.py:1053
 msgid ""
 "The subfolder preferences entered are invalid and cannot be used.\n"
 "They will be reset to their default values."
@@ -180,12 +190,12 @@ msgstr ""
 "Palautetaan oletusasetukset."
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1233
+#: rapid/rapid.py:1260
 msgid "externaldrive1"
 msgstr "ulkoinenasema1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1235
+#: rapid/rapid.py:1262
 msgid "externaldrive2"
 msgstr "ulkoinenasema2"
 
@@ -193,15 +203,15 @@ msgstr "ulkoinenasema2"
 #. 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:1293
+#: rapid/rapid.py:1323
 msgid "scanning..."
 msgstr "etsii..."
 
-#: rapid/rapid.py:1382 rapid/rapid.py:2453
+#: rapid/rapid.py:1412 rapid/rapid.py:2687
 msgid "There is an error in the program preferences."
-msgstr "Ohjelman setuksissa on virhe."
+msgstr "Ohjelman asetuksissa on virhe."
 
-#: rapid/rapid.py:1383
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -210,7 +220,7 @@ msgstr ""
 "Ole hyvä ja tarkista asetukset, käynnistä ohjelma uudelleen ja koita "
 "uudestaan."
 
-#: rapid/rapid.py:1384 rapid/rapid.py:1385
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Latausta ei voida jatkaa"
 
@@ -218,7 +228,7 @@ msgstr "Latausta ei voida jatkaa"
 #. 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:1421 rapid/rapid.py:2018
+#: rapid/rapid.py:1451 rapid/rapid.py:2149
 #, python-format
 msgid "0 of %s images copied"
 msgstr "0 kuvaa %s kuvasta kopioitu"
@@ -229,23 +239,23 @@ msgstr "0 kuvaa %s kuvasta kopioitu"
 #. %(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:1433
+#: rapid/rapid.py:1463
 #, python-format
 msgid "Device scan complete: found %(number)s images on %(device)s"
 msgstr ""
 "Laite etsintä on valmis: löytyi %(number)s kuvaa %(device)s laitteesta"
 
-#: rapid/rapid.py:1439
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Laite etsintä on valmis: kuvia ei löytynyt sijainnista %s"
 
-#: rapid/rapid.py:1470
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Kuvan tiedostonimeä ei pystytty luomaan"
 
 #. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1472
+#: rapid/rapid.py:1502
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -254,7 +264,7 @@ msgstr ""
 "Lähde: %(source)s\n"
 "Ongelma: %(problem)s"
 
-#: rapid/rapid.py:1476
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -262,7 +272,7 @@ msgstr ""
 "Kuvan tiedostonimeä ei pystytty luomaan oikein. Tarkista että kuvassa on "
 "riittävästi metatietoja."
 
-#: rapid/rapid.py:1477
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -273,20 +283,73 @@ msgstr ""
 "Kohde: %(destination)s\n"
 "Ongelma: %(problem)s"
 
-#: rapid/rapid.py:1486
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Lähde: %(source)s\n"
+"Kohde: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Yksilöinti '%s' lisätty"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Lähde: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Kopiointivirhe"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Lähde: %(source)s\n"
+"Kohde: %(destination)s\n"
+"Virhe: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Kuvaa ei kopioitu."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Löydettiin kuvia samalla tiedostonimellä, mutta ne on otettu eri ajakohtina:"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Ensimmäinen kuva: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Toinen kuva: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Kuvaa ei voitu avata"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Lähde: %s"
 
-#: rapid/rapid.py:1505
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Kuvassa ei ole metatietoja"
 
-#: rapid/rapid.py:1506
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -295,7 +358,7 @@ msgstr ""
 "Metatieto on välttämätöntä kansiorakenteen ja tiedostonimien luontiin.\n"
 "Lähde: %s"
 
-#: rapid/rapid.py:1516
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -303,7 +366,7 @@ msgstr ""
 "Kansiorakennetta ei voitu luoda. Tarkista että kuvassa on riittävästi "
 "metatietoja."
 
-#: rapid/rapid.py:1517
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -314,54 +377,20 @@ msgstr ""
 "Kuva: %(image)s\n"
 "Ongelma: %(problem)s"
 
-#: rapid/rapid.py:1569 rapid/rapid.py:1597 rapid/rapid.py:1616
-#: rapid/rapid.py:1678
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Lähde: %(source)s\n"
-"Kohde: %(destination)s"
-
-#: rapid/rapid.py:1618
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Yksilöinti '%s' lisätty"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1635
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Uusi päivä on alkanut - Palautetaan 'Latauksia Tänään' luku"
 
-#: rapid/rapid.py:1640 rapid/rapid.py:1646
-msgid "Download copying error"
-msgstr "Kopiointivirhe"
-
-#: rapid/rapid.py:1641
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Lähde: %(source)s\n"
-"Kohde: %(destination)s\n"
-"Virhe: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1643 rapid/rapid.py:1716
-msgid "The image was not copied."
-msgstr "Kuvaa ei kopioitu."
-
-#: rapid/rapid.py:1677
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Kuvan varmuuskopio on jo olemassa"
 
-#: rapid/rapid.py:1705 rapid/rapid.py:1713 rapid/rapid.py:1719
+#: rapid/rapid.py:1811 rapid/rapid.py:1819 rapid/rapid.py:1825
 msgid "Backing up error"
 msgstr "Varmuuskopiointi virhe"
 
-#: rapid/rapid.py:1706
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -372,7 +401,7 @@ msgstr ""
 "%(directory)s\n"
 "Virhe: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1714 rapid/rapid.py:1720
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -384,126 +413,205 @@ msgstr ""
 "Virhe: %(errno)s %(strerror)s"
 
 #. 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:1733
+#: rapid/rapid.py:1839
 msgid "The device can now be safely removed"
 msgstr "Laite voidaan turvallisesti poistaa"
 
-#: rapid/rapid.py:1737
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s kuvaa ladattu"
 
-#: rapid/rapid.py:1739
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s kuvaa ohitettu"
 
-#: rapid/rapid.py:1745 rapid/rapid.py:2999
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "varoitukset"
 
-#: rapid/rapid.py:1747 rapid/rapid.py:3001
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "virheet"
 
-#: rapid/rapid.py:1769
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Varmuuskopiolaite puuttuu"
 
-#: rapid/rapid.py:1769
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Varmuuskopiolaitetta ei löytynyt"
 
-#: rapid/rapid.py:1773
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Laitteessa ei ole kuvia ladattavaksi."
 
-#: rapid/rapid.py:1808
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Lataus lähteestä %s on alkanut"
 
-#: rapid/rapid.py:1853
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Kuva ohitettu"
 
-#: rapid/rapid.py:1854
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Kuva korvattu"
 
-#: rapid/rapid.py:1855
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Kuva on jo olemassa"
 
-#: rapid/rapid.py:1900
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Kuvalla ei ole näytekuvaa"
 
-#: rapid/rapid.py:1910
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s kuvaa %(total)s kuvasta kopioitu"
 
-#: rapid/rapid.py:1926
+#: rapid/rapid.py:2040 rapid/rapid.py:2044
+msgid "Could not delete image from image device"
+msgstr "Poistaminen kuvalaitteelta epäonnistui"
+
+#: rapid/rapid.py:2041
+#, python-format
+msgid ""
+"Image: %(source)s\n"
+"Error: %(errno)s %(strerror)s"
+msgstr ""
+"Kuva: %(source)s\n"
+"Virhe: %(errno)s %(strerror)s"
+
+#: rapid/rapid.py:2045
+#, python-format
+msgid "Image: %(source)s"
+msgstr "Kuva: %(source)s"
+
+#: rapid/rapid.py:2047
+#, python-format
+msgid "Deleted %i images from image device"
+msgstr "Poistettiin %i kuvaa kuvalaitteelta"
+
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Lataus lähteestä %s valmis"
 
 #. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2002
+#: rapid/rapid.py:2133
 msgid "Device"
 msgstr "Laite"
 
 #. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2007
+#: rapid/rapid.py:2138
 msgid "Size"
 msgstr "Koko"
 
-#: rapid/rapid.py:2010
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Latauksen edistyminen"
 
-#: rapid/rapid.py:2126 rapid/rapid.py:2132
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Näytekuvaa ei voida näyttää"
 
-#: rapid/rapid.py:2127 rapid/rapid.py:2133
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Se voi olla vahingoittunut"
 
-#: rapid/rapid.py:2163
+#: rapid/rapid.py:2290
+msgid "Device Detected"
+msgstr "Laite havaittu"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2299
+msgid "Should this device or partition be used to download images from?"
+msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvien lataamiseen?"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2318
+msgid "_Remember this choice"
+msgstr "_Muista tämä valinta"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2355
+#, python-format
+msgid "%s selected for downloading from"
+msgstr "%s valittu ladattavaksi"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2358
+msgid "This device or partition will always be used to download from"
+msgstr "Tätä laitetta tai osiota tullaan aina käyttämään kuvien lataamiseen"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2361
+#, python-format
+msgid "%s rejected as a download device"
+msgstr "%s laitetta ei hyväksytty latauslaitteeksi"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/rapid.py:2364
+msgid "This device or partition will never be used to download from"
+msgstr "Tästä laitteesta tai osiosta ei ladata koskaan"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/rapid.py:2374
 msgid "Enter a Job Code"
 msgstr "Syöta työkoodi"
 
-#: rapid/rapid.py:2179
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/rapid.py:2392
+msgid "Enter a new job code, or select a previous one."
+msgstr "Anna uusi työkoodi tai valitse aikaisempi."
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/rapid.py:2395
+msgid "Enter a new job code."
+msgstr "Anna uusi työkoodi."
+
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Työkoodi:"
 
-#: rapid/rapid.py:2225
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Työkoodi syötetty"
 
-#: rapid/rapid.py:2227
-msgid "Job Code not entered - download to be cancelled"
-msgstr "Työkoodia ei syötetty - Lataus peruutetaan"
+#: rapid/rapid.py:2449
+msgid "Job Code not entered"
+msgstr "Työkoodia ei annettu"
 
-#: rapid/rapid.py:2454
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Jotkin asetukset palautetaan."
 
-#: rapid/rapid.py:2488
+#: rapid/rapid.py:2722
+#, python-format
+msgid "Prompting whether to use %s"
+msgstr ""
+
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Kysyy työkoodia"
 
-#: rapid/rapid.py:2505
+#: rapid/rapid.py:2754
+msgid "Already prompting for Job Code, do not prompt again"
+msgstr "Työkoodia pyydetään jo, älä pyydä uudestaan"
+
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Työkoodia odottaneet lataukset käynnistetään"
 
-#: rapid/rapid.py:2509
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Käynnistetään latauksia"
 
-#: rapid/rapid.py:2539
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -511,35 +619,35 @@ msgstr ""
 "Ohjelman uudempaa versiota on käytetty tässä tietokoneessa.\n"
 "\n"
 
-#: rapid/rapid.py:2541
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "Ohjelma on kelpaava, mutta ole hyvä ja tarkista että ohjelma toimii oikein."
 
-#: rapid/rapid.py:2543
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Anteeksi, jotkin asetukset ovat virheellisiä ja ne palautetaan "
 "oletusarvoihin."
 
-#: rapid/rapid.py:2544
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Varoitus:"
 
-#: rapid/rapid.py:2549
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 "Tämä ohjelma on uudempi kuin aikaisemmin käytetty. Tarkista asetukset."
 
-#: rapid/rapid.py:2556
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Asetuksia on muokattu."
 
-#: rapid/rapid.py:2557
+#: rapid/rapid.py:2821
 msgid ""
 "This version of the program uses different preferences than the old version. "
 "Your preferences have been updated.\n"
@@ -551,11 +659,11 @@ msgstr ""
 "\n"
 "Ole hyvä ja tarkista ne varmistaaksesi ohjelman toiminta."
 
-#: rapid/rapid.py:2561
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Asetuksia ei tarvinnut muuttaa."
 
-#: rapid/rapid.py:2563
+#: 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. "
@@ -565,106 +673,111 @@ msgstr ""
 "asetuksistasi olivat virheellisiä ja niitä ei voitu päivittää. Ne "
 "palautetaan oletuksiin."
 
-#: rapid/rapid.py:2572
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Ongelmia pynotifyn käytössä."
 
-#: rapid/rapid.py:2588
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Ei saanut pynotify-palvelimen ominaisuuksia."
 
-#: rapid/rapid.py:2626
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "ja"
 
-#: rapid/rapid.py:2631
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Käyttää varmuuskopiolaitteita"
 
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Käyttää varmuuskopiolaitetta"
 
-#: rapid/rapid.py:2635
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Varmuuskopiolaitetta ei löytynyt"
 
-#: rapid/rapid.py:2770
+#: rapid/rapid.py:2948 rapid/rapid.py:3104
+#, python-format
+msgid "Device %(device)s (%(path)s) ignored"
+msgstr "Laite %(device)s (%(path)s) ohitettu"
+
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Löytyi %(device)s laitetta polusta %(path)s"
 
-#: rapid/rapid.py:2774
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Automaattinen latauksen aloitus on päällä"
 
-#: rapid/rapid.py:2776
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Automaattinen latauksen aloitus on pois päältä"
 
-#: rapid/rapid.py:2824
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Käytetään käsin valittua polkua"
 
-#: rapid/rapid.py:2945 rapid/rapid.py:2994
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Kaikki lataukset valmiita"
 
-#: rapid/rapid.py:2959
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "Mt/s"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Noin 1 sekunti jäljellä"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Noin %i sekuntia jäljellä"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Noin 1 minuutti jäljellä"
 
 #. 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:2978
+#: rapid/rapid.py:3273
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Noin %(minutes)i:%(seconds)02i minuuttia jäljellä"
 
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "kuvia ladattu"
 
-#: rapid/rapid.py:2997
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "kuvia ohitettu"
 
 #. 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:3089
+#: rapid/rapid.py:3386
 msgid "_Download "
 msgstr "_Lataa "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3099
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Keskeytä"
 
-#: rapid/rapid.py:3161
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Asetuksia muutettiin."
 
-#: rapid/rapid.py:3298
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Näkemiin"
 
 #. 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:3309
+#: rapid/rapid.py:3676
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -673,328 +786,337 @@ msgstr ""
 "näytä ohjelman tiedot komentorivillä kun ohjelma käynnistetään (oletus: "
 "%default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "tulosta vain virheet komentoriville"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3679
 msgid "list image file extensions the program recognizes and exit"
 msgstr "Listaa kuvatiedostopäätteet jotka ohjelma tunnistaa ja poistu"
 
-#: rapid/rapid.py:3325
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "ja %s"
 
 #. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:3330 rapid/rapid.py:3333
+#: rapid/rapid.py:3697 rapid/rapid.py:3700
 msgid "Using"
 msgstr "Käyttäen"
 
 #. this application is already running
-#: rapid/rapid.py:3347
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s on jo käynnissä"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Ajankohta"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Teksti"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metatieto"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Numeroinnit"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Kuvan päivämäärä"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Tänään"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Huomenna"
 
 #. 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 "Nimi + pääte"
 
 #. 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 "Nimi"
 
 #. 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 "Tiedostopääte"
 
 #. 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 "Kuvan numero"
 
 #. 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 "Aukko"
 
 #. 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 "Herkkyys"
 
 #. 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 "Valotusaika"
 
 #. 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 "Polttoväli"
 
 #. 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 "Kameran merkki"
 
 #. 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 "Kameran malli"
 
 #. 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 "Lyhyt kameramalli"
 
 #. 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 "Tavutettu lyhyt kameran malli"
 
 #. 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 "Sarjanumero"
 
 #. 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 "Suljinlaskuri"
 
 #. 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 "Omistajan nimi"
 
 #. 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 "Latauksia tänään"
 
 #. 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 "Istuntonumero"
 
 #. 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 "Alikansion numero"
 
 #. 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 "Tallennettu numero"
 
 #. 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 "Kirjainsarja"
 
 #. 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 "Kaikki numerot"
 
 #. 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 "Viimeinen numero"
 
 #. 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 "Kaksi viimeistä numeroa"
 
 #. 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 "Kolme viimeistä numeroa"
 
 #. 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 "Neljä viimeistä numeroa"
 
 #. 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 "Alkuperäinen kirjoitusasu"
 
 #. 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 "ISOT KIRJAIMET"
 
 #. 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 "pienet kirjaimet"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Yksi numero"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Kaksi numeroa"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Kolme numeroa"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Neljä numeroa"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Viisi numeroa"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Kuusi numeroa"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Seitsemän numeroa"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "sekunnin osat"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "VVVVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "VVVV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "VVKKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "VV-KK-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "KKPPVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "KKPPVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "KKPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "PPKKVVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "PPKKVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "VVVV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "VV"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275 rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "KK"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "hhmmss"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "hhmm"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
-msgstr ""
+msgstr "TT-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
-msgstr ""
+msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
-msgstr ""
+msgstr "TT"
 
 #. 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 "MM"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
-msgstr ""
+msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1003,54 +1125,54 @@ msgstr ""
 "Asetus '%(key)s' on virheellinen.\n"
 "Tulisi olla yksi näistä %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Asetuksen arvo '%(value)s' on virheellinen"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Nämä asetukset eivät ole oikeassa muodossa:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "sekunnin osia ei löydy metatiedoista tässä kuvassa"
 
-#: 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 "%s metatietoa ei löydy tästä kuvasta"
 
-#: 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 "Virhe aikamäärityksessä. Arvo %s näyttää virheelliseltä"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "tiedostopääte oli määritelty mutta kuvan nimessä ei ole tiedostopäätettä"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr "kuvan numero oli määritelty, mutta tiedostonimessä ei ole numeroa"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "virhe luotaessa nimeä osalla %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alikansioiiden asetusten ei tulisi alkaa %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alikansioiden asetusten ei tulisi loppua %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Alikansioiden asetusten ei tulisi sisältää kahta vierekkäistä %s"
@@ -1209,11 +1331,7 @@ msgstr "Varmuuskopioiden sijainti:"
 msgid "Backup photos when downloading"
 msgstr "Tee varmuuskopio ladattaessa kuvia"
 
-#: rapid/glade3/rapid.glade.h:40
-msgid "C_lear"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:41
+#: rapid/glade3/rapid.glade.h:39
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1221,63 +1339,67 @@ msgstr ""
 "Valitse latauskansio. Alikansiot ladatuille kuville tehdään automaattisesti "
 "tähän kansioon käyttäen alla määriteltyä rakennetta käyttäen."
 
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/rapid.glade.h:40
 msgid ""
 "Choose whether to skip downloading the image, or to add a unique indentifier."
 msgstr ""
 "Valitse ohitetaanko kuva ladattaessa vai lisätäänkö nimeen yksilöllinen "
 "tunniste."
 
-#: rapid/glade3/rapid.glade.h:43
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Tekijänoikeus Damon Lynch 2007-09"
+#: rapid/glade3/rapid.glade.h:41
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
 msgstr "Päivän alku:"
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/glade3/rapid.glade.h:43
+msgid "Delete images from image device upon download completion"
+msgstr "Poista kuvat kuvalaitteelta kun lataus on valmis"
+
+#: rapid/glade3/rapid.glade.h:44
 msgid "Download / Pause"
 msgstr "Lataa / Keskeytä"
 
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/rapid.glade.h:45
 msgid "Download Folder"
 msgstr "Latauskansio"
 
-#: rapid/glade3/rapid.glade.h:47
+#: rapid/glade3/rapid.glade.h:46
 msgid "Download folder:"
 msgstr "Latauskansio:"
 
-#: rapid/glade3/rapid.glade.h:48
+#: rapid/glade3/rapid.glade.h:47
 msgid "Downloads today:"
 msgstr "Latauksia tänään:"
 
-#: rapid/glade3/rapid.glade.h:49
+#: rapid/glade3/rapid.glade.h:48
 msgid "Error Handling"
 msgstr "Virheenkäsittely"
 
-#: rapid/glade3/rapid.glade.h:50
+#: rapid/glade3/rapid.glade.h:49
 msgid "Error Log"
 msgstr "Virheloki"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/rapid.glade.h:50
 msgid "Exit program after completion of successful download"
 msgstr "Poistu ohjelmasta onnistuneen latauksen jälkeen"
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/rapid.glade.h:51
 msgid "If you disable automatic detection, choose the exact backup location."
 msgstr ""
 "Jos poistat automaattisen tunnistuksen käytöstä, määritä varmuuskopioiden "
 "tarkka sijainti."
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/rapid.glade.h:52
 msgid ""
 "If you disable automatic detection, choose the exact location of the images."
 msgstr ""
 "Jos poistat automaattisen tunnistuksen käytöstä, määritä tarkka kuvien "
 "sijainti."
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/rapid.glade.h:53
 msgid ""
 "If you enable automatic detection of Portable Storage Devices, the entire "
 "device will be scanned for images. On large devices, this could take some "
@@ -1286,19 +1408,19 @@ msgstr ""
 "Jos kytket päälle automaattisen kannettavan laitteen tunnistuksen, koko "
 "laite käydään läpi kuvia etsittäessä, tämä voi kestää hetken."
 
-#: rapid/glade3/rapid.glade.h:55
+#: rapid/glade3/rapid.glade.h:54
 msgid "Ignore"
 msgstr "Ohita"
 
-#: rapid/glade3/rapid.glade.h:56
+#: rapid/glade3/rapid.glade.h:55
 msgid "Image Devices"
 msgstr "Kuvalaitteet"
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/glade3/rapid.glade.h:56
 msgid "Image Rename"
 msgstr "Kuvan uudelleennimeäminen"
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/rapid.glade.h:57
 msgid ""
 "Image devices are devices from which to download photos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
@@ -1318,27 +1440,31 @@ msgstr ""
 "asettaa se PTP tilaan. Jos ei ole mahdollista, harkitse kortinlukijan "
 "käyttämistä.</i>"
 
-#: rapid/glade3/rapid.glade.h:63
+#: rapid/glade3/rapid.glade.h:62
 msgid "Image location:"
 msgstr "Kuvan sijainti:"
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/rapid.glade.h:63
 msgid "Import your images efficiently and reliably"
 msgstr "Tuo kuvasti tehokkaasti ja turvallisesti"
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/rapid.glade.h:64
 msgid "Job Codes"
 msgstr "Työkoodit"
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/rapid.glade.h:65
 msgid "Overwrite"
 msgstr "Ylikirjoita"
 
-#: rapid/glade3/rapid.glade.h:67
+#: rapid/glade3/rapid.glade.h:66
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Asetukset: Nopea Valokuvien Lataaja"
 
-#: rapid/glade3/rapid.glade.h:69
+#: rapid/glade3/rapid.glade.h:68
+msgid "R_emove All"
+msgstr "P_oista kaikki"
+
+#: rapid/glade3/rapid.glade.h:70
 msgid ""
 "Rapid Photo Downloader is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1368,27 +1494,27 @@ msgstr ""
 "Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: rapid/glade3/rapid.glade.h:74
+#: rapid/glade3/rapid.glade.h:75
 msgid "Rename Options"
 msgstr "Uudelleennimeämis valinnat"
 
-#: rapid/glade3/rapid.glade.h:75
+#: rapid/glade3/rapid.glade.h:76
 msgid "Report a warning"
 msgstr "Raportoi varoitus"
 
-#: rapid/glade3/rapid.glade.h:76
+#: rapid/glade3/rapid.glade.h:77
 msgid "Report an error"
 msgstr "Raportoi virhe"
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/rapid.glade.h:78
 msgid "Skip"
 msgstr "Ohita"
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/rapid.glade.h:79
 msgid "Skip download"
 msgstr "Ohita lataus"
 
-#: rapid/glade3/rapid.glade.h:79
+#: rapid/glade3/rapid.glade.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1402,7 +1528,7 @@ msgstr ""
 "ei. Jokaiseen varmuuskopiolaitteeseen tulee tehdä tämän niminen "
 "hakemisto.</i>"
 
-#: rapid/glade3/rapid.glade.h:82
+#: rapid/glade3/rapid.glade.h:83
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1410,18 +1536,18 @@ msgstr ""
 "Valitse aika 24 tunnin muodossa jossa <i>Latauksia tänään</i> numerointi "
 "tulisi palauttaa."
 
-#: rapid/glade3/rapid.glade.h:83
+#: rapid/glade3/rapid.glade.h:84
 msgid ""
 "Specify what to do when an image of the same name has already been "
 "downloaded or backed up."
 msgstr ""
 "Valitse mitä tehdään kun samanniminen kuva on jo ladattu tai varmuuskopioitu."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/rapid.glade.h:85
 msgid "Specify what to do when there are no backup devices."
 msgstr "Valitse mitä tehdään jos varmuuskopiolaitteita ei löydy."
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/rapid.glade.h:86
 msgid ""
 "Specify whether image and folder names should have any characters removed "
 "that are not allowed by other operating systems."
@@ -1429,27 +1555,31 @@ msgstr ""
 "Valitse tuleeko kuva ja hakemistonimistä poistaa merkit joita ei tueta "
 "toisissa käyttöjärjestelmissä."
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/rapid.glade.h:87
 msgid "Start downloading at program startup"
 msgstr "Aloita lataus kun ohjelma käynnistetään"
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/rapid.glade.h:88
 msgid "Start downloading upon image device insertion"
 msgstr "Aloita lataus kun kuvalaite kytketään"
 
-#: rapid/glade3/rapid.glade.h:88
+#: rapid/glade3/rapid.glade.h:89
 msgid "Stored number:"
 msgstr "Tallennettu numero:"
 
-#: rapid/glade3/rapid.glade.h:89
+#: rapid/glade3/rapid.glade.h:90
 msgid "Strip incompatible characters"
 msgstr "Poista yhteensopimattomat merkit"
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Yhtenäistä RAW + JPEG järjestysnumerot"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Poista kuvalaite kun lataus on valmis"
 
-#: rapid/glade3/rapid.glade.h:91
+#: 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."
@@ -1457,7 +1587,7 @@ msgstr ""
 "Varmuuskopioitaessa, valitse ylikirjoitetaanko kuva varmuuskopiolaitteessa "
 "jos saman niminen kuva on jo olemassa, vai ohitetaanko se."
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1465,63 +1595,49 @@ msgstr ""
 "Voit varmuuskopioida kuvasi useaan kohteeseen kun kuvia ladataan, esim. "
 "ulkoisille kovalevyille."
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/rapid.glade.h:95
+msgid "_Add..."
+msgstr "_Lisää..."
+
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Tyhjennä valmistuneet lataukset"
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "Virheloki"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Hae ohjeita netistä..."
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Ohje"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Tee lahjoitus"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Valokuvat"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Raportoi ongelma..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Näytekuvat"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Käännä tämä ohjelma..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Näytä"
 
-#: rapid/glade3/rapid.glade.h:103
-msgid "translators please ignore this"
-msgstr "kääntäjät, olkaa hyvä ja olkaa välittämättä tästä"
-
-#~ msgid ""
-#~ "<i><b>Warning:</b> There is insufficient image metatdata to fully generate "
-#~ "the name. Please use other renaming options.</i>"
-#~ msgstr ""
-#~ "<i><b>Varoitus:</b> Kuvan metatiedoista puuttuu tietoja tiedostonimen "
-#~ "luontiin. Ole hyvä ja käytä muita nimeämis asetuksia.</i>"
-
-#~ msgid ""
-#~ "<i><b>Warning:</b> There is insufficient image metatdata to fully generate "
-#~ "subfolders. Please use other subfolder naming options.</i>"
-#~ msgstr ""
-#~ "<i><b>Varoitus:</b> Kuvan metatiedoista puuttuu tietoja kansiorakenteen "
-#~ "luontiin. Ole hyvä ja käytä muita kansionnimeämis asetuksia.</i>"
-
-#~ msgid "<b>Sequence numbers</b>"
-#~ msgstr "<b>Numerointi</b>"
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Tekijänoikeus Damon Lynch 2007-09"
diff --git a/po/fr.po b/po/fr.po
index 742119f..965e6b0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-01 12:28+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-16 08:21+0000\n"
 "Last-Translator: Julien Valroff <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-03 19:04+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 23:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,58 +94,58 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Valeur de 'Transferts journaliers' invalide.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Remise à zéro de la valeur.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "La valeur de la préférence « Début de la journée » est corrompue.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Réinialisation à minuit.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Erreur dans les préférences concernant le renommage des images"
 
-#: 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 "Désolé, il y a une erreur dans cette préférence :\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Réinitialisation aux valeurs par défaut"
 
 #. 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 "Étiquette de transfert"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr ""
 "Erreur dans les préférences concernant le sous-répertoire de transfert"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Sélectionnez le dossier de destination"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Sélectionner un dossier d'images"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Sélectionner un dossier de sauvegarde des images"
 
 #. 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>"
@@ -154,7 +154,7 @@ msgstr ""
 "pour générer le nom de façon complète. Utilisez une autre option de "
 "renommage.</i>"
 
-#: 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>"
@@ -164,19 +164,32 @@ msgstr ""
 "nommant les options."
 
 #. 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 "<i>Exemple : %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Un transfert est en cours : la valeur de 'Transferts journaliers' ne sera "
+"pas mise à jour."
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Un transfert est en cours : la valeur du nombre stocké ne sera pas mise à "
+"jour."
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Les préférences pour le sous-répertoire présentent des valeurs inutiles qui "
 "ont été retirées."
 
 #. 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."
@@ -186,12 +199,12 @@ msgstr ""
 "Les valeurs par défaut seront utilisées."
 
 #. 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 "disqueexterne1"
 
 #. 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 "disqueexterne2"
 
@@ -199,15 +212,15 @@ msgstr "disqueexterne2"
 #. 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 "Détection en cours..."
 
-#: 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 "Il y a une erreur dans les préférences concernant le programme."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -216,7 +229,7 @@ msgstr ""
 "Merci de vérifier les préférences, de redemarrer le programme et d'essayer "
 "encore."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Impossible de procéder au transfert"
 
@@ -224,7 +237,7 @@ msgstr "Impossible de procéder au transfert"
 #. 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 "0 de %s images copiées"
@@ -235,23 +248,23 @@ msgstr "0 de %s images copiées"
 #. %(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 ""
 "Scan du volume complet : %(number)s ont été trouvées sur le volume %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Détection terminée : aucune image trouvée sur %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Le nom du fichier n'a pas pu être généré"
 
 #. '%(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"
@@ -260,7 +273,7 @@ msgstr ""
 "Source : %(source)s\n"
 "Problème : %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -268,7 +281,7 @@ msgstr ""
 "Le nom du fichier n'a pas pu être généré correctement. Vérifiez qu'il y ait "
 "suffisamment de métadonnées dans l'image."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -279,20 +292,73 @@ msgstr ""
 "Destination : %(destination)s\n"
 "Problème : %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Source : %(source)s\n"
+"Destination : %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Identifant unique '%s' ajouté"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Source : %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Erreur de copie lors du transfert"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Source : %(source)s\n"
+"Destination : %(destination)s\n"
+"Erreurr : %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "L'image n'a pas été copiée."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Images ayant le même nom de fichier, mais prises à des heures différentes :"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Première image : %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Seconde image : %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Impossible d'ouvrier l'image"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Source : %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "L'image n'a pas de métadonnées"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -302,7 +368,7 @@ msgstr ""
 "images.\n"
 "Source : %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -310,7 +376,7 @@ msgstr ""
 "Le nom du sous-dossier n'a pas pu être généré correctement. Vérifiez qu'il y "
 "ait suffisamment de métadonnées dans l'image."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -321,56 +387,22 @@ msgstr ""
 "Image : %(image)s\n"
 "Problème : %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Source : %(source)s\n"
-"Destination : %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Identifant unique '%s' ajouté"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Un nouveau jour a commencé - remise à zero de la numérotation « Transferts "
 "journaliers »"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Erreur de copie lors du transfert"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Source : %(source)s\n"
-"Destination : %(destination)s\n"
-"Erreurr : %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "L'image n'a pas été copiée."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Une sauvegarde existe déjà"
 
-#: 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 "Erreur lors de la sauvegarde"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -381,7 +413,7 @@ msgstr ""
 "%(directory)s\n"
 "Erreurr : %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -393,71 +425,71 @@ msgstr ""
 "Erreur : %(errno)s %(strerror)s"
 
 #. 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 "Le volume peut maintenant être retiré en toute sécurité"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s images transférées"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s images non prises en compte"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "avertissements"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "erreurs"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Volume de sauvegarde absent"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Aucun volume de sauvegarde n'a été détecté."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Aucune image à transféré depuis le volume."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Le transfert a débuté depuis %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Image passée"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Image écrasée"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "L'image existe déjà"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "L'image n'a pas d'aperçu"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s images copiées sur %(total)s"
 
-#: 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 "Impossible de supprimer l'image du volume"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -466,142 +498,142 @@ msgstr ""
 "Image : %(source)s\n"
 "Erreur : %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Image : %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "%i images ont été supprimées du volume"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Transfert terminé depuis %s"
 
 #. 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 "Volume"
 
 #. 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 "Taille"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Progression du transfert"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Impossible d'afficher la vignette"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Il est peut-être corrompu"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Périphérique détecté"
 
 #. 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 ""
 "Voulez-vous utiliser ce périphérique ou cette partition comme source de "
 "transfert ?"
 
 #. 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 "Se _Souvenir de ce choix"
 
 #. 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 "%s a été séléctionné comme source de transfert"
 
 #. 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 ""
 "Ce périphérique ou cette partition sera toujours utilisé comme source de "
 "transfert"
 
 #. 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 "%s a été rejeté comme source de transfert"
 
 #. 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 ""
 "Ce périphérique ou cette partition ne sera jamais utilisé comme source de "
 "transfert"
 
 #. 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 "Entrer une étiquette de transfert"
 
 #. 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 ""
 "Saisissez une nouvelle étiquette de transfert, ou choisissez un précédemment "
 "ajouté"
 
 #. 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 "Saisissez une nouvelle étiquette de transfert"
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Étiquette de transfert"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Étiquette de transfert entrée"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Étiquettes de transfert non renseignée"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr ""
 "Certaines préférences vont être réinitalisées à leurs valeurs par défaut."
 
-#: 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 "En attende de l'étiquette de transfert"
 
-#: 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 ""
 "Démarrage des téléchargements qui ont attendu une étiquette de transfert"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Démarrage du transfert"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -610,7 +642,7 @@ msgstr ""
 "ordinateur.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -618,26 +650,26 @@ msgstr ""
 "Les préférences de l'application ont l'air d'être correctes, veuillez tout "
 "de même les vérifier afin d'assurer le bon déroulement de l'opération."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Désolé, certaines préférences ne sont pas valides et seront réinitialisées."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Avertissement :"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr "L'application a été mise à jour, vérification des préférences."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Les préférences ont été modifiées."
 
-#: 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"
@@ -648,11 +680,11 @@ msgstr ""
 "l'ancienne version. Vos préférences ont été mises à jour.\n"
 "Veuillez les vérifier afin d'assurer le bon fonctionnement de l'application."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Aucun changement des préférences n'a été nécessaire."
 
-#: 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. "
@@ -662,111 +694,111 @@ msgstr ""
 "l'ancienne version. Certaines de vos préférences antérieures sont invalides "
 "et n'ont pas été mises à jour. Elles vont être réinitialisées."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Problème d'utilisation de pynotify"
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Echec de la reception des possibilités du serveur pynotify"
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "et"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Utilisation des volumes de sauvegarde"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Utilisation du volume de sauvegarde"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détécté"
 
-#: 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 "Périphérique %(device)s (%(path)s) ignoré"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Le volume %(device)s a été détecté avec le chemin d'accès %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Le démarrage automatique du transfert est activé"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Le démarrage automatique du transfert est désactivé"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Utilisation du chemin d'accès renseigne manuellement"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "Mo/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Environ 1 seconde restante"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Environ %i secondes restantes"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Environ 1 minute restante"
 
 #. 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 "Environ %(minutes)i:%(seconds)02i restantes"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "Images transférées"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "Images non prises en compte"
 
 #. 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 "_Transfert "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pause"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Les préférences ont été modifiées"
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Au-revoir"
 
 #. 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 "
@@ -775,335 +807,339 @@ msgstr ""
 "affiche les informations de l'application sur la ligne de commande lorsque "
 "l'application est active (défaut: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "n'affiche que les erreurs sur la ligne de commande"
 
 #. 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 ""
 "affiche les extensions de fichier reconnues par l'application et quitte "
 "l'application"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "et %s"
 
 #. 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 "En utilisation"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s déjà actif"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Date/heure"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Texte"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Séquences"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Date de l'image"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Hier"
 
 #. 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 "Nom + extension"
 
 #. 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 "Nom"
 
 #. 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 "Extension"
 
 #. 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 "Numéro de l'image"
 
 #. 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 "Ouverture"
 
 #. 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 "ISO"
 
 #. 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 "Vitesse d'obturation"
 
 #. 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 "Longueur focale"
 
 #. 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 "Marque de l'appareil"
 
 #. 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 "Modèle de l'appareil"
 
 #. 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 "Modèle de l'appareil (version courte)"
 
 #. 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 "Nom court de l'appareil photo avec trait d'union"
 
 #. 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 "Numéro de série"
 
 #. 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 "Nombre de déclenchements de l'obturateur"
 
 #. 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 "Nom du propriétaire"
 
 #. 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 "Transferts journaliers"
 
 #. 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 "Numéro de session"
 
 #. 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 "Numéro de sous-dossier"
 
 #. 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 "Nombres stockés"
 
 #. 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 "Séquence alphabétique"
 
 #. 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 "Tous les chiffres"
 
 #. 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 "Dernier chiffre"
 
 #. 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 "2 derniers chiffres"
 
 #. 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 "3 derniers chiffres"
 
 #. 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 "4 derniers chiffres"
 
 #. 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 "Casse originale"
 
 #. 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 "MAJUSCULES"
 
 #. 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 "minuscules"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Un chiffre"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Deux chiffres"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Trois chiffres"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Quatre chiffres"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Cinq chiffres"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Six chiffres"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "7 chiffres"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Sous-secondes"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "AAA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "AA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MM-JJ-AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MM-JJ-AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minutes)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1112,60 +1148,60 @@ msgstr ""
 "La préférence '%(key)s' est invalude.\n"
 "Valeurs attendues : %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "La préférence « %(value)s » est invalide"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Les préférences suivantes ne sont pas bien formattées :"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "L'image ne contient pas la métadonnée sous-secondes"
 
-#: 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 "La métadonnée %s n'est pas présente dans l'image"
 
-#: 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 ""
 "Erreur dans le composant de date/heure. La valeur %s semble non valide"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "Un extension a été spécifiée mais le nom de l'image ne comporte aucune "
 "extension"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "Un numéro d'image a été spécifié mais le nom de l'image ne comporte aucun "
 "numéro"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "Erreur dans la génération du nom avec le composant %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 "Les préférences de sous-dossier ne devraient pas commencer avec un %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 "Les préférences de sous-dossier ne devraient pas se terminer avec un %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1340,8 +1376,8 @@ msgstr ""
 "Choisissez si vous souhaitez passer l'image ou ajouter un identifiant unique."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1572,10 +1608,15 @@ msgid "Strip incompatible characters"
 msgstr "Enlever les caractères incompatibles"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr ""
+"Synchroniser les séquences numériques pour les paires d'images RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Démonter (« éjecter ») le volume d'images après le transfert"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1583,7 +1624,7 @@ msgstr ""
 "Lors de la sauvegarde, choisissez s'il faut écraser une image portant le "
 "même nom sur le volume de sauvegarde, ou s'il faut passer l'image."
 
-#: 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."
@@ -1591,46 +1632,49 @@ msgstr ""
 "Il est possible de sauvegarder les photos sur des emplacements multiples, "
 "différents du dossier de transfert (par exemple, des disques durs externes)."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Ajouter..."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Effacer les transferts terminés"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "Journal des _erreurs"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "Aide en _ligne"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Aide"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Faire une _donation..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Photos"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Rapporter un problème..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Vignettes"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Traduire cette application..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "A_ffichage"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/hu.po b/po/hu.po
index 1521f33..6b3f9b0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-05 13:18+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-16 19:03+0000\n"
 "Last-Translator: Balazs Oveges <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-05 17:32+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 23:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
 msgid "Rapid Photo Downloader"
-msgstr "Gyors Fénykép Letöltő"
+msgstr "Rapid Photo Downloader"
 
 #: rapid/rapid.py:377
 msgid "New York"
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "A Mai letöltések értéke érvénytelen.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Az érték visszaállítása nullára.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "A 'Nap kezdete' beállítás értéke hibás.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Visszaállítás éjfélre.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Hiba a kép átnevezési beállításokban"
 
-#: 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 "Elnézést, de ezek a beállítások hibásak:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Visszaállítás az alapbeállításokra."
 
 #. 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 "Munka-szám"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "A megadott letöltési mappa beállítás hibás."
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Válasszon egy letöltési könyvtárat"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Válasszon egy könyvtárat a képeknek"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Válasszon egy könyvtárat a bizotnsági mentéseknek"
 
 #. 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Figyelmeztetés:</b> Nincs elegendő adat a név teljes kitöltéséhez. "
 "Kérem, használjon más átnevezési lehetőséget.</i>"
 
-#: 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>"
@@ -161,19 +161,28 @@ msgstr ""
 "kitöltéséhez. Kérem, használjon más almappa nevezési lehetőséget.</i>"
 
 #. 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 "<i>Példa: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr "Letöltés folyamatban, a mai letöltések száma nem aktuális."
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr "Letöltés folyamatban, a tárolt érték nem aktuális."
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Az almappára vonatkozó beállításokból el lettek távolítva a felesleges "
 "értékek."
 
 #. 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."
@@ -182,12 +191,12 @@ msgstr ""
 "Vissza lesznek állítva az alapértékekre."
 
 #. 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 "külső_meghajtó1"
 
 #. 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 "külső_meghajtó2"
 
@@ -195,15 +204,15 @@ msgstr "külső_meghajtó2"
 #. 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 "keresés..."
 
-#: 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 "A program beállítása hibás."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -212,7 +221,7 @@ msgstr ""
 "Kérem ellenőrizze a beállításokat, indítsa újra a programot, és próbálja meg "
 "újra."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "A letöltés megszakadt."
 
@@ -220,7 +229,7 @@ msgstr "A letöltés megszakadt."
 #. 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 "0 of %s kép átmásolva"
@@ -231,22 +240,22 @@ msgstr "0 of %s kép átmásolva"
 #. %(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 "A keresés kész: %(number)s számú képet található: %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "A keresés kész: nem található kép %s ."
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "A kép elnevezését nem lehet létrehozni."
 
 #. '%(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"
@@ -255,7 +264,7 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Hiba: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -263,7 +272,7 @@ msgstr ""
 "A kép elnevezését nem lehet meghatározni. Ellenőrizze, hogy elegendőek-e a "
 "meta-adatok."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -274,20 +283,74 @@ msgstr ""
 "Cél: %(destination)s\n"
 "Hiba: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Forrás: %(source)s\n"
+"Cél: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Egyedi azonosító hozzáaadva: '%s'"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Forrás: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Másolási hiba a letöltés során"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Forrás: %(source)s\n"
+"Cél: %(destination)s\n"
+"Hiba: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "A kép nem lett másolva."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"A program azonos névvel, de különböző készítési dátummal rendelkező képeket "
+"talált."
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Első kép: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Második kép: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "A kép megnyitása sikertelen."
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Forrás: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "A kép nem rendelkezik meta-adatokkal."
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -296,7 +359,7 @@ msgstr ""
 "Az alkönyvtár / kép nevének meghatározásához meta-adatra van szükség\n"
 "Forrás: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -304,7 +367,7 @@ msgstr ""
 "Az alkönyvtár neve nem volt meghatározható. Ellenőrizze, hogy van-e elegendő "
 "meta-adat."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -315,54 +378,20 @@ msgstr ""
 "Kép: %(image)s\n"
 "Hiba: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Forrás: %(source)s\n"
-"Cél: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Egyedi azonosító hozzáaadva: '%s'"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Új nap kezdődött - a mai letöltések száma vissza lesz állítva."
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Másolási hiba a letöltés során"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Forrás: %(source)s\n"
-"Cél: %(destination)s\n"
-"Hiba: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "A kép nem lett másolva."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "A biztonsági másolat már létezik."
 
-#: 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 "A biztonsági másolat készítése során hiba történt."
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -373,7 +402,7 @@ msgstr ""
 "%(directory)s\n"
 "Hiba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -385,71 +414,71 @@ msgstr ""
 "Hiba: %(errno)s %(strerror)s"
 
 #. 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 "Az eszköz biztonságosan eltávolítható."
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s kép letöltve"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s kép átugorva"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "figyelmeztetések"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "hibák"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "A biztonsági másolat eszköze hiányzik"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "A biztonsági másolat eszköze nem érzékelhető"
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Ezen az eszközön nincsenek letölthető képek"
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "A letöltés megkezdődött %s helyről"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Kép átugorva"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Kép felülírva"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "A kép már létezik"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "A képhez nem tartozik előnézet"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s a %(total)s képből átmásolva"
 
-#: 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 "A kép törlése az eszközről sikertelen."
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -458,133 +487,133 @@ msgstr ""
 "Kép: %(source)s\n"
 "Hiba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Kép: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "A következő képek le lettek törölve az eszközről: %i images"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "A letöltés befejeződött: %s"
 
 #. 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 "Eszköz"
 
 #. 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 "Fájlméret szerint"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Letöltés Folyamatban"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Az előnézet nem jeleníthető meg"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Hibás lehet"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Eszköz érzékelve"
 
 #. 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 "Erről az eszközről vagy partícióról le legyenek töltve a képek?"
 
 #. 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 "_Emlékezzen erre a választásra"
 
 #. 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 "%s kijelölve letöltésre innen"
 
 #. 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 ""
 "Az eszköz vagy partíció adatai mindig letöltési forrásként szolgálnak."
 
 #. 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 "%s nem használható letöltési eszközként."
 
 #. 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 "Ez az eszköz vagy partició még nem volt letöltési forrás."
 
 #. 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 "Adjon meg munka-számot"
 
 #. 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 "Adja meg az új munka-számot, vagy válasszon egy előzőt."
 
 #. 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 "Adja meg az új munka-számot"
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Munka-szám:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Munka-szám megadva"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "A munka-szám nincs megadva"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Néhány beállítás vissza lesz állítva"
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Javaslat helyette: %s"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Adjon meg munka-számot"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "A munka-szám már megadva, ne addja meg újra"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "A munka-számra várakozó letöltések megkezdése"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "A letöltések megkezdése"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -592,22 +621,22 @@ msgstr ""
 "A program frissebb változata volt futtatva ezen a számítógépen.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "A beállítások érvényesek, de ellenőrizze azokat a helyes működés érdekében."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Elnézést, de néhány beállítás helytelen, és vissza lesz állítva."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Figyelmeztetés:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -615,11 +644,11 @@ msgstr ""
 "A jelenlegi verzió frissebb a megelőzően futtatottnál. A beállítások "
 "ellenőrzése."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "A beállítások módosultak."
 
-#: 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"
@@ -630,11 +659,11 @@ msgstr ""
 "beállítások frissültek.\n"
 "Kérem ellenőrizze a helyes működéshez."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "A beállításokat nem kellett változtatni."
 
-#: 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. "
@@ -644,111 +673,111 @@ msgstr ""
 "beállítások egy része érvénytelen volt, nem lehetett frissíteni. Ezek "
 "visszaállításra kerültek."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "A pynotify használata során hiba jelentkezett."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "A pynotify kiszolgálót nem sikerült elérni."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "és"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "A biztonsági mentés eszközök használata"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "A biztonsági mentés eszköz használata"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Nincs elérhető biztonsági mentés eszköz"
 
-#: 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 "Eszköz %(device)s (%(path)s) mellőzve"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Érzékelve %(device)s megadott útvonalon %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Az automatikus letöltés indítás be lett állítva"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Az automatikus letöltés indítás nem lett beállítva"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Kézzel megadott útvonal használata"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Minden letöltés befejeződött"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Kb. 1 másodperc van hátra"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Kb. %i másodperc van hátra"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Kb. 1 perc van hátra"
 
 #. 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 "Kb. %(minutes)i:%(seconds)02i perc van hátra"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "képek letöltve"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "képek átugorva"
 
 #. 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 "_Letöltés "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Megállítás"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "A beállítások megváltoztak."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Viszlát"
 
 #. 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 "
@@ -757,334 +786,338 @@ msgstr ""
 "futás közben program információ megjelenítése a terminálban (default: "
 "%default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "csak a hibák megjelenítése a terminálban"
 
 #. 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 ""
 "a program által felismert fájl kiterjesztések listázása, majd kilépés"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "és %s"
 
 #. 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 "Használatban"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "A %s már fut."
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Dátum és idő"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Szöveg"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sorozatok"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Kép dátuma"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Ma"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. 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 "Név + kiterjesztés"
 
 #. 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 "Név"
 
 #. 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 "Kiterjesztés"
 
 #. 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 "Kép száma"
 
 #. 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 "Rekesz"
 
 #. 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 "ISO"
 
 #. 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 "Expozíciós idő"
 
 #. 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 "Fókusztávolság"
 
 #. 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 "Fényképezőgép gyártója"
 
 #. 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 "Fényképezőgép"
 
 #. 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 "Rövid típusmegnevezés"
 
 #. 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 "Bővített típusmegnevezés"
 
 #. 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 "Sorozatszám"
 
 #. 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 "Zár számláló"
 
 #. 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 "A tulajdonos neve"
 
 #. 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 "Mai letöltések"
 
 #. 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 "Munkamenetszám"
 
 #. 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 "Alkönyvtár száma"
 
 #. 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 "Tárolt szám"
 
 #. 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 "Sorozat betű"
 
 #. 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 "Minden számjegy"
 
 #. 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 "Utolsó számjegy"
 
 #. 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 "Utolsó 2 számjegy"
 
 #. 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 "Utolsó 3 számjegy"
 
 #. 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 "Utolsó 4 számjegy"
 
 #. 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 "Eredeti kisbetű / nagybetű"
 
 #. 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 "NAGYBETŰS"
 
 #. 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 "kisbetűs"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Egyszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Kétszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Háromszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Négyszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Ötszámjegyű"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Hatszámjegyű"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Hét számjegy"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Millimásodperc"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "ÉÉÉÉHHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "ÉÉÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "ÉÉHHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "ÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "HHNNÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "HHNNÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "HHNN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "NNHHÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "NNHHÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "ÉÉÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "ÉÉ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "NN"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "ÓÓPPMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "ÓÓPP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "ÓÓ-PP-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "ÓÓ-PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "ÓÓ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "MM"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1093,53 +1126,53 @@ msgstr ""
 "Beállítás '%(key)s' érvénytelen.\n"
 "Válasszon a listából %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Beállított érték '%(value)s' érvénytelen."
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Ezek a beállítások nem megfelelőek:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Millimásodperc meta-adat nem található a képben"
 
-#: 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 "%s meta-adat nem található"
 
-#: 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 "Hiba a dátum/idő összetevőben. %s érték érvénytelennek tűnik."
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr "kiterjesztés megadva, de a képnek nincs kiterjesztése"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr "kép száma lett megadva, de a fájlnévben nem található szám"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "a %s összetevővel hiba a név létrehozásakor"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alkönyvtár beállítások nem kezdődhetnek %s értékkel"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alkönyvtár beállítások nem végződhetnek %s értékkel"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1313,8 +1346,8 @@ msgstr ""
 "hozzá."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1538,11 +1571,15 @@ msgid "Strip incompatible characters"
 msgstr "Az inkompatibilis karakterek kihagyása"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "RAW és JPEG fájlok számkiosztásának szinkronizálása"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr ""
 "A fénykép eszköz leválasztása (kiadása) a letöltések elvégzését követően"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1550,7 +1587,7 @@ msgstr ""
 "Válasszon, hogy a biztonsági mentés készítésekor felülírja az azonos nevű "
 "képeket, vagy ugorja át azokat."
 
-#: 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."
@@ -1558,46 +1595,49 @@ msgstr ""
 "A képek letöltésekor lehetséges biztonsági másolat készítése, pl. külső "
 "merevlemezre."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Hozzáadás…"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Kész letöltések kiürítése"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Hibanapló"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Online help"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Súgó"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Küldjön adományt..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fényképek"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Hibajelentés küldése..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Indexképek"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Fordítás"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Nézet"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/it.po b/po/it.po
index a4187a7..07291bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-04 22:05+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 02:27+0000\n"
 "Last-Translator: Marco Solari <marcosolari@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-04 22:32+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stoccolma"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Il valore Downloads Oggi non è valido.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Resetta i valori a zero.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Il valore della preferenza 'Inizio del giorno' è corrotto.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Si resetta a mezzanotte.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Errore nelle preferenze Rinomina Immagine"
 
-#: 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 "Scusa ma queste preferenze contengono un errore:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Si resettano ai valori di default."
 
 #. 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 "Codice lavoro"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Errore nelle preferenze Sottocartella di Download"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Scegliere la cartella in cui scaricare le foto"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Selezionare una cartella contenente le foto"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Selezionare una cartella per le immagini di backup"
 
 #. 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>"
@@ -153,7 +153,7 @@ msgstr ""
 "generare correttamente un nome. Per favore, usa altre opzioni di "
 "rinomina.</i>"
 
-#: 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>"
@@ -163,19 +163,32 @@ msgstr ""
 "nomi di sottocartella.</i>"
 
 #. 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 "<i>Esempio: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Il numero dei downloads di oggi non è stato aggiornato, in quanto è in corso "
+"un download"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Il numero delle archiviazioni non è stato aggiornato, in quanto è in corso "
+"un download"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Sono stati rimossi alcuni valori non necessari nelle preferenze "
 "sottocartella."
 
 #. 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."
@@ -185,12 +198,12 @@ msgstr ""
 "Saranno reimpostate ai loro valori di default."
 
 #. 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 "driveesterno1"
 
 #. 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 "driveesterno1"
 
@@ -198,15 +211,15 @@ msgstr "driveesterno1"
 #. 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 "scansione in corso..."
 
-#: 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 "C'è un errore nelle referenze programma."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -214,7 +227,7 @@ msgstr ""
 "\n"
 "Per favore controlla le preferenze, riavvia il programma e prova di nuovo"
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Il download non può procedere"
 
@@ -222,7 +235,7 @@ msgstr "Il download non può procedere"
 #. 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 "0 di %s immagini copiate"
@@ -233,24 +246,24 @@ msgstr "0 di %s immagini copiate"
 #. %(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 ""
 "Scansione del dispositivo completata: trovate %(number)s immagini in "
 "%(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Scansione del dispositivo completata: nessuna immagine trovata in %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Non si è potuto generare il nome file dell'immagine"
 
 #. '%(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"
@@ -259,7 +272,7 @@ msgstr ""
 "Origine: %(source)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -267,7 +280,7 @@ msgstr ""
 "Non si è potuto generare correttamente il nome file dell'immagine. "
 "Controllare che ci siano sufficienti metadati per l'immagine."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -278,20 +291,72 @@ msgstr ""
 "Destinazione: %(destination)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Origine: %(source)s\n"
+"Destinazione: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Aggiunto identificatore univoco '%s'"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Origine: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Errore nella copia del download"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Origine: %(source)s\n"
+"Destinazione: %(destination)s\n"
+"Errore: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "L'immagine non è stata copiata."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr "Rilevate immagini con lo stesso nome, ma scattate ad ore diverse"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Prima immagine: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Seconda immagine: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Impossibile aprire l'immagine"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Origine: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "L'immagine non ha metadati"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -301,7 +366,7 @@ msgstr ""
 "immagini.\n"
 "Origine: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -309,7 +374,7 @@ msgstr ""
 "Impossibile generare correttamente il nome della sottocartella. Controllare "
 "che ci siano metadati sufficienti per l'immagine."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -320,56 +385,22 @@ msgstr ""
 "Immagine: %(image)s\n"
 "Problema: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Origine: %(source)s\n"
-"Destinazione: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Aggiunto identificatore univoco '%s'"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Un nuovo giorno è iniziato - si resetta il numero di sequenza 'Downloads "
 "Oggi'"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Errore nella copia del download"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Origine: %(source)s\n"
-"Destinazione: %(destination)s\n"
-"Errore: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "L'immagine non è stata copiata."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "L'immagine di backup esiste già"
 
-#: 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 "Errore durante il backup"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -380,7 +411,7 @@ msgstr ""
 "%(directory)s\n"
 "Errore: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -392,71 +423,71 @@ msgstr ""
 "Errore: %(errno)s %(strerror)s"
 
 #. 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 "Il dispositivo può adesso essere rimosso in modo sicuro"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s immagini scaricate"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s immagini ignorate"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "avvertenze"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "errori"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Manca il dispositivo di backup"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Nessun dispositivo di backup è stato rilevato."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Questo dispositivo non ha immagini da scaricare."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Il download è inziato da %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Immagine ignorata"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Immagine sovrascritta"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "L'immagine esiste già"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "L'immagine non ha miniatura"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s di %(total)s immagini copiate"
 
-#: 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 "Impossibile eliminare l'immagine dal dispositivo"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -465,136 +496,136 @@ msgstr ""
 "Immagine: %(source)s\n"
 "Errori: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Immagine: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "%i immagini eliminate dal dispositivo"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download completato da %s"
 
 #. 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 "Dispositivo"
 
 #. 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 "Dimensione"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Avanzamento del download"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "La miniatura non può essere visualizzata"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Può essere corrotto"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Dispositivo rilevato"
 
 #. 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 "Questo è un dispositivo o una partizione da cui scaricare immagini?"
 
 #. 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 "_Ricorda questa scelta"
 
 #. 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 "%s selezionato come sorgente per il download"
 
 #. 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 ""
 "Questo dispositivo o partizione sarà sempre usato come sorgente per il "
 "download"
 
 #. 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 "%s rifiutato come sorgente per il download"
 
 #. 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 ""
 "Questo dispositivo o partizione non sarà mai usato come sorgente per il "
 "download"
 
 #. 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 "Inserire un Codice Lavoro"
 
 #. 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 "Inserire un nuovo codice lavoro, o selezionarne uno precedente."
 
 #. 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 "Inserire un nuovo codice lavoro"
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Codice Lavoro:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Codice Lavoro inserito"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Codice Lavoro non inserito"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Alcune preferenze saranno azzerate."
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Si richiede se usare %s"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Si richiede un Codice Lavoro"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Si sta già richiedendo un Codice Lavoro, non si richiede di nuovo"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Si iniziano i downloads che attendevano un Codice Lavoro"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Inizio download"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -603,7 +634,7 @@ msgstr ""
 "computer.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -611,15 +642,15 @@ msgstr ""
 "Le preferenze del programma sembrano essere valide, ma occorre controllarle "
 "per assicurare la correttezza delle operazioni."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Spiacente, alcune preferenze non sono valide e saranno ripristinate."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -627,11 +658,11 @@ msgstr ""
 "Questa versione del programma è più recente della versione eseguita in "
 "precedenza. Si controllano le preferenze."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Le preferenze sono state modificate."
 
-#: 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"
@@ -643,11 +674,11 @@ msgstr ""
 "\n"
 "Controllarle per assicurare la correttezza delle operazioni."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Non occorre cambiare alcuna preferenza."
 
-#: 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. "
@@ -657,111 +688,111 @@ msgstr ""
 "versione. Alcune delle preferenze precedenti non erano valide, e non hanno "
 "potuto essere aggiornate. Saranno reimpostate."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Riscontrato un problema usando pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Impossibile acquisire le proprietà server di pynotify."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Si utilizzano dispositivi di backup"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Si utilizza un dispositivo di backup"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Non è stato rilevato nessun dispositivo di backup"
 
-#: 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 "Dispositivo %(device)s (%(path)s) ignorato"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Rilevato %(device)s con il percorso %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Avvio automatico dei download attivo"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Avvio automatico dei download disattivo"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Si utilizza un percorso specificato manualmente"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Tutti i download completati"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Circa 1 secondo rimanente"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Circa %i secondi rimanenti"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Manca circa 1 minuto"
 
 #. 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 "Circa %(minutes)i:%(seconds)02i minuti rimanenti"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "immagini scaricate"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "immagini saltate"
 
 #. 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 "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Le preferenze sono state modificate."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Arrivederci"
 
 #. 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 "
@@ -770,335 +801,339 @@ msgstr ""
 "visualizza informazioni sul programma sulla riga comando quando il programma "
 "è in esecuzione (default: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "visualizza solo gli errori sulla riga comando"
 
 #. 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 ""
 "elenca le estensioni per i files delle immagini che il programma riconosce, "
 "ed esce"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
 #. 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 "Si usa"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s è già in esecuzione"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Data e ora"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Testo"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Nome file"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadati"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Ordinamenti"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Data dell'immagine"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Oggi"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. 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 "Nome + estensione"
 
 #. 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 "Nome"
 
 #. 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 "Estensione"
 
 #. 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 "Numero immagine"
 
 #. 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 "Apertura"
 
 #. 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 "ISO"
 
 #. 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 "Tempo di esposizione"
 
 #. 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 "Lunghezza focale"
 
 #. 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 "Marca della fotocamera"
 
 #. 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 "Modello della fotocamera (es.: Canon EOS-1Ds Mark III)"
 
 #. 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 "Modello brevissimo della fotocamera (es.: D300)"
 
 #. 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 "Modello breve della fotocamera (es.: DSC-P92)"
 
 #. 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 "Numero seriale"
 
 #. 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 "Contatore dell'otturatore"
 
 #. 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 "Nome del proprietario"
 
 #. 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 "Downloads oggi"
 
 #. 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 "Numero della sessione"
 
 #. 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 "Numero della sottocartella"
 
 #. 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 "Numero memorizzato"
 
 #. 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 "Lettera di sequenza"
 
 #. 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 "Tutte le cifre"
 
 #. 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 "Ultima cifra"
 
 #. 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 "Ultime 2 cifre"
 
 #. 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 "Ultime 3 cifre"
 
 #. 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 "Ultime 4 cifre"
 
 #. 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 "Caso originale"
 
 #. 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 "MAIUSCOLO"
 
 #. 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 "minuscolo"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Una cifra"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Due cifre"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Quattro cifre"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Cinque cifre"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Sei cifre"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Sette cifre"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Sotto-secondi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "YYYYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "YYYY-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "YYMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "YY-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMYYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "YY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minuti)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1107,56 +1142,56 @@ msgstr ""
 "La chiave delle preferenze '%(key)s' non è valida\n"
 "Sono previsti uno di %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Il valore delle preferenze '%(value)s' non è valido"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Queste preferenze non sono formalmente corrette:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Metadato sotto-secondi non presente nell'immagine"
 
-#: 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 "Metadato %s non presente nell'immagine"
 
-#: 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 "Errore nel componente data e ora. Il valore %s non sembra valido"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "è stata specificata un'estensione ma il nome dell'immagine non ha estensione"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "è stato specificato un numero immagine ma il nome file dell'immagine non ha "
 "numero"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "errore nella generazione del nme con il componente %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero iniziare con un %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero terminare con un %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1331,8 +1366,8 @@ msgstr ""
 "identificatore univoco."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1562,10 +1597,14 @@ msgid "Strip incompatible characters"
 msgstr "Elimina caratteri incompatibili"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Smonta (\"espelle\") il dispositivo immagini al termine del download"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1573,7 +1612,7 @@ msgstr ""
 "Quando si effettua il backup, scegliere se sovrascrivere un'immagine che ha "
 "lo stesso nome sul dispositivo di backup, o se saltarne il backup."
 
-#: 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."
@@ -1581,46 +1620,49 @@ msgstr ""
 "Si possono salvare in locazioni diverse le proprie fotografie mentre vengono "
 "scaricate, ad esempio un dischi esterni."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Aggiungere"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Svotare i Downloads Completati"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Registrazione Errori"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Richiedi Aiuto In Linea..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Fai una Donazione..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Segnala un Problema..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniature"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Traduci questa Applicazione..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Visualizzazione"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/nl.po b/po/nl.po
index 2844965..06f72a4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-04 19:21+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 02:27+0000\n"
 "Last-Translator: A.J. Baudrez <a.baudrez@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-04 19:44+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Ongeldige Downloads Vandaag waarde.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Waarde op nul terugzetten.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "'Start of day' voorkeurswaarde is corrupt.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Terugzetten op middernacht.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Fout in Afbeelding Hernoemen  voorkeuren"
 
-#: 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 "Sorry, deze voorkeuren bevatten een fout:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Terugzetten naar de standaard waardes."
 
 #. 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 "Job code"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Fout in Download Submap voorkeuren"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Duid een map aan om de foto's te downloaden"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Duid een afbeeldingsmap aan"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Duid een map aan om afbeeldingen naar toe te backuppen"
 
 #. 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Opgepast:</b> Er is onvoldoende afbeeldingsmetadata om een volledige "
 "naam aan te maken. Gelieve andere hernoemingsopties te gebruiken.</i>"
 
-#: 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>"
@@ -161,18 +161,31 @@ msgstr ""
 "te maken. Gelieve andere submap benoemingsopties te gebruiken.</i>"
 
 #. 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 "<i>Voorbeeld: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"'Downloads Vandaag' waarde niet aangepast, daar er momenteel een download "
+"bezig is"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Waarde opgeslagen nummer niet aangepast, daar er momenteel een download "
+"bezig is"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Bij de submap voorkeuren werden enkele overbodige waardes verwijderd."
 
 #. 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."
@@ -181,12 +194,12 @@ msgstr ""
 "Ze zullen naar de standaard waardes worden teruggezet."
 
 #. 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 "extern apparaat 1"
 
 #. 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 "extern apparaat 2"
 
@@ -194,15 +207,15 @@ msgstr "extern apparaat 2"
 #. 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 "Aan het scannen..."
 
-#: 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 "Er is een fout in de programma voorkeuren."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -211,7 +224,7 @@ msgstr ""
 "Gelieve de voorkeuren te controleren, het programma te herstarten en opnieuw "
 "te proberen."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Download kan niet plaatsgrijpen"
 
@@ -219,7 +232,7 @@ msgstr "Download kan niet plaatsgrijpen"
 #. 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 "0 van %s afbeeldingen gekopieerd"
@@ -230,23 +243,23 @@ msgstr "0 van %s afbeeldingen gekopieerd"
 #. %(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 ""
 "Apparaat scan afgelopen: %(number)s afbeeldingen gevonden op %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Apparaat scan afgelopen: geen afbeeldingen gevonden op %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Afbeeldingsnaam kon niet aangemaakt worden"
 
 #. '%(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"
@@ -255,7 +268,7 @@ msgstr ""
 "Bron: %(source)s\n"
 "Probleem: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -263,7 +276,7 @@ msgstr ""
 "Afbeeldingsnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
 "afbeeldingsmetadata aanwezig is."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -274,20 +287,74 @@ msgstr ""
 "Doel: %(destination)s\n"
 "Probleem: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Bron: %(source)s\n"
+"Doel: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Unieke identifier '%s' toegevoegd"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Bron: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Download kopieer fout"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Bron: %(source)s\n"
+"Doel: %(destination)s\n"
+"Fout: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "De afbeelding werd niet gekopieerd"
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Afbeeldingen gevonden met identieke bestandsnamen, maar op verschillend "
+"tijdstip genomen"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Eerste afbeelding: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Tweede afbeelding: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Kon afbeelding niet openen"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Bron: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Afbeelding heeft geen metadata"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -296,7 +363,7 @@ msgstr ""
 "Metadata is essentieel om submappen / afbeeldingsnamen aan te maken.\n"
 "Bron: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -304,7 +371,7 @@ msgstr ""
 "Submapnaam kon niet goed aangemaakt worden. Controlleer of er voldoende "
 "afbeeldingsmetadata aanwezig is."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -315,55 +382,21 @@ msgstr ""
 "Afbeelding: %(image)s\n"
 "Probleem: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Bron: %(source)s\n"
-"Doel: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Unieke identifier '%s' toegevoegd"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Nieuwe dag begonnen - volgnummer 'Downloads Vandaag' aan het terugzetten"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Download kopieer fout"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Bron: %(source)s\n"
-"Doel: %(destination)s\n"
-"Fout: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "De afbeelding werd niet gekopieerd"
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Backup afbeelding bestaat al"
 
-#: 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 "Backup fout"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -374,7 +407,7 @@ msgstr ""
 "%(directory)s\n"
 "Fout: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -386,71 +419,71 @@ msgstr ""
 "Fout: %(errno)s %(strerror)s"
 
 #. 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 "Het apparaat kan nu veilig verwijderd worden"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s afbeeldingen gedownload"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s afbeeldingen overgeslaan"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "fouten"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Backup apparaat afwezig"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Geen backup apparaat gevonden."
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Dit apparaat bevat geen afbeeldingen die gedownload kunnen worden."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Download begonnen vanaf %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Afbeelding overgeslaan"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Afbeelding overschreven"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Afbeelding bestaat reeds"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Afbeelding heeft geen miniatuur"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s van %(total)s afbeeldingen gekopieerd"
 
-#: 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 "Kon afbeelding niet verwijderen van afbeeldingsapparaat"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -459,136 +492,136 @@ msgstr ""
 "Afbeelding: %(source)s\n"
 "Fout: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Afbeelding: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "%i afbeeldingen van afbeeldingsapparaat verwijderd"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Download van %s afgelopen"
 
 #. 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 "Apparaat"
 
 #. 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 "Grootte"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Downloadvoortgang"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Miniatuur kan niet getoond worden"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Het kan corrupt zijn"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Apparaat gedetecteerd"
 
 #. 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 ""
 "Moet dit apparaat of deze partitie gebruikt worden om afbeeldingen van te "
 "downloaden?"
 
 #. 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 "_Herinner deze keuze"
 
 #. 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 "%s aangeduid om gedownload te worden van"
 
 #. 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 ""
 "Dit apparaat of deze partitie zal altijd gebruikt worden om van te downloaden"
 
 #. 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 "%s afgewezen als download apparaat"
 
 #. 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 ""
 "Dit apparaat of deze partitie zal nooit gebruikt worden om van te downloaden"
 
 #. 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 "Geef een Job Code op"
 
 #. 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 "Geef een nieuwe job code op, of kies een vorige."
 
 #. 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 "Geef een nieuwe job code."
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Job Code:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Job Code ingevoerd"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Job Code niet ingevoerd"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Sommige voorkeuren worden gereset"
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Vragen om %s te gebruiken"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Vragen naar de Job Code"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Reeds bezig met vragen naar Job Code, vraag niet opnieuw"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Downloads beginnen die op een Job Code aan het wachten waren"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
-msgstr "Downloads aanvangen"
+msgstr "Downloaden aanvangen"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -597,7 +630,7 @@ msgstr ""
 "opgestart.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -605,27 +638,27 @@ msgstr ""
 "Programma voorkeuren blijken OK te zijn, maar controleer toch even op "
 "correcte werking van het programma"
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr "Sorry, bepaalde voorkeuren zijn ongeldig en worden gereset."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
-"Deze versie van het programma is recenter dan de vorige. Nagaan van de "
-"voorkeuren."
+"Deze versie van het programma is recenter dan de vorige. De voorkeuren "
+"worden overlopen."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Voorkeuren werden aangepast."
 
-#: 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"
@@ -637,11 +670,11 @@ msgstr ""
 "\n"
 "Gelieve deze te controleren om een goede werking te garanderen."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Er dienen geen voorkeuren aangepast te worden."
 
-#: 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. "
@@ -651,111 +684,111 @@ msgstr ""
 "Bepaalde van je vorige voorkeuren zijn ongeldig en kunnen niet aangepast "
 "worden. Ze worden naar standaard waarden teruggebracht."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Probleem met het gebruik van pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Kon de pynotify server mogelijkheden niet ontvangen."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: 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 "Apparaat %(device)s (%(path)s) wordt genegeerd"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Detecteerde %(device)s met als pad %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Automatisch opstarten download is waar"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Automatisch opstarten download is onwaar"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Manueel ingegeven pad aan het gebruiken"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Ongeveer 1 minuut te gaan"
 
 #. 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 "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
-msgstr "beeldbestanden gedownload"
+msgstr "afbeeldingen gedownload"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
-msgstr "beeldbestanden overgeslaan"
+msgstr "afbeeldingen overgeslaan"
 
 #. 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 "_Download "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Voorkeuren werden aangepast."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Tot later"
 
 #. 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 "
@@ -764,334 +797,338 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "alleen fouten naar de commandolijn sturen"
 
 #. 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 ""
 "toon een lijst van bestandextenties welke het programma herkent en keer terug"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
 #. 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 "Gebruik makend van"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s is al draaiende"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Datum/tijd"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Reeksen"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Afbeeldingsgegevens"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Vandaag"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. 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 "Naam + extentie"
 
 #. 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 "Naam"
 
 #. 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 "Extentie"
 
 #. 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 "Afbeeldingsnummer"
+msgstr "Afbeelding nummer"
 
 #. 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 "Diafragma"
 
 #. 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 "ISO"
 
 #. 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 "Belichtingstijd"
 
 #. 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 "Brandpuntsafstand"
 
 #. 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 "Camera merk"
 
 #. 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 "Camera model"
 
 #. 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 "Camera model (kort)"
 
 #. 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 "Camera model (kort na koppelteken)"
 
 #. 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 "Serienummer"
 
 #. 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 "Sluiter teller"
 
 #. 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 "Naam eigenaar"
 
 #. 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 "Downloads vandaag"
 
 #. 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 "Sessienummer"
 
 #. 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 "Nummer Submap"
 
 #. 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 "Opgeslagen nummer"
 
 #. 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 "Vervolg letter"
 
 #. 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 "Alle cijfers"
 
 #. 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 "Laatste cijfer"
 
 #. 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 "Laatste 2 cijfers"
 
 #. 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 "Laatste 3 cijfers"
 
 #. 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 "Laatste 4 cijfers"
 
 #. 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 "Oorspronkelijke hoofdletterstatus"
 
 #. 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 "HOOFDLETTERS"
 
 #. 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 "kleine letters"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Eén cijfer"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Twee cijfers"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Drie cijfers"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Vier cijfers"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Vijf cijfers"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Zes cijfers"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Zeven cijfers"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Subseconden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
-msgstr "YYYYMMDD"
+msgstr "JJJJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
-msgstr "YYYY-MM-DD"
+msgstr "JJJJ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
-msgstr "YYMMDD"
+msgstr "JJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
-msgstr "YY-MM-DD"
+msgstr "JJ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
-msgstr "MMDDYYYY"
+msgstr "MMDDJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
-msgstr "MMDDYY"
+msgstr "MMDDJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
-msgstr "DDMMYYYY"
+msgstr "DDMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
-msgstr "DDMMYY"
+msgstr "DDMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
-msgstr "YYYY"
+msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
-msgstr "YY"
+msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1100,54 +1137,54 @@ msgstr ""
 "Voorkeurtoets '%(key)s' is ongeldig.\n"
 "Eén van %(value)s werd verwacht"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Voorkeurwaarde '%(value)s' is ongeldig"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Deze voorkeuren zijn niet goed opgesteld:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Subsecond metadata niet aanwezig in de afbeelding"
 
-#: 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 "%s metadata is niet aanwezig in de afbeelding"
 
-#: 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 "Fout in datum/tijd component. Waarde %s blijkt ongeldig"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr "Uitbreiding was gespecifieerd, maar afbeeldingsnaam heeft er geen"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "afbeeldingsnummer was gespecifieerd, maar de bestandsnaam heeft er geen"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "fout bij het aanmaken van de naam met component %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Submap voorkeuren mogen niet starten met een %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Submap voorkeuren mogen niet eindigen op een %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Submap voorkeuren mogen geen twee opeenvolgende %s bevatten"
@@ -1254,7 +1291,7 @@ msgstr "<span weight=\"bold\" size=\"x-large\">Foutverwerking</span>"
 
 #: rapid/glade3/rapid.glade.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Afbeeldings Apparatenr</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Afbeeldings Apparaten</span>"
 
 #: rapid/glade3/rapid.glade.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
@@ -1320,8 +1357,8 @@ msgstr ""
 "unieke identifier aan toe te kennen."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1548,10 +1585,14 @@ msgid "Strip incompatible characters"
 msgstr "Verwijder niet-compatibele karakters"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synchroniseer RAW + JPEG volgnummers"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Ontkoppel (\"verwijder\") het afbeeldingsapparaat na de download"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1559,7 +1600,7 @@ msgstr ""
 "Kies tijdens het backuppen om een afbeelding met dezelfde naam op het "
 "backupapparaat te overschrijven of over te slaan."
 
-#: 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."
@@ -1567,46 +1608,49 @@ msgstr ""
 "Je kan je foto's op meerdere plaatsen backuppen tijdens het downloaden, bv. "
 "externe harde schijven."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Toevoegen…"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Verwijder Afgewerkte Downloads"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Fouten log"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Online Help..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Help"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Doe een gift..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Foto's"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Rapporteer een probleem..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniaturen"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Vertaal deze Toepassing"
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Weergave"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/pl.po b/po/pl.po
index 22303f9..8c55e3d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-04 20:13+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 09:32+0000\n"
 "Last-Translator: mmiicc <mpredotka@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-04 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madryt"
 msgid "Stockholm"
 msgstr "Sztokholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Nieprawidłowa wartość Pobierań dzisiaj.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Resetowanie wartości do zera.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Wartość preferencji \"Początek dnia\" jest uszkodzona.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Resetowanie do północy.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Błąd w preferencjach zmiany nazw obrazów"
 
-#: 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 "Przepraszamy, te preferencje zawierają błąd:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Resetowanie do wartości domyślnych."
 
 #. 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 "Kod pracy"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Błąd w preferencjach podkatalogu pobierania"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Wybór katalogu dla pobieranych zdjęć"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Wybór katalogu obrazów"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Wybór katalogu do utworzenia kopii zapasowej"
 
 #. 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Ostrzeżenie:</b> Metadane obrazu są niewystarczające do pełnego "
 "wygenerowania nazwy. Proszę użyć innych opcji zmiany nazwy.</i>"
 
-#: 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>"
@@ -162,18 +162,31 @@ msgstr ""
 "podkatalogów</i>"
 
 #. 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 "<i>Przykład: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Wartość \"Pobierań dzisiaj\" nie została zaktualizowana, ponieważ właśnie "
+"trwa pobieranie"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr ""
+"Wartość \"Numer zachowany\" nie została zaktualizowana, ponieważ właśnie "
+"trwa pobieranie"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Pewne niepotrzebne wartości zostały usunięte z preferencji podkatalogu."
 
 #. 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."
@@ -183,12 +196,12 @@ msgstr ""
 "Zostaną przywrócone ich domyślne wartości."
 
 #. 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 "dyskzewnętrzny1"
 
 #. 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 "dyskzewnętrzny2"
 
@@ -196,15 +209,15 @@ msgstr "dyskzewnętrzny2"
 #. 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 "wyszukiwanie..."
 
-#: 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 "Błąd w preferencjach programu."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -213,7 +226,7 @@ msgstr ""
 "Proszę sprawdzić preferencje, uruchomić program ponownie i spróbować jeszcze "
 "raz."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Pobieranie nie może się odbyć"
 
@@ -221,7 +234,7 @@ msgstr "Pobieranie nie może się odbyć"
 #. 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 "skopiowano 0 z %s obrazów"
@@ -232,23 +245,23 @@ msgstr "skopiowano 0 z %s obrazów"
 #. %(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 ""
 "Wyszukiwanie zakończone: w katalogu %(device)s znaleziono obrazów %(number)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Wyszukiwanie zakończone: nie znaleziono obrazów w katalogu %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Nazwa pliku obrazu nie mogła zostać wygenerowana"
 
 #. '%(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"
@@ -257,7 +270,7 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -265,7 +278,7 @@ msgstr ""
 "Nazwa pliku obrazu nie mogła zostać prawidłowo wygenerowana. Proszę "
 "sprawdzić, czy metadane obrazu są wystarczające."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -276,20 +289,74 @@ msgstr ""
 "Cel: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Źródło: %(source)s\n"
+"Cel: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Dodano unikatowy identyfikator \"%s\""
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Źródło: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Błąd pobierania"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Źródło: %(source)s\n"
+"Cel: %(destination)s\n"
+"Błąd: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Obraz nie został skopiowany."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+"Znalezione zdjęcia, które mają taką samą nazwę, ale zostały zrobione w "
+"różnym czasie:"
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Pierwsze zdjęcie: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Drugie zdjęcie: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Nie można otworzyć obrazu"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Źródło: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Obraz nie posiada metadanych"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -298,7 +365,7 @@ msgstr ""
 "Metadane są niezbędne aby wygenerować nazw podkatalogów / obrazów.\n"
 "Źródło: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -306,7 +373,7 @@ msgstr ""
 "Nazwa podkatalogu nie mogła zostać prawidłowo wygenerowana. Proszę "
 "sprawdzić, czy metadane obrazu są wystarczające."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -317,55 +384,21 @@ msgstr ""
 "Obraz: %(image)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Źródło: %(source)s\n"
-"Cel: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Dodano unikatowy identyfikator \"%s\""
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Rozpoczął się nowy dzień - resetowanie numeru sekwencji \"Pobierań dzisiaj\""
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Błąd pobierania"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Źródło: %(source)s\n"
-"Cel: %(destination)s\n"
-"Błąd: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "Obraz nie został skopiowany."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Kopia zapasowa obrazu już istnieje"
 
-#: 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 "Błąd tworzenia kopii zapasowej"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -376,7 +409,7 @@ msgstr ""
 "%(directory)s\n"
 "Błąd: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -388,71 +421,71 @@ msgstr ""
 "Błąd: %(errno)s %(strerror)s"
 
 #. 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 "Teraz można bezpiecznie usunąć urządzenie"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "obrazów pobranych: %s"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "obrazów pominiętych: %s"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "błędy"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Brak urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Nie wykryto urządzenia na którym można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Ten nośnik nie zawiera obrazów, które można pobrać."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Rozpoczęto pobieranie z %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Obraz pominięto"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Obraz nadpisano"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Obraz już istnieje"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Obraz nie posiada miniatury"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "Skopiowano %(number)s z %(total)s obrazów"
 
-#: 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 "Nie można usunąć obrazów z urządzenia"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
@@ -461,134 +494,134 @@ msgstr ""
 "Obraz: %(source)s\n"
 "Błąd: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Obraz: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "Usunięto %i obrazów z urządzenia"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Ukończono pobieranie z %s"
 
 #. 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 "Urządzenie"
 
 #. 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 "Rozmiar"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Postęp pobierania"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Nie można wyświetlić miniatury"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Może być uszkodzone"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Znalezione urządzenie"
 
 #. 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 "Pobierać obrazy z tego urządzenia lub partycji?"
 
 #. 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 "Zapa_miętaj ten wybór"
 
 #. 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 "jako źródło pobierania wybrano %s"
 
 #. 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 ""
 "To urządzenie lub partycja zawsze będzie używane jako źródło pobierania"
 
 #. 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 "urządzenie %s odrzucone jako źródło pobierania"
 
 #. 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 ""
 "To urządzenie lub partycja nigdy nie będzie używane jako źródło pobierania"
 
 #. 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 "Wprowadzenie kodu pracy"
 
 #. 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 "Proszę wprowadzić nowy kod pracy lub wybrać poprzedni."
 
 #. 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 "Proszę wprowadzić nowy kod pracy."
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Kod pracy:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Kod pracy wprowadzony"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Nie wprowadzono kodu pracy"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Niektóre preferencje zostaną zresetowane."
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Zapytanie o użycie %s"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Zapytanie o kod pracy"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Już pytano o kod pracy, nie zapytuj ponownie"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Rozpoczynanie pobierania oczekującego na kod pracy"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Rozpoczynanie pobierania"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -596,7 +629,7 @@ msgstr ""
 "Nowsza wersja tego programu była poprzednio uruchomiona na tym komputerze.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -604,16 +637,16 @@ msgstr ""
 "Preferencje programu wydają się być właściwe, proszę jednak sprawdzić, czy "
 "zapewniają prawidłowe działanie."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Przepraszamy, niektóre preferencje są nieprawidłowe i zostaną zresetowane."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Ostrzeżenie:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
@@ -621,11 +654,11 @@ msgstr ""
 "Ta wersja programu jest nowsza od uruchomionej poprzednio. Sprawdzanie "
 "preferencji."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Preferencje zostały zmodyfikowane."
 
-#: 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"
@@ -637,11 +670,11 @@ msgstr ""
 "\n"
 "Proszę je sprawdzić, czy zapewniają prawidłowe działanie."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Żadne preferencje nie muszą zostać zmienione."
 
-#: 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. "
@@ -651,111 +684,111 @@ msgstr ""
 "poprzednich preferencji były nieprawidłowe i nie mogły zostać "
 "zaktualizowane. Zostaną one zresetowane."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Problem z użyciem pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Pobranie właściwości serwera pynotify nieudane."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: 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 "Urzadzenie %(device)s (%(path)s) zignorowane"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Wykryto %(device)s ze ścieżką %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Automatyczne rozpoczęcie pobierania jest włączone"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Automatyczne rozpoczęcie pobierania jest wyłączone"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Użycie ręcznie wprowadzonej ścieżki"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Pozostała około minuta"
 
 #. 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 "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "obrazów pobranych"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "obrazów pominiętych"
 
 #. 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 "_Pobierz "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "W_strzymaj"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Preferencje zostały zmienione."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Do zobaczenia"
 
 #. 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 "
@@ -764,333 +797,337 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "wyświetlaj jedynie błędy w linii komend"
 
 #. 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 "wypisz typy plików rozpoznawane przez program i zakończ"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
 #. 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 "Użycie"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s jest już uruchomiony"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Data czas"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadane"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sekwencje"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Data zdjęcia"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. 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 "Nazwa + rozszerzenie"
 
 #. 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 "Nazwa"
 
 #. 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 "Rozszerzenie"
 
 #. 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 "Numer obrazu"
 
 #. 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 "Przysłona"
 
 #. 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 "ISO"
 
 #. 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 "Czas naświetlania"
 
 #. 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 "Ogniskowa"
 
 #. 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 "Producent aparatu"
 
 #. 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 "Model aparatu"
 
 #. 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 "Skrót modelu aparatu"
 
 #. 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 "Skrót z myślnikiem modelu aparatu"
 
 #. 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 "Numer seryjny"
 
 #. 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 "Licznik migawki"
 
 #. 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 "Nazwa właściciela"
 
 #. 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 "Pobierań dzisiaj"
 
 #. 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 "Numer sesji"
 
 #. 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 "Numer podkatalogu"
 
 #. 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 "Numer zachowany"
 
 #. 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 "Litera sekwencji"
 
 #. 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 "Wszystkie cyfry"
 
 #. 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 "Ostatnia cyfra"
 
 #. 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 "Ostatnie 2 cyfry"
 
 #. 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 "Ostatnie 3 cyfry"
 
 #. 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 "Ostatnie 4 cyfry"
 
 #. 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 "Oryginalna wielkość liter"
 
 #. 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 "WIELKIE LITERY"
 
 #. 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 "małe litery"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Jedna cyfra"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Dwie cyfry"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Trzy cyfry"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Cztery cyfry"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Pięć cyfr"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Sześć cyfr"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Siedem cyfr"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Części sekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "GGMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "GGMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "GG-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "GG-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1099,55 +1136,55 @@ msgstr ""
 "Klucz preferencji \"%(key)s\" jest nieprawidłowy.\n"
 "Oczekiwano %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Wartość preferencji \"%(value)s\" jest nieprawidłowa"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Następujące preferencje nie są dobrze sformułowane:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Obraz nie zawiera metadanych części sekundy"
 
-#: 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 "Obraz nie zawiera metadanych %s"
 
-#: 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 "Błąd w składniku data czas. Nieprawidłowa wartość %s"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr ""
 "rozszerzenie zostało określone ale obraz nie posiada żadnego rozszerzenia"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr ""
 "numer obrazu został określony ale nazwa pliku nie posiada żadnego numeru"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "błąd przy tworzeniu nazwy ze składową %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencje podkatalogu nie powinny zaczynać się od %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencje podkatalogu nie powinny kończyć się na %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
@@ -1322,8 +1359,8 @@ msgstr ""
 "identyfikator."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Copyright Damon Lynch 2007-10"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1555,10 +1592,14 @@ msgid "Strip incompatible characters"
 msgstr "Usuń niezgodne znaki"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synchronizuj numery sekwencji RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Odmontuj (\"wysuń\") nośnik zdjęć po ukończeniu pobierania"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1566,7 +1607,7 @@ msgstr ""
 "Proszę wybrać, czy podczas tworzenia kopii zapasowej nadpisać, czy pominąć "
 "obraz o tej samej nazwie na urządzeniu docelowym."
 
-#: 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."
@@ -1574,46 +1615,49 @@ msgstr ""
 "Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć, np. na "
 "zewnętrznych dyskach twardych."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Dodaj..."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "Wyczyść _ukończone pobierania"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Dziennik błędów"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "Z_najdź pomoc w sieci..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Darowizna"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Zdjęcia"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "Zgłoś _błąd w programie..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniatury"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Przetłumacz ten program..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Widok"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
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 ""
diff --git a/po/ru.po b/po/ru.po
index 84a9c35..6ecd784 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-01 06:49+0000\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-16 08:18+0000\n"
 "Last-Translator: Sergey Sedov <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-03 19:16+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 23:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Мадрид"
 msgid "Stockholm"
 msgstr "Стокгольм"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Неверное значение 'Скачиваний сегодня'.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Сбросить значение до нуля.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Значение 'Начало дня' повреждено.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Сброс настроек в полночь.\n"
 
-#: 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 "Извините, эти параметры содержат ошибку:\n"
 
-#: 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 "метка"
+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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Внимание:</b> Не хватает метаданных для генерирования названия "
 "фотографии. Пожалуйста, измените настройки переименования фотографий.</i>"
 
-#: 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>"
@@ -162,18 +162,29 @@ msgstr ""
 "(см. параметр Каталог хранения).</i>"
 
 #. 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 "<i>Пример: %s</i>"
 
-#: 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."
@@ -182,12 +193,12 @@ 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 "внешний диск 1"
 
 #. 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 "внешний диск 2"
 
@@ -195,15 +206,15 @@ msgstr "внешний диск 2"
 #. 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."
@@ -211,7 +222,7 @@ msgstr ""
 "\n"
 "Пожалуйста, проверьте параметры, перезапустите программу и попробуйте снова."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Невозможно осуществить скачивание"
 
@@ -219,7 +230,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 "0 из %s фотографий скопировано"
@@ -230,23 +241,23 @@ msgstr "0 из %s фотографий скопировано"
 #. %(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 ""
 "Сканирование носителя завершено: найдено %(number)s фотографий на %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Сканирование носителя %s завершено: фотографий не найдено"
 
-#: 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"
@@ -255,7 +266,7 @@ msgstr ""
 "Источник: %(source)s\n"
 "Проблема: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -263,7 +274,7 @@ msgstr ""
 "Название фотографии не получилось сгенерировать должным образом. Проверьте "
 "достаточно ли метаданных."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -274,20 +285,74 @@ msgstr ""
 "Получатель: %(destination)s\n"
 "Проблема: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Источник: %(source)s\n"
+"Получатель: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Добавлен уникальный идентификатор '%s'"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Источник: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Ошибка при закачке файлов"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Источник: %(source)s\n"
+"Получатель: %(destination)s\n"
+"Ошибка: %(errorno)s %(strerror)s"
+
+#: 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 ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Первое изображение: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Второе изображение: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Не смог открыть фотографию"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Источник: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Фотография не содержит метаданных"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -297,7 +362,7 @@ msgstr ""
 "фотографий.\n"
 "Источник: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -305,7 +370,7 @@ msgstr ""
 "Название подкаталога не получилось сгенерировать должным образом. Проверьте "
 "достаточно ли метаданных."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -316,56 +381,22 @@ msgstr ""
 "Фотография: %(image)s\n"
 "Проблема: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Источник: %(source)s\n"
-"Получатель: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Добавлен уникальный идентификатор '%s'"
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr ""
 "Начался новый день - сброшена последовательность номеров параметра "
 "'Скачиваний сегодня'"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Ошибка при закачке файлов"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Источник: %(source)s\n"
-"Получатель: %(destination)s\n"
-"Ошибка: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-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"
@@ -376,7 +407,7 @@ msgstr ""
 "%(directory)s\n"
 "Ошибка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -388,71 +419,71 @@ msgstr ""
 "Ошибка: %(errno)s %(strerror)s"
 
 #. 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 "%s фотографий скачано"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s фотографий пропущено"
 
-#: 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 "Начато скачивание с %s"
 
-#: 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 "%(number)s из %(total)s фотографий скопировано"
 
-#: 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"
@@ -461,137 +492,137 @@ msgstr ""
 "Изображение: %(source)s\n"
 "Ошибка: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Изображение: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "Удалены %i изображений с устройства хранения"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Скачивание с %s завершено"
 
 #. 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 "%s выбран для закачки"
 
 #. 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 "%s не выбран для закачки"
 
 #. 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 "Использовать ли %s"
 
-#: 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"
@@ -599,7 +630,7 @@ msgstr ""
 "На этом компьютере ранее запускалась более новая версия программы.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
@@ -607,26 +638,26 @@ 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"
@@ -638,11 +669,11 @@ msgstr ""
 "\n"
 "Пожалуйста, проверьте их, чтобы быть уверенными, что всё прошло правильно."
 
-#: 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. "
@@ -651,111 +682,111 @@ msgstr ""
 "Эта версия программы использует несколько другие параметры, чем предыдущая. "
 "Некоторые из ваших параметров были не верными. Они будут сброшены."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Проблема при использовании pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Не удалось получить возможности сервера pynotify."
 
-#: 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 "Носитель %(device)s (%(path)s) проигнорирован"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Обнаружено %(device)s с путём %(path)s"
 
-#: 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 "Осталась примерно 1 секунда"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Осталось %i  секунд"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Осталась примерно 1 минута"
 
 #. 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 "Осталось примерно %(minutes)i:%(seconds)02i"
 
-#: 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 "
@@ -764,334 +795,338 @@ msgstr ""
 "отобразить информацию о программе в командной строке при запуске программы "
 "(по умолчанию: %default)"
 
-#: 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 "и %s"
 
 #. 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 "%s уже запущено"
 
-#: 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 "ISO"
 
 #. 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 "Последние 2 цифры"
 
 #. 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 "Последние 3 цифры"
 
 #. 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 "Последние 4 цифры"
 
 #. 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 "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 "Subseconds"
 msgstr "Подсекунды"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 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:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 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:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 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:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "ЧЧ-ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: 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:291
+#: 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"
@@ -1100,53 +1135,53 @@ msgstr ""
 "Неверен ключ параметров '%(key)s'.\n"
 "Ожидался один из %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Неверное значение параметра '%(value)s'"
 
-#: 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 "%s метаданные не представлены в фотографии"
 
-#: 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 "Ошибка в компоненте даты и времени. Значение %s неверно."
 
-#: 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 "ошибка генерирования названия компонентом %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Параметры подкаталога не должны начинаться с %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Параметры подкаталога не должны заканчиваться с %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Параметры подкаталога не должны содержать две %s одну за другой"
@@ -1312,9 +1347,9 @@ msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
-"Выберите каталог, где будут храниться фотографии. Подкаталоги для "
+"Выберите каталог, в котором будут храниться фотографии. Подкаталоги для "
 "скачиваемых фотографий будут автоматически созданы в каждом каталоге, "
-"используя структуру указанную ниже."
+"используя структуру указанную вами ниже."
 
 #: rapid/glade3/rapid.glade.h:40
 msgid ""
@@ -1324,8 +1359,8 @@ msgstr ""
 "уникальный идентификатор."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr "Авторские права Damon Lynch 2007-2010"
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1441,7 +1476,7 @@ msgstr "Параметры: Rapid Photo Downloader"
 
 #: rapid/glade3/rapid.glade.h:68
 msgid "R_emove All"
-msgstr "У_далить всё"
+msgstr "У_далить все"
 
 #: rapid/glade3/rapid.glade.h:70
 msgid ""
@@ -1554,19 +1589,23 @@ msgid "Strip incompatible characters"
 msgstr "Убрать несовместимые символы"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Последовательность номеров при синхронизации RAW + JPEG"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr ""
 "Отсоединить (\"извлечь\") носитель с фотографиями после завершения скачивания"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1574,46 +1613,49 @@ 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 "_Просмотр"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/sk.po b/po/sk.po
index 003718b..2f58ccb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2010-01-03 11:37+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-15 19:20+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-03 19:20+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Štokholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Dnešná hodnota sťahovanie je invalidní.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Resetovanie hodnoty na nulu.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Hodnota nastavenia 'Začiatok dňa' je poškodená.\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Resetovanie do polnoci.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Chyba v nastavení premenovávanie obrázkov."
 
-#: 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 "Prepáčte, v nastavení je chyba:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Resetovanie na výchozí hodnoty."
 
 #. 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 ""
+msgstr "Pracovný kód"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Chyba v nastavenie sťahovacie podzložky"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Vyberte zložku do ktorej majú byť obrázky stiahnuté"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Vyberte zložku obrázkov"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Vyberte zložku do ktorej má byť uložená záloha obrázkov"
 
 #. 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>"
@@ -153,7 +153,7 @@ msgstr ""
 "možné vygenerovať názov. Ak chcete obrázok premenovať použite nastavenia "
 "premenovanie.</i>"
 
-#: 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>"
@@ -162,30 +162,41 @@ msgstr ""
 "podzložiek. Ak chcete podzložky premenovať použite nastavenia mien.</i>"
 
 #. 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 "<i>Príklad: %s</i>"
 
-#: 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 ""
 "Niektoré hodnoty v nastavení podzložky sú nepodstatné a preto boli zmazané."
 
 #. 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 ""
+"Vložené nastavenie podzložky je invalidné a nemožno použiť.\n"
+"Bolo teda resetované na predvolené hodnoty."
 
 #. 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 "externýdisk1"
 
 #. 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 "externýdisk2"
 
@@ -193,15 +204,15 @@ msgstr "externýdisk2"
 #. 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 "skenovanie..."
 
-#: 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 "Vyskytla sa chyba v nastavenie programu."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -209,7 +220,7 @@ msgstr ""
 "\n"
 "Prosím skontrolujte nastavenia, reštartujte program a skúste to znova."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Sťahovanie nemôže pokračovať"
 
@@ -217,7 +228,7 @@ msgstr "Sťahovanie nemôže pokračovať"
 #. 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 "0 z %s obrázkov skopírované"
@@ -228,69 +239,127 @@ msgstr "0 z %s obrázkov skopírované"
 #. %(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 ""
+"Sken zariadenia kompletný: nájdených %(number)s obrázkov na %(device)s"
 
-#: 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 "Názov obrázku nemohol byť vygenerovaný"
 
 #. '%(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 ""
+"Zdroj: %(source)s\n"
+"Problém: %(problem)s"
 
-#: 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"
 "Destination: %(destination)s\n"
 "Problem: %(problem)s"
 msgstr ""
+"Zdroj: %(source)s\n"
+"Destinácia: %(destination)s\n"
+"Problém: %(problem)s"
+
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Zdroj: %(source)s\n"
+"Destinácia: %(destination)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr ""
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Zdroj: %(source)s"
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Chyba kopírovanie sťahovanie"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Zdroj: %(source)s\n"
+"Destinácia: %(destination)s\n"
+"Chyba: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Obrázky neboli okopírované."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+msgstr ""
+"Prvý obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
+"Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+
+#: rapid/rapid.py:1553
 msgid "Could not open image"
 msgstr "Nemožno otvoriť obrázok"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Obrázok nemá metadáta."
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
 "Source: %s"
 msgstr ""
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
 msgstr ""
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -298,49 +367,20 @@ msgid ""
 "Problem: %(problem)s"
 msgstr ""
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr ""
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Nový deň začal - resetovanie 'Dnešná sťahovania' sekvenčné číslo"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Chyba kopírovanie sťahovanie"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "Obrázky neboli okopírované."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Záloha obrázku neexistuje"
 
-#: 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 "Chyba zálohovanie"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -348,7 +388,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"
@@ -360,233 +400,235 @@ msgstr ""
 "Chyba: %(errno)s %(strerror)s"
 
 #. 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 "Zariadenie teraz nemôže byť bezpečne vymazané"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s obrázkov stiahnutých"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "%s obrázkov preskočených"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "varovania"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "chyby"
 
-#: 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 "Zariadenie nemá žiadne obrázky na stiahnutie."
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Sťahovanie z %s začalo"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Obrázok preskočený"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Obrázok prepísaný"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Obrázok neexistuje"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Obrázok nemá náhľad"
 
-#: 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 ""
+"Obrázok: %(source)s\n"
+"Chyba: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
 msgstr "Obrázok: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
 msgstr "Zo zariadenie bolo odstráneno %i obrázkov"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Sťahovanie z %s dokončené"
 
 #. 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 "Zariadenie"
 
 #. 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 "Veľkosť"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Priebeh sťahovania"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
-msgstr ""
+msgstr "Náhľad nemôže byť zobrazený"
 
-#: 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 "Zariadenie detekované"
 
 #. 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 ""
+msgstr "_Zapamatovať si túto voľbu"
 
 #. 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 ""
+msgstr "Vložte pracovný kód"
 
 #. 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 "Pracovný kód:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
-msgstr ""
+msgstr "Pracovný kód bol vložen"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
-msgstr ""
+msgstr "Pracovný kód nebol vložen"
 
-#: 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 ""
+msgstr "Sťahovanie začína"
 
-#: 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 "Varovanie:"
 
-#: 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 "Nastavenie bolo upravené."
 
-#: 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"
@@ -594,508 +636,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 "Problém používania pynotify."
 
-#: 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 "a"
 
-#: 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 ""
+msgstr "Zariadenia %(device)s (%(path)s) bolo ignorované"
 
-#: 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 "Všetka sťahovania bola dokončená"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: 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 "obrázky stiahnuté"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "obrázky preskočené"
 
 #. 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 "_Stiahnutie "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Nastavenie zmenené."
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Hezký den"
 
 #. 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 "a %s"
 
 #. 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 "Používanie"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
-msgstr ""
+msgstr "%s nie je pripravené na používanie"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
-msgstr ""
+msgstr "Dátum a čas"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sekvencie"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Dátum obrázku"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Dnes"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Včera"
 
 #. 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 "Názov + koncovka"
 
 #. 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 "Názov"
 
 #. 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 "Koncovka"
 
 #. 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 "Číslo obrázka"
 
 #. 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 "Clona"
 
 #. 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 "ISO"
 
 #. 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 "Čas expozície"
 
 #. 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 "Ohnisková vzdialenosť"
 
 #. 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 "Model kamery"
 
 #. 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 "Sériové číslo"
 
 #. 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 "Meno vlastníka"
 
 #. 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 "Dnešné stiahnutie"
 
 #. 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 "Číslo relácie"
 
 #. 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 ""
+msgstr "VEĽKÉ PÍSMENÁ"
 
 #. 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 ""
+msgstr "malé písmená"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "Jedna číslica"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Dve číslice"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Tri číslice"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Štyri číslice"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Päť číslic"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Šesť číslic"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+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 "Subseconds"
 msgstr "Subsekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minúty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: 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 ""
@@ -1264,8 +1310,8 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1470,61 +1516,68 @@ msgid "Strip incompatible characters"
 msgstr "Odstrániť nekompatibilné znaky"
 
 #: 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 "_Pridať..."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Vyčistit kompletné sťahovanie"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Záznam chyb"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Nápoveda online..."
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Nápoveda"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Dejte príspevok ..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Fotografie"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Ohlásiť problém"
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniatúry"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Přeložit túto aplikáciu ..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Zobraziť"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/po/sr.po b/po/sr.po
new file mode 100644
index 0000000..0aa301b
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,1631 @@
+# Serbian translation for rapid
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the rapid package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rapid\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-12 07:45+0000\n"
+"Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-14 23:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
+#: rapid/rapid.py:100 rapid/glade3/rapid.glade.h:69
+msgid "Rapid Photo Downloader"
+msgstr "Брзи преносилац фотографија"
+
+#: rapid/rapid.py:377
+msgid "New York"
+msgstr "Београд"
+
+#: rapid/rapid.py:378
+msgid "Manila"
+msgstr "Софија"
+
+#: rapid/rapid.py:378
+msgid "Prague"
+msgstr "Праг"
+
+#: rapid/rapid.py:378
+msgid "Helsinki"
+msgstr "Зајечар"
+
+#: rapid/rapid.py:378
+msgid "Wellington"
+msgstr "Нови Сад"
+
+#: rapid/rapid.py:379
+msgid "Tehran"
+msgstr "Техеран"
+
+#: rapid/rapid.py:379
+msgid "Kampala"
+msgstr "Будва"
+
+#: rapid/rapid.py:379
+msgid "Paris"
+msgstr "Париз"
+
+#: rapid/rapid.py:379
+msgid "Berlin"
+msgstr "Берлин"
+
+#: rapid/rapid.py:379
+msgid "Sydney"
+msgstr "Сиднеј"
+
+#: rapid/rapid.py:380
+msgid "Budapest"
+msgstr "Будимпешта"
+
+#: rapid/rapid.py:380
+msgid "Rome"
+msgstr "Рим"
+
+#: rapid/rapid.py:380
+msgid "Moscow"
+msgstr "Москва"
+
+#: rapid/rapid.py:380
+msgid "Delhi"
+msgstr "Делфи"
+
+#: rapid/rapid.py:380
+msgid "Warsaw"
+msgstr "Варшава"
+
+#: rapid/rapid.py:381
+msgid "Jakarta"
+msgstr "Амазон"
+
+#: rapid/rapid.py:381
+msgid "Madrid"
+msgstr "Мадрид"
+
+#: rapid/rapid.py:381
+msgid "Stockholm"
+msgstr "Истамбул"
+
+#: rapid/rapid.py:408
+msgid "Invalid Downloads Today value.\n"
+msgstr "Није исправна вредност за данашња преузимања.\n"
+
+#: rapid/rapid.py:409
+msgid "Resetting value to zero.\n"
+msgstr "Постављам вредност на нулу.\n"
+
+#: rapid/rapid.py:448
+msgid "'Start of day' preference value is corrupted.\n"
+msgstr "Вредност подешавања за „почетак дана“ је неисправна.\n"
+
+#: rapid/rapid.py:449
+msgid "Resetting to midnight.\n"
+msgstr "Постављам на поноћ.\n"
+
+#: rapid/rapid.py:478
+msgid "Error in Image Rename preferences"
+msgstr "Грешка у подешавањима за преименовање"
+
+#: rapid/rapid.py:487 rapid/rapid.py:1334
+msgid "Sorry,these preferences contain an error:\n"
+msgstr "Ово подешавање садржи грешку:\n"
+
+#: 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:569 rapid/renamesubfolderprefs.py:185
+msgid "Job code"
+msgstr "Код задатка"
+
+#: rapid/rapid.py:637
+msgid "Error in Download Subfolder preferences"
+msgstr "Грешка у подешавањима подфасцикли за чување"
+
+#: rapid/rapid.py:776
+msgid "Select a folder to download photos to"
+msgstr "Изаберите фасциклу за чување фотографија"
+
+#: rapid/rapid.py:850
+msgid "Select an image folder"
+msgstr "Изаберите фасциклу са сликама"
+
+#: 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:964
+msgid ""
+"<i><b>Warning:</b> There is insufficient image metadata to fully generate "
+"the name. Please use other renaming options.</i>"
+msgstr ""
+"<i><b>Упозорење:</b> Нема довољно метаподатака за образовање назива "
+"фотографије. Искористите неку другу опцију за преименовање.</i>"
+
+#: 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 ""
+"<i><b>Упозорење:</b> Нема довољно метаподатака за образовање подфасцикли. "
+"Искористите неку другу опцију за именовање подфасцикли.</i>"
+
+#. 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:989
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Пример: %s</i>"
+
+#: 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:1053
+msgid ""
+"The subfolder preferences entered are invalid and cannot be used.\n"
+"They will be reset to their default values."
+msgstr ""
+"Унета подешавања подфасцикли нису исправна.\n"
+"Она ће бити враћена на подразумеване вредности."
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/rapid.py:1260
+msgid "externaldrive1"
+msgstr "СпољниУређај1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/rapid.py:1262
+msgid "externaldrive2"
+msgstr "СпољниУређај2"
+
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. 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:1323
+msgid "scanning..."
+msgstr "претражујем уређај..."
+
+#: rapid/rapid.py:1412 rapid/rapid.py:2687
+msgid "There is an error in the program preferences."
+msgstr "Постоји грешка у подешавањима програма."
+
+#: rapid/rapid.py:1413
+msgid ""
+"\n"
+"Please check preferences, restart the program, and try again."
+msgstr ""
+"\n"
+"Проверите поставке и поново покрените програм."
+
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
+msgid "Download cannot proceed"
+msgstr "Не могу да наставим преузимање"
+
+#. Translators: as already, mentioned the %s value should not be modified or left out. It may be moved if necessary.
+#. 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:1451 rapid/rapid.py:2149
+#, python-format
+msgid "0 of %s images copied"
+msgstr "преузето је 0 од %s фотографија"
+
+#. Translators: as you have already seen, the text can contain values that should not be modified or left out by you, for example %s.
+#. This text is another example of that, but it is is a little more complex. Here there are two values which will be displayed
+#. to the user when they run the program, signifying the number of images found, and the device they were found on.
+#. %(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:1463
+#, python-format
+msgid "Device scan complete: found %(number)s images on %(device)s"
+msgstr "Пронађено је %(number)s фотографија на %(device)s"
+
+#: rapid/rapid.py:1469
+#, python-format
+msgid "Device scan complete: no images found on %s"
+msgstr "Није нађена ни једна фотографија на %s"
+
+#: 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:1502
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Problem: %(problem)s"
+msgstr ""
+"Извор: %(source)s\n"
+"Проблем: %(problem)s"
+
+#: rapid/rapid.py:1506
+msgid ""
+"Image filename could not be properly generated. Check to ensure there is "
+"sufficient image metadata."
+msgstr ""
+"Не могу да образујем назив фотографија. Проверите да ли оне садрже довољно "
+"метаподатака."
+
+#: rapid/rapid.py:1507
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Problem: %(problem)s"
+msgstr ""
+"Извор: %(source)s\n"
+"Циљ: %(destination)s\n"
+"Проблем: %(problem)s"
+
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Извор: %(source)s\n"
+"Циљ: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Додат је јединствена реч „%s“"
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr ""
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Грешка у преузимању"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Извор: %(source)s\n"
+"Циљ: %(destination)s\n"
+"Грешка: %(errorno)s %(strerror)s"
+
+#: 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 ""
+"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:1554
+#, python-format
+msgid "Source: %s"
+msgstr "Извор: %s"
+
+#: rapid/rapid.py:1572
+msgid "Image has no metadata"
+msgstr "Фотографија не садржи метаподатке"
+
+#: rapid/rapid.py:1573
+#, python-format
+msgid ""
+"Metadata is essential for generating subfolders / image names.\n"
+"Source: %s"
+msgstr ""
+"Метаподаци су неопходни за образовање назива подфасцикли и датотека.\n"
+"Извор: %s"
+
+#: 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 ""
+"Subfolder: %(subfolder)s\n"
+"Image: %(image)s\n"
+"Problem: %(problem)s"
+msgstr ""
+"Подфасцикла: %(subfolder)s\n"
+"Слика: %(image)s\n"
+"Проблем: %(problem)s"
+
+#. 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:1783
+msgid "Backup image already exists"
+msgstr "Већ постоји резервна копија слике"
+
+#: rapid/rapid.py:1811 rapid/rapid.py:1819 rapid/rapid.py:1825
+msgid "Backing up error"
+msgstr "Грешка приликом образовања резервне копије"
+
+#: rapid/rapid.py:1812
+#, python-format
+msgid ""
+"Destination directory could not be created\n"
+"%(directory)s\n"
+"Error: %(errno)s %(strerror)s"
+msgstr ""
+"Не могу да направим циљни директоријум\n"
+"%(directory)s\n"
+"Грешка %(errno)s %(strerror)s"
+
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errno)s %(strerror)s"
+msgstr ""
+"Извор: %(source)s\n"
+"Циљ: %(destination)s\n"
+"Грешка: %(errno)s %(strerror)s"
+
+#. 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:1839
+msgid "The device can now be safely removed"
+msgstr "Сада је безбедно да уклоните уређај"
+
+#: rapid/rapid.py:1843
+#, python-format
+msgid "%s images downloaded"
+msgstr "Преузето је %s склика"
+
+#: rapid/rapid.py:1845
+#, python-format
+msgid "%s images skipped"
+msgstr "Прескочено је %s склика"
+
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
+msgid "warnings"
+msgstr "упозорења"
+
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
+msgid "errors"
+msgstr "грешке"
+
+#: rapid/rapid.py:1882
+msgid "Backup device missing"
+msgstr "Нама уређаја за резервне копије"
+
+#: rapid/rapid.py:1882
+msgid "No backup device was detected."
+msgstr "Није пронађен уређај за резервне копије"
+
+#: rapid/rapid.py:1886
+msgid "This device has no images to download from."
+msgstr "Уређај не садржи фотографије за преузимање."
+
+#: rapid/rapid.py:1921
+#, python-format
+msgid "Download has started from %s"
+msgstr "Преузимам фотографије са %s"
+
+#: rapid/rapid.py:1967
+msgid "Image skipped"
+msgstr "Прескочена слика"
+
+#: rapid/rapid.py:1968
+msgid "Image overwritten"
+msgstr "Преписана слика"
+
+#: rapid/rapid.py:1969
+msgid "Image already exists"
+msgstr "Већ постојећа слика"
+
+#: rapid/rapid.py:2015
+msgid "Image has no thumbnail"
+msgstr "Слика нема умањени приказ"
+
+#: rapid/rapid.py:2025
+#, python-format
+msgid "%(number)s of %(total)s images copied"
+msgstr "Преузето је %(number)s од %(total)s слика"
+
+#: rapid/rapid.py:2040 rapid/rapid.py:2044
+msgid "Could not delete image from image device"
+msgstr "Не могу да уклоним фотографије са уређаја"
+
+#: rapid/rapid.py:2041
+#, python-format
+msgid ""
+"Image: %(source)s\n"
+"Error: %(errno)s %(strerror)s"
+msgstr ""
+"Слика: %(source)s\n"
+"Грешка: %(errno)s %(strerror)s"
+
+#: rapid/rapid.py:2045
+#, python-format
+msgid "Image: %(source)s"
+msgstr "Слика: %(source)s"
+
+#: rapid/rapid.py:2047
+#, python-format
+msgid "Deleted %i images from image device"
+msgstr "Обрисано је %i слика са уређаја"
+
+#: rapid/rapid.py:2057
+#, python-format
+msgid "Download complete from %s"
+msgstr "Завршено је преузимање са %s"
+
+#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
+#: 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:2138
+msgid "Size"
+msgstr "Величина"
+
+#: rapid/rapid.py:2141
+msgid "Download Progress"
+msgstr "Напредак преузимања"
+
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
+msgid "Thumbnail cannot be displayed"
+msgstr "Не могу да прикажем умањени приказ"
+
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
+msgid "It may be corrupted"
+msgstr "Можда је оштећен"
+
+#: 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: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: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:2355
+#, python-format
+msgid "%s selected for downloading from"
+msgstr "%s је изабран за преузимање слика"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: 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:2361
+#, python-format
+msgid "%s rejected as a download device"
+msgstr "%s је забрањен за преузимање слика"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: 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: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: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:2395
+msgid "Enter a new job code."
+msgstr "Унос новог кода задатка."
+
+#: rapid/rapid.py:2400
+msgid "Job Code:"
+msgstr "Код задатка:"
+
+#: rapid/rapid.py:2447
+msgid "Job Code entered"
+msgstr "Код задатка је унет"
+
+#: rapid/rapid.py:2449
+msgid "Job Code not entered"
+msgstr "Код задатка није унет"
+
+#: rapid/rapid.py:2688
+msgid "Some preferences will be reset."
+msgstr "Нека подешавања ће бити поништена."
+
+#: rapid/rapid.py:2722
+#, python-format
+msgid "Prompting whether to use %s"
+msgstr "Питај да ли да користим %s"
+
+#: rapid/rapid.py:2750
+msgid "Prompting for Job Code"
+msgstr "Питај за код задатка"
+
+#: rapid/rapid.py:2754
+msgid "Already prompting for Job Code, do not prompt again"
+msgstr "Већ сам питао за код задатка, нећу питати поново"
+
+#: rapid/rapid.py:2769
+msgid "Starting downloads that have been waiting for a Job Code"
+msgstr "Започињем преузимања која чекају на код задатка"
+
+#: rapid/rapid.py:2773
+msgid "Starting downloads"
+msgstr "Почињем преузимање"
+
+#: rapid/rapid.py:2803
+msgid ""
+"A newer version of this program was previously run on this computer.\n"
+"\n"
+msgstr ""
+"Новије издање програма је било покретано на овом рачунару.\n"
+"\n"
+
+#: rapid/rapid.py:2805
+msgid ""
+"Program preferences appear to be valid, but please check them to ensure "
+"correct operation."
+msgstr "Изгледа да су подешавања програма исправна, али их проверите."
+
+#: rapid/rapid.py:2807
+msgid "Sorry, some preferences are invalid and will be reset."
+msgstr "Нека подешавања су неисправна, пе ће бити поништена."
+
+#: rapid/rapid.py:2808
+msgid "Warning:"
+msgstr "Упозорење:"
+
+#: rapid/rapid.py:2813
+msgid ""
+"This version of the program is newer than the previously run version. "
+"Checking preferences."
+msgstr ""
+"Ово издање програма не новије од претходно покретаног. Проверавам подешавања."
+
+#: rapid/rapid.py:2820
+msgid "Preferences were modified."
+msgstr "Поставке су измењене."
+
+#: rapid/rapid.py:2821
+msgid ""
+"This version of the program uses different preferences than the old version. "
+"Your preferences have been updated.\n"
+"\n"
+"Please check them to ensure correct operation."
+msgstr ""
+"Ово издање програма користи различите поставке од претходног издања. "
+"Поставке су ажуриране.\n"
+"\n"
+"Проверите да ли су жељене радње исправне."
+
+#: rapid/rapid.py:2825
+msgid "No preferences needed to be changed."
+msgstr "Поставке нису мењане."
+
+#: 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:2836
+msgid "Problem using pynotify."
+msgstr "Проблем при коришћењу pynotify."
+
+#: rapid/rapid.py:2852
+msgid "Failed to receive pynotify server capabilities."
+msgstr "Не могу да користим могућности pynotify сервера."
+
+#: rapid/rapid.py:2900
+msgid "and"
+msgstr "и"
+
+#: rapid/rapid.py:2905
+msgid "Using backup devices"
+msgstr "Употреба резервног уређаја"
+
+#: rapid/rapid.py:2907
+msgid "Using backup device"
+msgstr "Употреба резервног уређаја"
+
+#: rapid/rapid.py:2909
+msgid "No backup devices detected"
+msgstr "Нису изабрани резервни уређаји"
+
+#: rapid/rapid.py:2948 rapid/rapid.py:3104
+#, python-format
+msgid "Device %(device)s (%(path)s) ignored"
+msgstr "Уређај %(device)s (%(path)s) је занемарен"
+
+#: rapid/rapid.py:3063
+#, python-format
+msgid "Detected %(device)s with path %(path)s"
+msgstr "Пронађен је уређај %(device)s у %(path)s"
+
+#: rapid/rapid.py:3067
+msgid "Automatically start download is true"
+msgstr "Укључено је аутоматско преузимање"
+
+#: rapid/rapid.py:3069
+msgid "Automatically start download is false"
+msgstr "Искључено је аутоматско преузимање"
+
+#: rapid/rapid.py:3122
+msgid "Using manually specified path"
+msgstr "Користим ручно изабрану путању"
+
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
+msgid "All downloads complete"
+msgstr "Сва преузимања су завршена"
+
+#: rapid/rapid.py:3254
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/rapid.py:3264
+msgid "About 1 second remaining"
+msgstr "Преостала је 1 секунда"
+
+#: rapid/rapid.py:3266
+#, python-format
+msgid "About %i seconds remaining"
+msgstr "Преостало је %i секунди"
+
+#: rapid/rapid.py:3268
+msgid "About 1 minute remaining"
+msgstr "Преостао је 1 минут"
+
+#. 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:3273
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Преостало је %(minutes)i:%(seconds)02i"
+
+#: rapid/rapid.py:3290
+msgid "images downloaded"
+msgstr "преузете фотографије"
+
+#: 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:3386
+msgid "_Download "
+msgstr "_Преузми "
+
+#. This text will be displayed to the user on the Download / Pause button.
+#: rapid/rapid.py:3396
+msgid "_Pause"
+msgstr "_Паузирај"
+
+#: rapid/rapid.py:3470
+msgid "Preferences were changed."
+msgstr "Поставке су измењене."
+
+#: 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:3676
+#, python-format
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
+msgstr ""
+"исписује податке о програму у командној линији док је покренут програм "
+"(подразумевано: %default)"
+
+#: 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:3679
+msgid "list image file extensions the program recognizes and exit"
+msgstr "исписује наставке датотека са сликом које су подржане"
+
+#: rapid/rapid.py:3692
+#, python-format
+msgid "and %s"
+msgstr "и %s"
+
+#. Which volume management code is being used (GIO or GnomeVFS)
+#: rapid/rapid.py:3697 rapid/rapid.py:3700
+msgid "Using"
+msgstr "Користи"
+
+#. this application is already running
+#: rapid/rapid.py:3714
+#, python-format
+msgid "%s is already running"
+msgstr "%s је већ покренут"
+
+#: rapid/renamesubfolderprefs.py:179
+msgid "Date time"
+msgstr "Датум"
+
+#: rapid/renamesubfolderprefs.py:180
+msgid "Text"
+msgstr "Текст"
+
+#: rapid/renamesubfolderprefs.py:181
+msgid "Filename"
+msgstr "Име датотеке"
+
+#: rapid/renamesubfolderprefs.py:182
+msgid "Metadata"
+msgstr "Метаподаци"
+
+#: rapid/renamesubfolderprefs.py:183
+msgid "Sequences"
+msgstr "Низови"
+
+#: rapid/renamesubfolderprefs.py:186
+msgid "Image date"
+msgstr "Датум фотографије"
+
+#: rapid/renamesubfolderprefs.py:187
+msgid "Today"
+msgstr "Данас"
+
+#: 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: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:192
+msgid "Name"
+msgstr "Назив"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: 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: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:198
+msgid "Aperture"
+msgstr "Отвор бленде"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: 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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:244
+msgid "lowercase"
+msgstr "мала слова"
+
+#: rapid/renamesubfolderprefs.py:245
+msgid "One digit"
+msgstr "Једна цифра"
+
+#: rapid/renamesubfolderprefs.py:246
+msgid "Two digits"
+msgstr "Две цифре"
+
+#: rapid/renamesubfolderprefs.py:247
+msgid "Three digits"
+msgstr "Три цифре"
+
+#: rapid/renamesubfolderprefs.py:248
+msgid "Four digits"
+msgstr "Четири цифре"
+
+#: rapid/renamesubfolderprefs.py:249
+msgid "Five digits"
+msgstr "Пет цифре"
+
+#: rapid/renamesubfolderprefs.py:250
+msgid "Six digits"
+msgstr "Шест цифре"
+
+#: rapid/renamesubfolderprefs.py:251
+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 "Subseconds"
+msgstr "Стотинке"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:255
+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 "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 "YYMMDD"
+msgstr "ГГММДД"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:261
+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 "MMDDYYYY"
+msgstr "ММДДГГГГ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:265
+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 "MMDD"
+msgstr "ММДД"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:269
+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 "DDMMYY"
+msgstr "ДДММГГ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:273
+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 "YY"
+msgstr "ГГ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:277
+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 "DD"
+msgstr "ДД"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:281
+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 "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-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-MM"
+msgstr "ЧЧ-ММ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:289
+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:710
+#, python-format
+msgid ""
+"Preference key '%(key)s' is invalid.\n"
+"Expected one of %(value)s"
+msgstr ""
+"Није исправна поставка „%(key)s“.\n"
+"Очекивано је %(value)s"
+
+#: rapid/renamesubfolderprefs.py:717
+#, python-format
+msgid "Preference value '%(value)s' is invalid"
+msgstr "Није исправна поставка „%(value)s“"
+
+#: rapid/renamesubfolderprefs.py:721
+msgid "These preferences are not well formed:"
+msgstr "Ова подешавања нису исправно образована:"
+
+#: rapid/renamesubfolderprefs.py:831
+msgid "Subsecond metadata not present in image"
+msgstr "Метаподатак за време у стотинкама не потоји"
+
+#: rapid/renamesubfolderprefs.py:834 rapid/renamesubfolderprefs.py:974
+#, python-format
+msgid "%s metadata is not present in image"
+msgstr "Не постоје %s метаподаци у фотографији"
+
+#: rapid/renamesubfolderprefs.py:859 rapid/renamesubfolderprefs.py:866
+#, python-format
+msgid "Error in date time component. Value %s appears invalid"
+msgstr "Грешка у датуму. Изгледа да није исправна вредност %s"
+
+#: rapid/renamesubfolderprefs.py:897
+msgid "extension was specified but image name has no extension"
+msgstr "наставак је одређен, али назив фотографије не садржи наставак"
+
+#: rapid/renamesubfolderprefs.py:901
+msgid "image number was specified but image filename has no number"
+msgstr "број слике је одређен, али назив фотографије не садржи број"
+
+#: rapid/renamesubfolderprefs.py:1088
+#, python-format
+msgid "error generating name with component %s"
+msgstr "грешка при образовању назива са %s"
+
+#: rapid/renamesubfolderprefs.py:1387
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr "Подешавања подфасцикле не треба да почиње са %s"
+
+#: rapid/renamesubfolderprefs.py:1389
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr "Подешавања подфасцикле не треба да се завршава са %s"
+
+#: rapid/renamesubfolderprefs.py:1393
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr "Подешавања подфасцикле не треба да садржи два %s један за другим"
+
+#: rapid/glade3/rapid.glade.h:1
+msgid " "
+msgstr " "
+
+#: rapid/glade3/rapid.glade.h:2
+msgid "      "
+msgstr "      "
+
+#: rapid/glade3/rapid.glade.h:3
+msgid " hh:mm"
+msgstr " чч:мм"
+
+#: rapid/glade3/rapid.glade.h:4
+msgid ":"
+msgstr ":"
+
+#: rapid/glade3/rapid.glade.h:5
+msgid "<b>Backup</b>"
+msgstr "<b>Резервна копија</b>"
+
+#: rapid/glade3/rapid.glade.h:6
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Сагласност са осталим оперативним системима</b>"
+
+#: rapid/glade3/rapid.glade.h:7
+msgid "<b>Download Folder</b>"
+msgstr "<b>Фасцикла за чување фотографија</b>"
+
+#: rapid/glade3/rapid.glade.h:8
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Подфасцикле за чување фотографија</b>"
+
+#: rapid/glade3/rapid.glade.h:9
+msgid "<b>Example</b>"
+msgstr "<b>Пример</b>"
+
+#: rapid/glade3/rapid.glade.h:10
+msgid "<b>Image Devices</b>"
+msgstr "<b>Уређај са сликама</b>"
+
+#: rapid/glade3/rapid.glade.h:11
+msgid "<b>Image Name Conflicts</b>"
+msgstr "<b>Неподударање назива слика</b>"
+
+#: rapid/glade3/rapid.glade.h:12
+msgid "<b>Image Rename</b>"
+msgstr "<b>Преименовање слика</b>"
+
+#: rapid/glade3/rapid.glade.h:13
+msgid "<b>Job Codes</b>"
+msgstr "<b>Кодови задатка</b>"
+
+#: rapid/glade3/rapid.glade.h:14
+msgid "<b>Missing Backup Devices</b>"
+msgstr "<b>Нису присутни уређај за резервне копије</b>"
+
+#: rapid/glade3/rapid.glade.h:15
+msgid "<b>Program Automation</b>"
+msgstr "<b>Аутоматизација програма</b>"
+
+#: rapid/glade3/rapid.glade.h:16
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Низ бројева</b>"
+
+#: rapid/glade3/rapid.glade.h:17
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/Спољни_Уређај/Фотографије</i>"
+
+#: rapid/glade3/rapid.glade.h:18
+msgid "<i>Example: /home/user/photos</i>"
+msgstr "<i>Example: /home/user/фотографије</i>"
+
+#: rapid/glade3/rapid.glade.h:19
+msgid "<i>Example:</i>"
+msgstr "<i>Пример:</i>"
+
+#: rapid/glade3/rapid.glade.h:20
+msgid "<i>New:</i>"
+msgstr "<i>Нова:</i>"
+
+#: rapid/glade3/rapid.glade.h:21
+msgid "<i>Original:</i>"
+msgstr "<i>Оригинал:</i>"
+
+#: rapid/glade3/rapid.glade.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Аутоматизација</span>"
+
+#: rapid/glade3/rapid.glade.h:23
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Резервна копија</span>\t"
+
+#: rapid/glade3/rapid.glade.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Download Folder</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Фасцикла за чување фотографија</span>"
+
+#: rapid/glade3/rapid.glade.h:25
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Превазилажење грешака</span>"
+
+#: rapid/glade3/rapid.glade.h:26
+msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Уређаји са сликама</span>"
+
+#: rapid/glade3/rapid.glade.h:27
+msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Преименовање слика</span>\t"
+
+#: rapid/glade3/rapid.glade.h:28
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Кодови задатка</span>"
+
+#: rapid/glade3/rapid.glade.h:29
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Опције за преименовање</span>"
+
+#: rapid/glade3/rapid.glade.h:30
+msgid "Add unique identifier"
+msgstr "Јединствена реч"
+
+#: rapid/glade3/rapid.glade.h:31
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Сам пронађи преносне меморијске уређаје"
+
+#: rapid/glade3/rapid.glade.h:32
+msgid "Automatically detect backup devices"
+msgstr "Сам пронађи уређаје за резервне копије"
+
+#: rapid/glade3/rapid.glade.h:33
+msgid "Automatically detect image devices"
+msgstr "Сам пронађи уређаје са сликама"
+
+#: rapid/glade3/rapid.glade.h:34
+msgid "Automation"
+msgstr "Аутоматизација"
+
+#: rapid/glade3/rapid.glade.h:35
+msgid "Backup"
+msgstr "Резервна копија"
+
+#: rapid/glade3/rapid.glade.h:36
+msgid "Backup folder name:"
+msgstr "Име фасцикле за резервну копију:"
+
+#: rapid/glade3/rapid.glade.h:37
+msgid "Backup location:"
+msgstr "Место за резервну копију:"
+
+#: rapid/glade3/rapid.glade.h:38
+msgid "Backup photos when downloading"
+msgstr "Направи резервну копију прилико преузимања фотографија"
+
+#: rapid/glade3/rapid.glade.h:39
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Изаберите фасциклу за чување преузетих фотографија. Подфасцикле ће бити "
+"аутоматски направљене на основу следећег редоследа."
+
+#: rapid/glade3/rapid.glade.h:40
+msgid ""
+"Choose whether to skip downloading the image, or to add a unique indentifier."
+msgstr ""
+"Да ли да прекинем преузимање или да додам јединствену реч на назив "
+"фотографије."
+
+#: rapid/glade3/rapid.glade.h:41
+msgid "Copyright Damon Lynch 2007-10"
+msgstr ""
+
+#: rapid/glade3/rapid.glade.h:42
+msgid "Day start:"
+msgstr "Почетни дан:"
+
+#: rapid/glade3/rapid.glade.h:43
+msgid "Delete images from image device upon download completion"
+msgstr "Обриши фотографије са изворног уређаја по преузимању"
+
+#: rapid/glade3/rapid.glade.h:44
+msgid "Download / Pause"
+msgstr "Преузми / Паузирај"
+
+#: rapid/glade3/rapid.glade.h:45
+msgid "Download Folder"
+msgstr "Фасцикла за чување фотографија"
+
+#: rapid/glade3/rapid.glade.h:46
+msgid "Download folder:"
+msgstr "Фасцикла за чување фотографија:"
+
+#: rapid/glade3/rapid.glade.h:47
+msgid "Downloads today:"
+msgstr "Данашњих преузимања:"
+
+#: rapid/glade3/rapid.glade.h:48
+msgid "Error Handling"
+msgstr "Превазилажење грешки"
+
+#: rapid/glade3/rapid.glade.h:49
+msgid "Error Log"
+msgstr "Испис грешака"
+
+#: rapid/glade3/rapid.glade.h:50
+msgid "Exit program after completion of successful download"
+msgstr "Напусти програм по успешном преузимању фотографија"
+
+#: rapid/glade3/rapid.glade.h:51
+msgid "If you disable automatic detection, choose the exact backup location."
+msgstr ""
+"Уколико искључите аутоматско налажење, изаберите место за резервну копију."
+
+#: rapid/glade3/rapid.glade.h:52
+msgid ""
+"If you disable automatic detection, choose the exact location of the images."
+msgstr "Уколико искључите аутоматско налажење, изаберите путању до слика."
+
+#: rapid/glade3/rapid.glade.h:53
+msgid ""
+"If you enable automatic detection of Portable Storage Devices, the entire "
+"device will be scanned for images. On large devices, this could take some "
+"time."
+msgstr ""
+"Уколико омогућите аутоматско налажење покретних меморијских уређаја, цео "
+"уређај ће бити претражен у потрази за фотографијама, што може да потраје."
+
+#: rapid/glade3/rapid.glade.h:54
+msgid "Ignore"
+msgstr "Занемари"
+
+#: rapid/glade3/rapid.glade.h:55
+msgid "Image Devices"
+msgstr "Уређај са сликама"
+
+#: rapid/glade3/rapid.glade.h:56
+msgid "Image Rename"
+msgstr "Преименовање фотографија"
+
+#: rapid/glade3/rapid.glade.h:57
+msgid ""
+"Image devices are devices from which to download photos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
+"\n"
+"You can download photos from multiple image devices simultaneously.\n"
+"\n"
+"<i>If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, consider using a card "
+"reader.</i>"
+msgstr ""
+"Уређаји са сликама могу бити фотоапарати, разне спољне меморије и покретни "
+"дискови.\n"
+"\n"
+"Можете преузети фотографије са више уређаја одједном.\n"
+"\n"
+"<i>Уколико је преузимање фотографија директоно са фотоапарата споро или не "
+"ради, пробајте да подесите фотоапарат на PTP режим. Уколико то није могуће, "
+"набавите спољни читач картица.</i>"
+
+#: rapid/glade3/rapid.glade.h:62
+msgid "Image location:"
+msgstr "Место фотографије:"
+
+#: rapid/glade3/rapid.glade.h:63
+msgid "Import your images efficiently and reliably"
+msgstr "Увезите фотографије ефикасно и сигурно"
+
+#: rapid/glade3/rapid.glade.h:64
+msgid "Job Codes"
+msgstr "Код задатка"
+
+#: rapid/glade3/rapid.glade.h:65
+msgid "Overwrite"
+msgstr "Препиши"
+
+#: rapid/glade3/rapid.glade.h:66
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Поставке: Брзи преносилац фотографија"
+
+#: rapid/glade3/rapid.glade.h:68
+msgid "R_emove All"
+msgstr "У_клони све"
+
+#: rapid/glade3/rapid.glade.h:70
+msgid ""
+"Rapid Photo Downloader is free software; you can redistribute it and/or "
+"modify it under the terms of the GNU General Public License as published by "
+"the Free Software Foundation; either version 2 of the License, or (at your "
+"option) any later version.\n"
+"\n"
+"Rapid Photo Downloader is distributed in the hope that it will be useful, "
+"but WITHOUT ANY WARRANTY; without even the implied warranty of "
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+"Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Rapid Photo Downloader; if not, write to the Free Software Foundation, Inc., "
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Брзи преносилац фотографија је слободан софтвер; можете га расподељивати "
+"и/или га мењати под условима ГНУ Опште Јавне Лиценце (GNU GPL) како је "
+"објављује Задужбина за Слободни Софтвер (FSF); било верзије 2 те Лиценце, "
+"било (по вашем нахођењу) било које новије верзије.\n"
+"\n"
+"Брзи преносилац фотографија се расподељује у нади да ће бити од користи, али "
+"БЕЗ ИКАКВИХ ГАРАНЦИЈА; чак и без подразумеване гаранције КОРИСНОСТИ или "
+"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.  Видите ГНУ Општу Јавну Лиценцу за више "
+"детаља.\n"
+"\n"
+"Требали сте да добијете примерак ГНУ Опште Јавне Лиценце уз Брзи преносилац "
+"фотографија; ако нисте, пишите Задужбини за Слободни Софтвер (Free Software "
+"Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#: rapid/glade3/rapid.glade.h:75
+msgid "Rename Options"
+msgstr "Опције за преименовање"
+
+#: rapid/glade3/rapid.glade.h:76
+msgid "Report a warning"
+msgstr "Пријавите упизорење"
+
+#: rapid/glade3/rapid.glade.h:77
+msgid "Report an error"
+msgstr "Пријавите грешку"
+
+#: rapid/glade3/rapid.glade.h:78
+msgid "Skip"
+msgstr "Прескочи"
+
+#: rapid/glade3/rapid.glade.h:79
+msgid "Skip download"
+msgstr "Прескочи преузимање"
+
+#: rapid/glade3/rapid.glade.h:80
+msgid ""
+"Specify the folder in which backups are stored on the device.  \n"
+"\n"
+"<i>Note: this will also be used to determine whether or not the device is "
+"used for backups. For each device you wish to use for backing up to, create "
+"a folder in it with this name.</i>"
+msgstr ""
+"Одређује фасциклу на уређају у којој се чувају резервне копије.  \n"
+"\n"
+"<i>Примедба: ово одређује и да ли се уређај користи као резервни. За сваки "
+"уређај са резервник копијама направите посебну фасциклу, која се налази "
+"унутар уређаја.</i>"
+
+#: rapid/glade3/rapid.glade.h:83
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+msgstr ""
+"Одређује време у које ће вредност <i>данашњих преузимања</i> бити поништена."
+
+#: rapid/glade3/rapid.glade.h:84
+msgid ""
+"Specify what to do when an image of the same name has already been "
+"downloaded or backed up."
+msgstr ""
+"Одређује шта треба предузети када већ постоји фотографија са истим именом "
+"међу преузетим или резервним."
+
+#: rapid/glade3/rapid.glade.h:85
+msgid "Specify what to do when there are no backup devices."
+msgstr "Одређује шта треба предузети када не постоје резервни уређаји."
+
+#: rapid/glade3/rapid.glade.h:86
+msgid ""
+"Specify whether image and folder names should have any characters removed "
+"that are not allowed by other operating systems."
+msgstr ""
+"Одређује да ли треба уклонити знакове које не подржава оперативни систем из "
+"назива датотека и фасцикли."
+
+#: rapid/glade3/rapid.glade.h:87
+msgid "Start downloading at program startup"
+msgstr "Започни преузимање по покретању програма"
+
+#: rapid/glade3/rapid.glade.h:88
+msgid "Start downloading upon image device insertion"
+msgstr "Започни преузимање по прикључењу уређаја"
+
+#: rapid/glade3/rapid.glade.h:89
+msgid "Stored number:"
+msgstr "Сачувани бројеви:"
+
+#: rapid/glade3/rapid.glade.h:90
+msgid "Strip incompatible characters"
+msgstr "Избаци неподржане знакове"
+
+#: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Усагласи називе RAW и JPEG слика"
+
+#: 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: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:95
+msgid "_Add..."
+msgstr "_Додај..."
+
+#: rapid/glade3/rapid.glade.h:96
+msgid "_Clear Completed Downloads"
+msgstr "_Очисти завршена преузимања"
+
+#: rapid/glade3/rapid.glade.h:97
+msgid "_Error Log"
+msgstr "Списак са _грешкама"
+
+#: rapid/glade3/rapid.glade.h:98
+msgid "_Get Help Online..."
+msgstr "Помоћ на _мрежи"
+
+#: rapid/glade3/rapid.glade.h:99
+msgid "_Help"
+msgstr "_Помоћ"
+
+#: rapid/glade3/rapid.glade.h:100
+msgid "_Make a Donation..."
+msgstr "_Новчани прилог пројекту"
+
+#: rapid/glade3/rapid.glade.h:101
+msgid "_Photos"
+msgstr "_Фотографија"
+
+#: rapid/glade3/rapid.glade.h:102
+msgid "_Report a Problem..."
+msgstr "_Пријављивање грешака"
+
+#: rapid/glade3/rapid.glade.h:103
+msgid "_Thumbnails"
+msgstr "_Умањени прикази"
+
+#: rapid/glade3/rapid.glade.h:104
+msgid "_Translate this Application..."
+msgstr "Помоћ у _локализацији"
+
+#: rapid/glade3/rapid.glade.h:105
+msgid "_View"
+msgstr "П_реглед"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Сва права су задржана, Дејмон Линч (Damon Lynch) 2007-09"
diff --git a/po/sv.po b/po/sv.po
index e0a26f1..d8ca79f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-31 14:23-0600\n"
-"PO-Revision-Date: 2009-12-31 20:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-01-13 16:27-0600\n"
+"PO-Revision-Date: 2010-01-12 07:46+0000\n"
+"Last-Translator: Ulf Urdén <ulf.urden@purplescout.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-03 19:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-14 23:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
@@ -94,57 +94,57 @@ msgstr "Madrid"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: rapid/rapid.py:407
+#: rapid/rapid.py:408
 msgid "Invalid Downloads Today value.\n"
 msgstr "Felaktigt värde för 'Antal överföringar idag'.\n"
 
-#: rapid/rapid.py:408
+#: rapid/rapid.py:409
 msgid "Resetting value to zero.\n"
 msgstr "Nollställer värde.\n"
 
-#: rapid/rapid.py:447
+#: rapid/rapid.py:448
 msgid "'Start of day' preference value is corrupted.\n"
 msgstr "Värdet på 'början på dagen' är korrupt\n"
 
-#: rapid/rapid.py:448
+#: rapid/rapid.py:449
 msgid "Resetting to midnight.\n"
 msgstr "Nollställer till midnatt.\n"
 
-#: rapid/rapid.py:477
+#: rapid/rapid.py:478
 msgid "Error in Image Rename preferences"
 msgstr "Fel i inställningarna för bildnamnbyte"
 
-#: 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 "Följande inställningar innehåller fel:\n"
 
-#: rapid/rapid.py:497
+#: rapid/rapid.py:498
 msgid "Resetting to default values."
 msgstr "Återställer till standardvärde."
 
 #. 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 "Fototillfälle"
 
-#: rapid/rapid.py:636
+#: rapid/rapid.py:637
 msgid "Error in Download Subfolder preferences"
 msgstr "Fel i inställningar för överföring till underkataloger"
 
-#: rapid/rapid.py:775
+#: rapid/rapid.py:776
 msgid "Select a folder to download photos to"
 msgstr "Välj en katalog att överföra bilder till"
 
-#: rapid/rapid.py:846
+#: rapid/rapid.py:850
 msgid "Select an image folder"
 msgstr "Välj en bildkatalog"
 
-#: rapid/rapid.py:868
+#: rapid/rapid.py:872
 msgid "Select a folder in which to backup images"
 msgstr "Välj en mapp för säkerhetskopiering av bilder"
 
 #. 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>"
@@ -152,7 +152,7 @@ msgstr ""
 "<i><b>Varning:</b> Det finns inte tillräckligt med metadata i bildfilen för "
 "att skapa ett filnamn. Var god ändra inställningarna för namnbyte.</i>"
 
-#: 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>"
@@ -162,18 +162,28 @@ msgstr ""
 "namnbyte av underkatalog.</i>"
 
 #. 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 "<i>Exempel: %s</i>"
 
-#: rapid/rapid.py:1040
+#: rapid/rapid.py:1007
+msgid ""
+"Downloads today value not updated, as a download is currently occurring"
+msgstr ""
+"Antal nedladdningar idag uppdateras inte, eftersom en överföring pågår"
+
+#: rapid/rapid.py:1023
+msgid "Stored number value not updated, as a download is currently occurring"
+msgstr "Lagrat nummervärde uppdateras inte, eftersom en överföring pågår"
+
+#: rapid/rapid.py:1048
 msgid "The subfolder preferences had some unnecessary values removed."
 msgstr ""
 "Inställningar för underkataloger hade överflödiga värden som avlägsnades."
 
 #. 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."
@@ -182,12 +192,12 @@ msgstr ""
 " Använder standardvärden."
 
 #. 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 "extern_enhet_1"
 
 #. 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 "extern_enhet_2"
 
@@ -195,15 +205,15 @@ msgstr "extern_enhet_2"
 #. 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 "söker av..."
 
-#: 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 "Det fanns ett fel i programinställningarna."
 
-#: rapid/rapid.py:1400
+#: rapid/rapid.py:1413
 msgid ""
 "\n"
 "Please check preferences, restart the program, and try again."
@@ -212,7 +222,7 @@ msgstr ""
 "Var god kontrollera programinställningarna, starta om programmet, och försök "
 "igen."
 
-#: rapid/rapid.py:1401 rapid/rapid.py:1402
+#: rapid/rapid.py:1414 rapid/rapid.py:1415
 msgid "Download cannot proceed"
 msgstr "Kan inte fortsätta överföringen"
 
@@ -220,7 +230,7 @@ msgstr "Kan inte fortsätta överföringen"
 #. 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 "0 av %s bilder överförda"
@@ -231,23 +241,23 @@ msgstr "0 av %s bilder överförda"
 #. %(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 ""
 "Avsökning av enhet klar: hittade %(number)s bilder på enheten %(device)s"
 
-#: rapid/rapid.py:1456
+#: rapid/rapid.py:1469
 #, python-format
 msgid "Device scan complete: no images found on %s"
 msgstr "Avsökning av enhet klar: hittade inga bilder på enheten %s"
 
-#: rapid/rapid.py:1487
+#: rapid/rapid.py:1500
 msgid "Image filename could not be generated"
 msgstr "Kunde inte skapa ett filnamn för bild"
 
 #. '%(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"
@@ -256,7 +266,7 @@ msgstr ""
 "Källa: %(source)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1493
+#: rapid/rapid.py:1506
 msgid ""
 "Image filename could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -264,7 +274,7 @@ msgstr ""
 "Kunde inte skapa filenamn för bild. Kontrollera att bilden har tillräckligt "
 "med metadata."
 
-#: rapid/rapid.py:1494
+#: rapid/rapid.py:1507
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -275,20 +285,70 @@ msgstr ""
 "Mål: %(destination)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1503
+#: rapid/rapid.py:1516 rapid/rapid.py:1521 rapid/rapid.py:1784
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Källa: %(source)s\n"
+"Destination: %(destination)s"
+
+#: rapid/rapid.py:1518
+#, python-format
+msgid "Unique identifier '%s' added"
+msgstr "Lade till unik indentifierare \"%s\""
+
+#: rapid/rapid.py:1526
+#, python-format
+msgid "Source: %(source)s"
+msgstr ""
+
+#: rapid/rapid.py:1533
+msgid "Download copying error"
+msgstr "Överföringsfel"
+
+#: rapid/rapid.py:1534
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s\n"
+"Error: %(errorno)s %(strerror)s"
+msgstr ""
+"Källa: %(source)s\n"
+"Mål: %(destination)s\n"
+"Fel: %(errorno)s %(strerror)s"
+
+#: rapid/rapid.py:1536 rapid/rapid.py:1822
+msgid "The image was not copied."
+msgstr "Bilden överfördes inte."
+
+#: rapid/rapid.py:1539
+msgid ""
+"Images detected with the same filenames, but taken at different times:"
+msgstr ""
+
+#: rapid/rapid.py:1540
+#, python-format
+msgid ""
+"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 "Kunde inte öppna bild"
 
-#: rapid/rapid.py:1504
+#: rapid/rapid.py:1554
 #, python-format
 msgid "Source: %s"
 msgstr "Källa: %s"
 
-#: rapid/rapid.py:1522
+#: rapid/rapid.py:1572
 msgid "Image has no metadata"
 msgstr "Bilden innehåller ingen metadata"
 
-#: rapid/rapid.py:1523
+#: rapid/rapid.py:1573
 #, python-format
 msgid ""
 "Metadata is essential for generating subfolders / image names.\n"
@@ -297,7 +357,7 @@ msgstr ""
 "Metadata behövs för att kunna skapa underkataloger / filnamn.\n"
 "Källa: %s"
 
-#: rapid/rapid.py:1533
+#: rapid/rapid.py:1583
 msgid ""
 "Subfolder name could not be properly generated. Check to ensure there is "
 "sufficient image metadata."
@@ -305,7 +365,7 @@ msgstr ""
 "Namn på underkatalog kunde inte skapas. Var god kontrollera att det finns "
 "tillräckligt med metadata."
 
-#: rapid/rapid.py:1534
+#: rapid/rapid.py:1584
 #, python-format
 msgid ""
 "Subfolder: %(subfolder)s\n"
@@ -316,54 +376,20 @@ msgstr ""
 "Bild: %(image)s\n"
 "Problem: %(problem)s"
 
-#: rapid/rapid.py:1585 rapid/rapid.py:1613 rapid/rapid.py:1632
-#: rapid/rapid.py:1694
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Källa: %(source)s\n"
-"Destination: %(destination)s"
-
-#: rapid/rapid.py:1634
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Lade till unik indentifierare \"%s\""
-
 #. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:1651
+#: rapid/rapid.py:1746
 msgid "New day has started - resetting 'Downloads Today' sequence number"
 msgstr "Ny dag påbörjad - nollställer dagens överföringar"
 
-#: rapid/rapid.py:1656 rapid/rapid.py:1662
-msgid "Download copying error"
-msgstr "Överföringsfel"
-
-#: rapid/rapid.py:1657
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Källa: %(source)s\n"
-"Mål: %(destination)s\n"
-"Fel: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1659 rapid/rapid.py:1732
-msgid "The image was not copied."
-msgstr "Bilden överfördes inte."
-
-#: rapid/rapid.py:1693
+#: rapid/rapid.py:1783
 msgid "Backup image already exists"
 msgstr "Bilden är redan säkerhetskopierad"
 
-#: 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 "Fel vid säkerhetskopiering"
 
-#: rapid/rapid.py:1722
+#: rapid/rapid.py:1812
 #, python-format
 msgid ""
 "Destination directory could not be created\n"
@@ -374,7 +400,7 @@ msgstr ""
 "%(directory)s\n"
 "Fel: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1730 rapid/rapid.py:1736
+#: rapid/rapid.py:1820 rapid/rapid.py:1826
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -386,203 +412,205 @@ msgstr ""
 "Fel: %(errno)s %(strerror)s"
 
 #. 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 "Enheten kan nu avlägsnas säkert"
 
-#: rapid/rapid.py:1753
+#: rapid/rapid.py:1843
 #, python-format
 msgid "%s images downloaded"
 msgstr "%s bilder överförda"
 
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1845
 #, python-format
 msgid "%s images skipped"
 msgstr "hoppade över %s bilder"
 
-#: rapid/rapid.py:1761 rapid/rapid.py:3198
+#: rapid/rapid.py:1851 rapid/rapid.py:3294
 msgid "warnings"
 msgstr "varningar"
 
-#: rapid/rapid.py:1763 rapid/rapid.py:3200
+#: rapid/rapid.py:1853 rapid/rapid.py:3296
 msgid "errors"
 msgstr "fel"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "Backup device missing"
 msgstr "Enhet för säkerhetskopiering saknas"
 
-#: rapid/rapid.py:1792
+#: rapid/rapid.py:1882
 msgid "No backup device was detected."
 msgstr "Ingen enhet för säkerhetskopiering hittades"
 
-#: rapid/rapid.py:1796
+#: rapid/rapid.py:1886
 msgid "This device has no images to download from."
 msgstr "Enheten saknar bilder att överföra"
 
-#: rapid/rapid.py:1831
+#: rapid/rapid.py:1921
 #, python-format
 msgid "Download has started from %s"
 msgstr "Överföringen startade vid %s"
 
-#: rapid/rapid.py:1877
+#: rapid/rapid.py:1967
 msgid "Image skipped"
 msgstr "Hoppade över bild"
 
-#: rapid/rapid.py:1878
+#: rapid/rapid.py:1968
 msgid "Image overwritten"
 msgstr "Skrev över bild"
 
-#: rapid/rapid.py:1879
+#: rapid/rapid.py:1969
 msgid "Image already exists"
 msgstr "Bilden finns redan"
 
-#: rapid/rapid.py:1925
+#: rapid/rapid.py:2015
 msgid "Image has no thumbnail"
 msgstr "Bilden saknar miniatyr"
 
-#: rapid/rapid.py:1935
+#: rapid/rapid.py:2025
 #, python-format
 msgid "%(number)s of %(total)s images copied"
 msgstr "%(number)s av %(total)s bilder överförda"
 
-#: 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 ""
+msgstr "Kunde inte radera bilder från bildenhet"
 
-#: rapid/rapid.py:1951
+#: rapid/rapid.py:2041
 #, python-format
 msgid ""
 "Image: %(source)s\n"
 "Error: %(errno)s %(strerror)s"
 msgstr ""
+"Bild: %(source)s\n"
+"Fel: %(errno)s %(strerror)s"
 
-#: rapid/rapid.py:1955
+#: rapid/rapid.py:2045
 #, python-format
 msgid "Image: %(source)s"
-msgstr ""
+msgstr "Bild: %(source)s"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2047
 #, python-format
 msgid "Deleted %i images from image device"
-msgstr ""
+msgstr "Raderade %i bilder från bildenhet"
 
-#: rapid/rapid.py:1967
+#: rapid/rapid.py:2057
 #, python-format
 msgid "Download complete from %s"
 msgstr "Överföring från %s är klart"
 
 #. 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 "Enhet"
 
 #. 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 "Storlek"
 
-#: rapid/rapid.py:2051
+#: rapid/rapid.py:2141
 msgid "Download Progress"
 msgstr "Överföringsförlopp"
 
-#: rapid/rapid.py:2167 rapid/rapid.py:2173
+#: rapid/rapid.py:2257 rapid/rapid.py:2263
 msgid "Thumbnail cannot be displayed"
 msgstr "Kunde inte skapa miniatyr"
 
-#: rapid/rapid.py:2168 rapid/rapid.py:2174
+#: rapid/rapid.py:2258 rapid/rapid.py:2264
 msgid "It may be corrupted"
 msgstr "Den kan vara korrupt"
 
-#: rapid/rapid.py:2200
+#: rapid/rapid.py:2290
 msgid "Device Detected"
 msgstr "Enhet hittad"
 
 #. 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 "Vill du överföra bilder från den här enheten eller partitionen?"
 
 #. 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 "_Kom ihåg mitt val"
 
 #. 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 "%s bilder valda för överföring från"
 
 #. 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 "Bilder kommer alltid att överföras från denna enhet"
 
 #. 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 "%s nekades som överföringsenhet"
 
 #. 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 "Bilder kommer aldrig att överföras från denna enhet"
 
 #. 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 "Ange fototillfälle"
 
 #. 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 "Ange ett nytt fototillfälle, eller välj ett tidigare."
 
 #. 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 "Ange ett nytt fototillfälle."
 
-#: rapid/rapid.py:2310
+#: rapid/rapid.py:2400
 msgid "Job Code:"
 msgstr "Fototillfälle:"
 
-#: rapid/rapid.py:2357
+#: rapid/rapid.py:2447
 msgid "Job Code entered"
 msgstr "Ett fototillfälle angavs"
 
-#: rapid/rapid.py:2359
+#: rapid/rapid.py:2449
 msgid "Job Code not entered"
 msgstr "Inget fototillfälle angivet"
 
-#: rapid/rapid.py:2593
+#: rapid/rapid.py:2688
 msgid "Some preferences will be reset."
 msgstr "Några inställningar kommer att återställas"
 
-#: rapid/rapid.py:2627
+#: rapid/rapid.py:2722
 #, python-format
 msgid "Prompting whether to use %s"
 msgstr "Frågar om %s ska användas"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2750
 msgid "Prompting for Job Code"
 msgstr "Frågar om fototillfälle"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2754
 msgid "Already prompting for Job Code, do not prompt again"
 msgstr "Visar redan fråga om fototillfälle, fråga inte igen"
 
-#: rapid/rapid.py:2674
+#: rapid/rapid.py:2769
 msgid "Starting downloads that have been waiting for a Job Code"
 msgstr "Påbörjar överföringar som har väntat på fototillfälle"
 
-#: rapid/rapid.py:2678
+#: rapid/rapid.py:2773
 msgid "Starting downloads"
 msgstr "Påbörjar överföring"
 
-#: rapid/rapid.py:2708
+#: rapid/rapid.py:2803
 msgid ""
 "A newer version of this program was previously run on this computer.\n"
 "\n"
@@ -590,34 +618,34 @@ msgstr ""
 "En nyare version av det här programmet har startats.\n"
 "\n"
 
-#: rapid/rapid.py:2710
+#: rapid/rapid.py:2805
 msgid ""
 "Program preferences appear to be valid, but please check them to ensure "
 "correct operation."
 msgstr ""
 "Inställningarna ser korrekta ut, men kontrollera dem för att vara säker."
 
-#: rapid/rapid.py:2712
+#: rapid/rapid.py:2807
 msgid "Sorry, some preferences are invalid and will be reset."
 msgstr ""
 "Beklagar, några av inställningarna innehåller fel och kommer att återställas."
 
-#: rapid/rapid.py:2713
+#: rapid/rapid.py:2808
 msgid "Warning:"
 msgstr "Varning:"
 
-#: rapid/rapid.py:2718
+#: rapid/rapid.py:2813
 msgid ""
 "This version of the program is newer than the previously run version. "
 "Checking preferences."
 msgstr ""
 "Programmet är av en nyare version än tidigare, kontrollerar inställningar."
 
-#: rapid/rapid.py:2725
+#: rapid/rapid.py:2820
 msgid "Preferences were modified."
 msgstr "Inställningarna har ändrats."
 
-#: 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"
@@ -627,11 +655,11 @@ msgstr ""
 "Denna versionen av programmet använder andra inställningar än äldre "
 "versioner. Inställningarna har därför uppdaterats."
 
-#: rapid/rapid.py:2730
+#: rapid/rapid.py:2825
 msgid "No preferences needed to be changed."
 msgstr "Inga inställningar behöver ändras."
 
-#: 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. "
@@ -641,111 +669,111 @@ msgstr ""
 "versioner. Några av inställningarna var felaktiga och kunde inte uppdateras. "
 "De kommer därför att återställas."
 
-#: rapid/rapid.py:2741
+#: rapid/rapid.py:2836
 msgid "Problem using pynotify."
 msgstr "Ett problem uppstod vid användning av pynotify."
 
-#: rapid/rapid.py:2757
+#: rapid/rapid.py:2852
 msgid "Failed to receive pynotify server capabilities."
 msgstr "Kunde inte ta emot serveregenskaper från pynotify."
 
-#: rapid/rapid.py:2805
+#: rapid/rapid.py:2900
 msgid "and"
 msgstr "och"
 
-#: rapid/rapid.py:2810
+#: rapid/rapid.py:2905
 msgid "Using backup devices"
 msgstr "Använder enheter för säkerhetskopiering"
 
-#: rapid/rapid.py:2812
+#: rapid/rapid.py:2907
 msgid "Using backup device"
 msgstr "Använder enhet för säkerhetskopiering"
 
-#: rapid/rapid.py:2814
+#: rapid/rapid.py:2909
 msgid "No backup devices detected"
 msgstr "Inga enheter för säkerhetskopiering hittades"
 
-#: 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 "Enhete %(device)s (%(path)s) ignorerades"
 
-#: rapid/rapid.py:2967
+#: rapid/rapid.py:3063
 #, python-format
 msgid "Detected %(device)s with path %(path)s"
 msgstr "Hittade %(device)s med sökvägen %(path)s"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3067
 msgid "Automatically start download is true"
 msgstr "Automatisk överföring är aktiverad"
 
-#: rapid/rapid.py:2973
+#: rapid/rapid.py:3069
 msgid "Automatically start download is false"
 msgstr "Automatisk överföring är avaktiverad"
 
-#: rapid/rapid.py:3026
+#: rapid/rapid.py:3122
 msgid "Using manually specified path"
 msgstr "Använder manuell sökväg"
 
-#: rapid/rapid.py:3144 rapid/rapid.py:3193
+#: rapid/rapid.py:3240 rapid/rapid.py:3289
 msgid "All downloads complete"
 msgstr "Alla överföringar klara"
 
-#: rapid/rapid.py:3158
+#: rapid/rapid.py:3254
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/rapid.py:3168
+#: rapid/rapid.py:3264
 msgid "About 1 second remaining"
 msgstr "Cirka en sekund återstår"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3266
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Cirka %i sekunder återstår"
 
-#: rapid/rapid.py:3172
+#: rapid/rapid.py:3268
 msgid "About 1 minute remaining"
 msgstr "Cirka en minut återstår"
 
 #. 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 "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
 
-#: rapid/rapid.py:3194
+#: rapid/rapid.py:3290
 msgid "images downloaded"
 msgstr "bilder överförda"
 
-#: rapid/rapid.py:3196
+#: rapid/rapid.py:3292
 msgid "images skipped"
 msgstr "bilder skippade"
 
 #. 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 "_Överför "
 
 #. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:3299
+#: rapid/rapid.py:3396
 msgid "_Pause"
 msgstr "_Paus"
 
-#: rapid/rapid.py:3373
+#: rapid/rapid.py:3470
 msgid "Preferences were changed."
 msgstr "Inställningar ändrades"
 
-#: rapid/rapid.py:3532
+#: rapid/rapid.py:3665
 msgid "Goodbye"
 msgstr "Farväl"
 
 #. 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 "
@@ -754,333 +782,337 @@ msgstr ""
 "visa programinformation på kommandoraden när programmet körs (standardvärde: "
 "%default)"
 
-#: rapid/rapid.py:3544
+#: rapid/rapid.py:3677
 msgid "only output errors to the command line"
 msgstr "Visa fel endast på kommandoraden"
 
 #. 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 "visa filändelser för bildformat som programmet hanterar och avsluta"
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3692
 #, python-format
 msgid "and %s"
 msgstr "och %s"
 
 #. 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 "Använder"
 
 #. this application is already running
-#: rapid/rapid.py:3581
+#: rapid/rapid.py:3714
 #, python-format
 msgid "%s is already running"
 msgstr "%s körs redan"
 
-#: rapid/renamesubfolderprefs.py:178
+#: rapid/renamesubfolderprefs.py:179
 msgid "Date time"
 msgstr "Datumtid"
 
-#: rapid/renamesubfolderprefs.py:179
+#: rapid/renamesubfolderprefs.py:180
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:180
+#: rapid/renamesubfolderprefs.py:181
 msgid "Filename"
 msgstr "Filnamn"
 
-#: rapid/renamesubfolderprefs.py:181
+#: rapid/renamesubfolderprefs.py:182
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:182
+#: rapid/renamesubfolderprefs.py:183
 msgid "Sequences"
 msgstr "Sekvenser"
 
-#: rapid/renamesubfolderprefs.py:185
+#: rapid/renamesubfolderprefs.py:186
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/renamesubfolderprefs.py:186
+#: rapid/renamesubfolderprefs.py:187
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/renamesubfolderprefs.py:187
+#: rapid/renamesubfolderprefs.py:188
 msgid "Yesterday"
 msgstr "Igår"
 
 #. 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 "Namn + filändelse"
 
 #. 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 "Namn"
 
 #. 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 "Filändelse"
 
 #. 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 "Bildnummer"
 
 #. 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 "Bländare"
 
 #. 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 "ISO"
 
 #. 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 "Bländartid"
 
 #. 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 "Brännvidd"
 
 #. 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 "Kameratillverkare"
 
 #. 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 "Kameramodell"
 
 #. 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 "Förkortning på kameramodell"
 
 #. 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 "Utökad förkortning på kameramodell"
 
 #. 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 "Serienummer"
 
 #. 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 "Antal exponeringar"
 
 #. 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 "Ägarens namn"
 
 #. 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 "Överföringar idag"
 
 #. 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 "Sessionsnummer"
 
 #. 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 "Nummer på underkatalog"
 
 #. 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 "Tidigare sekvensnummer"
 
 #. 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 "Sekvensbokstav"
 
 #. 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 "Alla siffror"
 
 #. 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 "Senaste siffra"
 
 #. 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 "Senaste två siffrorna"
 
 #. 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 "Senaste tre siffrorna"
 
 #. 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 "Senaste fyra siffrorna"
 
 #. 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 "Använd ursprungligt skiftläge"
 
 #. 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 "VERSALER"
 
 #. 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 "gemener"
 
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/renamesubfolderprefs.py:245
 msgid "One digit"
 msgstr "En siffra"
 
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/renamesubfolderprefs.py:246
 msgid "Two digits"
 msgstr "Två siffror"
 
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/renamesubfolderprefs.py:247
 msgid "Three digits"
 msgstr "Tre siffror"
 
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/renamesubfolderprefs.py:248
 msgid "Four digits"
 msgstr "Fyra siffror"
 
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/renamesubfolderprefs.py:249
 msgid "Five digits"
 msgstr "Fem siffror"
 
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/renamesubfolderprefs.py:250
 msgid "Six digits"
 msgstr "Sex siffror"
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/renamesubfolderprefs.py:251
+msgid "Seven digits"
+msgstr "Sju siffror"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/renamesubfolderprefs.py:253
 msgid "Subseconds"
 msgstr "Sekunder"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/renamesubfolderprefs.py:255
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/renamesubfolderprefs.py:257
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/renamesubfolderprefs.py:259
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/renamesubfolderprefs.py:261
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/renamesubfolderprefs.py:263
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/renamesubfolderprefs.py:265
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/renamesubfolderprefs.py:267
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/renamesubfolderprefs.py:269
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/renamesubfolderprefs.py:271
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/renamesubfolderprefs.py:273
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/renamesubfolderprefs.py:275
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/renamesubfolderprefs.py:277
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/renamesubfolderprefs.py:279
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/renamesubfolderprefs.py:281
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/renamesubfolderprefs.py:283
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/renamesubfolderprefs.py:285
 msgid "HH-MM-SS"
 msgstr "HH-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: rapid/renamesubfolderprefs.py:287
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
+#: rapid/renamesubfolderprefs.py:289
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/renamesubfolderprefs.py:291
 msgid "MM (minutes)"
 msgstr "MM (minuter)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: rapid/renamesubfolderprefs.py:293
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:707
+#: rapid/renamesubfolderprefs.py:710
 #, python-format
 msgid ""
 "Preference key '%(key)s' is invalid.\n"
@@ -1089,53 +1121,53 @@ msgstr ""
 "Inställningen '%(key)s' är ogiltig.\n"
 "Förväntat värde är något av %(value)s"
 
-#: rapid/renamesubfolderprefs.py:714
+#: rapid/renamesubfolderprefs.py:717
 #, python-format
 msgid "Preference value '%(value)s' is invalid"
 msgstr "Inställningen '%(value)s' är ogiltig"
 
-#: rapid/renamesubfolderprefs.py:718
+#: rapid/renamesubfolderprefs.py:721
 msgid "These preferences are not well formed:"
 msgstr "Följande inställningar är ogiltiga:"
 
-#: rapid/renamesubfolderprefs.py:828
+#: rapid/renamesubfolderprefs.py:831
 msgid "Subsecond metadata not present in image"
 msgstr "Metadata för sekunder finns inte i bilden"
 
-#: 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 "%s metadata finns inte i bilden"
 
-#: 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 "Fel i komponenten för datumtid. Värdet %s verkar ogiltigt"
 
-#: rapid/renamesubfolderprefs.py:894
+#: rapid/renamesubfolderprefs.py:897
 msgid "extension was specified but image name has no extension"
 msgstr "filändelse angavs men bilden saknar filändelse"
 
-#: rapid/renamesubfolderprefs.py:898
+#: rapid/renamesubfolderprefs.py:901
 msgid "image number was specified but image filename has no number"
 msgstr "Bildnummer angavs men filnamnet saknar nummer"
 
-#: rapid/renamesubfolderprefs.py:1085
+#: rapid/renamesubfolderprefs.py:1088
 #, python-format
 msgid "error generating name with component %s"
 msgstr "ett fel uppstod med komponenten %s"
 
-#: rapid/renamesubfolderprefs.py:1381
+#: rapid/renamesubfolderprefs.py:1387
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Inställningen för underkataloger skall inte börja med %s"
 
-#: rapid/renamesubfolderprefs.py:1383
+#: rapid/renamesubfolderprefs.py:1389
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Inställning för underkatalog skall inte börja med %s"
 
-#: rapid/renamesubfolderprefs.py:1387
+#: rapid/renamesubfolderprefs.py:1393
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Inställning för underkatalog skall inte innehålla två %s i rad"
@@ -1309,8 +1341,8 @@ msgstr ""
 "identifierare."
 
 #: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-09"
-msgstr "Copyright Damon Lynch 2007-09"
+msgid "Copyright Damon Lynch 2007-10"
+msgstr ""
 
 #: rapid/glade3/rapid.glade.h:42
 msgid "Day start:"
@@ -1318,7 +1350,7 @@ msgstr "Början på dagen:"
 
 #: rapid/glade3/rapid.glade.h:43
 msgid "Delete images from image device upon download completion"
-msgstr ""
+msgstr "Radera bilder från bildenhet när bildöverföring är färdig"
 
 #: rapid/glade3/rapid.glade.h:44
 msgid "Download / Pause"
@@ -1534,10 +1566,14 @@ msgid "Strip incompatible characters"
 msgstr "Avlägsna inkompatibla tecken"
 
 #: rapid/glade3/rapid.glade.h:91
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synkronisera RAW och JPEG-sekvensnummer"
+
+#: rapid/glade3/rapid.glade.h:92
 msgid "Unmount (\"eject\") image device upon download completion"
 msgstr "Mata ut enhet när överföring är klar"
 
-#: rapid/glade3/rapid.glade.h:92
+#: 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."
@@ -1545,7 +1581,7 @@ msgstr ""
 "Ange om bilder med samma filnamn på enheten för säkerhetskopiering ska "
 "ersättas, eller hoppas över."
 
-#: 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."
@@ -1553,46 +1589,49 @@ msgstr ""
 "Du kan säkerhetskopiera bilder till flera platser när de överförs, t.ex. "
 "externa hårddiskar."
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/rapid.glade.h:95
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/rapid.glade.h:96
 msgid "_Clear Completed Downloads"
 msgstr "_Töm slutförda överföringar"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/rapid.glade.h:97
 msgid "_Error Log"
 msgstr "_Fellogg"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/rapid.glade.h:98
 msgid "_Get Help Online..."
 msgstr "_Få hjälp online"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/rapid.glade.h:99
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/rapid.glade.h:100
 msgid "_Make a Donation..."
 msgstr "_Donera..."
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/rapid.glade.h:101
 msgid "_Photos"
 msgstr "_Bilder"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/rapid.glade.h:102
 msgid "_Report a Problem..."
 msgstr "_Rapportera ett fel..."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/rapid.glade.h:103
 msgid "_Thumbnails"
 msgstr "_Miniatyrbilder"
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/rapid.glade.h:104
 msgid "_Translate this Application..."
 msgstr "_Översätt programmet..."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/rapid.glade.h:105
 msgid "_View"
 msgstr "_Visa"
+
+#~ msgid "Copyright Damon Lynch 2007-09"
+#~ msgstr "Copyright Damon Lynch 2007-09"
diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index f9093dc..f700e80 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,3 +1,40 @@
+Version 0.1.2
+-------------
+
+2010-01-16
+
+New feature: photographers using RAW + JPEG mode now have the option to 
+synchronize sequence numbers for the matching pair of images. This option is
+useful if you use the RAW + JPEG feature on your camera and you use sequence
+numbers or letters in your image renaming. Enabling this option will cause the 
+program to detect matching pairs of RAW and JPEG images, and when they are 
+detected, the same sequence numbers and letters will be applied to both image
+names. Furthermore, sequences will be updated as if the images were one. For 
+example, if 200 RAW images and 200 matching JPEG images are downloaded, the 
+value of Downloads today will be incremented by 200, and not 400. The same goes 
+for the rest of the sequence values, including the Stored number sequence 
+number. Images are detected by comparing filename, as well as the exif value for
+the date and time the image was created (including subseconds when the camera 
+records this value). This option will take effect regardless of whether the RAW 
+and JPEG images are stored on different memory cards or the same memory card. 
+Furthermore, if they are stored on separate memory cards, you can download from 
+them simultaneously or one after the other. The only requirement is to download 
+the images in the same session--in other words, for the feature to work, use as 
+many memory cards as you need, but do not exit the program between downloads of 
+the matching sets of images.
+
+Increased maximum sequence number length to seven digits by user request.
+
+Fixed bug #503704: changes in values for downloads today and stored number not
+updated when changed via program preferences while a download is ready to begin.
+
+Fixed a rare startup bug, where the program could crash when starting a thread.
+
+Added Serbian translation by Milos Popovic. Updated Czech, Dutch, Finnish,
+French, German, Hungarian, Italian, Polish, Russian, Slovak, Spanish and 
+Swedish translations.
+
+
 Version 0.1.1
 -------------
 
diff --git a/rapid/config.py b/rapid/config.py
index f70aef1..615fda3 100644
--- a/rapid/config.py
+++ b/rapid/config.py
@@ -1,5 +1,5 @@
 # -*- coding: latin1 -*-
-### Copyright (C) 2007, 2008, 2009 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007, 2008, 2009, 2010 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 ### along with this program; if not, write to the Free Software
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-version = '0.1.1'
+version = '0.1.2'
 
 GCONF_KEY="/apps/rapid-photo-downloader"
 GLADE_FILE = "glade3/rapid.glade"
diff --git a/rapid/glade3/rapid.glade b/rapid/glade3/rapid.glade
index 79ceee1..41387c7 100644
--- a/rapid/glade3/rapid.glade
+++ b/rapid/glade3/rapid.glade
@@ -774,6 +774,19 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="synchronize_raw_jpg_checkbutton">
+                                    <property name="label" translatable="yes">Synchronize RAW + JPEG sequence numbers</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
                                 <property name="position">1</property>
@@ -2368,7 +2381,7 @@ You can download photos from multiple image devices simultaneously.
     <property name="icon">rapid-photo-downloader-about.png</property>
     <property name="type_hint">normal</property>
     <property name="program_name">Rapid Photo Downloader</property>
-    <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-09</property>
+    <property name="copyright" translatable="yes">Copyright Damon Lynch 2007-10</property>
     <property name="comments" translatable="yes">Import your images efficiently and reliably</property>
     <property name="website">http://www.damonlynch.net/rapid</property>
     <property name="license" translatable="yes">Rapid Photo Downloader is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -2387,6 +2400,7 @@ Tomas Novak &lt;kuvaly@seznam.cz&gt;
 Abel O'Rian &lt;abel.orian@gmail.com&gt;
 Balazs Oveges &lt;ovegesb@freemail.hu&gt;
 Daniel Paessler &lt;daniel@paessler.org&gt;
+Milo&#x161; Popovi&#x107; &lt;gpopac@gmail.com&gt;
 Michal Predotka &lt;mpredotka@googlemail.com&gt;
 Luca Reverberi &lt;thereve@gmail.com&gt;
 Mikko Ruohola &lt;polarfox@polarfox.net&gt;
diff --git a/rapid/rapid.py b/rapid/rapid.py
index ae7394c..4a137e2 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007, 2008, 2009, 2010 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -213,7 +213,9 @@ class ThreadManager:
 
     def startWorkers(self):
         for w in self.getReadyToStartWorkers():
-            w.start()
+            #for some reason, very occassionally a thread that has been started shows up in this list, so must filter them out
+            if not w.isAlive():
+                w.start()
 
     def startDownloadingWorkers(self):
         for w in self.getReadyToDownloadWorkers():
@@ -373,12 +375,13 @@ class RapidPreferences(prefs.Preferences):
         "show_log_dialog": prefs.Value(prefs.BOOL, False),
         "day_start": prefs.Value(prefs.STRING,  "03:00"), 
         "downloads_today": prefs.ListValue(prefs.STRING_LIST,  [today(),  '0']), 
-         "stored_sequence_no": prefs.Value(prefs.INT,  0), 
-         "job_codes": prefs.ListValue(prefs.STRING_LIST,  [_('New York'),  
+        "stored_sequence_no": prefs.Value(prefs.INT,  0), 
+        "job_codes": prefs.ListValue(prefs.STRING_LIST,  [_('New York'),  
                _('Manila'),  _('Prague'),  _('Helsinki'),   _('Wellington'), 
                _('Tehran'), _('Kampala'),  _('Paris'), _('Berlin'),  _('Sydney'), 
                _('Budapest'), _('Rome'),  _('Moscow'),  _('Delhi'), _('Warsaw'), 
-               _('Jakarta'),  _('Madrid'),  _('Stockholm')])
+               _('Jakarta'),  _('Madrid'),  _('Stockholm')]),
+        "synchronize_raw_jpg": prefs.Value(prefs.BOOL, False),
         }
 
     def __init__(self):
@@ -816,6 +819,9 @@ class PreferencesDialog(gnomeglade.Component):
         self.hour_spinbutton.set_value(float(hour))
         self.minute_spinbutton.set_value(float(minute))
 
+        self.synchronize_raw_jpg_checkbutton.set_active(
+                            self.prefs.synchronize_raw_jpg)
+        
         #compatibility
         self.strip_characters_checkbutton.set_active(
                             self.prefs.strip_characters)
@@ -998,8 +1004,10 @@ class PreferencesDialog(gnomeglade.Component):
         self.on_downloads_today_entry_changed(self.downloads_today_entry)
 
     def on_downloads_today_entry_changed(self, entry):
-        if workers.noRunningWorkers() == 0:
-            # do not update value if a download is occurring - it will mess it up!
+        # do not update value if a download is occurring - it will mess it up!
+        if workers.noDownloadingWorkers() <> 0:
+            cmd_line(_("Downloads today value not updated, as a download is currently occurring"))
+        else:            
             v = entry.get_text()
             try:
                 v = int(v)
@@ -1012,8 +1020,10 @@ class PreferencesDialog(gnomeglade.Component):
             self.updateImageRenameExample()
         
     def on_stored_number_entry_changed(self, entry):
-        if workers.noRunningWorkers() == 0:
-            # do not update value if a download is occurring - it will mess it up!
+        # do not update value if a download is occurring - it will mess it up!        
+        if workers.noDownloadingWorkers() <> 0:
+            cmd_line(_("Stored number value not updated, as a download is currently occurring"))
+        else:
             v = entry.get_text()
             try:
                 # the displayed value of stored sequence no 1 more than actual value
@@ -1165,6 +1175,8 @@ class PreferencesDialog(gnomeglade.Component):
         path, column = tree.get_cursor()
         self.notebook.set_current_page(path[0])
 
+    def on_synchronize_raw_jpg_checkbutton_toggled(self, check_button):
+        self.prefs.synchronize_raw_jpg = check_button.get_active()
         
     def on_strip_characters_checkbutton_toggled(self, check_button):
         self.prefs.strip_characters = check_button.get_active()
@@ -1263,7 +1275,9 @@ class PreferencesDialog(gnomeglade.Component):
 
 class CopyPhotos(Thread):
     """Copies photos from source to destination, backing up if needed"""
-    def __init__(self, thread_id, parentApp, fileRenameLock,  fileSequenceLock, statsLock,  downloadStats,  autoStart = False,  cardMedia = None):
+    def __init__(self, thread_id, parentApp, fileRenameLock,  fileSequenceLock, 
+                statsLock,  downloadedFilesLock,
+                downloadStats,  autoStart = False,  cardMedia = None):
         self.parentApp = parentApp
         self.thread_id = thread_id
         self.ctrl = True
@@ -1279,6 +1293,7 @@ class CopyPhotos(Thread):
         self.fileRenameLock = fileRenameLock
         self.fileSequenceLock = fileSequenceLock
         self.statsLock = statsLock
+        self.downloadedFilesLock = downloadedFilesLock
         
         self.downloadStats = downloadStats
         
@@ -1493,10 +1508,47 @@ class CopyPhotos(Thread):
                     _("Image filename could not be properly generated. Check to ensure there is sufficient image metadata."),
                     _("Source: %(source)s\nDestination: %(destination)s\nProblem: %(problem)s") % 
                     {'source': image, 'destination': newName, 'problem': problem})
-             
+                    
+
+        def imageAlreadyExists(source, destination=None, identifier=None):
+            """ Notify the user that the image could not be downloaded because it already exists"""
+            if self.prefs.indicate_download_error:
+                if source and destination and identifier:
+                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                        _("Source: %(source)s\nDestination: %(destination)s")
+                        % {'source': image, 'destination': newFile},
+                        _("Unique identifier '%s' added") % identifier)                    
+                elif source and destination:
+                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                        _("Source: %(source)s\nDestination: %(destination)s")
+                        % {'source': source, 'destination': destination},
+                        IMAGE_SKIPPED)
+                else:
+                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
+                        _("Source: %(source)s")
+                        % {'source': source},
+                        IMAGE_SKIPPED)
+
+                    
+        def downloadCopyingError(source, destination, errno, strerror):
+            """Notify the user that an error occurred when coyping an image"""
+            logError(config.SERIOUS_ERROR, _('Download copying error'), 
+                        _("Source: %(source)s\nDestination: %(destination)s\nError: %(errorno)s %(strerror)s") 
+                        % {'source': source, 'destination': destination, 'errorno': errno, 'strerror': strerror},
+                        _('The image was not copied.'))
+                        
+        def sameFileNameDifferentExif(image1, image1_date_time, image1_subseconds, image2, image2_date_time, image2_subseconds):
+            logError(config.WARNING, _('Images detected with the same filenames, but taken at different times:'),
+                _("First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\nSecond image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s") % 
+                {'image1': image1, 'image1_date_time': image1_date_time, 'image1_subseconds': image1_subseconds,
+                'image2': image2, 'image2_date_time': image2_date_time, 'image2_subseconds': image2_subseconds})
+
+
+
         def generateSubfolderAndFileName(image,  name,  needMetaDataToCreateUniqueImageName,  
                        needMetaDataToCreateUniqueSubfolderName):
-            skipImage = False
+            skipImage = alreadyDownloaded = False
+            sequence_to_use = None
             try:
                 imageMetadata = metadata.MetaData(image)
             except IOError:
@@ -1534,23 +1586,43 @@ class CopyPhotos(Thread):
                             _("Subfolder: %(subfolder)s\nImage: %(image)s\nProblem: %(problem)s") % 
                             {'subfolder': subfolder, 'image': image, 'problem': problem})
                     
+                    if self.prefs.synchronize_raw_jpg and usesSequenceElements:
+                        image_name, image_ext = os.path.splitext(name)
+                        with self.downloadedFilesLock:
+                            i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, imageMetadata.dateTime(), imageMetadata.subSeconds())
+                            if i == -1:
+                                # this exact file has already been downloaded (same extension, same filename, and same exif date time subsecond info)
+                                if not addUniqueIdentifier:
+                                    # there is no point to download it, as there is no way a unique filename will be generated
+                                    alreadyDownloaded = skipImage = True
+                            elif i == -99:
+                                i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
+                                sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, name, imageMetadata.dateTime(), imageMetadata.subSeconds())
+                           
+                    
                     # pass the subfolder the image will go into, as this is needed to determine subfolder sequence numbers 
                     # indicate that sequences chosen should be queued
                     
-                    newName, problem = self.imageRenamePrefsFactory.generateNameUsingPreferences(
-                                                            imageMetadata, name, self.stripCharacters,  subfolder,  
-                                                            sequencesPreliminary = True)
-                                                            
-                    path = os.path.join(baseDownloadDir, subfolder)
-                    newFile = os.path.join(path, newName)
+                    if not skipImage or alreadyDownloaded:
+                        newName, problem = self.imageRenamePrefsFactory.generateNameUsingPreferences(
+                                                                imageMetadata, name, self.stripCharacters,  subfolder,  
+                                                                sequencesPreliminary = True,
+                                                                sequence_to_use = sequence_to_use)
+                                                                
+                        path = os.path.join(baseDownloadDir, subfolder)
+                        newFile = os.path.join(path, newName)
                     
                     if not newName:
                         skipImage = True
-                    checkProblemWithImageNameGeneration(newName,  image,  problem)
+                    if not alreadyDownloaded:
+                        checkProblemWithImageNameGeneration(newName,  image,  problem)
+                    else:
+                        imageAlreadyExists(image, newFile)
+                        newName = newFile = path = subfolder = None
                     
-            return (skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder)
+            return (skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use)
         
-        def downloadImage(path,  newFile,  newName,  originalName,  image,  imageMetadata,  subfolder):
+        def downloadImage(path,  newFile,  newName,  originalName,  image,  imageMetadata,  subfolder, sequence_to_use):
             try:
                 imageDownloaded = False
                 if not os.path.isdir(path):
@@ -1565,7 +1637,7 @@ class CopyPhotos(Thread):
                     nameUniqueBeforeCopy = False
                     if not addUniqueIdentifier:
                         downloadNonUniqueFile = False
-                        if usesSequenceElements:
+                        if usesSequenceElements and not self.prefs.synchronize_raw_jpg:
                             # potentially, a unique image name could still be generated
                             # investigate this possibility
                             with self.fileSequenceLock:
@@ -1580,11 +1652,8 @@ class CopyPhotos(Thread):
                                             break
 
                                         
-                    if self.prefs.indicate_download_error and not downloadNonUniqueFile:
-                        logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
-                                _("Source: %(source)s\nDestination: %(destination)s") % 
-                                {'source': image, 'destination': newFile},
-                                IMAGE_SKIPPED)
+                    if not downloadNonUniqueFile:
+                        imageAlreadyExists(image, newFile)
 
                 if nameUniqueBeforeCopy or downloadNonUniqueFile:
                     tempWorkingfile = os.path.join(tempWorkingDir, newName)
@@ -1595,9 +1664,21 @@ class CopyPhotos(Thread):
                         if usesSequenceElements:
                             with self.fileSequenceLock:
                                 # get a filename and use this as the "real" filename
+                                if sequence_to_use is None and self.prefs.synchronize_raw_jpg:
+                                    # must check again, just in case the matching pair has been downloaded in the meantime
+                                    image_name, image_ext = os.path.splitext(originalName)
+                                    with self.downloadedFilesLock:
+                                        i, sequence_to_use = downloaded_files.matching_pair(image_name, image_ext, imageMetadata.dateTime(), imageMetadata.subSeconds())
+                                        if i == -99:
+                                            i1_ext, i1_date_time, i1_subseconds = downloaded_files.extExifDateTime(image_name)
+                                            sameFileNameDifferentExif("%s%s" % (image_name, i1_ext), i1_date_time, i1_subseconds, originalName, imageMetadata.dateTime(), imageMetadata.subSeconds())
+
+                                            
+
                                 newName, problem = self.imageRenamePrefsFactory.generateNameUsingPreferences(
                                                                 imageMetadata, originalName, self.stripCharacters,  subfolder,  
-                                                                sequencesPreliminary = False)
+                                                                sequencesPreliminary = False,
+                                                                sequence_to_use = sequence_to_use)
                             checkProblemWithImageNameGeneration(newName,  image,  problem)
                             if not newName:
                                 # there was a serious error generating the filename
@@ -1608,11 +1689,7 @@ class CopyPhotos(Thread):
                         if os.path.exists(newFile):
                             if not addUniqueIdentifier:
                                 doRename = False
-                                if self.prefs.indicate_download_error:
-                                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
-                                        _("Source: %(source)s\nDestination: %(destination)s")
-                                        % {'source': image, 'destination': newFile},
-                                        IMAGE_SKIPPED) 
+                                imageAlreadyExists(image, newFile)
                             else:
                                 # add  basic suffix to make the filename unique
                                 name = os.path.splitext(newName)
@@ -1627,46 +1704,50 @@ class CopyPhotos(Thread):
                                     possibleNewFile = os.path.join(path,  newName)
                                     suffixAlreadyUsed = os.path.exists(possibleNewFile)
 
-                                if self.prefs.indicate_download_error:
-                                    logError(config.SERIOUS_ERROR, IMAGE_ALREADY_EXISTS,
-                                        _("Source: %(source)s\nDestination: %(destination)s")
-                                        % {'source': image, 'destination': newFile},
-                                        _("Unique identifier '%s' added") % identifier)
-                                        
+                                imageAlreadyExists(image, newFile, identifier)
                                 newFile = possibleNewFile
                                 
 
                         if doRename:
                             os.rename(tempWorkingfile, newFile)
+                                    
                             imageDownloaded = True
                             if usesSequenceElements:
+                                if self.prefs.synchronize_raw_jpg:
+                                    name, ext = os.path.splitext(originalName)
+                                    if sequence_to_use is None:
+                                        with self.fileSequenceLock:
+                                            seq = self.imageRenamePrefsFactory.sequences.getFinalSequence()
+                                    else:
+                                        seq = sequence_to_use
+                                    with self.downloadedFilesLock:
+                                        downloaded_files.add_download(name, ext, imageMetadata.dateTime(), imageMetadata.subSeconds(), seq) 
+
+                                
                                 with self.fileSequenceLock:
-                                    self.imageRenamePrefsFactory.sequences.imageCopySucceeded()
-                                    if usesStoredSequenceNo:
-                                        self.prefs.stored_sequence_no += 1
+                                    if sequence_to_use is None:
+                                        self.imageRenamePrefsFactory.sequences.imageCopySucceeded()
+                                        if usesStoredSequenceNo:
+                                            self.prefs.stored_sequence_no += 1
                                         
                             with self.fileSequenceLock:
-                                if self.prefs.incrementDownloadsToday():
-                                    # A new day, according the user's preferences of what time a day begins, has started
-                                    cmd_line(_("New day has started - resetting 'Downloads Today' sequence number"))
-                                    
-                                    sequences.setDownloadsToday(0)
+                                if sequence_to_use is None:
+                                    if self.prefs.incrementDownloadsToday():
+                                        # A new day, according the user's preferences of what time a day begins, has started
+                                        cmd_line(_("New day has started - resetting 'Downloads Today' sequence number"))
+                                        
+                                        sequences.setDownloadsToday(0)
                     
             except IOError, (errno, strerror):
-                logError(config.SERIOUS_ERROR, _('Download copying error'), 
-                            _("Source: %(source)s\nDestination: %(destination)s\nError: %(errorno)s %(strerror)s") 
-                            % {'source': image, 'destination': newFile, 'errorno': errno, 'strerror': strerror},
-                            _('The image was not copied.'))
+                downloadCopyingError(image, newFile, errno, strerror)
 
             except OSError, (errno, strerror):
-                logError(config.CRITICAL_ERROR, _('Download copying error'), 
-                            "Source: %(source)s\nDestination: %(destination)s\nError: %(errorno)s %(strerror)s" 
-                            % {'source': image, 'destination': newFile, 'errorno': errno, 'strerror': strerror},
-                        )
+                downloadCopyingError(image, newFile, errno, strerror)                
             
             if usesSequenceElements:
-                if not imageDownloaded:
+                if not imageDownloaded and sequence_to_use is None:
                     self.imageRenamePrefsFactory.sequences.imageCopyFailed()
+                    
 
             return (imageDownloaded,  newName,  newFile)
             
@@ -1901,7 +1982,7 @@ class CopyPhotos(Thread):
             name, root, size,  modificationTime = self.cardMedia.images[i]
             image = os.path.join(root, name)
             
-            skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder = generateSubfolderAndFileName(
+            skipImage,  imageMetadata,  newName,  newFile,  path,  subfolder, sequence_to_use = generateSubfolderAndFileName(
                        image,  name,  needMetaDataToCreateUniqueImageName,  
                        needMetaDataToCreateUniqueSubfolderName)
 
@@ -1909,7 +1990,7 @@ class CopyPhotos(Thread):
                 noImagesSkipped += 1
             else:
                 imageDownloaded, newName, newFile  = downloadImage(path,  newFile,  newName,  name,  image,  
-                                                                   imageMetadata,  subfolder)
+                                                                   imageMetadata,  subfolder, sequence_to_use)
 
                 if self.prefs.backup_images:
                     backupImage(subfolder,  newName,  imageDownloaded,  newFile,  image)
@@ -2473,6 +2554,9 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         #track files that should have a suffix added to them
         global duplicate_files
         
+        #track files that have been downloaded in this session
+        global downloaded_files
+        
         # control sequence numbers and letters
         global sequences
         
@@ -2480,6 +2564,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         global need_job_code
 
         duplicate_files = {}
+        downloaded_files = DownloadedFiles()
         
         downloadsToday = self.prefs.getAndMaybeResetDownloadsToday()
         sequences = rn.Sequences(downloadsToday,  self.prefs.stored_sequence_no)
@@ -2493,6 +2578,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         self.fileRenameLock = Lock()
         self.fileSequenceLock = Lock()
         self.statsLock = Lock()
+        self.downloadedFilesLock = Lock()
 
         # log window, in dialog format
         # used for displaying download information to the user
@@ -2716,7 +2802,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                 
                 else:
                     cmd_line(_("This version of the program is newer than the previously run version. Checking preferences."))
-#                    if True:
+
                     if rn.checkPreferencesForValidity(self.prefs.image_rename,  self.prefs.subfolder,  previousVersion):
                         upgraded,  imageRename,  subfolder = rn.upgradePreferencesToCurrent(self.prefs.image_rename,  self.prefs.subfolder,  previousVersion)
                         if upgraded:
@@ -2877,9 +2963,10 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         cardMedia = CardMedia(path, volume,  True)
         i = workers.getNextThread_id()
         
-        workers.append(CopyPhotos(i, self, self.fileRenameLock, self.fileSequenceLock, self.statsLock, 
-                                                    self.downloadStats, autostart, 
-                                                    cardMedia))
+        workers.append(CopyPhotos(i, self, self.fileRenameLock, 
+                                    self.fileSequenceLock, self.statsLock,
+                                    self.downloadedFilesLock, self.downloadStats,
+                                    autostart, cardMedia))
 
 
         self.setDownloadButtonSensitivity()
@@ -2972,7 +3059,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
         else:
             cmd_line(_("Automatically start download is false") )
         
-    def setupAvailableImageAndBackupMedia(self,  onStartup,  onPreferenceChange,  doNotAllowAutoStart):
+    def setupAvailableImageAndBackupMedia(self, onStartup, onPreferenceChange, doNotAllowAutoStart):
         """
         Sets up volumes for downloading from and backing up to
         
@@ -3205,6 +3292,7 @@ class RapidApp(gnomeglade.GnomeApp,  dbus.service.Object):
                 self.downloadStats.clear()
             self._resetDownloadInfo()
             self.speed_label.set_text('         ')
+            
                 
     def exitOnDownloadComplete(self):
         if self.downloadComplete():
@@ -3478,7 +3566,43 @@ class DownloadStats:
         self.downloadSize = 0
         self.noWarnings = self.noErrors = 0
         
+class DownloadedFiles:
+    def __init__(self):
+        self.images = {}
+        
+    def add_download(self, name, extension, date_time, sub_seconds, sequence_number_used):
+        if name not in self.images:
+            self.images[name] = ([extension], date_time, sub_seconds, sequence_number_used)
+        else:
+            if extension not in self.images[name][0]:
+                self.images[name][0].append(extension)
+
+        
+    def matching_pair(self, name, extension, date_time, sub_seconds):
+        """Checks to see if the image matches an image that has already been downloaded.
+        Image name (minus extension), exif date time, and exif subseconds are checked.
+        
+        Returns -1 and a sequence number if the name, extension, and exif values match (i.e. it has already been downloaded)
+        Returns 0 and a sequence number if name and exif values match, but the extension is different (i.e. a matching RAW + JPG image)
+        Returns -99 and a sequence number of None if images detected with the same filenames, but taken at different times
+        Returns 1 and a sequence number of None if no match"""
+        
+        if name in self.images:
+            if self.images[name][1] == date_time and self.images[name][2] == sub_seconds:
+                if extension in self.images[name][0]:
+                    return (-1, self.images[name][3])
+                else:
+                    return (0, self.images[name][3])
+            else:
+                return (-99, None)
+        return (1, None)
+        
+    def extExifDateTime(self, name):
+        """Returns first extension, exif date time and subseconds data for the already downloaded  image"""
+        return (self.images[name][0][0], self.images[name][1], self.images[name][2])
+        
 class TimeForDownload:
+    # used to store variables, see below
     pass
 
 class TimeRemaining:
diff --git a/rapid/renamesubfolderprefs.py b/rapid/renamesubfolderprefs.py
index 71f9089..a449fd7 100644
--- a/rapid/renamesubfolderprefs.py
+++ b/rapid/renamesubfolderprefs.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: latin1 -*-
 
-### Copyright (C) 2007, 2008, 2009 Damon Lynch <damonlynch@gmail.com>
+### Copyright (C) 2007, 2008, 2009, 2010 Damon Lynch <damonlynch@gmail.com>
 
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
@@ -147,6 +147,7 @@ SEQUENCE_NUMBER_3 = "Three digits"
 SEQUENCE_NUMBER_4 = "Four digits"
 SEQUENCE_NUMBER_5 = "Five digits"
 SEQUENCE_NUMBER_6 = "Six digits"
+SEQUENCE_NUMBER_7 = "Seven digits"
 
 
 # Now, define dictionaries and lists of valid combinations of preferences.
@@ -247,6 +248,7 @@ class i18TranslateMeThanks:
         _("Four digits")
         _("Five digits")
         _("Six digits")
+        _("Seven digits")
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
         _('Subseconds')
         # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
@@ -322,6 +324,7 @@ LIST_SEQUENCE_NUMBERS_L2 = [
                     SEQUENCE_NUMBER_4,
                     SEQUENCE_NUMBER_5,
                     SEQUENCE_NUMBER_6,
+                    SEQUENCE_NUMBER_7,
                     ]
                 
 
@@ -757,7 +760,7 @@ class Comboi18n(gtk.ComboBox):
         return model[active][0]        
 
 class ImageRenamePreferences:
-    def __init__(self, prefList, parent,  fileSequenceLock=None,  sequences=None):
+    def __init__(self, prefList, parent, fileSequenceLock=None, sequences=None):
         """
         Exception raised if preferences are invalid.
         
@@ -1126,7 +1129,8 @@ class ImageRenamePreferences:
     def generateNameUsingPreferences(self, photo, existingFilename=None, 
                                     stripCharacters = False,  subfolder=None,  
                                     stripInitialPeriodFromExtension=False, 
-                                    sequencesPreliminary = True):
+                                    sequencesPreliminary = True,
+                                    sequence_to_use = None):
         """
         Generate a filename for the photo in string format based on user prefs.
         
@@ -1136,7 +1140,9 @@ class ImageRenamePreferences:
         """
 
         if self.sequences:
-            if sequencesPreliminary:
+            if sequence_to_use is not None:
+                sequence = sequence_to_use
+            elif sequencesPreliminary:
                 sequence = self.sequences.getPrelimSequence()
             else:
                 sequence = self.sequences.getFinalSequence()
@@ -1470,10 +1476,11 @@ class Sequences:
     def imageCopySucceeded(self):
         self.increment()
     
-    def increment(self,  subfolder=None):
+    def increment(self):
         assert(self.assignedSequenceCounter == self.pool[0])
         self.assignedSequenceCounter += 1
         self.pool = self.pool[1:]
+        #assert(len(self.pool) > 0)