Imported Upstream version 0.4.1+bzr402

24 files changed, 6444 insertions, 5100 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..2d5d91f
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,8 @@
+include rapid-photo-downloader
+include rapid/AUTHORS rapid/ChangeLog rapid/INSTALL rapid/COPYING
+recursive-include data/ *.png *.xpm *.desktop
+recursive-include rapid/glade3 *.ui *.png *.svg *.xpm
+include po/rapid-photo-downloader.pot
+include po/*.po
+include doc/rapid-photo-downloader.pod
+
diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index 7cd233f..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,15 +0,0 @@
-Metadata-Version: 1.0
-Name: rapid-photo-downloader
-Version: 0.4.1
-Summary: Rapid Photo Downloader for Linux
-Home-page: http://www.damonlynch.net/rapid
-Author: Damon Lynch
-Author-email: damonlynch@gmail.com
-License: GPL
-Description: Rapid Photo Downloader is written by a photographer for professional and
-        amateur photographers. It can  download photos and videos from multiple
-        cameras, memory cards and Portable Storage Devices simultaneously. It 
-        provides many flexible, user-defined options for subfolder creation,
-        photo and video renaming, and backup.
-        
-Platform: linux
diff --git a/po/bg.po b/po/bg.po
index b71c227..f34d0f8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,1776 +7,1669 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-13 19:03+0500\n"
-"PO-Revision-Date: 2010-08-06 22:16+0000\n"
-"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-08-16 01:11+0000\n"
+"Last-Translator: velinda <Unknown>\n"
 "Language-Team: Bulgarian <bg@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-09-05 14:32+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-08-24 14:24+0000\n"
+"X-Generator: Launchpad (build 13727)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6299 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "Ню Йорк"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "Манила"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "Прага"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Хелзинки"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Уелингтън"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Техеран"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "Кампала"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "Париж"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Берлин"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "Сидни"
+#: rapid/rapid.py:110
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "Будапеща"
+#: rapid/rapid.py:112
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "Рим"
+#: rapid/rapid.py:115
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "Москва"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:149
+msgid "Device"
+msgstr "Устройство"
 
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "Делхи"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:166
+msgid "Size"
+msgstr "Размер"
 
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "Варшава"
+#: rapid/rapid.py:169
+msgid "Download Progress"
+msgstr "Прогрес на свалянето"
 
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "Джакарта"
+#: rapid/rapid.py:315
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s did not unmount"
 
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "Мадрид"
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1171
+msgid "scanning..."
+msgstr "сканиране ..."
 
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "Стокхолм"
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr ""
 
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
+#: rapid/rapid.py:1992
+msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
+#: rapid/rapid.py:2093
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
+#: rapid/rapid.py:2096
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
 
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
+#: rapid/rapid.py:2097
+msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
+#: rapid/rapid.py:2386
+msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:591 rapid/rapid.py:1710
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "Настройките съдържат грешка :\n"
+#: rapid/rapid.py:2388
+#, python-format
+msgid "About %i seconds remaining"
+msgstr ""
 
-#: rapid/rapid.py:602
-msgid "Resetting to default values."
+#: rapid/rapid.py:2390
+msgid "About 1 minute remaining"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:677 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
+#. 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:2395
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:745
-msgid "Error in Video Rename preferences"
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:763
-msgid "Error in Photo Download Subfolders preferences"
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:780
-msgid "Error in Video Download Subfolders preferences"
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:813 rapid/rapid.py:1544
-msgid "photos and videos"
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:815 rapid/rapid.py:1554 rapid/rapid.py:1679
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rpdfile.py:120
 msgid "photos"
 msgstr ""
 
-#: rapid/rapid.py:948
-msgid "Select a folder to download photos to"
-msgstr "Изберете папка, в която да изтеглите снимки"
-
-#: rapid/rapid.py:966
-msgid "Select a folder to download videos to"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:1048
+#: rapid/rapid.py:2456
 #, python-format
-msgid "Select a folder containing %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1070
+#: rapid/rapid.py:2460
 #, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s failed to download"
 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:1151
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
+msgid "warnings"
+msgstr "предупреждения"
 
-#: rapid/rapid.py:1187
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
+#: rapid/rapid.py:2472
+msgid "All downloads complete"
 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:1191
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Пример: %s</i>"
-
-#: rapid/rapid.py:1217
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1233
-msgid "Stored number value not updated, as a download is currently occurring"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:1263
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1268
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1282 rapid/rapid.py:1556
-msgid "photo"
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2546
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#: rapid/rapid.py:1283 rapid/rapid.py:1551
-msgid "video"
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2553
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1520
-msgid "externaldrive1"
-msgstr ""
+#: rapid/rapid.py:2935
+msgid "and"
+msgstr "и"
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1522
-msgid "externaldrive2"
+#: rapid/rapid.py:2940
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:1546 rapid/rapid.py:1677
-msgid "photos or videos"
+#: rapid/rapid.py:2942
+msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:1549
-msgid "videos"
+#: rapid/rapid.py:2944
+msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:1561
-#, python-format
-msgid ""
-"%(date)s\n"
-"%(time)s"
+#: rapid/rapid.py:2971
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:1563
+#. (videos) or (photos) will be appended to the free space message displayed to the
+#. user in the status bar.
+#. you should only translate this if your language does not use parantheses
+#: rapid/rapid.py:2983
 #, python-format
-msgid "%(date)s %(time)s"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:1566
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:2987
 #, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:1573
-#, python-format
-msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2992
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:1601 rapid/rapid.py:2267
-msgid "subfolder and filename"
+#. Inserted at the end of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2997
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:1603 rapid/rapid.py:2269
-msgid "filename"
-msgstr ""
-
-#: rapid/rapid.py:1605 rapid/rapid.py:2271
-msgid "subfolder"
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3003
+#, python-format
+msgid "%(free)s free"
 msgstr ""
 
-#. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for photos or videos. It is visible initially in the progress bar for each device
-#. (which normally holds "x photos and videos").
-#. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1693
-msgid "scanning..."
-msgstr "сканиране ..."
-
-#: rapid/rapid.py:1804
-msgid "The following download path could not be created:\n"
+#. user manually specified backup location
+#: rapid/rapid.py:3009
+#, python-format
+msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:1805
+#: rapid/rapid.py:3014
 #, python-format
-msgid "%(path)s: "
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:1806 rapid/rapid.py:1807 rapid/rapid.py:1822
-#: rapid/rapid.py:1823 rapid/rapid.py:2084 rapid/rapid.py:2087
-msgid "Download cannot proceed"
+#: rapid/rapid.py:3043
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:1820 rapid/rapid.py:4959
-msgid "There is an error in the program preferences."
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:1821
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+msgid "Video"
 msgstr ""
-"\n"
-"Моля, проверете настройките, рестартирайте програмата, и опитайте отново."
 
-#. 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 photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1995
+#: rapid/rapid.py:3159
 #, python-format
-msgid "%(number)s %(filetypes)s"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#. 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 photos 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:2006
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:2013
+#: rapid/rapid.py:3173
 #, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgid "%(file_type)s download folder is invalid"
 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:2034
-msgid "The device can now be safely removed"
+#: rapid/rapid.py:3186
+#, python-format
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:2040
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
+#: rapid/rapid.py:3264
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:2043
+#. 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:3311
 #, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:2046 rapid/rapid.py:5744
-msgid "warnings"
-msgstr "предупреждения"
+#: rapid/rapid.py:3312
+msgid "display debugging information when run from the command line"
+msgstr ""
 
-#: rapid/rapid.py:2048 rapid/rapid.py:5748
-msgid "errors"
-msgstr "грешкиа"
+#: rapid/rapid.py:3313
+msgid "only output errors to the command line"
+msgstr ""
 
-#: rapid/rapid.py:2078
-#, python-format
-msgid "Source: %s\n"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:3315
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:2080
-#, python-format
-msgid "Device: %s\n"
+#: rapid/rapid.py:3316
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:2081
-#, python-format
-msgid "Destination: %s"
+#: rapid/rapid.py:3329
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:2082 rapid/rapid.py:2085
-msgid "Could not create temporary download directory"
+#: rapid/rapid.py:3329
+msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:2085
-msgid "Error:"
+#: rapid/rapid.py:3334
+#, python-format
+msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:2109
-msgid "Backup path does not exist"
+#: rapid/rapid.py:3342
+msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:2110
-#, python-format
-msgid "The path %s could not be created"
+#: rapid/rapid.py:3351
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
 msgstr ""
 
-#: rapid/rapid.py:2111
-msgid "No backups can occur"
+#: rapid/backupfile.py:139 rapid/backupfile.py:162
+msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:2140
+#: rapid/backupfile.py:141
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:2171 rapid/rapid.py:2517 rapid/rapid.py:2552
-#: rapid/rapid.py:2580 rapid/rapid.py:2611 rapid/rapid.py:2630
+#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2186
-msgid "Please check your system and try again."
+#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#, python-format
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:2206
-msgid "Photos detected with the same filenames, but taken at different times"
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
+#: rapid/subfolderfile.py:348 rapid/subfolderfile.py:366
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:2246
-msgid "Photo has already been downloaded"
-msgstr ""
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "Устройството е открито"
 
-#: rapid/rapid.py:2247 rapid/rapid.py:2646
-#, python-format
-msgid "Source: %(source)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:88
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2445
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:107
+msgid "_Remember this choice"
 msgstr ""
 
-#: rapid/rapid.py:2516
-#, python-format
-msgid "Backup of %(file_type)s already exists"
+#: rapid/downloadtracker.py:268
+msgid "MB/s"
 msgstr ""
 
-#: rapid/rapid.py:2520
-#, python-format
-msgid "Backup %(file_type)s overwritten"
+#: rapid/generatenameconfig.py:145
+msgid "Date time"
 msgstr ""
 
-#: rapid/rapid.py:2524
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+#: rapid/generatenameconfig.py:146
+msgid "Text"
 msgstr ""
 
-#: rapid/rapid.py:2526
-#, python-format
-msgid "%(file_type)s not backed up"
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
 msgstr ""
 
-#: rapid/rapid.py:2549 rapid/rapid.py:2577 rapid/rapid.py:2610
-#: rapid/rapid.py:2629
-msgid "Backing up error"
+#: rapid/generatenameconfig.py:148
+msgid "Metadata"
 msgstr ""
 
-#: rapid/rapid.py:2550 rapid/rapid.py:2578
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+#: rapid/generatenameconfig.py:149
+msgid "Sequences"
 msgstr ""
 
-#: rapid/rapid.py:2554 rapid/rapid.py:2613
-#, python-format
-msgid "Error: %(inst)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
+msgid "Job code"
 msgstr ""
 
-#: rapid/rapid.py:2555 rapid/rapid.py:2583 rapid/rapid.py:2614
-#: rapid/rapid.py:2633
-#, python-format
-msgid "The %(file_type)s was not backed up."
+#: rapid/generatenameconfig.py:152
+msgid "Image date"
 msgstr ""
 
-#: rapid/rapid.py:2582 rapid/rapid.py:2632
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr "Грешка: %(errno)s %(strerror)s"
-
-#: rapid/rapid.py:2645
-#, python-format
-msgid "%(file_type)s could not be backed up"
+#: rapid/generatenameconfig.py:153
+msgid "Video date"
 msgstr ""
 
-#: rapid/rapid.py:2648
-msgid "No suitable backup volume was found"
+#: rapid/generatenameconfig.py:154
+msgid "Today"
 msgstr ""
 
-#: rapid/rapid.py:2650
-msgid "A backup location was not found"
+#: rapid/generatenameconfig.py:155
+msgid "Yesterday"
 msgstr ""
 
-#: rapid/rapid.py:2704
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:157
+msgid "Download time"
 msgstr ""
 
-#: rapid/rapid.py:2777
-#, python-format
-msgid "Download has started from %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:159
+msgid "Name + extension"
 msgstr ""
 
-#: rapid/rapid.py:2780
-#, python-format
-msgid "Attempting to download %s files"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:161
+msgid "Name"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2813 rapid/rapid.py:2880
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:163
+msgid "Extension"
 msgstr ""
 
-#: rapid/rapid.py:2876
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Image number"
 msgstr ""
 
-#: rapid/rapid.py:2901 rapid/rapid.py:2905
-msgid "Could not delete photo or video from device"
+#: rapid/generatenameconfig.py:166
+msgid "Video number"
 msgstr ""
 
-#: rapid/rapid.py:2902
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:168
+msgid "Aperture"
 msgstr ""
 
-#: rapid/rapid.py:2906
-#, python-format
-msgid "Photo: %(source)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:170
+msgid "ISO"
 msgstr ""
 
-#: rapid/rapid.py:2908
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:172
+msgid "Exposure time"
 msgstr ""
 
-#: rapid/rapid.py:2921
-#, python-format
-msgid "Download complete from %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Focal length"
 msgstr ""
 
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3036 rapid/rapid.py:3505
-msgid "Device"
-msgstr "Устройство"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3041 rapid/rapid.py:3494
-msgid "Size"
-msgstr "Размер"
-
-#: rapid/rapid.py:3044
-msgid "Download Progress"
-msgstr "Прогрес на свалянето"
-
-#: rapid/rapid.py:3132
-msgid "Downloading From Cameras"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:176
+msgid "Camera make"
 msgstr ""
 
-#: rapid/rapid.py:3138
-msgid "Downloading directly from a camera may work poorly or not at all"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:178
+msgid "Camera model"
 msgstr ""
 
-#: rapid/rapid.py:3139
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3153
-msgid "_Show this message again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:182
+msgid "Hyphenated short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3188
-msgid "Device Detected"
-msgstr "Устройството е открито"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3197
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:184
+msgid "Serial number"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3216
-msgid "_Remember this choice"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:186
+msgid "Shutter count"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-#, python-format
-msgid "%s selected for downloading from"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:188
+msgid "Owner name"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3256
-msgid "This device or partition will always be used to download from"
+#: rapid/generatenameconfig.py:189
+msgid "Codec"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3259
-#, python-format
-msgid "%s rejected as a download device"
+#: rapid/generatenameconfig.py:190
+msgid "Width"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3262
-msgid "This device or partition will never be used to download from"
+#: rapid/generatenameconfig.py:191
+msgid "Height"
 msgstr ""
 
-#: rapid/rapid.py:3269
-msgid "Remove all Job Codes?"
+#: rapid/generatenameconfig.py:192
+msgid "Length"
 msgstr ""
 
-#: rapid/rapid.py:3286
-msgid "Should all Job Codes be removed?"
+#: rapid/generatenameconfig.py:193
+msgid "Frames Per Second"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3314
-msgid "Enter a Job Code"
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3333
-msgid "Enter a new Job Code, or select a previous one"
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3336
-msgid "Enter a new Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:197
+msgid "Downloads today"
 msgstr ""
 
-#: rapid/rapid.py:3341 rapid/rapid.py:4496
-msgid "Job Code:"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:199
+msgid "Session number"
 msgstr ""
 
-#: rapid/rapid.py:3388
-msgid "Job Code entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:201
+msgid "Subfolder number"
 msgstr ""
 
-#: rapid/rapid.py:3390
-msgid "Job Code not entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:203
+msgid "Stored number"
 msgstr ""
 
-#: rapid/rapid.py:3440
-msgid "Status"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
+#: rapid/generatenameconfig.py:205
+msgid "Sequence letter"
 msgstr ""
 
-#: rapid/rapid.py:3448
-msgid "Type"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:207
+msgid "All digits"
 msgstr ""
 
-#: rapid/rapid.py:3457 rapid/rapid.py:4921 rapid/rapid.py:4923
-msgid "Photo"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:209
+msgid "Last digit"
 msgstr ""
 
-#: rapid/rapid.py:3459
-msgid "File"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:211
+msgid "Last 2 digits"
 msgstr ""
 
-#: rapid/rapid.py:3474
-msgid "Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:213
+msgid "Last 3 digits"
 msgstr ""
 
-#: rapid/rapid.py:3484
-msgid "Date"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:215
+msgid "Last 4 digits"
 msgstr ""
 
-#: rapid/rapid.py:3516 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:217
+msgid "Original Case"
 msgstr ""
 
-#: rapid/rapid.py:3527
-msgid "Path"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:219
+msgid "UPPERCASE"
 msgstr ""
 
-#: rapid/rapid.py:3918
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:221
+msgid "lowercase"
 msgstr ""
 
-#: rapid/rapid.py:3920
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#: rapid/generatenameconfig.py:222
+msgid "One digit"
 msgstr ""
 
-#: rapid/rapid.py:3922
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#: rapid/generatenameconfig.py:223
+msgid "Two digits"
 msgstr ""
 
-#: rapid/rapid.py:3924
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#: rapid/generatenameconfig.py:224
+msgid "Three digits"
 msgstr ""
 
-#: rapid/rapid.py:3926
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+#: rapid/generatenameconfig.py:225
+msgid "Four digits"
 msgstr ""
 
-#: rapid/rapid.py:3928
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
+#: rapid/generatenameconfig.py:226
+msgid "Five digits"
 msgstr ""
 
-#: rapid/rapid.py:3930
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#: rapid/generatenameconfig.py:227
+msgid "Six digits"
 msgstr ""
 
-#: rapid/rapid.py:3932
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#: rapid/generatenameconfig.py:228
+msgid "Seven digits"
 msgstr ""
 
-#: rapid/rapid.py:3934
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:230
+msgid "Subseconds"
 msgstr ""
 
-#: rapid/rapid.py:4303
-msgid "Preview"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:232
+msgid "YYYYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:4518
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:234
+msgid "YYYY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:4887
-#, python-format
-msgid "%(free)s available"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:236
+msgid "YYMMDD"
 msgstr ""
 
-#. user manually specified backup location
-#: rapid/rapid.py:4894
-#, python-format
-msgid "Backing up to %(path)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:238
+msgid "YY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:4899
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:240
+msgid "MMDDYYYY"
 msgstr ""
 
-#: rapid/rapid.py:4908
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "MMDDYY"
 msgstr ""
 
-#: rapid/rapid.py:4912
-msgid "Problem with Device Location Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:244
+msgid "MMDD"
 msgstr ""
 
-#: rapid/rapid.py:4921
-msgid "Video"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:246
+msgid "DDMMYYYY"
 msgstr ""
 
-#: rapid/rapid.py:4928
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "DDMMYY"
 msgstr ""
 
-#: rapid/rapid.py:4937
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:250
+msgid "YYYY"
 msgstr ""
 
-#: rapid/rapid.py:4942
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:252
+msgid "YY"
 msgstr ""
 
-#: rapid/rapid.py:4945
-msgid "Problem with Download Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:254
+msgid "MM"
 msgstr ""
 
-#: rapid/rapid.py:4947
-msgid "Problem with Download Folders"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:256
+msgid "DD"
 msgstr ""
 
-#: rapid/rapid.py:4960
-msgid "Some preferences will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:258
+msgid "HHMMSS"
 msgstr ""
 
-#: rapid/rapid.py:4993
-msgid "Displaying warning about downloading directly from camera"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "HHMM"
 msgstr ""
 
-#: rapid/rapid.py:5003
-#, python-format
-msgid "Prompting whether to use %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:262
+msgid "HH-MM-SS"
 msgstr ""
 
-#: rapid/rapid.py:5030
-msgid "Prompting for Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:264
+msgid "HH-MM"
 msgstr ""
 
-#: rapid/rapid.py:5034
-msgid "Already prompting for Job Code, do not prompt again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:266
+msgid "HH"
 msgstr ""
 
-#: rapid/rapid.py:5051
-msgid "Starting downloads"
-msgstr "Начална на изтеглянето"
-
-#. autostart is true
-#: rapid/rapid.py:5055
-msgid "Starting downloads that have been waiting for a Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:268
+msgid "MM (minutes)"
 msgstr ""
 
-#: rapid/rapid.py:5102
-#, python-format
-msgid "Creating photo download folder %(folder)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:270
+msgid "SS"
 msgstr ""
 
-#: rapid/rapid.py:5107
+#: rapid/preferencesdialog.py:370
 #, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5111
+#: rapid/preferencesdialog.py:372
 #, python-format
-msgid "Creating video download folder %(folder)s"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5116
+#: rapid/preferencesdialog.py:376
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/rapid.py:5141
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-"По-нова версия на тази програма е била инсталирана на този компютър.\n"
-"\n"
-
-#: rapid/rapid.py:5143
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:5145
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5146
-msgid "Warning:"
-msgstr "Предупреждение:"
-
-#: rapid/rapid.py:5151
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/preferencesdialog.py:436
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5158
-msgid "Preferences were modified."
+#: rapid/preferencesdialog.py:617
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5159
-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."
+#: rapid/preferencesdialog.py:638
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5163
-msgid "No preferences needed to be changed."
+#: rapid/preferencesdialog.py:655
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5165
-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."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:714
+msgid "Enter a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5175
-msgid "Problem using pynotify."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:731
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/rapid.py:5191
-msgid "Failed to receive pynotify server capabilities."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:734
+msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5202
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
+#: rapid/preferencesdialog.py:739
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:5250
-msgid "and"
-msgstr "и"
-
-#: rapid/rapid.py:5255
-msgid "Using backup devices"
+#: rapid/preferencesdialog.py:916
+msgid "Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5257
-msgid "Using backup device"
-msgstr ""
+#: rapid/preferencesdialog.py:998
+msgid "Select a folder to download photos to"
+msgstr "Изберете папка, в която да изтеглите снимки"
 
-#: rapid/rapid.py:5259
-msgid "No backup devices detected"
+#: rapid/preferencesdialog.py:1016
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:5309 rapid/rapid.py:5471
+#: rapid/preferencesdialog.py:1107
 #, python-format
-msgid "Device %(device)s (%(path)s) ignored"
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5430
+#: rapid/preferencesdialog.py:1129
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
+msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5434
-msgid "Automatically start download is true"
+#. 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/preferencesdialog.py:1215
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5436
-msgid "Automatically start download is false"
+#: rapid/preferencesdialog.py:1266
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5489
-msgid "Using manually specified path"
-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/preferencesdialog.py:1269
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Пример: %s</i>"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5557
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1359
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/rapid.py:5573
-msgid "D_ownload Selected"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1645
+msgid "externaldrive1"
 msgstr ""
 
-#: rapid/rapid.py:5665 rapid/rapid.py:5716
-msgid "All downloads complete"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1647
+msgid "externaldrive2"
 msgstr ""
 
-#: rapid/rapid.py:5680
-msgid "MB/s"
-msgstr ""
+#: rapid/prefsrapid.py:122
+msgid "New York"
+msgstr "Ню Йорк"
 
-#: rapid/rapid.py:5690
-msgid "About 1 second remaining"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Manila"
+msgstr "Манила"
 
-#: rapid/rapid.py:5692
-#, python-format
-msgid "About %i seconds remaining"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Prague"
+msgstr "Прага"
 
-#: rapid/rapid.py:5694
-msgid "About 1 minute remaining"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Helsinki"
+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:5699
-#, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Wellington"
+msgstr "Уелингтън"
 
-#: rapid/rapid.py:5719 rapid/rapid.py:5725 rapid/rapid.py:5731
-#: rapid/rapid.py:5737 rapid/rapid.py:5742 rapid/rapid.py:5746
-#, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Tehran"
+msgstr "Техеран"
 
-#: rapid/rapid.py:5721 rapid/rapid.py:5733
-#, python-format
-msgid "%(filetype)s downloaded"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Kampala"
+msgstr "Кампала"
 
-#: rapid/rapid.py:5727 rapid/rapid.py:5739
-#, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Paris"
+msgstr "Париж"
 
-#: rapid/rapid.py:5907
-msgid "_Resume"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Berlin"
+msgstr "Берлин"
 
-#: rapid/rapid.py:5910
-msgid "_Download All"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Sydney"
+msgstr "Сидни"
+
+#: rapid/prefsrapid.py:125
+msgid "Budapest"
+msgstr "Будапеща"
+
+#: rapid/prefsrapid.py:125
+msgid "Rome"
+msgstr "Рим"
+
+#: rapid/prefsrapid.py:125
+msgid "Moscow"
+msgstr "Москва"
+
+#: rapid/prefsrapid.py:125
+msgid "Delhi"
+msgstr "Делхи"
+
+#: rapid/prefsrapid.py:125
+msgid "Warsaw"
+msgstr "Варшава"
+
+#: rapid/prefsrapid.py:126
+msgid "Jakarta"
+msgstr "Джакарта"
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5919
-msgid "_Pause"
+#: rapid/prefsrapid.py:126
+msgid "Madrid"
+msgstr "Мадрид"
+
+#: rapid/prefsrapid.py:126
+msgid "Stockholm"
+msgstr "Стокхолм"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+msgid "subfolder"
 msgstr ""
 
-#: rapid/rapid.py:6031
-msgid "Download device settings preferences were changed."
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+msgid "filename"
 msgstr ""
 
-#: rapid/rapid.py:6043
-msgid "Backup preferences were changed."
+#: rapid/problemnotification.py:80
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/rapid.py:6049
-msgid "Subfolder and filename preferences were changed."
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
 msgstr ""
 
-#: rapid/rapid.py:6060
-msgid "Download folder preferences were changed."
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:83
+msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/rapid.py:6259
-msgid "Goodbye"
+#: rapid/problemnotification.py:84
+#, python-format
+msgid "Error generating component %s."
 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:6270
+#. a generic problem
+#: rapid/problemnotification.py:86
 #, python-format
-msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/rapid.py:6271
-msgid "only output errors to the command line"
+#: rapid/problemnotification.py:88
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6273
-msgid "list photo and video file extensions the program recognizes and exit"
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:6274
-msgid "reset all program settings and preferences and exit"
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Photos:"
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Videos:"
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
+"%(image2)s on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
-#: rapid/rapid.py:6288
+#: rapid/problemnotification.py:103
 #, python-format
-msgid "and %s"
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/rapid.py:6296
-msgid "All settings and preferences have been reset"
+#: rapid/problemnotification.py:107
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6300 rapid/rapid.py:6301 rapid/rapid.py:6303
-#: rapid/rapid.py:6308 rapid/rapid.py:6312
-msgid "Using"
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/rapid.py:6305
-msgid "\n"
-msgstr "\n"
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
 
-#. this application is already running
-#: rapid/rapid.py:6329
+#: rapid/problemnotification.py:111
 #, python-format
-msgid "%s is already running"
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:192
-msgid "Date time"
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
-msgid "Text"
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
-msgid "Metadata"
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:196
-msgid "Sequences"
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:199
-msgid "Image date"
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
-msgid "Video date"
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
-msgid "Today"
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
-msgid "Yesterday"
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
-msgid "Name + extension"
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
-msgid "Name"
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
-msgid "Extension"
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
-msgid "Image number"
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:211
-msgid "Video number"
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
-msgid "Aperture"
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
-msgid "ISO"
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
-msgid "Exposure time"
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
-msgid "Focal length"
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
-msgid "Camera make"
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
-msgid "Camera model"
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
-msgid "Short camera model"
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
-msgid "Hyphenated short camera model"
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
-msgid "Serial number"
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
-msgid "Shutter count"
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
-msgid "Owner name"
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:234
-msgid "Codec"
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:235
-msgid "Width"
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
-msgid "Height"
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
-msgid "Length"
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
-msgid "Frames Per Second"
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:240
-msgid "Downloads today"
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
-msgid "Session number"
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
-msgid "Subfolder number"
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
-msgid "Stored number"
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:248
-msgid "Sequence letter"
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:250
-msgid "All digits"
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
-msgid "Last digit"
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
-msgid "Last 2 digits"
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
-msgid "Last 3 digits"
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
-msgid "Last 4 digits"
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:260
-msgid "Original Case"
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
-msgid "UPPERCASE"
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
-msgid "lowercase"
+#: rapid/subfolderfile.py:297
+msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:265
-msgid "One digit"
+#: rapid/subfolderfile.py:298
+#, python-format
+msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:266
-msgid "Two digits"
+#: rapid/subfolderfile.py:355
+msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:267
-msgid "Three digits"
+#: rapid/subfolderfile.py:393
+msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:268
-msgid "Four digits"
+#: rapid/subfolderfile.py:394
+#, python-format
+msgid "Path: %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:269
-msgid "Five digits"
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:270
-msgid "Six digits"
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:271
-msgid "Seven digits"
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
-msgid "Subseconds"
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
-msgid "YYYYMMDD"
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
-msgid "YYYY-MM-DD"
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
-msgid "YYMMDD"
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
-msgid "YY-MM-DD"
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
-msgid "MMDDYYYY"
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
-msgid "MMDDYY"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
-msgid "MMDD"
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
-msgid "DDMMYYYY"
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
-msgid "DDMMYY"
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
-msgid "YYYY"
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
-msgid "YY"
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
-msgid "MM"
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
-msgid "DD"
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
-msgid "HHMMSS"
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
-msgid "HHMM"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
-msgid "HH-MM-SS"
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:307
-msgid "HH-MM"
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:309
-msgid "HH"
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
-msgid "MM (minutes)"
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
-msgid "SS"
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:796
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:803
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:807
-msgid "These preferences are not well formed:"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1517
-#, python-format
-msgid "Subfolder preferences should not start with a %s"
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1519
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1523
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/glade3/prefs.ui.h:1
 msgid " "
 msgstr " "
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
-
-#: rapid/glade3/rapid.glade.h:3
+#: rapid/glade3/prefs.ui.h:2
 msgid " hh:mm"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
+#: rapid/glade3/prefs.ui.h:3
 msgid ":"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
+#: rapid/glade3/prefs.ui.h:4
 msgid "<b>Backup</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/prefs.ui.h:6
 msgid "<b>Download Folder</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#: rapid/glade3/prefs.ui.h:19
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
+#: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
+#: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
+#: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
+#: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:36
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:38
+#: rapid/glade3/prefs.ui.h:35
 msgid "Backup photos and videos when downloading"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/glade3/prefs.ui.h:36
 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
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/glade3/prefs.ui.h:42
 msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/glade3/prefs.ui.h:52
+msgid "Generate thumbnails (slower)"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: rapid/glade3/prefs.ui.h:68
+msgid "Preferences: Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
-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 ""
-
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
+#: rapid/glade3/prefs.ui.h:75
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
+"python."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1785,136 +1678,150 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr ""
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Настройките съдържат грешка :\n"
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr ""
+#~ msgid "Select an image folder"
+#~ msgstr "Изберете папка за изображение"
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr ""
+#~ msgid "The subfolder preferences had some unnecessary values removed."
+#~ msgstr "В настройките за подпапка  са премахнати някои ненужни стойности."
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr ""
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Моля, проверете настройките, рестартирайте програмата, и опитайте отново."
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr ""
+#, python-format
+#~ msgid "0 of %s images copied"
+#~ msgstr "0 от %s копирани изображения"
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr ""
+#~ msgid "Could not open image"
+#~ msgstr "Изображението не може да бъде отворено"
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr ""
+#, python-format
+#~ msgid "Source: %s"
+#~ msgstr "Източник: %s"
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr ""
+#~ msgid "The image was not copied."
+#~ msgstr "Изображението не е копирано."
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr ""
+#, python-format
+#~ msgid "%s images skipped"
+#~ msgstr "%s пропуснати изображения"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr ""
+#~ msgid "errors"
+#~ msgstr "грешкиа"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr ""
+#~ msgid "Image overwritten"
+#~ msgstr "Изображението е презаписано"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr ""
+#~ msgid "Image already exists"
+#~ msgstr "Изображението вече съществува"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr ""
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s от %(total)s копирани изображения"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr ""
+#~ msgid "Image skipped"
+#~ msgstr "Изображението е пропуснато"
+
+#~ msgid "Warning:"
+#~ msgstr "Предупреждение:"
+
+#~ msgid ""
+#~ "A newer version of this program was previously run on this computer.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "По-нова версия на тази програма е била инсталирана на този компютър.\n"
+#~ "\n"
+
+#~ msgid "Starting downloads"
+#~ msgstr "Начална на изтеглянето"
+
+#~ msgid "      "
+#~ msgstr "      "
diff --git a/po/de.po b/po/de.po
index 1497f65..fdbbdc7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-02 14:14+0000\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-20 13:34+0000\n"
 "Last-Translator: Eg <Unknown>\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: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -70,15 +70,15 @@ msgstr "%(device)s konnte nicht entfernt werden"
 msgid "scanning..."
 msgstr "Überprüfe Laufwerke ..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Herunterladen"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Anhalten"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,136 +98,136 @@ msgstr ""
 "Dieses Download-Verzeichnis ist ungültig:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "Der Download kann nicht weitergeführt werden"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "BIlder und Filme"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "Bilder oder Filme"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "Filme"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "Film"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "Bilder"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s konnten nicht heruntergeladen werden"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s heruntergeladen"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s konnten nicht heruntergeladen werden"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s of %(total)s %(filetypes)s (%(remaining)s verbleibend)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s von %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Freier Speicherplatz:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s verfügbar"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sicherungskopieren in %(path)s erstellen"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Die Benutzervoreinstellungen sind ungültig"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s Download-Verzeichnis existiert nicht"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Verzeichnis: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s Download-Verzeichnis ist ungültig"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s Download-Verzeichnis ist schreibgeschützt"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Vorschaubilder"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,44 +312,44 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr ""
 "Während des Ausführens von der Kommandozeile Debug-Informationen anzeigen"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 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:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "Anzeigen der Dateitypen für Bilder und Filme anzeigen, welche das Programm "
 "erkennt und beenden"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr "Alle Einstellungen auf Standardwerte zurücksetzten und beenden"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Filme:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Alle Einstellungen wurden zurückgesetzt"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -413,346 +413,354 @@ msgstr "_Auswahl merken"
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Datum Zeit"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Text"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Dateiname"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sequenzen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Film Datum"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Heute"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Download-Zeit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Name + Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Name"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Film Nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Blende"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO-Wert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Brennweite"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Kamerahersteller"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 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/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 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/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Seriennummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 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/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Name des Eigentümers"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Breite"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Höhe"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Länge"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Bilder pro Sekunde"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Autor"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Downloads heute"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Sitzungsnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 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/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Gespeicherte Nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Vorlaufender Buchstabe"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Alle Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Letzte Ziffer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 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/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "GROSSBUCHSTABEN"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "kleinschreibung"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Eine Ziffer"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Zwei Ziffern"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Drei Ziffern"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Vier Ziffern"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Fünf Ziffern"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Sechs Ziffern"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sieben Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Hundertstelsekunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "JJJJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 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/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "JJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMTTJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMTTJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "TTMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "TTMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (Minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
@@ -1435,65 +1443,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilität mit anderen Betriebssystemen</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Laufwerke</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Download Verzeichnis</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Download Unterverzeichnis</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Beispiel</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Auftragsbezeichnungen</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Umbenennen von Bildern</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Namenskonflikte Bilder und Filme</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Programm Automatisierung</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sequenznummern</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/medium/externeslaufwerk/Fotos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Beispiel: /home/user/Bilder</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Beispiel:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Neu:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Original:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Datensicherung</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Geräteeinstellungen</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Laufwerke</span>"
@@ -1552,14 +1560,10 @@ msgid "Backup"
 msgstr "Datensicherung"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Ziel der Datensicherung"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Sicherungskopien während dem Herunterladen erstellen"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1567,7 +1571,7 @@ msgstr ""
 "Wählen Sie das Downloadverzeichnis. Unterverzeichnisse werden je nach "
 "gewählten Voreinstellungen automatisch erzeugt."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1575,15 +1579,19 @@ msgstr ""
 "Wählen Sie den Download Ordner. Unterordner für die Filme werden automatisch "
 "basierend auf der unten angefügten Struktur erstellt."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Beginn des Tages:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 "Bilder und Filme nach vollständigem Download auf dem Laufwerk löschen"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Geräteeinstellungen"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Laufwerke"
@@ -1593,22 +1601,24 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Von Laufwerken können Bilder oder Filme heruntergeladen werden, z.B. "
-"Kameras, Speicherkarten oder externe Speichergeräte.\n"
+"Devices are from where to download photos and videos, such as cameras, "
+"memory cards or Portable Storage Devices.\n"
 "\n"
-"Sie können gleichzeit von mehreren Laufwerken Bilder herunterladen oder auch "
-"einen Pfad auf Ihrer festplatte angeben.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\n"
 "\n"
-"<i>Falls der Download von Ihrer Kamera schlecht oder nicht funktioniert, "
-"stellen Sie 'PTP Modus' ein. Sollte das nicht möglich sein, so verwenden Sie "
-"bitte Speicherkarten.</i>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1635,82 +1645,100 @@ msgid "Generate thumbnails (slower)"
 msgstr "Vorschaubilder erstellen (langsam)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Wählen Sie das genaue Verzeichnis für die Datensicherung, falls die "
-"automatische Erkennung ausgeschaltet ist."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
-"Falls Sie die automatische Erkennung von Laufwerken ausschalten, geben Sie "
-"bitte den genauen Pfad zu den Bildern oder Filmen an."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Wenn Sie die automatische Erkennung für portable Laufwerke aktivieren, wird "
-"das gesamte Laufwerk nach Bildern durchsucht. Bei sehr grossen Datenträgern "
-"kann dies eine Weile dauern."
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Ignorierte Pfade\t"
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Auftragsbezeichnungen"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Ort:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Überschreibe"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Geschwindigkeit"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Bilder Verzeichnisse"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Bilder Umbenennen"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Ordner für Sicherungskopien der Bilder:"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Voreinstellungen: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "_Alle entfernen"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Bekannte Geräte"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Optionen für die Umbenennung"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Überspringen"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Überspringe Download"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1720,7 +1748,7 @@ msgstr ""
 "ermöglichen müssen Sie die beiden Pakete <i>hachoir metadata</i> und <i>kaa "
 "metadata</i> für Python installieren."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1735,7 +1763,7 @@ msgstr ""
 "Sicherungskopien verwendet wird. Erstellen Sie auf jedem Laufwerk, welches "
 "für Sicherungskopien verwendet wird, einen Ordner mit diesem Namen.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1743,7 +1771,7 @@ msgstr ""
 "Geben Sie die Zeit im 24-Stunden Format an, wann die Sequenznummer in "
 "<i>Downloads heute</i> zurückgesetzt werden soll."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1751,44 +1779,48 @@ msgstr ""
 "Geben Sie ab, ob Zeichen in Namen oder Ordnern, welche auf einem anderen "
 "Betriebssystem nicht gültig sind, entfernt werden sollen."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Beginn des Downloads bei Programmstart"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Mit dem Herunterladen beginnen, sobald ein Laufwerk verfügbar ist"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Gespeicherte Nummer"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Entferne nicht kompatible Zeichen"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronisiere RAW + JPEG Sequenznummern"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 "Unmount (\"Auswerfen\") des Laufwerkes, sobald das Herunterladen beendet ist"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Filme Ordner"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Filme Umbenennen"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Sicherungsordner für Filme:"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1797,7 +1829,7 @@ msgstr ""
 "heruntergeladen wurde, entweder Datei überspringen oder eine eindeutige "
 "Bezeichnung anfügen."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1805,7 +1837,7 @@ msgstr ""
 "Bitte geben Sie an was geschehen soll, falls bei der Sicherung bereits eine "
 "Datei mit demselben Namen vorhanden ist, Überspringen oder Überschreiben."
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1813,10 +1845,14 @@ msgstr ""
 "Bilder und Filme können während dem Herunterladen an mehrere Orte gesichert "
 "werden, z.B. auf externe Laufwerke."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Hinzufügen …"
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "Reguläre Ausdrücke _benutzen"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
@@ -2086,6 +2122,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Backup folder name:"
 #~ msgstr "Verzeichnis für Datensicherung:"
 
+#~ msgid "Backup location:"
+#~ msgstr "Ziel der Datensicherung"
+
 #~ msgid "Automatically detect image devices"
 #~ msgstr "Suche automatisch nach Laufwerken mit Bildern"
 
@@ -2095,6 +2134,11 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Download Folder"
 #~ msgstr "Downloadverzeichnis"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Wählen Sie das genaue Verzeichnis für die Datensicherung, falls die "
+#~ "automatische Erkennung ausgeschaltet ist."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Beende das Programm nach Abschluss des Downloads"
 
@@ -2449,6 +2493,15 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgstr "Bilder auf dem Laufwerk nach erfolgreichem Download löschen"
 
 #~ 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 ""
+#~ "Wenn Sie die automatische Erkennung für portable Laufwerke aktivieren, wird "
+#~ "das gesamte Laufwerk nach Bildern durchsucht. Bei sehr grossen Datenträgern "
+#~ "kann dies eine Weile dauern."
+
+#~ msgid ""
 #~ "Image devices are devices from which to download photos, such as cameras, "
 #~ "memory cards or Portable Storage Devices.\n"
 #~ "\n"
@@ -2650,6 +2703,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "\n"
 #~ msgstr "\n"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Laufwerke</b>"
+
 #, python-format
 #~ msgid "The %s(filetype)s was not copied."
 #~ msgstr "Die %s(filetype)s wurde nicht kopiert."
@@ -2888,6 +2944,34 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ "angefügt werden soll."
 
 #~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "Falls Sie die automatische Erkennung von Laufwerken ausschalten, geben Sie "
+#~ "bitte den genauen Pfad zu den Bildern oder Filmen an."
+
+#~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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 ""
+#~ "Von Laufwerken können Bilder oder Filme heruntergeladen werden, z.B. "
+#~ "Kameras, Speicherkarten oder externe Speichergeräte.\n"
+#~ "\n"
+#~ "Sie können gleichzeit von mehreren Laufwerken Bilder herunterladen oder auch "
+#~ "einen Pfad auf Ihrer festplatte angeben.\n"
+#~ "\n"
+#~ "<i>Falls der Download von Ihrer Kamera schlecht oder nicht funktioniert, "
+#~ "stellen Sie 'PTP Modus' ein. Sollte das nicht möglich sein, so verwenden Sie "
+#~ "bitte Speicherkarten.</i>"
+
+#~ msgid ""
 #~ "Sorry, video downloading functionality disabled. To download videos, please "
 #~ "install the <i>kaa metadata</i> package for python."
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 094510a..6a3a0c9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-01 21:10+0000\n"
-"Last-Translator: Monkey <monkey.libre@gmail.com>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-07-11 10:16+0000\n"
+"Last-Translator: Jose Navajo Bardera <Unknown>\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: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -60,7 +60,7 @@ msgstr "Progreso de descarga"
 #: rapid/rapid.py:315
 #, python-format
 msgid "%(device)s did not unmount"
-msgstr ""
+msgstr "%(device)s no se extrajo"
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
@@ -70,159 +70,164 @@ msgstr ""
 msgid "scanning..."
 msgstr "explorando..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Descargar"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
-msgstr "Pausar"
+msgstr "Pausa"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
+"Los directorios de descarga son incorrectos:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
+"Directorio de descarga incorrecto:\n"
+"%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
-msgstr "No se puede proceder con la descarga"
+msgstr "No se puede iniciar la descarga"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Aproximadamente 1 segundo restante"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Aproximadamente %i segundos restantes"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Resta cerca de %(minutes)i:%(seconds)02i minutos"
+msgstr "Falta %(minutes)i:%(seconds)02i minutos restantes"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotos y videos"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "fotos y vídeos"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vídeos"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descargados"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr ""
+msgstr "%(noFiles)s %(filetypes)s fallo al descargar"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
-msgstr "avisos"
+msgstr "advertencias"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Todas las descargas completadas"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s descargados"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
-msgstr ""
+msgstr "%(filetype)s fallo en la descarga"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "y"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Dispositivos de copia de seguridad no detectados"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Espacio libre:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -230,75 +235,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
-msgstr "%(free)s libre"
+msgstr "%(free)s disponible"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
-msgstr "Guardar en %(path)s"
+msgstr "Realizar copia de seguridad en %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
-msgstr ""
+msgstr "Las preferencias son incorrectas"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
-msgstr ""
+msgstr "%(file_type)s directorio de descarga no existe"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Carpeta: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
-msgstr ""
+msgstr "%(file_type)s directorio de descarga es incorrecto"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
-msgstr ""
+msgstr "%(file_type)s imposible escribir en directorio de descarga"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -307,50 +312,54 @@ 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:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr ""
 "mostrar información de depuración cuando se ejecute desde la línea de "
 "comandos"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 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:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "listar las extensiones de archivo para fotos y vídeos que el programa "
 "reconoce y salir"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr ""
+"Restablecer todas las configuraciones y preferencias del programa y salir"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
-msgstr "Fotos:"
+msgstr "Fotografias"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Videos:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "y %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Todas las opciones y preferencias se han reestablecido"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr ""
+"Descarga de videos desactivada\n"
+"Para activarla, por favor instale los paquetes hachoir y kaa metadata para "
+"python"
 
 #: rapid/backupfile.py:139 rapid/backupfile.py:162
 msgid "Backing up error"
@@ -394,6 +403,8 @@ msgstr "Dispositivo detectado"
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
+"¿Quiere utilizar este dispositivo para almacenar las fotos o videos "
+"descargados?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
 #: rapid/device.py:107
@@ -404,364 +415,372 @@ msgstr "_Recordar esta elección"
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
-msgstr "Fecha"
+msgstr "Fecha Hora"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Texto"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Secuencias"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Código de trabajo"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Fecha de la imagen"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
-msgstr ""
+msgstr "Fecha del video"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Hoy"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
-msgstr ""
+msgstr "Hora de la descarga"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 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/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Nombre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Extensión"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Número de imagen"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
-msgstr ""
+msgstr "Numero de video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 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/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Longitud focal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
-msgstr "Marca cámara"
+msgstr "Fabricante camara"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 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/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 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/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 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/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 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/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
-msgstr "Obturador contador"
+msgstr "Contador obturador"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Nombre propietario"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Códec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Ancho"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Alto"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Duración"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Cuadros por Segundo"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Autor"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Derechos de autor"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 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/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 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/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 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/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 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/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
-msgstr "Letra de secuencia"
+msgstr "Letra secuencial"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 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/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 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/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 msgid "Original Case"
-msgstr "Mantener original"
+msgstr "Formato original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "MAYÚSCULAS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "minúsculas"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Un dígito"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Dos dígitos"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tres dígitos"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Cuatro dígitos"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Siete digitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
-msgstr "Sub-segundos"
+msgstr "Decimas de segundo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
-msgstr "AAAAMMDD"
+msgstr "AñoMesDia"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 msgid "YYYY-MM-DD"
-msgstr "AAAA-MM-DD"
+msgstr "Año-Mes-Dia"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
-msgstr "AAMMDD"
+msgstr "AñoMesDia"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
 #: rapid/preferencesdialog.py:370
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
-msgstr "Preferencias de subcarpeta no debería empezar con una %s"
+msgstr "Preferencias de subcarpeta no debe empezar con una %s"
 
 #: rapid/preferencesdialog.py:372
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
-msgstr "Preferencias de subcarpeta no debería terminar con una %s"
+msgstr "Preferencias de subcarpeta no debe terminar con una %s"
 
 #: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
-"Preferencias de subcarpeta no debería contener dos %s uno después que el otro"
+"Preferencias de subcarpeta no debe contener dos %s una después de la otra"
 
 #: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
 msgid "Remove all Job Codes?"
@@ -769,7 +788,7 @@ msgstr "¿Borrar todos los Códigos de Trabajo?"
 
 #: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
 msgid "Should all Job Codes be removed?"
-msgstr "¿Deberían ser removidos todos los Codigos de Trabajo?"
+msgstr "¿Quitar todos los Codigos de Trabajo?"
 
 #: rapid/preferencesdialog.py:436
 msgid "Error in Photo Rename preferences"
@@ -800,7 +819,7 @@ msgstr "Inserte un nuevo código de trabajo o seleccione uno anterior"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
 #: rapid/preferencesdialog.py:734
 msgid "Enter a new Job Code"
-msgstr ""
+msgstr "Inserte un nuevo código de trabajo"
 
 #: rapid/preferencesdialog.py:739
 msgid "Job Code:"
@@ -821,13 +840,13 @@ msgstr "Selecciona un directorio donde descargar los videos"
 #: rapid/preferencesdialog.py:1107
 #, python-format
 msgid "Select a folder containing %(file_types)s"
-msgstr "Selecciona un directorio conteniendo %(file_types)s"
+msgstr "Selecciona un directorio que contenga %(file_types)s"
 
 #: rapid/preferencesdialog.py:1129
 #, python-format
 msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
-"Selecciona un directorio a donde hacer una copia de seguridad de "
+"Selecciona un directorio donde realizar la copia de seguridad de "
 "%(file_types)s"
 
 #. 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
@@ -836,12 +855,16 @@ msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
+"<i><b>Atencion:</b> No hay suficientes datos para generar el nombre "
+"completo. Por favor utilice otras opciones para renombrar.</i>"
 
 #: rapid/preferencesdialog.py:1266
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
+"<i><b>Atencion:</b> No hay suficientes metadatos para crear subdirectorios. "
+"Por favor utilice otro nombre para el subdirectorio.</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/preferencesdialog.py:1269
@@ -857,6 +880,9 @@ msgid ""
 "used.\n"
 "They will be reset to their default values."
 msgstr ""
+"El %(filetype)s las preferencias para el subdirectorio son incorrectas y no "
+"pueden ser utilizadas.\n"
+"Se ajustaran 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/preferencesdialog.py:1645
@@ -943,7 +969,7 @@ msgstr "Estocolmo"
 #. components
 #: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
 msgid "subfolder"
-msgstr "subcarpeta"
+msgstr "subdirectorio"
 
 #: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
 msgid "filename"
@@ -952,32 +978,32 @@ msgstr "nombre de archivo"
 #: rapid/problemnotification.py:80
 #, python-format
 msgid "Date time value %s appears invalid."
-msgstr ""
+msgstr "Fecha y hora %s parecen incorrectos."
 
 #: rapid/problemnotification.py:81
 msgid "Filename does not have an extension."
-msgstr ""
+msgstr "El nombre del archivo no tiene extension."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
 #: rapid/problemnotification.py:83
 msgid "Filename does not have a number component."
-msgstr ""
+msgstr "El nombre del archivo no tiene componentes numericos."
 
 #: rapid/problemnotification.py:84
 #, python-format
 msgid "Error generating component %s."
-msgstr "Error al generar el componente %s"
+msgstr "Error generando componente %s."
 
 #. a generic problem
 #: rapid/problemnotification.py:86
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
-msgstr ""
+msgstr "%(filetype)s no se pueden leer los metadatos"
 
 #: rapid/problemnotification.py:88
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
-msgstr ""
+msgstr "%(filetype)s %(area)s no se pueden generar"
 
 #: rapid/problemnotification.py:90 rapid/problemnotification.py:91
 #, python-format
@@ -995,6 +1021,8 @@ msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 msgstr ""
+"%(filetype)s no se hizo copia de seguridad por que no se encontro una "
+"ubicacion donde realizarla."
 
 #: rapid/problemnotification.py:102
 #, python-format
@@ -1002,11 +1030,13 @@ msgid ""
 "%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
 "%(image2)s on %(image2_date)s at %(image2_time)s."
 msgstr ""
+"%(image1)s fue realizada en %(image1_date)s el %(image1_time)s, y %(image2)s "
+"en %(image2_date)s el %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
 msgid "%(filetype)s was already downloaded"
-msgstr ""
+msgstr "%(filetype)s ya estan descargadas"
 
 #: rapid/problemnotification.py:107
 #, python-format
@@ -1014,16 +1044,20 @@ msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
 "identifier '%(identifier)s' added."
 msgstr ""
+"El existente %(filetype)s fue modificado por ultima vez el %(date)s a las "
+"%(time)s. identificador único '%(identifier)s' añadido."
 
 #: rapid/problemnotification.py:108
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
+"El existente %(filetype)s fue modificado por ultima vez el %(date)s a las "
+"%(time)s."
 
 #: rapid/problemnotification.py:109
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
-msgstr ""
+msgstr "No hay datos que coincidan con el nombre del %(filetype)s."
 
 #: rapid/problemnotification.py:111
 #, python-format
@@ -1032,22 +1066,25 @@ msgstr "Error: %(errorno)s %(strerror)s"
 
 #: rapid/problemnotification.py:201
 msgid "The metadata might be corrupt."
-msgstr ""
+msgstr "Los metadatos parecen corruptos."
 
 #: rapid/problemnotification.py:204
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
+"El nombre de fichero, extensión y la información Exif indican que ya ha sido "
+"descargado."
 
 #: rapid/problemnotification.py:223
 #, python-format
 msgid " It was backed up to %(volume)s"
-msgstr ""
+msgstr " Fue realizada una copia de seguridad de los datos en %(volume)s"
 
 #: rapid/problemnotification.py:225
 msgid " It was backed up to these devices: "
 msgstr ""
+" Fue realizada una copia de seguridad de los datos en este dispositivo "
 
 #: rapid/problemnotification.py:227 rapid/problemnotification.py:288
 #: rapid/problemnotification.py:300
@@ -1059,7 +1096,7 @@ msgstr "%s, "
 #: rapid/problemnotification.py:301
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
-msgstr ""
+msgstr "%(volumes)s y %(final_volume)s."
 
 #: rapid/problemnotification.py:240
 #, python-format
@@ -1067,73 +1104,81 @@ msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
+"Detectadas fotos con el mismo nombre, pero distinta fecha de realizacion: "
+"%(details)s"
 
 #: rapid/problemnotification.py:257
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
+"Ocurrio un error durante la realizacion de la copia de seguridad en "
+"%(volume)s: %(inst)s."
 
 #: rapid/problemnotification.py:259
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
-msgstr ""
+msgstr "Ocurrio un error al realizar la copia de seguridad en %(volume)s."
 
 #: rapid/problemnotification.py:261
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
+"Ocurrió un error durante la realización de la copia de seguridad en el "
+"dispositivo: "
 
 #: rapid/problemnotification.py:265 rapid/problemnotification.py:313
 #, python-format
 msgid "%(volume)s (%(inst)s), "
-msgstr ""
+msgstr "%(volume)s (%(inst)s), "
 
 #: rapid/problemnotification.py:267
 #, python-format
 msgid "%(volume)s, "
-msgstr ""
+msgstr "%(volume)s, "
 
 #: rapid/problemnotification.py:271 rapid/problemnotification.py:315
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
-msgstr ""
+msgstr "%(volumes)s y %(volume)s (%(inst)s)."
 
 #: rapid/problemnotification.py:276
 #, python-format
 msgid "%(volumes)s and %(volume)s."
-msgstr ""
+msgstr "%(volumes)s y %(volume)s."
 
 #: rapid/problemnotification.py:284
 #, python-format
 msgid "Backup already exists on %(volume)s."
-msgstr ""
+msgstr "La copia de seguridad ya existe en %(volume)s."
 
 #: rapid/problemnotification.py:286
 msgid "Backups already exist in these locations: "
-msgstr ""
+msgstr "Las copias de seguridad estan en este directorio: "
 
 #: rapid/problemnotification.py:296
 #, python-format
 msgid "Backup overwritten on %(volume)s."
-msgstr ""
+msgstr "Sobreescrita copia de seguridad en %(volume)s."
 
 #: rapid/problemnotification.py:298
 msgid "Backups overwritten on these devices: "
-msgstr ""
+msgstr "Sobreescritas copias de seguridad en estos dispositivos: "
 
 #: rapid/problemnotification.py:309
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
-msgstr ""
+msgstr "Ocurrió un error al crear los directorios en %(volume)s: %(inst)s."
 
 #: rapid/problemnotification.py:311
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
+"Ocurrió un error al crear los directorios en los dispositivos de copia de "
+"seguridad: "
 
 #: rapid/problemnotification.py:322
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
-msgstr ""
+msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
 #: rapid/problemnotification.py:330
 #, python-format
@@ -1148,76 +1193,77 @@ msgstr ""
 #: rapid/problemnotification.py:341
 #, python-format
 msgid "The %(type)s metadata is missing."
-msgstr ""
+msgstr "Los %(type)s metadatos no estan."
 
 #: rapid/problemnotification.py:343
 msgid "The following metadata is missing: "
-msgstr ""
+msgstr "Los siguientes metadatos faltan: "
 
 #: rapid/problemnotification.py:346
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-msgstr ""
+msgstr "%(missing_metadata_elements)s y %(final_missing_metadata_element)s."
 
 #: rapid/problemnotification.py:363
 msgid "Problems in subfolder and filename generation"
-msgstr ""
+msgstr "Problemas al crear subdirectorio y nombre de archivo"
 
 #: rapid/problemnotification.py:365
 msgid "Problem in subfolder and filename generation"
-msgstr ""
+msgstr "Problema al crear subdirectorio y nombre de archivo"
 
 #: rapid/problemnotification.py:368
 #, python-format
 msgid "Problems in %s generation"
-msgstr ""
+msgstr "Problemas al %s crear"
 
 #: rapid/problemnotification.py:370
 #, python-format
 msgid "Problem in %s generation"
-msgstr ""
+msgstr "Problema al %s crear"
 
 #: rapid/problemnotification.py:379
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
-msgstr ""
+msgstr "%(filetype)s ya existen, pero fue realizada copia de seguridad"
 
 #: rapid/problemnotification.py:381
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
+"Un error ocurrió al copiar los %(filetype)s, pero fue realizada una copia de "
+"seguridad"
 
 #: rapid/problemnotification.py:401
 msgid "Multiple problems were encountered"
-msgstr ""
+msgstr "Varios problemas fueron encontrados"
 
 #: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
-"Fotos detectadas con el mismo nombre de archivo, pero tomadas en momentos "
-"diferentes"
+"Fotos detectadas con el mismo nombre de archivo, pero tomadas a distinta hora"
 
 #: rapid/problemnotification.py:409
 msgid "there were errors backing up"
-msgstr ""
+msgstr "Hubo varios errores al realizar la copia de seguridad"
 
 #: rapid/problemnotification.py:410
 msgid "There were errors backing up"
-msgstr ""
+msgstr "Hubo varios errores al realizar la copia de seguridad"
 
 #: rapid/problemnotification.py:412
 msgid "there was an error backing up"
-msgstr ""
+msgstr "Hubo un error al realizar la copia de seguridad"
 
 #: rapid/problemnotification.py:413
 msgid "There was an error backing up"
-msgstr ""
+msgstr "Hubo un error al realizar la copia de seguridad"
 
 #. e.g.
 #: rapid/problemnotification.py:416
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
-msgstr ""
+msgstr "%(previousproblem)s, y %(backinguperror)s"
 
 #: rapid/rpdfile.py:136
 #, python-format
@@ -1231,7 +1277,7 @@ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #: rapid/subfolderfile.py:297
 msgid "Photo has already been downloaded"
-msgstr ""
+msgstr "La fotografia ya ha sido descargada"
 
 #: rapid/subfolderfile.py:298
 #, python-format
@@ -1240,11 +1286,11 @@ msgstr "Origen: %(source)s"
 
 #: rapid/subfolderfile.py:355
 msgid "subfolder and filename"
-msgstr "subcarpeta y el archivo"
+msgstr "Subdirectorio y nombre de archivo"
 
 #: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
-msgstr ""
+msgstr "Fallo al crear carpeta para descargas"
 
 #: rapid/subfolderfile.py:394
 #, python-format
@@ -1257,19 +1303,19 @@ msgstr "Acerca de..."
 
 #: rapid/glade3/rapid.ui.h:2
 msgid "Check All"
-msgstr ""
+msgstr "Seleccionar todos"
 
 #: rapid/glade3/rapid.ui.h:3
 msgid "Check All Photos"
-msgstr ""
+msgstr "Seleccionar todas las fotografias"
 
 #: rapid/glade3/rapid.ui.h:4
 msgid "Check All Videos"
-msgstr ""
+msgstr "Seleccionar todos los videos"
 
 #: rapid/glade3/rapid.ui.h:6
 msgid "Download / Pause"
-msgstr "Descargar / Pausar"
+msgstr "Descarga/Pausa"
 
 #: rapid/glade3/rapid.ui.h:7
 msgid "Get Help Online..."
@@ -1289,7 +1335,7 @@ msgstr "Archivo siguiente"
 
 #: rapid/glade3/rapid.ui.h:11
 msgid "Preferences"
-msgstr ""
+msgstr "Preferencias"
 
 #: rapid/glade3/rapid.ui.h:12
 msgid "Previous File"
@@ -1309,11 +1355,11 @@ msgstr "Informar de un problema..."
 
 #: rapid/glade3/rapid.ui.h:17
 msgid "Select All Wit_h Job Code"
-msgstr ""
+msgstr "Seleccionar todo con codigo de trabajo Wit_h"
 
 #: rapid/glade3/rapid.ui.h:18
 msgid "Select All Without _Job Code"
-msgstr ""
+msgstr "Seleccionar todo sin codigo de trabajo"
 
 #: rapid/glade3/rapid.ui.h:19
 msgid "Translate this Application..."
@@ -1321,11 +1367,11 @@ msgstr "Traducir esta aplicación..."
 
 #: rapid/glade3/rapid.ui.h:20
 msgid "Uncheck All"
-msgstr ""
+msgstr "Deseleccionar todo"
 
 #: rapid/glade3/rapid.ui.h:21
 msgid "_Check All"
-msgstr ""
+msgstr "_Seleccionar todo"
 
 #: rapid/glade3/rapid.ui.h:22
 msgid "_Clear Completed Downloads"
@@ -1333,7 +1379,7 @@ msgstr "_Limpiar descargas completadas"
 
 #: rapid/glade3/rapid.ui.h:23
 msgid "_Download"
-msgstr ""
+msgstr "_Descarga"
 
 #: rapid/glade3/rapid.ui.h:24
 msgid "_Error Log"
@@ -1345,11 +1391,11 @@ msgstr "_Archivo"
 
 #: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
-msgstr "Ay_uda"
+msgstr "_Ayuda"
 
 #: rapid/glade3/rapid.ui.h:27
 msgid "_Include in download"
-msgstr ""
+msgstr "_Incluido en la descarga"
 
 #: rapid/glade3/rapid.ui.h:28
 msgid "_Make a Donation..."
@@ -1365,7 +1411,7 @@ msgstr "_Traducir esta aplicación..."
 
 #: rapid/glade3/rapid.ui.h:31
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Deseleccionar todo"
 
 #: rapid/glade3/rapid.ui.h:32
 msgid "_View"
@@ -1385,72 +1431,72 @@ msgstr ":"
 
 #: rapid/glade3/prefs.ui.h:4
 msgid "<b>Backup</b>"
-msgstr "<b>Respaldo</b>"
+msgstr "<b>Copia de seguridad</b>"
 
 #: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilidad con otros Sistemas Operativos</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Dispositivos</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Carpeta de descargas</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Subcarpeta de descargas</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Ejemplo</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Códigos de trabajo</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
-msgstr ""
+msgstr "Copy text \t <b>cambiar nombre a la fotografia</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr ""
+msgstr "<b>Problemas con el nombre de Fotografiay Video</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatización de programa</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Números de secuencia</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/externaldrive/Imágenes</i>"
+msgstr "<i>/medio/dispositivoexterno/Fotografias</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Ejemplo: /home/user/Pictures</i>"
+msgstr "<i>Ejemplo: /home/usuario/Imagenes</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Ejemplo:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nuevo:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Original:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Respaldo</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivos</span>"
@@ -1497,7 +1543,7 @@ msgstr "Detectar automáticamente dispositivos de almacenamiento portables"
 
 #: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
-msgstr "Detectar automáticamente dispositivos de respaldo"
+msgstr "Detectar automáticamente dispositivos de copia de seguridad"
 
 #: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
@@ -1505,38 +1551,41 @@ msgstr "Detectar dispositivos automaticamente"
 
 #: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
-msgstr "Respaldo"
+msgstr "Copia de seguridad"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Ruta de respaldo:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
-msgstr ""
+msgstr "Realizar copia de seguridad al descargar fotografias y videos"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
-"Seleccione una carpeta de descargas. Las subcarpetas para descargar fotos "
-"serán creadas automáticamente en la carpeta usando la estructura "
+"Seleccione una carpeta para descargas. Las subcarpetas para descargar "
+"fotografías serán creadas automáticamente en la carpeta usando la estructura "
 "especificada abajo."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
+"Seleccione una carpeta para descargas. Las subcarpetas para descargar videos "
+"serán creadas automáticamente en la carpeta usando la estructura "
+"especificada abajo."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Día de inicio:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
-msgstr ""
+msgstr "Borrar los archivos del dispositivo una vez terminada la descarga"
+
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Opciones de dispositivo"
 
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
@@ -1547,17 +1596,18 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
-msgstr "Carpeta de descarga:"
+msgstr "Directorio de descarga"
 
 #: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
@@ -1573,93 +1623,123 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:51
 msgid "Exit program when download completes"
-msgstr ""
+msgstr "Salir del programa cuando se completen las descargas"
 
 #: rapid/glade3/prefs.ui.h:52
 msgid "Generate thumbnails (slower)"
-msgstr ""
+msgstr "Generar miniaturas (lento)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Si desactiva la detección automática, seleccione la ruta exacta de respaldo."
+"Si se desactiva la detección automática, elegir la ubicación exacta para la "
+"copia de seguridad."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
+"Si se desactiva la detección automática, elegir la ubicación exacta para las "
+"fotografías y videos."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Si activa la detección automática de Dispositivos de almacenamiento "
-"portátil, será revisado completamente en busca de imágenes. En dispositivos "
-"grandes, esto puede tomar algún tiempo."
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Códigos de trabajo"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varios"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
-msgstr ""
+msgstr "Prestaciones"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
-msgstr ""
+msgstr "Directorios de fotografías"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
-msgstr ""
+msgstr "Cambiar nombre a fotografía"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
-msgstr ""
+msgstr "Directorio para copia de seguridad de fotografías:"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Ubicación para copia de seguridad de fotografías:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferencias: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
-msgstr "R_emover todo"
+msgstr "R_etirar todo"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "Re_tirar todo"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Recordar dispositivos utilizados"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+"Recordar los dispositivos elegidos para ser o no escaneados cuando la opción "
+"de Dispositivos de almacenamiento portables esta activada"
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
-msgstr "Opciones de renombre"
+msgstr "Opciones para cambio de nombre"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Saltar"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
 "python."
 msgstr ""
+"La función de descarga de videos esta desactivada. Para descargar videos, "
+"por favor instalar <i>hachoir metadata</i> y <i>kaa metadata</i> paquetes "
+"para python."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1668,7 +1748,7 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1676,73 +1756,83 @@ msgstr ""
 "Especifique la hora en formato de 24 horas en la que el numero de secuencia "
 "de las <i> Descargas de hoy </i>, debe ser restablecido."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Empezar descargas al iniciar el programa"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
-msgstr ""
+msgstr "Comenzar a descargar al conectar un dispositivo"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Número almacenado:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Quitar carácteres incompatibles"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizar números de secuencia de RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
-msgstr ""
+msgstr "Extraer (\"eject\") el dispositivo al concluir la descarga"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Carpetas de vídeo"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Renombrar vídeo"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
-msgstr ""
+msgstr "Nombre de la carpeta para copia de seguridad de videos:"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr "Ubicacion de la copia de seguridad de videos:"
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
+"Cuando una fotografía o video ha sido ya descargada, elegir omitirla "
+"descarga del archivo o añadir un identificador único."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Añadir…"
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "_Utilizar expresiones comunes"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
-msgstr "Importe sus fotos y vídeos de forma eficaz y fiable"
+msgstr "descargue sus fotografias y videos de forma eficaz y segura"
 
 #, python-format
 #~ msgid "0 of %s images copied"
@@ -2085,6 +2175,9 @@ msgstr "Importe sus fotos y vídeos de forma eficaz y fiable"
 #~ msgid "Backup folder name:"
 #~ msgstr "Nombre de carpeta de respaldo"
 
+#~ msgid "Backup location:"
+#~ msgstr "Ruta de respaldo:"
+
 #~ msgid "Automatically detect image devices"
 #~ msgstr "Detectar automáticamente dispositivos de imagen"
 
@@ -2174,6 +2267,10 @@ msgstr "Importe sus fotos y vídeos de forma eficaz y fiable"
 #~ "utilizar para hacer copias de seguridad se creará una carpeta con este "
 #~ "nombre.</i>"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Si desactiva la detección automática, seleccione la ruta exacta de respaldo."
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
@@ -2255,6 +2352,15 @@ msgstr "Importe sus fotos y vídeos de forma eficaz y fiable"
 #~ "configurarla en modo PTP. Si esto no es posible, considere usar un lector de "
 #~ "tarjetas.</i>"
 
+#~ 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 ""
+#~ "Si activa la detección automática de Dispositivos de almacenamiento "
+#~ "portátil, será revisado completamente en busca de imágenes. En dispositivos "
+#~ "grandes, esto puede tomar algún tiempo."
+
 #~ msgid "Starting downloads"
 #~ msgstr "Iniciando descargas"
 
@@ -2552,6 +2658,9 @@ msgstr "Importe sus fotos y vídeos de forma eficaz y fiable"
 #~ msgid "videos skipped"
 #~ msgstr "videos saltados"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Dispositivos</b>"
+
 #, python-format
 #~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4715cf5..9c10d14 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-02 19:17+0000\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-14 16:42+0000\n"
 "Last-Translator: Tubuntu <Unknown>\n"
 "Language-Team: Français <null>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -71,15 +71,15 @@ msgstr "Le périphérique %(device)s n'a pas été démonté"
 msgid "scanning..."
 msgstr "Détection en cours..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Transférer"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -90,7 +90,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -99,136 +99,136 @@ msgstr ""
 "Ce répertoire de téléchargement n'est pas valide:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "Impossible de procéder au transfert"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Environ 1 seconde restante"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Environ %i secondes restantes"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Environ %(minutes)i:%(seconds)02i restantes"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "photos et vidéos"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "photos ou vidéos"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vidéos"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vidéo"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "photos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "photo"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s transférés"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "erreur lors du transfert de %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "avertissements"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s téléchargé"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Echec de transfert pour %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s sur %(total)s %(filetypes)s (%(remaining)s restants)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s sur %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "et"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Utilisation des volumes de sauvegarde"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Utilisation du volume de sauvegarde"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détécté"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Espace libre :"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr ", "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s disponibles"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sauvegarde sur %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Les préférences de l'application sont invalides"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Photo"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Vidéo"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s répertoires de téléchargement n'existe pas"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Répertoire: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s répertoire de téléchargement n'est pas valide"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s répertoire de téléchargement protégé en écriture"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Aperçus"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,42 +313,42 @@ msgstr ""
 "affiche les informations de l'application sur la ligne de commande lorsque "
 "l'application est active (défaut: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr "Affiche les informations de débogage en mode console"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 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:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "Liste des extensions de fichiers photo et vidéo reconnues par le programme"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr "Réinitialise tous les paramètres et préférences du programme"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Photos :"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Vidéos :"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "et %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Tous les paramètres et préférences ont été réinitialisés"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -412,346 +412,354 @@ msgstr "Se souveni_r de ce choix"
 msgid "MB/s"
 msgstr "Mo/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Date/heure"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Texte"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Séquences"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Étiquette de transfert"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Date de l'image"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Date de la vidéo"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Hier"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Temps de transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Nom + extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Extension"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Numéro de l'image"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Numéro de vidéo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Ouverture"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 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/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Longueur focale"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 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/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 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/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 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/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 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/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 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/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 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/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Nom du propriétaire"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Largeur"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Hauteur"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Longueur"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Images par seconde"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Artiste"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Droits d’auteur"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Transferts journaliers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 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/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 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/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 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/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 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/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 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/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Dernier chiffre"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 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/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "MAJUSCULES"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "minuscules"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Un chiffre"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Deux chiffres"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Trois chiffres"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Quatre chiffres"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Cinq chiffres"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Six chiffres"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "7 chiffres"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Sous-secondes"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 msgid "YYYY-MM-DD"
 msgstr "AAAA-MM-JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMJJAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMJJAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minutes)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
@@ -1431,65 +1439,66 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilité avec d'autres systèmes d'exploitation</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Périphériques</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Dossier de destination</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Sous-dossiers de transfert</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Exemple</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Étiquettes de transfert</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Renommage des phtoos</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Photo et Vidéo Conflits de noms</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatisation de l'application</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Séquences numériques</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/disqueexterne/Photos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Exemple : /home/utilisateur/Images</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Exemple :</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nouveau :</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Original :</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Sauvegarde</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Options du périphérique</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Périphériques</span>"
@@ -1552,14 +1561,10 @@ msgid "Backup"
 msgstr "Sauvegarde"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Emplacement de la sauvegarde :"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Sauvegarder les photos et les vidéos lors du transfert"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1568,7 +1573,7 @@ msgstr ""
 "transférées seront automatiquement crées dans ce dossier selon la structure "
 "spécifiée ci-dessous."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1577,15 +1582,19 @@ msgstr ""
 "téléchargées seront automatiquement créés dans ce dossier en utilisant la "
 "structure spécifiée ci-dessous."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Début du jour :"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 "Supprimer des photos et vidéos de l'appareil à la fin du téléchargement"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Options du périphérique"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Périphériques"
@@ -1595,24 +1604,25 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Périphériques depuis lesquels sont transférés les photos et les vidéos, tels "
-"que les appareils photo, cartes mémoire, ou périphérique de stockage "
+"Les périphériques sont les emplacements d'où sont chargés les photos et "
+"vidéos, tels que les caméras, les cartes mémoire ou volumes de stockage "
 "amovibles.\n"
 "\n"
-"Il est possible de transférer des photos depuis plusieurs périphériques de "
-"façon simultanée, ainsi que de transférer des fichiers depuis un emplacement "
-"spécifié du disque dur.\n"
+"Vous pouvez charger à partir de différents périphériques simultanément ou "
+"vous pouvez spécifier un emplacement sur votre disque dur.\n"
 "\n"
-"<i>Si le transfert direct depuis votre appareil photo fonctionne mal, voire "
-"pas du tout, essayez le mode PTP. Si cela n'est pas possible, considérez "
-"l'utilisation d'un lecteur de cartes.</i>"
+"<i>Charger directement à partir d'une caméra est actuellement une options au "
+"stade expérimental. Si le chargement direct à partir de la caméra "
+"fonctionnement lentement ou pas du tout, essayez le réglage en mode PTP. Si "
+"c'est impossible, un lecteur de carte devra être utilisé.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1641,82 +1651,113 @@ msgid "Generate thumbnails (slower)"
 msgstr "Générer les aperçus (plus lent)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Si la détection automatique est désactivée, choisissez un emplacement pour "
-"la sauvegarde."
+"Si vous désactivez la détection automatique, choisissez les emplacements "
+"exacts des sauvegardes."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
-"Si vous désactiver la détection automatique, choisissez l'emplacement exact "
-"des images et des vidéos."
+"Si vous désactivez la détection automatique, choisissez les emplacements "
+"exacts des photos et vidéos."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 "Si vous activez la détection automatique des volumes de stockage amovibles, "
-"le volume complet sera analysé. Sur des volumes de capacité importante, cela "
-"peut prendre du temps."
+"le périphérique sera scanné dans son entièreté. Pour les grands volumes, "
+"cela peut prendre un certain temps.\n"
+"\n"
+"Lorsque cette options est activée et qu'un périphérique potentiel est "
+"détecté, il vous sera demandé s'il doit être scanné ou non."
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Chemins ignorés\t"
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Étiquettes de transfert"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Performance"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Dossiers photos"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Renommage des photos"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Dossier de sauvegarde des photos :"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Emplacement de sauvegarde photo:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Préférences : Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "Supprim_er tout"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "Tout suppri_mer"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Périphériques mémorisés"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+"Les emplacements mémorisés sont ceux que vous avez choisi de scanner "
+"(toujours ou jamais) lorsque la détection automatique de volumes de stockage "
+"amovibles est activée."
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Options de renommage"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Passer"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Passer le transfert"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1726,7 +1767,7 @@ msgstr ""
 "vidéos, veuillez installer les paquets pour python <i>hachoir-metadata</i> "
 "et <i>kaa-metadata</i>."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1741,7 +1782,7 @@ msgstr ""
 "périphérique est utilisé pour les sauvegardes. Créez un répertoire avec un "
 "de ces noms sur chaque volume de sauvegarde.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1749,7 +1790,7 @@ msgstr ""
 "Spécifiez l'heure au format 24h à laquelle la séquence <i>Transferts "
 "journaliers</i> doit être réinitialisée."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1758,44 +1799,48 @@ msgstr ""
 "caractères supprimés n'étant pas autorisés par d'autre systèmes "
 "d'exploitation."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Démarrer le transfert au démarrage de l'application"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Commencer le transfert lors de l'insertion d'un périphérique"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Nombre stocké :"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Enlever les caractères incompatibles"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 "Synchroniser les séquences numériques pour les paires d'images RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Démonter (« éjecter ») le périphérique après un transfert réussi"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Dossiers vidéos"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Renommage des vidéos"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Dossier de sauvegarde des vidéos :"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr "Emplacement de sauvegarde vidéo:"
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1804,7 +1849,7 @@ msgstr ""
 "choisissez si vous souhaitez sauter le transfert ou si vous préférez ajouter "
 "un identifiant unique."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1812,7 +1857,7 @@ msgstr ""
 "Lors de l'archivage, choisir s'il faut écraser ou passer un fichier ayant le "
 "même nom sur le volume de sauvegarde."
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1820,10 +1865,14 @@ msgstr ""
 "Vous pouvez archiver vos photos et vidéos vers des emplacements multiples "
 "dès lors qu'elles sont téléchargées, sur différents disques durs par exemple."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Ajouter..."
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "_Utiliser des expressions régulières"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Transférez vos photos et vidéos de façon simple et fiable"
@@ -2112,6 +2161,11 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgid "Image location:"
 #~ msgstr "Emplacement de l'image :"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Si la détection automatique est désactivée, choisissez un emplacement pour "
+#~ "la sauvegarde."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Quitter l'application à la suite d'un transfert réussi"
 
@@ -2727,6 +2781,13 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgid "A backup location was not found"
 #~ msgstr "Un emplacement de sauvegarde n'a pas été trouvé"
 
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "Si vous désactiver la détection automatique, choisissez l'emplacement exact "
+#~ "des images et des vidéos."
+
 #~ msgid "_Path"
 #~ msgstr "_Chemin"
 
@@ -2753,6 +2814,9 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ "télécharger des vidéos, veuillez installer le package <i>kaa metadata</ i> "
 #~ "pour python."
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Périphériques</b>"
+
 #~ msgid "Miscillaneous"
 #~ msgstr "Divers"
 
@@ -2811,6 +2875,9 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ "La préférence '%(key)s' est invalide.\n"
 #~ "Valeurs attendues : %(value)s"
 
+#~ msgid "Backup location:"
+#~ msgstr "Emplacement de la sauvegarde :"
+
 #~ msgid "Download Folder"
 #~ msgstr "Dossier de téléchargement"
 
@@ -2886,3 +2953,35 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 
 #~ msgid "_Thumbnails"
 #~ msgstr "Vigne_ttes"
+
+#~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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 ""
+#~ "Périphériques depuis lesquels sont transférés les photos et les vidéos, tels "
+#~ "que les appareils photo, cartes mémoire, ou périphérique de stockage "
+#~ "amovibles.\n"
+#~ "\n"
+#~ "Il est possible de transférer des photos depuis plusieurs périphériques de "
+#~ "façon simultanée, ainsi que de transférer des fichiers depuis un emplacement "
+#~ "spécifié du disque dur.\n"
+#~ "\n"
+#~ "<i>Si le transfert direct depuis votre appareil photo fonctionne mal, voire "
+#~ "pas du tout, essayez le mode PTP. Si cela n'est pas possible, considérez "
+#~ "l'utilisation d'un lecteur de cartes.</i>"
+
+#~ 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 ""
+#~ "Si vous activez la détection automatique des volumes de stockage amovibles, "
+#~ "le volume complet sera analysé. Sur des volumes de capacité importante, cela "
+#~ "peut prendre du temps."
diff --git a/po/ja.po b/po/ja.po
index f3141ec..1e33650 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,1772 +7,1669 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-13 19:03+0500\n"
-"PO-Revision-Date: 2010-08-06 20:53+0000\n"
-"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-09 11:18+0000\n"
+"Last-Translator: Hiroshi Arai <Unknown>\n"
 "Language-Team: Japanese <ja@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-09-05 14:32+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6299 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "ニューヨーク"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "マニラ"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "プラハ"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "ヘルシンキ"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "ウェリントン"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "テヘラン"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "カンパラ"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "パリ"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "ベルリン"
+#: rapid/rapid.py:110
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
+msgstr ""
 
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "シドニー"
+#: rapid/rapid.py:112
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "ブダペスト"
+#: rapid/rapid.py:115
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "ローマ"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:149
+msgid "Device"
+msgstr "デバイス"
 
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "モスクワ"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:166
+msgid "Size"
+msgstr "サイズ"
 
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "デリー"
+#: rapid/rapid.py:169
+msgid "Download Progress"
+msgstr "ダウンロードの進行状況"
 
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "ワルシャワ"
+#: rapid/rapid.py:315
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr ""
 
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "ジャカルタ"
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1171
+msgid "scanning..."
+msgstr "スキャン中…"
 
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "マドリッド"
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "ダウンロード"
 
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "ストックホルム"
+#: rapid/rapid.py:1992
+msgid "Pause"
+msgstr "一時停止"
 
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
+#: rapid/rapid.py:2093
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr "値をゼロにリセットする\n"
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
+#: rapid/rapid.py:2096
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
 
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
+#: rapid/rapid.py:2097
+msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
+#: rapid/rapid.py:2386
+msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:591 rapid/rapid.py:1710
-msgid "Sorry,these preferences contain an error:\n"
+#: rapid/rapid.py:2388
+#, python-format
+msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:602
-msgid "Resetting to default values."
-msgstr "初期設定の値にリセットする"
+#: rapid/rapid.py:2390
+msgid "About 1 minute remaining"
+msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:677 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
+#. 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:2395
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:745
-msgid "Error in Video Rename preferences"
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:763
-msgid "Error in Photo Download Subfolders preferences"
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:780
-msgid "Error in Video Download Subfolders preferences"
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:813 rapid/rapid.py:1544
-msgid "photos and videos"
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:815 rapid/rapid.py:1554 rapid/rapid.py:1679
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rpdfile.py:120
 msgid "photos"
 msgstr ""
 
-#: rapid/rapid.py:948
-msgid "Select a folder to download photos to"
-msgstr "写真をダウンロードする先のフォルダを選択してください"
-
-#: rapid/rapid.py:966
-msgid "Select a folder to download videos to"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:1048
+#: rapid/rapid.py:2456
 #, python-format
-msgid "Select a folder containing %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1070
+#: rapid/rapid.py:2460
 #, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s failed to download"
 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:1151
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
+msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:1187
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
+#: rapid/rapid.py:2472
+msgid "All downloads complete"
 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:1191
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
-msgid "<i>Example: %s</i>"
-msgstr ""
-
-#: rapid/rapid.py:1217
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:1233
-msgid "Stored number value not updated, as a download is currently occurring"
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#, python-format
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1263
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1268
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2546
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1282 rapid/rapid.py:1556
-msgid "photo"
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2553
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:1283 rapid/rapid.py:1551
-msgid "video"
+#: rapid/rapid.py:2935
+msgid "and"
 msgstr ""
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1520
-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:1522
-msgid "externaldrive2"
-msgstr "外部ドライブ2"
-
-#: rapid/rapid.py:1546 rapid/rapid.py:1677
-msgid "photos or videos"
+#: rapid/rapid.py:2940
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:1549
-msgid "videos"
+#: rapid/rapid.py:2942
+msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:1561
-#, python-format
-msgid ""
-"%(date)s\n"
-"%(time)s"
+#: rapid/rapid.py:2944
+msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:1563
-#, python-format
-msgid "%(date)s %(time)s"
+#: rapid/rapid.py:2971
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:1566
+#. (videos) or (photos) will be appended to the free space message displayed to the
+#. user in the status bar.
+#. you should only translate this if your language does not use parantheses
+#: rapid/rapid.py:2983
 #, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:1573
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:2987
 #, python-format
-msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:1601 rapid/rapid.py:2267
-msgid "subfolder and filename"
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2992
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:1603 rapid/rapid.py:2269
-msgid "filename"
+#. Inserted at the end of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2997
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:1605 rapid/rapid.py:2271
-msgid "subfolder"
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3003
+#, python-format
+msgid "%(free)s free"
 msgstr ""
 
-#. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for photos or videos. It is visible initially in the progress bar for each device
-#. (which normally holds "x photos and videos").
-#. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1693
-msgid "scanning..."
-msgstr "スキャン中…"
-
-#: rapid/rapid.py:1804
-msgid "The following download path could not be created:\n"
+#. user manually specified backup location
+#: rapid/rapid.py:3009
+#, python-format
+msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:1805
+#: rapid/rapid.py:3014
 #, python-format
-msgid "%(path)s: "
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:1806 rapid/rapid.py:1807 rapid/rapid.py:1822
-#: rapid/rapid.py:1823 rapid/rapid.py:2084 rapid/rapid.py:2087
-msgid "Download cannot proceed"
+#: rapid/rapid.py:3043
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:1820 rapid/rapid.py:4959
-msgid "There is an error in the program preferences."
-msgstr "プログラムの設定にエラーがあります"
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr ""
 
-#: rapid/rapid.py:1821
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+msgid "Video"
 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 photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1995
+#: rapid/rapid.py:3159
 #, python-format
-msgid "%(number)s %(filetypes)s"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#. 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 photos 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:2006
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:2013
+#: rapid/rapid.py:3173
 #, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgid "%(file_type)s download folder is invalid"
 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:2034
-msgid "The device can now be safely removed"
+#: rapid/rapid.py:3186
+#, python-format
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:2040
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
+#: rapid/rapid.py:3264
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:2043
+#. 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:3311
 #, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:2046 rapid/rapid.py:5744
-msgid "warnings"
+#: rapid/rapid.py:3312
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:2048 rapid/rapid.py:5748
-msgid "errors"
+#: rapid/rapid.py:3313
+msgid "only output errors to the command line"
 msgstr ""
 
-#: rapid/rapid.py:2078
-#, python-format
-msgid "Source: %s\n"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:3315
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:2080
-#, python-format
-msgid "Device: %s\n"
+#: rapid/rapid.py:3316
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:2081
-#, python-format
-msgid "Destination: %s"
+#: rapid/rapid.py:3329
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:2082 rapid/rapid.py:2085
-msgid "Could not create temporary download directory"
+#: rapid/rapid.py:3329
+msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:2085
-msgid "Error:"
+#: rapid/rapid.py:3334
+#, python-format
+msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:2109
-msgid "Backup path does not exist"
+#: rapid/rapid.py:3342
+msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:2110
-#, python-format
-msgid "The path %s could not be created"
+#: rapid/rapid.py:3351
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
 msgstr ""
 
-#: rapid/rapid.py:2111
-msgid "No backups can occur"
+#: rapid/backupfile.py:139 rapid/backupfile.py:162
+msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:2140
+#: rapid/backupfile.py:141
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:2171 rapid/rapid.py:2517 rapid/rapid.py:2552
-#: rapid/rapid.py:2580 rapid/rapid.py:2611 rapid/rapid.py:2630
+#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2186
-msgid "Please check your system and try again."
-msgstr ""
-
-#: rapid/rapid.py:2206
-msgid "Photos detected with the same filenames, but taken at different times"
-msgstr ""
-
-#: rapid/rapid.py:2246
-msgid "Photo has already been downloaded"
-msgstr ""
-
-#: rapid/rapid.py:2247 rapid/rapid.py:2646
+#: rapid/backupfile.py:146 rapid/backupfile.py:166
 #, python-format
-msgid "Source: %(source)s"
-msgstr ""
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2445
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:2516
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
+#: rapid/subfolderfile.py:348 rapid/subfolderfile.py:366
 #, python-format
-msgid "Backup of %(file_type)s already exists"
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:2520
-#, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr ""
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "デバイスが検知されました"
 
-#: rapid/rapid.py:2524
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:88
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
 
-#: rapid/rapid.py:2526
-#, python-format
-msgid "%(file_type)s not backed up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:107
+msgid "_Remember this choice"
 msgstr ""
 
-#: rapid/rapid.py:2549 rapid/rapid.py:2577 rapid/rapid.py:2610
-#: rapid/rapid.py:2629
-msgid "Backing up error"
+#: rapid/downloadtracker.py:268
+msgid "MB/s"
 msgstr ""
 
-#: rapid/rapid.py:2550 rapid/rapid.py:2578
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+#: rapid/generatenameconfig.py:145
+msgid "Date time"
 msgstr ""
 
-#: rapid/rapid.py:2554 rapid/rapid.py:2613
-#, python-format
-msgid "Error: %(inst)s"
+#: rapid/generatenameconfig.py:146
+msgid "Text"
 msgstr ""
 
-#: rapid/rapid.py:2555 rapid/rapid.py:2583 rapid/rapid.py:2614
-#: rapid/rapid.py:2633
-#, python-format
-msgid "The %(file_type)s was not backed up."
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
 msgstr ""
 
-#: rapid/rapid.py:2582 rapid/rapid.py:2632
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
+#: rapid/generatenameconfig.py:148
+msgid "Metadata"
 msgstr ""
 
-#: rapid/rapid.py:2645
-#, python-format
-msgid "%(file_type)s could not be backed up"
+#: rapid/generatenameconfig.py:149
+msgid "Sequences"
 msgstr ""
 
-#: rapid/rapid.py:2648
-msgid "No suitable backup volume was found"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
+msgid "Job code"
 msgstr ""
 
-#: rapid/rapid.py:2650
-msgid "A backup location was not found"
+#: rapid/generatenameconfig.py:152
+msgid "Image date"
 msgstr ""
 
-#: rapid/rapid.py:2704
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#: rapid/generatenameconfig.py:153
+msgid "Video date"
 msgstr ""
 
-#: rapid/rapid.py:2777
-#, python-format
-msgid "Download has started from %s"
+#: rapid/generatenameconfig.py:154
+msgid "Today"
 msgstr ""
 
-#: rapid/rapid.py:2780
-#, python-format
-msgid "Attempting to download %s files"
+#: rapid/generatenameconfig.py:155
+msgid "Yesterday"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2813 rapid/rapid.py:2880
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:157
+msgid "Download time"
 msgstr ""
 
-#: rapid/rapid.py:2876
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:159
+msgid "Name + extension"
 msgstr ""
 
-#: rapid/rapid.py:2901 rapid/rapid.py:2905
-msgid "Could not delete photo or video from device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:161
+msgid "Name"
 msgstr ""
 
-#: rapid/rapid.py:2902
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:163
+msgid "Extension"
 msgstr ""
 
-#: rapid/rapid.py:2906
-#, python-format
-msgid "Photo: %(source)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Image number"
 msgstr ""
 
-#: rapid/rapid.py:2908
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+#: rapid/generatenameconfig.py:166
+msgid "Video number"
 msgstr ""
 
-#: rapid/rapid.py:2921
-#, python-format
-msgid "Download complete from %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:168
+msgid "Aperture"
 msgstr ""
 
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3036 rapid/rapid.py:3505
-msgid "Device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:170
+msgid "ISO"
 msgstr ""
 
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3041 rapid/rapid.py:3494
-msgid "Size"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:172
+msgid "Exposure time"
 msgstr ""
 
-#: rapid/rapid.py:3044
-msgid "Download Progress"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Focal length"
 msgstr ""
 
-#: rapid/rapid.py:3132
-msgid "Downloading From Cameras"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:176
+msgid "Camera make"
 msgstr ""
 
-#: rapid/rapid.py:3138
-msgid "Downloading directly from a camera may work poorly or not at all"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:178
+msgid "Camera model"
 msgstr ""
 
-#: rapid/rapid.py:3139
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3153
-msgid "_Show this message again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:182
+msgid "Hyphenated short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3188
-msgid "Device Detected"
-msgstr "デバイスが検知されました"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3197
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:184
+msgid "Serial number"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3216
-msgid "_Remember this choice"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:186
+msgid "Shutter count"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-#, python-format
-msgid "%s selected for downloading from"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:188
+msgid "Owner name"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3256
-msgid "This device or partition will always be used to download from"
+#: rapid/generatenameconfig.py:189
+msgid "Codec"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3259
-#, python-format
-msgid "%s rejected as a download device"
+#: rapid/generatenameconfig.py:190
+msgid "Width"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3262
-msgid "This device or partition will never be used to download from"
+#: rapid/generatenameconfig.py:191
+msgid "Height"
 msgstr ""
 
-#: rapid/rapid.py:3269
-msgid "Remove all Job Codes?"
+#: rapid/generatenameconfig.py:192
+msgid "Length"
 msgstr ""
 
-#: rapid/rapid.py:3286
-msgid "Should all Job Codes be removed?"
+#: rapid/generatenameconfig.py:193
+msgid "Frames Per Second"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3314
-msgid "Enter a Job Code"
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3333
-msgid "Enter a new Job Code, or select a previous one"
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3336
-msgid "Enter a new Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:197
+msgid "Downloads today"
 msgstr ""
 
-#: rapid/rapid.py:3341 rapid/rapid.py:4496
-msgid "Job Code:"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:199
+msgid "Session number"
 msgstr ""
 
-#: rapid/rapid.py:3388
-msgid "Job Code entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:201
+msgid "Subfolder number"
 msgstr ""
 
-#: rapid/rapid.py:3390
-msgid "Job Code not entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:203
+msgid "Stored number"
 msgstr ""
 
-#: rapid/rapid.py:3440
-msgid "Status"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
+#: rapid/generatenameconfig.py:205
+msgid "Sequence letter"
 msgstr ""
 
-#: rapid/rapid.py:3448
-msgid "Type"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:207
+msgid "All digits"
 msgstr ""
 
-#: rapid/rapid.py:3457 rapid/rapid.py:4921 rapid/rapid.py:4923
-msgid "Photo"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:209
+msgid "Last digit"
 msgstr ""
 
-#: rapid/rapid.py:3459
-msgid "File"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:211
+msgid "Last 2 digits"
 msgstr ""
 
-#: rapid/rapid.py:3474
-msgid "Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:213
+msgid "Last 3 digits"
 msgstr ""
 
-#: rapid/rapid.py:3484
-msgid "Date"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:215
+msgid "Last 4 digits"
 msgstr ""
 
-#: rapid/rapid.py:3516 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:217
+msgid "Original Case"
 msgstr ""
 
-#: rapid/rapid.py:3527
-msgid "Path"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:219
+msgid "UPPERCASE"
 msgstr ""
 
-#: rapid/rapid.py:3918
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:221
+msgid "lowercase"
 msgstr ""
 
-#: rapid/rapid.py:3920
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#: rapid/generatenameconfig.py:222
+msgid "One digit"
 msgstr ""
 
-#: rapid/rapid.py:3922
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#: rapid/generatenameconfig.py:223
+msgid "Two digits"
 msgstr ""
 
-#: rapid/rapid.py:3924
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#: rapid/generatenameconfig.py:224
+msgid "Three digits"
 msgstr ""
 
-#: rapid/rapid.py:3926
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+#: rapid/generatenameconfig.py:225
+msgid "Four digits"
 msgstr ""
 
-#: rapid/rapid.py:3928
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
+#: rapid/generatenameconfig.py:226
+msgid "Five digits"
 msgstr ""
 
-#: rapid/rapid.py:3930
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#: rapid/generatenameconfig.py:227
+msgid "Six digits"
 msgstr ""
 
-#: rapid/rapid.py:3932
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#: rapid/generatenameconfig.py:228
+msgid "Seven digits"
 msgstr ""
 
-#: rapid/rapid.py:3934
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:230
+msgid "Subseconds"
 msgstr ""
 
-#: rapid/rapid.py:4303
-msgid "Preview"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:232
+msgid "YYYYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:4518
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:234
+msgid "YYYY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:4887
-#, python-format
-msgid "%(free)s available"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:236
+msgid "YYMMDD"
 msgstr ""
 
-#. user manually specified backup location
-#: rapid/rapid.py:4894
-#, python-format
-msgid "Backing up to %(path)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:238
+msgid "YY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:4899
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:240
+msgid "MMDDYYYY"
 msgstr ""
 
-#: rapid/rapid.py:4908
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "MMDDYY"
 msgstr ""
 
-#: rapid/rapid.py:4912
-msgid "Problem with Device Location Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:244
+msgid "MMDD"
 msgstr ""
 
-#: rapid/rapid.py:4921
-msgid "Video"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:246
+msgid "DDMMYYYY"
 msgstr ""
 
-#: rapid/rapid.py:4928
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "DDMMYY"
 msgstr ""
 
-#: rapid/rapid.py:4937
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:250
+msgid "YYYY"
 msgstr ""
 
-#: rapid/rapid.py:4942
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:252
+msgid "YY"
 msgstr ""
 
-#: rapid/rapid.py:4945
-msgid "Problem with Download Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:254
+msgid "MM"
 msgstr ""
 
-#: rapid/rapid.py:4947
-msgid "Problem with Download Folders"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:256
+msgid "DD"
 msgstr ""
 
-#: rapid/rapid.py:4960
-msgid "Some preferences will be reset."
-msgstr "いくつかの設定はリセットされます"
-
-#: rapid/rapid.py:4993
-msgid "Displaying warning about downloading directly from camera"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:258
+msgid "HHMMSS"
 msgstr ""
 
-#: rapid/rapid.py:5003
-#, python-format
-msgid "Prompting whether to use %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "HHMM"
 msgstr ""
 
-#: rapid/rapid.py:5030
-msgid "Prompting for Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:262
+msgid "HH-MM-SS"
 msgstr ""
 
-#: rapid/rapid.py:5034
-msgid "Already prompting for Job Code, do not prompt again"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:264
+msgid "HH-MM"
 msgstr ""
 
-#: rapid/rapid.py:5051
-msgid "Starting downloads"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:266
+msgid "HH"
 msgstr ""
 
-#. autostart is true
-#: rapid/rapid.py:5055
-msgid "Starting downloads that have been waiting for a Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:268
+msgid "MM (minutes)"
 msgstr ""
 
-#: rapid/rapid.py:5102
-#, python-format
-msgid "Creating photo download folder %(folder)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:270
+msgid "SS"
 msgstr ""
 
-#: rapid/rapid.py:5107
+#: rapid/preferencesdialog.py:370
 #, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5111
+#: rapid/preferencesdialog.py:372
 #, python-format
-msgid "Creating video download folder %(folder)s"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5116
+#: rapid/preferencesdialog.py:376
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/rapid.py:5141
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:5143
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/rapid.py:5145
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/preferencesdialog.py:436
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5146
-msgid "Warning:"
+#: rapid/preferencesdialog.py:617
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5151
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/preferencesdialog.py:638
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5158
-msgid "Preferences were modified."
+#: rapid/preferencesdialog.py:655
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5159
-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."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:714
+msgid "Enter a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5163
-msgid "No preferences needed to be changed."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:731
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/rapid.py:5165
-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."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:734
+msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5175
-msgid "Problem using pynotify."
+#: rapid/preferencesdialog.py:739
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:5191
-msgid "Failed to receive pynotify server capabilities."
+#: rapid/preferencesdialog.py:916
+msgid "Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5202
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
+#: rapid/preferencesdialog.py:998
+msgid "Select a folder to download photos to"
+msgstr "写真をダウンロードする先のフォルダを選択してください"
+
+#: rapid/preferencesdialog.py:1016
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:5250
-msgid "and"
+#: rapid/preferencesdialog.py:1107
+#, python-format
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5255
-msgid "Using backup devices"
+#: rapid/preferencesdialog.py:1129
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5257
-msgid "Using backup device"
+#. 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/preferencesdialog.py:1215
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5259
-msgid "No backup devices detected"
+#: rapid/preferencesdialog.py:1266
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5309 rapid/rapid.py:5471
+#. 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/preferencesdialog.py:1269
 #, python-format
-msgid "Device %(device)s (%(path)s) ignored"
+msgid "<i>Example: %s</i>"
 msgstr ""
 
-#: rapid/rapid.py:5430
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1359
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/rapid.py:5434
-msgid "Automatically start download is true"
-msgstr ""
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1645
+msgid "externaldrive1"
+msgstr "外部ドライブ1"
 
-#: rapid/rapid.py:5436
-msgid "Automatically start download is false"
-msgstr ""
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1647
+msgid "externaldrive2"
+msgstr "外部ドライブ2"
 
-#: rapid/rapid.py:5489
-msgid "Using manually specified path"
-msgstr ""
+#: rapid/prefsrapid.py:122
+msgid "New York"
+msgstr "ニューヨーク"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5557
-#, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Manila"
+msgstr "マニラ"
 
-#: rapid/rapid.py:5573
-msgid "D_ownload Selected"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Prague"
+msgstr "プラハ"
 
-#: rapid/rapid.py:5665 rapid/rapid.py:5716
-msgid "All downloads complete"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Helsinki"
+msgstr "ヘルシンキ"
 
-#: rapid/rapid.py:5680
-msgid "MB/s"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Wellington"
+msgstr "ウェリントン"
 
-#: rapid/rapid.py:5690
-msgid "About 1 second remaining"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Tehran"
+msgstr "テヘラン"
 
-#: rapid/rapid.py:5692
-#, python-format
-msgid "About %i seconds remaining"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Kampala"
+msgstr "カンパラ"
 
-#: rapid/rapid.py:5694
-msgid "About 1 minute remaining"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Paris"
+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:5699
-#, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Berlin"
+msgstr "ベルリン"
 
-#: rapid/rapid.py:5719 rapid/rapid.py:5725 rapid/rapid.py:5731
-#: rapid/rapid.py:5737 rapid/rapid.py:5742 rapid/rapid.py:5746
-#, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Sydney"
+msgstr "シドニー"
 
-#: rapid/rapid.py:5721 rapid/rapid.py:5733
-#, python-format
-msgid "%(filetype)s downloaded"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Budapest"
+msgstr "ブダペスト"
 
-#: rapid/rapid.py:5727 rapid/rapid.py:5739
-#, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Rome"
+msgstr "ローマ"
 
-#: rapid/rapid.py:5907
-msgid "_Resume"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Moscow"
+msgstr "モスクワ"
 
-#: rapid/rapid.py:5910
-msgid "_Download All"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Delhi"
+msgstr "デリー"
+
+#: rapid/prefsrapid.py:125
+msgid "Warsaw"
+msgstr "ワルシャワ"
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5919
-msgid "_Pause"
+#: rapid/prefsrapid.py:126
+msgid "Jakarta"
+msgstr "ジャカルタ"
+
+#: rapid/prefsrapid.py:126
+msgid "Madrid"
+msgstr "マドリッド"
+
+#: rapid/prefsrapid.py:126
+msgid "Stockholm"
+msgstr "ストックホルム"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+msgid "subfolder"
 msgstr ""
 
-#: rapid/rapid.py:6031
-msgid "Download device settings preferences were changed."
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+msgid "filename"
 msgstr ""
 
-#: rapid/rapid.py:6043
-msgid "Backup preferences were changed."
+#: rapid/problemnotification.py:80
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/rapid.py:6049
-msgid "Subfolder and filename preferences were changed."
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
 msgstr ""
 
-#: rapid/rapid.py:6060
-msgid "Download folder preferences were changed."
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:83
+msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/rapid.py:6259
-msgid "Goodbye"
+#: rapid/problemnotification.py:84
+#, python-format
+msgid "Error generating component %s."
 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:6270
+#. a generic problem
+#: rapid/problemnotification.py:86
 #, python-format
-msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/rapid.py:6271
-msgid "only output errors to the command line"
+#: rapid/problemnotification.py:88
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6273
-msgid "list photo and video file extensions the program recognizes and exit"
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/rapid.py:6274
-msgid "reset all program settings and preferences and exit"
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Photos:"
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Videos:"
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
+"%(image2)s on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
-#: rapid/rapid.py:6288
+#: rapid/problemnotification.py:103
 #, python-format
-msgid "and %s"
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/rapid.py:6296
-msgid "All settings and preferences have been reset"
+#: rapid/problemnotification.py:107
+#, python-format
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6300 rapid/rapid.py:6301 rapid/rapid.py:6303
-#: rapid/rapid.py:6308 rapid/rapid.py:6312
-msgid "Using"
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/rapid.py:6305
-msgid "\n"
-msgstr "\n"
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
 
-#. this application is already running
-#: rapid/rapid.py:6329
+#: rapid/problemnotification.py:111
 #, python-format
-msgid "%s is already running"
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:192
-msgid "Date time"
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
-msgid "Text"
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
-msgid "Metadata"
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:196
-msgid "Sequences"
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:199
-msgid "Image date"
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
-msgid "Video date"
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
-msgid "Today"
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
-msgid "Yesterday"
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
-msgid "Name + extension"
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
-msgid "Name"
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
-msgid "Extension"
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
-msgid "Image number"
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:211
-msgid "Video number"
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
-msgid "Aperture"
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
-msgid "ISO"
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
-msgid "Exposure time"
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
-msgid "Focal length"
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
-msgid "Camera make"
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
-msgid "Camera model"
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
-msgid "Short camera model"
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
-msgid "Hyphenated short camera model"
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
-msgid "Serial number"
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
-msgid "Shutter count"
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
-msgid "Owner name"
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:234
-msgid "Codec"
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:235
-msgid "Width"
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
-msgid "Height"
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
-msgid "Length"
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
-msgid "Frames Per Second"
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:240
-msgid "Downloads today"
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
-msgid "Session number"
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
-msgid "Subfolder number"
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
-msgid "Stored number"
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:248
-msgid "Sequence letter"
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:250
-msgid "All digits"
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
-msgid "Last digit"
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
-msgid "Last 2 digits"
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
-msgid "Last 3 digits"
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
-msgid "Last 4 digits"
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:260
-msgid "Original Case"
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
-msgid "UPPERCASE"
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
-msgid "lowercase"
+#: rapid/subfolderfile.py:297
+msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:265
-msgid "One digit"
+#: rapid/subfolderfile.py:298
+#, python-format
+msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:266
-msgid "Two digits"
+#: rapid/subfolderfile.py:355
+msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:267
-msgid "Three digits"
+#: rapid/subfolderfile.py:393
+msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:268
-msgid "Four digits"
+#: rapid/subfolderfile.py:394
+#, python-format
+msgid "Path: %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:269
-msgid "Five digits"
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:270
-msgid "Six digits"
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:271
-msgid "Seven digits"
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
-msgid "Subseconds"
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
-msgid "YYYYMMDD"
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
-msgid "YYYY-MM-DD"
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
-msgid "YYMMDD"
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
-msgid "YY-MM-DD"
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
-msgid "MMDDYYYY"
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
-msgid "MMDDYY"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
-msgid "MMDD"
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
-msgid "DDMMYYYY"
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
-msgid "DDMMYY"
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
-msgid "YYYY"
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
-msgid "YY"
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
-msgid "MM"
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
-msgid "DD"
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
-msgid "HHMMSS"
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
-msgid "HHMM"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
-msgid "HH-MM-SS"
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:307
-msgid "HH-MM"
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:309
-msgid "HH"
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
-msgid "MM (minutes)"
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
-msgid "SS"
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:796
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:803
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:807
-msgid "These preferences are not well formed:"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1517
-#, python-format
-msgid "Subfolder preferences should not start with a %s"
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1519
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1523
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/glade3/prefs.ui.h:1
 msgid " "
 msgstr " "
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
-
-#: rapid/glade3/rapid.glade.h:3
+#: rapid/glade3/prefs.ui.h:2
 msgid " hh:mm"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
+#: rapid/glade3/prefs.ui.h:3
 msgid ":"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
+#: rapid/glade3/prefs.ui.h:4
 msgid "<b>Backup</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/prefs.ui.h:6
 msgid "<b>Download Folder</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#: rapid/glade3/prefs.ui.h:19
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
+#: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
+#: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
+#: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
+#: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:36
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:38
+#: rapid/glade3/prefs.ui.h:35
 msgid "Backup photos and videos when downloading"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/glade3/prefs.ui.h:36
 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
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/glade3/prefs.ui.h:42
 msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/glade3/prefs.ui.h:52
+msgid "Generate thumbnails (slower)"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: rapid/glade3/prefs.ui.h:68
+msgid "Preferences: Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
-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 ""
-
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
+#: rapid/glade3/prefs.ui.h:75
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
+"python."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1781,136 +1678,108 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr ""
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "値をゼロにリセットする\n"
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr ""
+#~ msgid "Resetting to default values."
+#~ msgstr "初期設定の値にリセットする"
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr ""
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "プログラムの設定にエラーがあります"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr ""
+#~ msgid "Could not open image"
+#~ msgstr "画像を開くことができませんでした"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr ""
+#~ msgid "Some preferences will be reset."
+#~ msgstr "いくつかの設定はリセットされます"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr ""
+#~ msgid "Select a folder in which to backup images"
+#~ msgstr "画像をバックアップする先のフォルダを選択してください"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr ""
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr ""
+#~ msgid "      "
+#~ msgstr "      "
diff --git a/po/nl.po b/po/nl.po
index b805607..db1a7ab 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-13 05:50+0000\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-17 05:02+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: 2011-05-18 23:36+0000\n"
-"X-Generator: Launchpad (build 13067)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -70,15 +70,15 @@ msgstr "%(device)s werd niet ontkoppeld"
 msgid "scanning..."
 msgstr "Aan het scannen..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Pauze"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,137 +98,137 @@ msgstr ""
 "Deze downloadmap is ongeldig:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "Download kan niet plaatsgrijpen"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "foto's en video's"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "foto's of video's"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "video's"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "foto's"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kon niet gedownload worden"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s gedownload"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s werden niet gedownload"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 "%(number)s van de %(total)s %(filetypes)s (%(remaining)s blijven over)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s van %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Vrije ruimte:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s vrij"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Backuppen naar %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Programma voorkeuren zijn ongeldig"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s downloadmap bestaat niet"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Map: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s downloadmap is ongeldig"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s downloadmap is niet beschrijfbaar"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Miniaturen"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,43 +313,43 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr "vertoon debug informatie wanneer uitgevoerd vanop de commando prompt"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 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:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "vertoon de foto en video bestandsextenties welke het programma herkent en "
 "verlaat het programma"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr "reset alle programma instellingen en verlaat het programma"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Foto's:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Video's:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Alle instellingen en voorkeuren werden gereset"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -413,346 +413,354 @@ msgstr "_Herinner deze keuze"
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Datum/tijd"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Reeksen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Job code"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Afbeeldingsgegevens"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Video datum"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Vandaag"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Download tijd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Naam + extentie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Naam"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Extentie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Afbeelding nummer"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Video nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Diafragma"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Belichtingstijd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Brandpuntsafstand"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Camera merk"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Camera model"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 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/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 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/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Sluiter teller"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Naam eigenaar"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Breedte"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Hoogte"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Lengte"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Frames per seconde"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Artiest"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Copyright"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Downloads vandaag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Sessienummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Nummer Submap"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Opgeslagen nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Vervolg letter"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Alle cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Laatste cijfer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 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/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "HOOFDLETTERS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "kleine letters"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Eén cijfer"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Twee cijfers"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Drie cijfers"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Vier cijfers"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Vijf cijfers"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Zes cijfers"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Zeven cijfers"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Subseconden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "JJJJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 msgid "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/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "JJMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 msgid "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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
@@ -1421,65 +1429,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibiliteit met andere besturingssystemen</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Apparaten</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Download Map</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Download Submappen</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Voorbeeld</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Job Codes</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Foto Hernoemen</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Foto- en Videonaam conflict</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Programma Automatisatie</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Volgnummers</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Voorbeeld: /home/user/Afbeeldingen</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Voorbeeld:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nieuw:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Origineel:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">`Apparaat Opties</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Apparaten</span>"
@@ -1537,14 +1545,10 @@ msgid "Backup"
 msgstr "Backup"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Backup locatie:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Backup foto's en video's gedurende het downloaden"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1552,7 +1556,7 @@ msgstr ""
 "Kies de downloadmap. Submappen voor de gedownloadde foto's zullen "
 "automatisch aangemaakt worden in deze map volgens de structuur hieronder."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1560,15 +1564,19 @@ msgstr ""
 "Kies de download map. Submappen voor de gedownloadde video's zullen "
 "automatisch aangemaakt worden in deze map conform de onderstaande structuur."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Aanvang dag:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 "Verwijder foto's en video's van het apparaat als de download afgelopen is"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Apparaat Opties"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Apparaten"
@@ -1578,22 +1586,24 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Apparaten zijn gegevensdragers van waar foto's en video's gedownload worden, "
-"zoals camera's, geheugenkaarten of Draagbare Opslagapparaten..\n"
+"Met apparaten wordt bedoeld van waar je de foto's en video's dowloadt, zoals "
+"camera's, geheugenkaartken of Draagbare Opslag Media.\n"
 "\n"
-"Je kan foto's van meerdere apparaten simultaan downloaden, of je kunt een "
-"plaats op je harde schijf aanduiden.\n"
+"Er kan vanaf meerdere apparaten simultaan gedownload worden, of je kunt een "
+"plaats op je harde schijf aanduiden..\n"
 "\n"
-"<i>Indien het rechtstreeks downloaden van je camera maar povertjes of zelfs "
-"helemaal niet gaat, probeer dan eens de instelling naar PTP mode te zetten. "
-"Als dat niet kan, zoek dan je heil in een kaartlezer..</i>"
+"<i>Rechtstreeks downloaden vanaf de camera is momenteel een experimentele "
+"optie. Indien rechtstreeks downloaden vanaf de camera niet of onvoldoende "
+"werkt, probeer via de PTP mode. Als dat niet mogelijk is, moet een "
+"kaartlezer gebruikt worden.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1620,81 +1630,113 @@ msgid "Generate thumbnails (slower)"
 msgstr "Aanmaken miniatuur (trager)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Als je de automatische herkenning uitschakelt, kies de juiste backup plaats."
+"Als je de automatische herkenning uitzet, moet je een exacte backup locatie "
+"ingeven."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
-"Als je de automatische detectie afzet, kies dan de juiste plaats van de "
-"beelden en video's."
+"Als je de automatische herkenning uitzet, moet je een exacte locatie ingeven "
+"van de foto's en video's."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Als je de automatische herkenning van Draagbare Opslagmedia inschakelt, zal "
-"het volledig apparaat gescanned worden op afbeeldingen. Bij grote apparaten, "
-"kan dat een tijd duren."
+"Als je de automatische herkenning van draagbare opslag media aanzet, zal het "
+"volledig apparaat gelezen worden. Bij grote apparaten kan dat een tijd "
+"duren.\n"
+"\n"
+"Als deze optie aanstaat en een mogelijks apparaat gedetecteerd wordt, zal je "
+"gevraagd worden om te bepalen of het al dan niet ingelezen kan worden."
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Genegeerde Paden\t"
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Job Codes"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Locatie:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Prestatie"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Foto Mappen"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Foto Hernoemen"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Foto backup foldernaam:"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Foto backup locatie:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Voorkeuren: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "V_erwijder alles"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "_Alles verwijderen"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Onthouden Apparaten"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+"Onthouden apparaten zijn die apparaten waarvan je bepaald hebt dat ze altijd "
+"of nooit gelezen dienen te worden wanneer het automatisch inlezen van "
+"Draagbare Opslag Media aangezet is."
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Hernoemingsopties"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Overslaan"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Download overslaan"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1704,7 +1746,7 @@ msgstr ""
 "<i>hachoir metadata</i> en <i>kaa metadata</i> pakketten voor python "
 "installeren."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1718,7 +1760,7 @@ msgstr ""
 "niet voor backups gebruikt wordt. Voor ieder apparaat dat je als backup "
 "wenst te gebruiken, maak er een map in met één van de volgende namen.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1726,7 +1768,7 @@ msgstr ""
 "Specifieer de tijd in 24-uurs formaat waar het <i>Downloads vandaag</i> "
 "volgnummer aan gelijk gezet moet worden.."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1734,43 +1776,47 @@ msgstr ""
 "Duid aan of foto-, video- en  mapnamen tekens die niet toegelaten zijn bij "
 "andere besturingssystemen dienen verwijderd te worden."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Start de download tijdens het opstarten van het programma"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Start de download zodra het apparaat wordt aangekoppeld"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Opgeslagen nummer:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Verwijder niet-compatibele karakters"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchroniseer RAW + JPEG volgnummers"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Ontkoppen (\"eject\") apparaat na beëindigen van de download"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Video Mappen"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Video Hernoemen"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Video backup foldernaam:"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr "Video backup locatie:"
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1779,7 +1825,7 @@ msgstr ""
 "om het downloaden van dit bestand over te slaan of om er een uniek "
 "identificatieteken aan toe te voegen."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1787,7 +1833,7 @@ msgstr ""
 "Kies om het bestand op het backupapparaat met dezelfde naam te "
 "overschrijven, of over te slaan, gedurende de backup."
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1795,10 +1841,14 @@ msgstr ""
 "Je kan je foto's en video's naar meerdere lokaties backuppen terwijl ze "
 "gedownload worden, bv. externe harde schijven."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Toevoegen…"
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "Gebruik _reguliere expressies"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
@@ -2132,12 +2182,19 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
+#~ msgid "Backup location:"
+#~ msgstr "Backup locatie:"
+
 #~ msgid "Delete images from image device upon download completion"
 #~ msgstr "Verwijder de afbeeldingen van het apparaat na de download"
 
 #~ msgid "Image Devices"
 #~ msgstr "Afbeeldingsapparaat"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Als je de automatische herkenning uitschakelt, kies de juiste backup plaats."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Verlaat programma na het beëindigen van een gelukte download"
 
@@ -2207,6 +2264,15 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "unieke identifier aan toe te kennen."
 
 #~ 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 ""
+#~ "Als je de automatische herkenning van Draagbare Opslagmedia inschakelt, zal "
+#~ "het volledig apparaat gescanned worden op afbeeldingen. Bij grote apparaten, "
+#~ "kan dat een tijd duren."
+
+#~ msgid ""
 #~ "Image devices are devices from which to download photos, such as cameras, "
 #~ "memory cards or Portable Storage Devices.\n"
 #~ "\n"
@@ -2838,12 +2904,22 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "%s metadata is not present"
 #~ msgstr "%s metadata ontbreekt"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Apparaten</b>"
+
 #~ msgid "Exit program if download completes without any warnings or errors"
 #~ msgstr ""
 #~ "Verlaat het programma als de download zonder verwittigingen noch fouten "
 #~ "beëindigd wordt."
 
 #~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "Als je de automatische detectie afzet, kies dan de juiste plaats van de "
+#~ "beelden en video's."
+
+#~ msgid ""
 #~ "Choose whether to skip downloading the file, or to add a unique indentifier."
 #~ msgstr ""
 #~ "Kies tussen het overslaan van het downloaden van het bestand, of er een "
@@ -3032,5 +3108,26 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "%(free)s available"
 #~ msgstr "%(free)s beschikbaar"
 
+#~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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 ""
+#~ "Apparaten zijn gegevensdragers van waar foto's en video's gedownload worden, "
+#~ "zoals camera's, geheugenkaarten of Draagbare Opslagapparaten..\n"
+#~ "\n"
+#~ "Je kan foto's van meerdere apparaten simultaan downloaden, of je kunt een "
+#~ "plaats op je harde schijf aanduiden.\n"
+#~ "\n"
+#~ "<i>Indien het rechtstreeks downloaden van je camera maar povertjes of zelfs "
+#~ "helemaal niet gaat, probeer dan eens de instelling naar PTP mode te zetten. "
+#~ "Als dat niet kan, zoek dan je heil in een kaartlezer..</i>"
+
 #~ msgid "Miscillaneous"
 #~ msgstr "Diversen"
diff --git a/po/pl.po b/po/pl.po
index eef3fab..195daeb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-02 10:03+0000\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-10 09:24+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: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -70,15 +70,15 @@ msgstr "Nie odmontowano %(device)s"
 msgid "scanning..."
 msgstr "wyszukiwanie..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Pobierz"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,137 +98,137 @@ msgstr ""
 "Nieprawidłowy katalog pobierania:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "Pobieranie nie może się odbyć"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "zdjęcia i filmy"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "zdjęcia lub filmy"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "filmy"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "film"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "zdjęcia"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "zdjęcie"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Pobrane pliki typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Nieudanych pobrań plików typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "Plik typu %(filetype)s został pobrany"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Nie udało się pobrać pliku typu %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 "%(number)s z %(total)s plików typu %(filetypes)s (pozostało: %(remaining)s)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Wolne miejsce:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s wolnego miejsca"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tworzenie kopii zapasowej w %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Preferencje programu są nieprawidłowe"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "katalog pobierania %(file_type)s nie istnieje"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Katalog: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "katalog pobierania %(file_type)s jest nieprawidłowy"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "katalog pobierania %(file_type)s nie jest zapisywalny"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Miniatury"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,42 +313,42 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr ""
 "wyświetlanie informacji o błędach w przypadku uruchomienia z linii poleceń"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 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:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "wypisz typy plików rozpoznawane przez program i zakończ"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Zdjęcia:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Filmy:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Wszystkie ustawienia oraz preferencje zostały zresetowane"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -410,346 +410,354 @@ msgstr "Zapa_miętaj ten wybór"
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Data czas"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadane"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sekwencje"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Kod pracy"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Data zdjęcia"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Data filmu"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Data pobierania"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Nazwa + rozszerzenie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Nazwa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Rozszerzenie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Numer obrazu"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Numer filmu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Przysłona"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 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/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Ogniskowa"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Producent aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Model aparatu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 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/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 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/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Numer seryjny"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Licznik migawki"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Nazwa właściciela"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Szerokość"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Wysokość"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Długość"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Klatki na sekundę"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Wykonawca"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Pobierań dzisiaj"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Numer sesji"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Numer podkatalogu"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Numer zachowany"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Litera sekwencji"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Wszystkie cyfry"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Ostatnia cyfra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 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/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "WIELKIE LITERY"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "małe litery"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Jedna cyfra"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Dwie cyfry"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Trzy cyfry"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Cztery cyfry"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Pięć cyfr"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Sześć cyfr"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Siedem cyfr"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Części sekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 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/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "GGMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "GGMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "GG-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
@@ -1417,65 +1425,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Zgodność z innymi systemami operacyjnymi</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Urządzenia</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Katalog pobierania</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Podkatalogi pobierania</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Przykład</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Kody pracy</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Zmiana nazw zdjęć</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Konflikty między nazwami zdjęć i filmów</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatyzacja programu</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Numery sekwencji</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/dyskzewnętrzny/Photos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Przykład: /home/użytkownik/Obrazy</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Przykład:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nowa:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Oryginalna:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Kopia zapasowa</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opcje urządzenia</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Urządzenia</span>"
@@ -1536,14 +1544,10 @@ msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Położenie kopii zapasowej:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Utwórz kopię zapasową zdjęć i filmów podczas pobierania"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1551,7 +1555,7 @@ msgstr ""
 "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych zdjęć zostaną w "
 "nim automatycznie utworzone w oparciu o poniższą specyfikację."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1559,14 +1563,18 @@ msgstr ""
 "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych filmów zostaną w "
 "nim automatycznie utworzone w oparciu o poniższą specyfikację."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Początek dnia:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Usuń zdjęcia i filmy z urządzenia po ukończeniu pobierania"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Opcje urządzenia"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Urządzenia"
@@ -1576,20 +1584,24 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Nośniki obrazów to urządzenia z których można pobrać zdjęcia i filmy, takie "
-"jak aparaty fotograficzne, karty pamięci czy przenośne magazyny danych.\n"
-"Zdjęcia mogą być pobierane jednocześnie z kilku nośników obrazów, lub z "
-"określonego położenia na dysku.\n"
-"<i>Jeżeli pobieranie bezpośrednio z aparatu fotograficznego działa "
-"nieprawidłowo lub wcale, proszę spróbować przestawić go do trybu PTP. Jeśli "
-"jest to niemożliwe, proszę rozważyć użycie czytnika kart pamięci.</i>"
+"Urządzenia z których można pobrać zdjęcia i filmy, takie jak aparaty "
+"fotograficzne, karty pamięci czy przenośne magazyny danych.\n"
+"\n"
+"Pobieranie może następować z kilku urządzeń jednocześnie, lub z określonego "
+"położenia na dysku.\n"
+"\n"
+"<i>Pobieranie bezpośrednio z aparatu jest obecnie w fazie eksperymentalnej. "
+"Jeśli pobieranie bezpośrednio z aparatu fotograficznego działa nieprawidłowo "
+"lub wcale, proszę spróbować przestawić go do trybu PTP. Jeśli nie jest to "
+"możliwe, zalecane jest użycie czytnika kart pamięci.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1617,82 +1629,110 @@ msgid "Generate thumbnails (slower)"
 msgstr "Utwórz miniatury (wolniej)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"W przypadku wyłączenia wykrywania automatycznego, proszę określić dokładne "
+"W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
 "położenie kopii zapasowej."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
-"położenie obrazów i filmów."
+"położenie zdjęć i filmów."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 "Jeżeli automatyczne wykrywanie przenośnych magazynów danych jest aktywne, "
 "obrazy będą wyszukiwane na całym nośniku. W przypadku nośników o dużych "
-"pojemnościach, może to chwilę potrwać."
+"pojemnościach, może to chwilę potrwać.\n"
+"\n"
+"Jeżeli ta opcja jest zaznaczona, a potencjalne urządzenie zostanie wykryte, "
+"pojawi się komunikat z pytaniem o przeprowadzenie skanowania."
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Ignorowane ścieżki\t"
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Kody pracy"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Położenie:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Różności"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Wydajność"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Katalogi zdjęć"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Zmiana nazw zdjęć"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Nazwa katalogu z kopią zapasową zdjęć:"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Położenie kopii zapasowej:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferencje: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "U_suń wszystko"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Zapamiętane urządzenia"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Opcje zmiany nazw"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Pomiń"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Pomiń pobieranie"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1702,7 +1742,7 @@ msgstr ""
 "zainstalować następujące pakiety dla Pythona:  <i>hachoir metadata</i> oraz "
 "<i>kaa metadata</i>"
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1718,7 +1758,7 @@ msgstr ""
 "podanej nazwie dla każdego urządzenia, które będzie używane do zapisu kopii "
 "zapasowych.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1726,7 +1766,7 @@ msgstr ""
 "Proszę określić czas, w formacie 24-godzinnym, w którym numer sekwencji "
 "<i>Pobierań dzisiaj</i> powinien zostać zresetowany."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1734,43 +1774,47 @@ msgstr ""
 "Proszę określić czy znaki, które są niedozwolone przez inne systemy "
 "operacyjne, powinny zostać usunięte z nazw obrazów i katalogów."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Rozpocznij pobieranie przy uruchomieniu programu"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Rozpocznij pobieranie po podłączeniu urządzenia"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Numer zachowany:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Usuń niezgodne znaki"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronizuj numery sekwencji RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Odmontuj (\"wysuń\") urządzenie po ukończeniu pobierania"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Katalogi filmów"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Zmiana nazw filmów"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Nazwa katalogu z kopią zapasową filmów:"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr "Położenie kopii zapasowej filmów:"
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1778,7 +1822,7 @@ msgstr ""
 "Proszę określić działanie w przypadku, gdy zdjęcie lub film o tej samej "
 "nazwie został już pobrany."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1786,7 +1830,7 @@ msgstr ""
 "Proszę wybrać, czy podczas tworzenia kopii zapasowej nadpisać czy pominąć "
 "plik o tej samej nazwie na urządzeniu docelowym."
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1794,10 +1838,14 @@ msgstr ""
 "Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć i "
 "filmów, np. na zewnętrznych dyskach twardych."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Dodaj..."
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr ""
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
@@ -1872,6 +1920,9 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgid "Backup photos when downloading"
 #~ msgstr "Utwórz kopię zapasową podczas pobierania zdjęć"
 
+#~ msgid "Backup location:"
+#~ msgstr "Położenie kopii zapasowej:"
+
 #~ msgid "_Get Help Online..."
 #~ msgstr "Z_najdź pomoc w sieci..."
 
@@ -2250,6 +2301,11 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgid "<b>Missing Backup Devices</b>"
 #~ msgstr "<b>Brak urządzeń do zapisu kopii zapasowej</b>"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "W przypadku wyłączenia wykrywania automatycznego, proszę określić dokładne "
+#~ "położenie kopii zapasowej."
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
@@ -2377,6 +2433,15 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgstr "Niektóre preferencje zostaną zresetowane."
 
 #~ 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 ""
+#~ "Jeżeli automatyczne wykrywanie przenośnych magazynów danych jest aktywne, "
+#~ "obrazy będą wyszukiwane na całym nośniku. W przypadku nośników o dużych "
+#~ "pojemnościach, może to chwilę potrwać."
+
+#~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 #~ "the name. Please use other renaming options.</i>"
 #~ msgstr ""
@@ -2575,6 +2640,13 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ "Zakończ działanie programu, jeśli pobieranie zostanie ukończone bez błędów "
 #~ "czy ostrzeżeń"
 
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
+#~ "położenie obrazów i filmów."
+
 #, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
@@ -2772,6 +2844,9 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ msgid "%s metadata is not present"
 #~ msgstr "Brak metadanych %s"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Urządzenia</b>"
+
 #~ msgid ""
 #~ "Choose whether to skip downloading the file, or to add a unique indentifier."
 #~ msgstr ""
@@ -2779,6 +2854,25 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #~ "identyfikator."
 
 #~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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 ""
+#~ "Nośniki obrazów to urządzenia z których można pobrać zdjęcia i filmy, takie "
+#~ "jak aparaty fotograficzne, karty pamięci czy przenośne magazyny danych.\n"
+#~ "Zdjęcia mogą być pobierane jednocześnie z kilku nośników obrazów, lub z "
+#~ "określonego położenia na dysku.\n"
+#~ "<i>Jeżeli pobieranie bezpośrednio z aparatu fotograficznego działa "
+#~ "nieprawidłowo lub wcale, proszę spróbować przestawić go do trybu PTP. Jeśli "
+#~ "jest to niemożliwe, proszę rozważyć użycie czytnika kart pamięci.</i>"
+
+#~ msgid ""
 #~ "Sorry, problems were encountered with your download folders. Please fix the "
 #~ "problems or modify the preferences.\n"
 #~ "\n"
@@ -3049,3 +3143,11 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 
 #~ msgid "Miscillaneous"
 #~ msgstr "Różne"
+
+#~ msgid ""
+#~ "Remebered devices are those devices you have chosen to always scan or never "
+#~ "scan when automatic detection of Portable Storage Devices is enabled."
+#~ msgstr ""
+#~ "Zapamiętane urządzenia to te, które zostały uprzednio wybrane lub nie, do "
+#~ "przeskanowania przy zaznaczonym automatycznym wykrywaniu przenośnych "
+#~ "magazynów danych."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 51603ee..4222409 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-08 03:26+0000\n"
-"Last-Translator: Sam Samuels <gemini_sam_samuels@hotmail.co.uk>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-05-30 17:32+0000\n"
+"Last-Translator: Aluísio Augusto Silva Gonçalves <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -70,15 +70,15 @@ msgstr "%(device)s não desmontado"
 msgid "scanning..."
 msgstr "verificando..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Pausar"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,136 +98,136 @@ msgstr ""
 "Essa pasta de download é inválida:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "A descarga não pôde ser levada a cabo"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Faltando 1 segundo aproximadamente"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Faltando %i segundos aproximadamente"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 msgid "About 1 minute remaining"
 msgstr "Faltando 1 minuto aproximadamente"
 
 #. 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Faltando %(minutes)i:%(seconds)02i minutos aproximadamente"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotos e vídeos"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "fotos ou vídeos"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vídeos"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Todos os downloads completos"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s downloaded"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s falhou em baixar"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Usando dispositivos de backup"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Usando o dispositivo de backup"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Nenhum dispositivo de backup detectado"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Espaço livre:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,75 @@ msgstr "%(free)s %(file_type)s"
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s livres"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "A criar cópias de segurança em %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Preferências do programa são inválidas"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Fotografia"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Vídeo"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s pasta de download não existe"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Pasta: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s pasta de download e inválida"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s pasta de download não é gravável"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
 #. 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:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,44 +312,44 @@ msgstr ""
 "exibir informaçṍes do programa na linha de comando enquando o programa é "
 "executado (default: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr ""
 "mostrar informações de depuração quando executado a partir da linha de "
 "comando"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 msgid "only output errors to the command line"
 msgstr "Ouvir apenas os erros de saída para a linha de comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "Listar extensões de foto vídeo que o  programa reconhece e sair"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 "Restabelecer todas as configurações e preferências do programa e fechá-lo"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Fotos:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Vídeos:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Todas as configurações e preferências foram redefinidas"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -410,346 +410,354 @@ msgstr "_Relembrar esta escolha"
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Data e hora"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Texto"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadados"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Seqüências"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Etiqueta"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Imagem de dados"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Dados de vídeo"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Hoje"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Início do download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Nome + extensão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Extensão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Número da imagem"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Número do vídeo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Abertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Tempo de exposição"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Distância focal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Filmar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Modelo da câmera"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Modelo de câmera Curta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Modelo hifenizada de câmera de curto"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Número de série"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Contagem de Disparos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Nome do dono"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Largura"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Altura"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Comprimento"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Quadros Por Segundo"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Artista"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Direitos autorais"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Downloads de hoje"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Número da sessão"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Número da subpasta"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Número armazenado"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Seqüência de letras"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Todos os dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 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/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 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/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 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/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 msgid "Original Case"
 msgstr "Caixa de tetxo original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "CAIXA ALTA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "caixa baixa"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Um dígito"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Dois dígitos"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Três dígitos"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Quatro dígitos"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sete dígitos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Subsegundos"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 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/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 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/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 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/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
@@ -1419,65 +1427,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Compatibilidade com Outros Sistemas Operacionais</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Dispositivos</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Pasta de Download </b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Subpastas de Download</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Exemplo</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Job Códigos</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Renomear Foto</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Conflitos de Nomes de Fotos e Vídeos</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Programa de Automação</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Números de sequência</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/midia/ldriveexterno/Fotos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Exemplo: /home/usuário/Fotos</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Exemplo:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Novo:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Original:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opções do dispositivo</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Devices</span>"
@@ -1537,14 +1545,10 @@ msgid "Backup"
 msgstr "Backup"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Localização do Backup:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Fazer backup de fotos e vídeos ao baixar"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1552,7 +1556,7 @@ msgstr ""
 "Escolher pasta de download. Subpastas para as fotos serão criados "
 "automaticamente nesta pasta usando a estrutura a seguir especificados."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1560,15 +1564,19 @@ msgstr ""
 "Escolher pasta de download. Subpastas para os vídeos baixados serão criados "
 "automaticamente nesta pasta usando a estrutura a seguir especificados."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Dia de início:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 "Excluir as fotos e vídeos do dispositivo após a conclusão do download"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Opções do dispositivo"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Dispositivos"
@@ -1578,22 +1586,14 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Os dispositivos são de onde baixar fotos e vídeos, como câmeras, cartões de "
-"memória ou dispositivos portáteis.\n"
-"\n"
-"Você pode transferir fotos de vários dispositivos simultaneamente, ou você "
-"pode especificar um local em seu disco rígido.\n"
-"\n"
-"<i>Se o download diretamente de sua câmera funciona mal ou não funciona de "
-"modo algum , tente configurá-lo para o modo PTP. Se isso não for possível, "
-"considere o uso de um leitor de cartão.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1620,81 +1620,100 @@ msgid "Generate thumbnails (slower)"
 msgstr "Gerar miniaturas (mais lento)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Se você desabilitar a detecção automática, escolha o local de backup exato."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
-"Se você desabilitar a detecção automática, escolha a localização exata das "
-"imagens e vídeos."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Se você ativar a detecção automática de dispositivos de armazenamento "
-"portáteis, todo o dispositivo será digitalizado de imagens. Em dispositivos "
-"grande, isto poderá levar algum tempo."
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Caminhos ignorados\t"
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Job Códigos"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Localização"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Performance"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Pastas de Fotos"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Renomear Foto"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Nome da Pasta de Backup de Fotos"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Preferências: Photo Downloader Rapid"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "R_emover Tudo"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "Re_mover todos"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Renomear Opções"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Pular"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Pular download"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1704,7 +1723,7 @@ msgstr ""
 "vídeos, instale <i>hachoir metadata</i> e <i>kaa metadados</i> pacotes para "
 "Python."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1718,7 +1737,7 @@ msgstr ""
 "não utilizado para backups. Para cada dispositivo que deseja usar para fazer "
 "backup, criar uma pasta com um desses nomes.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1726,7 +1745,7 @@ msgstr ""
 "Especifique o tempo em formato de 24 horas em que a sequência numérica de  "
 "<i> Downloads de Hoje </i> devem reiniciar."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1734,44 +1753,48 @@ msgstr ""
 "Escolha se um caractere do nome de uma foto, vídeo ou diretório deverá ser "
 "omitido, caso o mesmo não seja suportado por outros sistemas operacionais."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr "Iniciar a descarga após o início do programa"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Iniciar a descarga ao conectar o dispositivo"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Número acumulado:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Omitir caracteres incompatíveis"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizar números seqüênciais em pares RAW-JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 "Desmontar ou ejetar o dispositivo após conclusão da tarefa de descarga"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Pasta de Vídeo"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Renomear Vídeo"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Nome da pasta para cópia de segurança de vídeos:"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1779,7 +1802,7 @@ msgstr ""
 "Escolha como o programa deverá proceder caso ao copiar uma fotografia ou "
 "vídeo haja um arquivo de mesmo nome."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1787,7 +1810,7 @@ msgstr ""
 "Escolha como o programa deverá proceder caso ao fazer uma cópia de segurança "
 "haja um arquivo de mesmo nome."
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1796,10 +1819,14 @@ msgstr ""
 "uma cópia de segurança em vários locais diferentes, como, por exemplo, em "
 "discos rígidos externos."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Adicionar..."
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "_Usar expressões regulares"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Importar fotos e vídeos de forma eficiente e confiável"
@@ -2500,6 +2527,53 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "D_ownload Selected"
 #~ msgstr "D_ownload selecionados"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Dispositivos</b>"
+
+#~ msgid "Backup location:"
+#~ msgstr "Localização do Backup:"
+
+#~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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 ""
+#~ "Os dispositivos são de onde baixar fotos e vídeos, como câmeras, cartões de "
+#~ "memória ou dispositivos portáteis.\n"
+#~ "\n"
+#~ "Você pode transferir fotos de vários dispositivos simultaneamente, ou você "
+#~ "pode especificar um local em seu disco rígido.\n"
+#~ "\n"
+#~ "<i>Se o download diretamente de sua câmera funciona mal ou não funciona de "
+#~ "modo algum , tente configurá-lo para o modo PTP. Se isso não for possível, "
+#~ "considere o uso de um leitor de cartão.</i>"
+
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "Se você desabilitar a detecção automática, escolha a localização exata das "
+#~ "imagens e vídeos."
+
+#~ 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 ""
+#~ "Se você ativar a detecção automática de dispositivos de armazenamento "
+#~ "portáteis, todo o dispositivo será digitalizado de imagens. Em dispositivos "
+#~ "grande, isto poderá levar algum tempo."
+
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Se você desabilitar a detecção automática, escolha o local de backup exato."
+
 #, python-format
 #~ msgid ""
 #~ "Preference key '%(key)s' is invalid.\n"
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index 5739cf9..70514a4 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: 2011-05-19 20:22-0500\n"
+"POT-Creation-Date: 2011-08-24 19:49+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"
@@ -64,19 +64,19 @@ msgstr ""
 #. looking for photos or videos. It is visible initially in the progress bar for each device
 #. (which normally holds "x photos and videos").
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1171
+#: rapid/rapid.py:1177
 msgid "scanning..."
 msgstr ""
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2007 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:2010
 msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2090
+#: rapid/rapid.py:2111
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -84,143 +84,143 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2114
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2094
+#: rapid/rapid.py:2115
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2383
+#: rapid/rapid.py:2404
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2406
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2408
 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:2392
+#: rapid/rapid.py:2413
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2414 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2435 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2416 rapid/rpdfile.py:112
+#: rapid/rapid.py:2437 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2419 rapid/rapid.py:2964 rapid/rpdfile.py:115
+#: rapid/rapid.py:2440 rapid/rapid.py:2987 rapid/rpdfile.py:115
 msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:2421 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2442 rapid/preferencesdialog.py:1586 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2424 rapid/rapid.py:2962 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2445 rapid/rapid.py:2985 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr ""
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2426 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2447 rapid/preferencesdialog.py:1585 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2453
+#: rapid/rapid.py:2474
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2457
+#: rapid/rapid.py:2478
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2460 rapid/rapid.py:2512
+#: rapid/rapid.py:2481 rapid/rapid.py:2533
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2469
+#: rapid/rapid.py:2490
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2475 rapid/rapid.py:2484 rapid/rapid.py:2493
-#: rapid/rapid.py:2502 rapid/rapid.py:2510
+#: rapid/rapid.py:2496 rapid/rapid.py:2505 rapid/rapid.py:2514
+#: rapid/rapid.py:2523 rapid/rapid.py:2531
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2495
+#: rapid/rapid.py:2498 rapid/rapid.py:2516
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2486 rapid/rapid.py:2504
+#: rapid/rapid.py:2507 rapid/rapid.py:2525
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2543
+#: rapid/rapid.py:2564
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2550
+#: rapid/rapid.py:2571
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2932
+#: rapid/rapid.py:2955
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:2937
+#: rapid/rapid.py:2960
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2939
+#: rapid/rapid.py:2962
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2941
+#: rapid/rapid.py:2964
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2968
+#: rapid/rapid.py:2991
 msgid "Free space:"
 msgstr ""
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2980
+#: rapid/rapid.py:3003
 #, python-format
 msgid "(%(file_type)s)"
 msgstr ""
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2984
+#: rapid/rapid.py:3007
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -228,116 +228,116 @@ msgstr ""
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2989
+#: rapid/rapid.py:3012
 msgid "; "
 msgstr ""
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2994
+#: rapid/rapid.py:3017
 msgid "."
 msgstr ""
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3000
+#: rapid/rapid.py:3023
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:3006
+#: rapid/rapid.py:3029
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3011
+#: rapid/rapid.py:3034
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3040
+#: rapid/rapid.py:3063
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3145 rapid/rpdfile.py:251
+#: rapid/rapid.py:3168 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:3147 rapid/rpdfile.py:271
+#: rapid/rapid.py:3170 rapid/rpdfile.py:271
 msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:3156
+#: rapid/rapid.py:3179
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3158 rapid/rapid.py:3172 rapid/rapid.py:3185
+#: rapid/rapid.py:3181 rapid/rapid.py:3195 rapid/rapid.py:3208
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3193
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3183
+#: rapid/rapid.py:3206
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3261
+#: rapid/rapid.py:3284
 msgid "Thumbnails"
 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:3308
+#: rapid/rapid.py:3331
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3309
+#: rapid/rapid.py:3332
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3333
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3335
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3337
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:3326
+#: rapid/rapid.py:3350
 msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3326
+#: rapid/rapid.py:3350
 msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3331
+#: rapid/rapid.py:3355
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:3339
+#: rapid/rapid.py:3363
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:3348
+#: rapid/rapid.py:3381
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -353,7 +353,7 @@ msgstr ""
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -365,8 +365,8 @@ msgstr ""
 msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
-#: rapid/subfolderfile.py:348 rapid/subfolderfile.py:366
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -413,7 +413,7 @@ msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
 msgid "Job code"
 msgstr ""
 
@@ -758,92 +758,120 @@ msgstr ""
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Devices?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered devices be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:735
 msgid "Enter a Job Code"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:731
+#: rapid/preferencesdialog.py:751
 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/preferencesdialog.py:734
+#: rapid/preferencesdialog.py:754
 msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr ""
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1074
 msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1156
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1174
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1319
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1129
+#: rapid/preferencesdialog.py:1341
 #, python-format
 msgid "Select a folder in which to backup %(file_types)s"
 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/preferencesdialog.py:1215
+#: rapid/preferencesdialog.py:1427
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1478
 msgid ""
 "<i><b>Warning:</b> There is insufficient 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/preferencesdialog.py:1269
+#: rapid/preferencesdialog.py:1481
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1571
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -851,94 +879,114 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
+#: rapid/preferencesdialog.py:1716
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1718
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1719
+msgid "Invalid regular expression"
+msgstr ""
+
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1645
+#: rapid/preferencesdialog.py:1901
 msgid "externaldrive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1903
 msgid "externaldrive2"
 msgstr ""
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:125
 msgid "New York"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:126
 msgid "Manila"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:126
 msgid "Prague"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:126
 msgid "Helsinki"
 msgstr ""
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:126
 msgid "Wellington"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:127
 msgid "Tehran"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:127
 msgid "Kampala"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:127
 msgid "Paris"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:127
 msgid "Berlin"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:127
 msgid "Sydney"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:128
 msgid "Budapest"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:128
 msgid "Rome"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:128
 msgid "Moscow"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:128
 msgid "Delhi"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:128
 msgid "Warsaw"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:129
 msgid "Jakarta"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:129
 msgid "Madrid"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:129
 msgid "Stockholm"
 msgstr ""
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr ""
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr ""
 
@@ -1184,7 +1232,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
@@ -1220,24 +1268,24 @@ msgstr ""
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr ""
@@ -1383,63 +1431,63 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
+msgid "<b>Download Folder</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:7
-msgid "<b>Download Folder</b>"
+msgid "<b>Download Subfolders</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Download Subfolders</b>"
+msgid "<b>Example</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Example</b>"
+msgid "<b>Job Codes</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:10
-msgid "<b>Job Codes</b>"
+msgid "<b>Photo Rename</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo Rename</b>"
+msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Photo and Video Name Conflicts</b>"
+msgid "<b>Program Automation</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Program Automation</b>"
+msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<b>Sequence Numbers</b>"
+msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>/media/externaldrive/Photos</i>"
+msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example: /home/user/Pictures</i>"
+msgid "<i>Example:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>Example:</i>"
+msgid "<i>New:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>New:</i>"
+msgid "<i>Original:</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:19
-msgid "<i>Original:</i>"
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:21
@@ -1499,33 +1547,33 @@ msgid "Backup"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr ""
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 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/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr ""
@@ -1535,12 +1583,13 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be used."
+"</i>"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:47
@@ -1568,82 +1617,112 @@ msgid "Generate thumbnails (slower)"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid "If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered paths are those that you have chosen to always scan or ignore "
+"when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
 "python."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify any paths you want ignored when scanning devices for photos or "
+"videos. Any path ending with the values below will not be scanned."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1652,73 +1731,81 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:84
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:97
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:98
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 03ca104..16d9862 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-30 15:03-0500\n"
-"PO-Revision-Date: 2011-05-05 03:59+0000\n"
-"Last-Translator: D.Makhonin <Unknown>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-07-22 09:11+0000\n"
+"Last-Translator: Eugene Marshal <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: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
@@ -70,15 +70,15 @@ msgstr "%(device)s не отсоединён"
 msgid "scanning..."
 msgstr "поиск файлов..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Загрузка"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:1992
 msgid "Pause"
 msgstr "Пауза"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2093
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2096
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,256 +98,256 @@ msgstr ""
 "Неправильно указанная папка загрузки:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2097
 msgid "Download cannot proceed"
 msgstr "Невозможно загрузить"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2386
 msgid "About 1 second remaining"
 msgstr "Осталась примерно 1 секунда"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2388
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Осталось %i  секунд"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2390
 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:2394
+#: rapid/rapid.py:2395
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Осталось примерно %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "фото и видео"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "фото или видео"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "видео"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "видео"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "фото"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "фото"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2456
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s загружено"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2460
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не удалось загрузить"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
 msgid "warnings"
 msgstr "предупреждения"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2472
 msgid "All downloads complete"
 msgstr "Все загрузки завершены"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s загружено"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не удалось загрузить"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2546
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s из %(total)s %(filetypes)s (%(remaining)s осталось)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2553
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s из %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:2935
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:2940
 msgid "Using backup devices"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:2942
 msgid "Using backup device"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:2944
 msgid "No backup devices detected"
 msgstr "Не обнаружен носитель для резервных копий"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:2971
 msgid "Free space:"
 msgstr "Свободное место:"
 
 #. (videos) or (photos) will be appended to the free space message displayed to the
 #. user in the status bar.
 #. you should only translate this if your language does not use parantheses
-#: rapid/rapid.py:2981
+#: rapid/rapid.py:2983
 #, python-format
 msgid "(%(file_type)s)"
 msgstr ""
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2985
+#: rapid/rapid.py:2987
 #, python-format
 msgid "%(free)s %(file_type)s"
-msgstr ""
+msgstr "Доступно %(free)s для %(file_type)s"
 
 #. Inserted in the middle of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2990
+#: rapid/rapid.py:2992
 msgid "; "
 msgstr "; "
 
 #. Inserted at the end of the statusbar message concerning the amount of freespace
 #. Used to differentiate between two different file systems
 #. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
-#: rapid/rapid.py:2995
+#: rapid/rapid.py:2997
 msgid "."
 msgstr "."
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
 #. e.g. 14.7GB available
-#: rapid/rapid.py:3001
+#: rapid/rapid.py:3003
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s свободно"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3009
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Резервное копирование в  %(path)s"
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3014
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3043
 msgid "Program preferences are invalid"
 msgstr "Настройки программы не корректны"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Фото"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Видео"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3159
 #, python-format
 msgid "%(file_type)s download folder does not exist"
-msgstr "%(file_type)s каталог для закачки не существует"
+msgstr "Указанный для загрузки каталог %(file_type)s не существует"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
 msgid "Folder: %s"
 msgstr "Каталог: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "для %(file_type)s папка загрузки указана неверно."
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3186
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "каталог для %(file_type)s доступен только для чтения"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3264
 msgid "Thumbnails"
 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:3309
+#: rapid/rapid.py:3311
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
-"отобразить информацию о программе в командной строке при запуске программы "
-"(по умолчанию: %default)"
+"выводить информацию в командной строке во время выполнения программы (по "
+"умолчанию: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3312
 msgid "display debugging information when run from the command line"
 msgstr "отображать отладочную информацию при запуске из командной строки"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3313
 msgid "only output errors to the command line"
 msgstr "выводить в командную строку только ошибки"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3315
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "вывести расширения фото- и видеофайлов, которые распознает программа, и выйти"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3316
 msgid "reset all program settings and preferences and exit"
 msgstr "сбросить все настройки и выйти"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Photos:"
 msgstr "Фото:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3329
 msgid "Videos:"
 msgstr "Видео:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3334
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3342
 msgid "All settings and preferences have been reset"
 msgstr "Все установки и настройки были сброшены"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3351
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -409,346 +409,354 @@ msgstr "_Запомнить мой выбор"
 msgid "MB/s"
 msgstr "МБ/с"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Дата и время"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Текст"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Имя файла"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Последовательности"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
 msgid "Job code"
 msgstr "Метка"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Дата фотографии"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Дата видео"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Сегодня"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:155
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Время начала загрузки"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Имя + расширение"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Имя"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:161
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Расширение"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:163
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Номер фотографии"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Номер видео"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Диафрагма"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:170
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Выдержка"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:172
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Фокусное расстояние"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:174
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Производитель камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Модель камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Сокращённое название камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Дополнительное сокращенное название камеры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Серийный номер"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Счётчик кадров"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Имя владельца"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Кодек"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Ширина"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Высота"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Длительность"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Кадров в секунду"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Автор"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Авторские права"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
-msgstr "Скачиваний сегодня"
+msgstr "Загрузок за текущий день"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Номер в текущей сессии"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Номер подкаталога"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Сквозная нумерация"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Последовательность символов"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Все цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Последняя цифра"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:207
+#: rapid/generatenameconfig.py:211
 msgid "Last 2 digits"
 msgstr "Последние 2 цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:209
+#: rapid/generatenameconfig.py:213
 msgid "Last 3 digits"
 msgstr "Последние 3 цифры"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:211
+#: rapid/generatenameconfig.py:215
 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/generatenameconfig.py:213
+#: rapid/generatenameconfig.py:217
 msgid "Original Case"
 msgstr "Исходный Регистр"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:215
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "ВЕРХНИЙ РЕГИСТР"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:217
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "нижний регистр"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Одна цифра"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Две цифры"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Три цифры"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Четыре цифры"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Пять цифр"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Шесть цифр"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "семь цифр"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Доли секунды"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:234
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:238
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:240
+#: rapid/generatenameconfig.py:244
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:242
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:244
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:246
+#: rapid/generatenameconfig.py:250
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:248
+#: rapid/generatenameconfig.py:252
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:250
+#: rapid/generatenameconfig.py:254
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:252
+#: rapid/generatenameconfig.py:256
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:254
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:256
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:258
+#: rapid/generatenameconfig.py:262
 msgid "HH-MM-SS"
 msgstr "ЧЧ-ММ-СС"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:260
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "ЧЧ-ММ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:262
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:264
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "ММ (мин.)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:266
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "СС"
 
@@ -983,7 +991,7 @@ msgstr "Ошибка создания компонента %s."
 #: rapid/problemnotification.py:86
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
-msgstr "%(filetype)s метаданные невозможно прочесть"
+msgstr "для %(filetype)s не удается прочитать метаданные"
 
 #: rapid/problemnotification.py:88
 #, python-format
@@ -1006,7 +1014,7 @@ msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 msgstr ""
-"%(filetype)s не может быть сохранен в резервной копии, так как не найдено "
+"Резервная копия %(filetype)s не может быть создана, так как не найдено "
 "хранилище резервных копий."
 
 #: rapid/problemnotification.py:102
@@ -1015,6 +1023,8 @@ msgid ""
 "%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
 "%(image2)s on %(image2_date)s at %(image2_time)s."
 msgstr ""
+"%(image1)s снят(ы) %(image1_date)s в %(image1_time)s, а %(image2)s снят(ы) "
+"%(image2_date)s в %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1027,6 +1037,8 @@ msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
 "identifier '%(identifier)s' added."
 msgstr ""
+"Файл %(filetype)s изменен %(date)s в %(time)s. Добавлен уникальный код "
+"'%(identifier)s'."
 
 #: rapid/problemnotification.py:108
 #, python-format
@@ -1036,7 +1048,7 @@ msgstr "Файл %(filetype)s был изменен %(date)s в %(time)s"
 #: rapid/problemnotification.py:109
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
-msgstr ""
+msgstr "Недостаточно данных для переименования файла %(filetype)s."
 
 #: rapid/problemnotification.py:111
 #, python-format
@@ -1112,7 +1124,7 @@ msgstr "%(volume)s, "
 #: rapid/problemnotification.py:271 rapid/problemnotification.py:315
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
-msgstr ""
+msgstr "%(volumes)s и %(volume)s (%(inst)s)."
 
 #: rapid/problemnotification.py:276
 #, python-format
@@ -1150,7 +1162,7 @@ msgstr "Произошла ошибка при создании каталого
 #: rapid/problemnotification.py:322
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
-msgstr ""
+msgstr "В дополнение к %(previousproblem)s: %(newproblem)s"
 
 #: rapid/problemnotification.py:330
 #, python-format
@@ -1197,12 +1209,14 @@ msgstr "Ошибка при создании %s"
 #: rapid/problemnotification.py:379
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
-msgstr ""
+msgstr "Хотя %(filetype)s уже существует, резервная копия все равно создана."
 
 #: rapid/problemnotification.py:381
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
+"При копировании %(filetype)s возникла ошибка, но резервная копия все равно "
+"создана."
 
 #: rapid/problemnotification.py:401
 msgid "Multiple problems were encountered"
@@ -1289,7 +1303,7 @@ msgstr "Загрузка / Пауза"
 
 #: rapid/glade3/rapid.ui.h:7
 msgid "Get Help Online..."
-msgstr ""
+msgstr "Получить помощь в сети..."
 
 #: rapid/glade3/rapid.ui.h:8
 msgid "Help"
@@ -1408,69 +1422,69 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Совместимость с другими операционными системами</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Носители</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Каталог для загрузки фотографий</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Подкаталоги для загрузки фотографий</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Пример</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Метки</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Переименование фото</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Конфликт названий между фото и видео</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Автоматизация программы</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Последовательности номеров</b>"
 
-#: rapid/glade3/prefs.ui.h:15
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Пример: /home/user/Pictures</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Пример:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Новое название:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Исходное название:</i>"
 
-#: rapid/glade3/prefs.ui.h:20
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Резервное копирование</span>\t"
 
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Настройки устройств</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Носители</span>"
+msgstr "Устройства"
 
 #: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
@@ -1528,15 +1542,11 @@ msgid "Backup"
 msgstr "Резервное копирование"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Местоположение резервных копий"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr ""
 "Создавать резервные копии фотографий и видеороликов во время загрузки"
 
-#: rapid/glade3/prefs.ui.h:37
+#: rapid/glade3/prefs.ui.h:36
 msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
@@ -1545,7 +1555,7 @@ msgstr ""
 "загружаемых фотографий будут автоматически созданы в каждом каталоге, "
 "используя структуру, указанную вами ниже."
 
-#: rapid/glade3/prefs.ui.h:38
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
@@ -1554,14 +1564,18 @@ msgstr ""
 "загружаемых видеороликов будут автоматически созданы в каждом каталоге, "
 "используя структуру, указанную вами ниже."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Начало дня:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Удалить фото и видео после окончания загрузки"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Настройки устройства"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Носители"
@@ -1571,22 +1585,24 @@ msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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>"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
-"Носители - устройства, откуда загружаются фото и видео, например, камеры, "
-"карты памяти или переносные накопители.\n"
+"Устройства -  с них загружается фото и видео, например, камера, карта памяти "
+"или переносной накопитель.\n"
 "\n"
-"Вы можете загружать фото с нескольких носителей одновременно, или указать "
-"расположение на жёстком диске.\n"
+"Вы можете настроить загрузку с нескольких устройств одновременно или указать "
+"место для загрузки на жестком диске\n"
 "\n"
-"<i>Если прямая загрузка с камеры работает плохо или не работает совсем, "
-"попробуйте преключить ее в режим PTP. Если это невозможно, используйте "
-"устройство для чтения карт памяти.</i>"
+"<i>Загрузки напрямую с камеры пока что являются пробной возможностью. Если "
+"загрузка напрямую с камеры работает плохо или не работает вообще, "
+"переключите ее в режим PTP. Если это невозможно, используйте устройство для "
+"чтения карт памяти.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1613,82 +1629,113 @@ msgid "Generate thumbnails (slower)"
 msgstr "Создавать миниатюры (дольше копируется)"
 
 #: rapid/glade3/prefs.ui.h:53
-msgid "If you disable automatic detection, choose the exact backup location."
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Если вы отключаете автоматическое определение, то, пожалуйста, выберите "
-"точное местоположение носителя для резервного копирования."
+"Если вы отключаете автоопределение, выберите место для резервного "
+"копирования."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
-"Если вы отключите автоматическое обнаружение, выберите точное местоположение "
-"фото и видео."
+"Если вы отключаете автоопределение, выберите место для резервного "
+"копирования фото и видео."
 
 #: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
-"Если вы включите автоматическое определение съёмных носителей, то они будут "
-"просканированы на наличие фотографий. На носителях большого объёма это может "
-"занять достаточно много времени."
+"Если вы включили автоопределение переносного накопителя, будет просканирован "
+"весь накопитель. На устройствах большой емкости это может занять время\n"
+"\n"
+"Когда эта опция включена, и подходящее устройство обнаружено, программа "
+"спросит вас, нужно ли его сканировать."
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
+msgstr "Папки, из которых не будет производится загрузка\t"
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Метки"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Расположение:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Прочие"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Быстродействие"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Каталоги фото"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Переименование фото"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Название каталога резервного копирования фото"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Размещение для резервного копирования фото:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Настройки: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "У_далить все"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "У_далить все"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
+msgstr "Выбранные устройства"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
+msgstr ""
+"Запомненными устройствами являются те, для которых вы выбрали режим "
+"постоянного сканирования или для которых сканирование не задействуется при "
+"включённой возможности автоматического определения переносных устройств "
+"хранения."
+
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Параметры переименования"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Пропустить"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Пропустить загрузку"
 
-#: rapid/glade3/prefs.ui.h:70
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
 "install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
@@ -1698,7 +1745,7 @@ msgstr ""
 "пожалуйста, установите пакеты python <i>hachoir metadata</i> and <i>kaa "
 "metadata</i>."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1712,7 +1759,7 @@ msgstr ""
 "резервного копирования. На каждом носителе, который вы хотите использовать "
 "для резервного копирования, создайте каталог с одним из этих имен.</i>"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
@@ -1720,7 +1767,7 @@ msgstr ""
 "Укажите время в 24-часовом формате, когда следует обнулять параметр "
 "<i>Загрузок сегодня</i>."
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
@@ -1728,44 +1775,48 @@ msgstr ""
 "Укажите, следует ли удалить символы в названиях фото, видео, каталогов, "
 "которые не распознаются в других операционных системах."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr ""
 "Начать загрузку фотографий и видеороликов сразу после запуска программы"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr "Начать загрузку сразу после подключения носителя"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr "Сквозная нумерация:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr "Убрать несовместимые символы"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Синхронизировать последовательность номеров при загрузке RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Отключить (\"извлечь\") носитель после завершения загрузки"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr "Каталоги видео"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr "Переименование видео"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr "Название каталога резервного копирования видео"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr "Размещение для резервного копирования видео:"
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
@@ -1773,7 +1824,7 @@ msgstr ""
 "Если фотография или видеоролик с таким названием уже загружен, выберите, "
 "пропустить загрузку или добавить уникальный идентификатор."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1781,7 +1832,7 @@ msgstr ""
 "Во время резервного копирования следует перезаписать файл, имеющий тоже "
 "самое название, или пропустить его?"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -1789,10 +1840,14 @@ msgstr ""
 "Имеется возможность создания резервной копии ваших фотографий и видеороликов "
 "прямо во время загрузки, в том числе на внешних жёстких дисках."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr "_Добавить..."
 
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
+msgstr "Использовать _регулярные выражения"
+
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
 msgstr "Импортируйте ваши фото и видео быстро и надёжно"
@@ -1912,6 +1967,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Automation"
 #~ msgstr "Автоматизация"
 
+#~ msgid "Backup location:"
+#~ msgstr "Местоположение резервных копий"
+
 #~ msgid "Image Rename"
 #~ msgstr "Переименование фотографий"
 
@@ -2069,6 +2127,11 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Start downloading upon image device insertion"
 #~ msgstr "Начать скачивание фотографий при вставке носителя"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Если вы отключаете автоматическое определение, то, пожалуйста, выберите "
+#~ "точное местоположение носителя для резервного копирования."
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
@@ -2360,6 +2423,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "\n"
 #~ msgstr "\n"
 
+#~ msgid "<b>Devices</b>"
+#~ msgstr "<b>Носители</b>"
+
 #, python-format
 #~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
 #~ msgstr ""
@@ -2738,6 +2804,15 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "предупреждений и ошибок"
 
 #~ 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 ""
+#~ "Если вы включите автоматическое определение съёмных носителей, то они будут "
+#~ "просканированы на наличие фотографий. На носителях большого объёма это может "
+#~ "занять достаточно много времени."
+
+#~ 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 "
@@ -2939,6 +3014,27 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Could not delete photo or video from device"
 #~ msgstr "Не удалось удалить фото или видео с носителя"
 
+#~ msgid ""
+#~ "Devices are from where to download photos and videos, such as cameras, "
+#~ "memory cards or Portable Storage Devices.\n"
+#~ "\n"
+#~ "You can download photos from multiple devices simultaneously, or you can "
+#~ "specify a location on your hard drive.\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>"
+
 #, python-format
 #~ msgid "Failed to create default video download folder %(folder)s"
 #~ msgstr "Не удалось создать каталог для загрузки видео %(folder)s"
@@ -2947,6 +3043,13 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Creating video download folder %(folder)s"
 #~ msgstr "Создание каталога для загрузки видео %(folder)s"
 
+#~ msgid ""
+#~ "If you disable automatic detection, choose the exact location of the images "
+#~ "and videos."
+#~ msgstr ""
+#~ "Если вы отключите автоматическое обнаружение, выберите точное местоположение "
+#~ "фото и видео."
+
 #, python-format
 #~ msgid "%(filetype)s is ready to be downloaded"
 #~ msgstr "%(filetype)s готово к загрузке"
@@ -3022,3 +3125,11 @@ msgstr "Импортируйте ваши фото и видео быстро и
 
 #~ msgid "Miscillaneous"
 #~ msgstr "Разное"
+
+#~ msgid ""
+#~ "Remebered devices are those devices you have chosen to always scan or never "
+#~ "scan when automatic detection of Portable Storage Devices is enabled."
+#~ msgstr ""
+#~ "Назначенные устройства - те устройства, для которых вы выбрали вариант "
+#~ "\"всегда сканировать\" или \"не сканировать\" при автоопределении "
+#~ "переносного накопителя."
diff --git a/po/tr.po b/po/tr.po
index 09eb6ae..637e3ab 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,1772 +7,1673 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-13 19:03+0500\n"
-"PO-Revision-Date: 2010-08-06 19:31+0000\n"
-"Last-Translator: linuxseven <linuxseven@mynet.com>\n"
+"POT-Creation-Date: 2011-06-13 18:23-0500\n"
+"PO-Revision-Date: 2011-06-09 08:55+0000\n"
+"Last-Translator: Semih Korkmaz <Unknown>\n"
 "Language-Team: Turkish <tr@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-09-05 14:32+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-08-03 08:43+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:124 rapid/rapid.py:6299 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:105 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:456
-msgid "New York"
-msgstr "New York"
-
-#: rapid/rapid.py:457
-msgid "Manila"
-msgstr "Manila"
-
-#: rapid/rapid.py:457
-msgid "Prague"
-msgstr "Prag"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Tahran"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
+#: rapid/rapid.py:110
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "Paris"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Berlin"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "Sidney"
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "Budapeşte"
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "Roma"
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "Moskova"
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "Delhi"
+#: rapid/rapid.py:112
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr ""
 
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "Varşova"
+#: rapid/rapid.py:115
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
 
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "Jakarta"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:149
+msgid "Device"
+msgstr "Aygıt"
 
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "Madrid"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:166
+msgid "Size"
+msgstr "Boyut"
 
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "Stockholm"
+#: rapid/rapid.py:169
+msgid "Download Progress"
+msgstr "İndirme Süreci"
 
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
+#: rapid/rapid.py:315
+#, python-format
+msgid "%(device)s did not unmount"
 msgstr ""
 
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr ""
+#. This refers to when a device like a hard drive is having its contents scanned,
+#. looking for photos or videos. It is visible initially in the progress bar for each device
+#. (which normally holds "x photos and videos").
+#. It maybe displayed only briefly if the contents of the device being scanned is small.
+#: rapid/rapid.py:1171
+msgid "scanning..."
+msgstr "taranıyor..."
 
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr ""
+#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "İndir"
 
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr ""
+#: rapid/rapid.py:1992
+msgid "Pause"
+msgstr "Duraklat"
 
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
+#: rapid/rapid.py:2093
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:591 rapid/rapid.py:1710
-msgid "Sorry,these preferences contain an error:\n"
+#: rapid/rapid.py:2096
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
+"Bu indirme klasörü geçersiz:\n"
+"%s"
 
-#: rapid/rapid.py:602
-msgid "Resetting to default values."
+#: rapid/rapid.py:2097
+msgid "Download cannot proceed"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:677 rapid/renamesubfolderprefs.py:198
-msgid "Job code"
-msgstr ""
+#: rapid/rapid.py:2386
+msgid "About 1 second remaining"
+msgstr "Yaklaşık 1 saniye kaldı"
 
-#: rapid/rapid.py:745
-msgid "Error in Video Rename preferences"
-msgstr ""
+#: rapid/rapid.py:2388
+#, python-format
+msgid "About %i seconds remaining"
+msgstr "Yaklaşık %i saniye kaldı"
 
-#: rapid/rapid.py:763
-msgid "Error in Photo Download Subfolders preferences"
-msgstr ""
+#: rapid/rapid.py:2390
+msgid "About 1 minute remaining"
+msgstr "Yaklaşık 1 dakika kaldı"
 
-#: rapid/rapid.py:780
-msgid "Error in Video Download Subfolders preferences"
-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:2395
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Yaklaşık %(minutes)i:%(seconds)02i dakika kaldı"
 
-#: rapid/rapid.py:813 rapid/rapid.py:1544
+#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotoğraflar ve videolar"
 
-#: rapid/rapid.py:815 rapid/rapid.py:1554 rapid/rapid.py:1679
+#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "fotoğraflar veya videolar"
+
+#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+msgid "videos"
+msgstr "videolar"
+
+#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
+
+#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotoğraflar"
 
-#: rapid/rapid.py:948
-msgid "Select a folder to download photos to"
-msgstr ""
-
-#: rapid/rapid.py:966
-msgid "Select a folder to download videos to"
-msgstr ""
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "fotoğraf"
 
-#: rapid/rapid.py:1048
+#: rapid/rapid.py:2456
 #, python-format
-msgid "Select a folder containing %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1070
+#: rapid/rapid.py:2460
 #, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+msgid "%(noFiles)s %(filetypes)s failed to download"
 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:1151
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
+#: rapid/rapid.py:2463 rapid/rapid.py:2515
+msgid "warnings"
+msgstr "uyarılar"
 
-#: rapid/rapid.py:1187
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
+#: rapid/rapid.py:2472
+msgid "All downloads complete"
+msgstr "Bütün yüklemeler tamamlandı"
 
-#. 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:1191
+#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
+#: rapid/rapid.py:2505 rapid/rapid.py:2513
 #, python-format
-msgid "<i>Example: %s</i>"
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:1217
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
+#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#, python-format
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:1233
-msgid "Stored number value not updated, as a download is currently occurring"
+#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#, python-format
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:1263
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2546
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1268
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2553
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1282 rapid/rapid.py:1556
-msgid "photo"
-msgstr "fotoğraf"
-
-#: rapid/rapid.py:1283 rapid/rapid.py:1551
-msgid "video"
-msgstr "video"
+#: rapid/rapid.py:2935
+msgid "and"
+msgstr "ve"
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1520
-msgid "externaldrive1"
-msgstr ""
+#: rapid/rapid.py:2940
+msgid "Using backup devices"
+msgstr "Yedekleme ünitelerini kullanma"
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1522
-msgid "externaldrive2"
-msgstr ""
+#: rapid/rapid.py:2942
+msgid "Using backup device"
+msgstr "Yedekleme ünitesi kullanma"
 
-#: rapid/rapid.py:1546 rapid/rapid.py:1677
-msgid "photos or videos"
-msgstr ""
+#: rapid/rapid.py:2944
+msgid "No backup devices detected"
+msgstr "Yedekleme ünitesi bulunamadı"
 
-#: rapid/rapid.py:1549
-msgid "videos"
-msgstr "videolar"
+#: rapid/rapid.py:2971
+msgid "Free space:"
+msgstr "Boş alan:"
 
-#: rapid/rapid.py:1561
+#. (videos) or (photos) will be appended to the free space message displayed to the
+#. user in the status bar.
+#. you should only translate this if your language does not use parantheses
+#: rapid/rapid.py:2983
 #, python-format
-msgid ""
-"%(date)s\n"
-"%(time)s"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:1563
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:2987
 #, python-format
-msgid "%(date)s %(time)s"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:1566
+#. Inserted in the middle of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2992
+msgid "; "
+msgstr "; "
+
+#. Inserted at the end of the statusbar message concerning the amount of freespace
+#. Used to differentiate between two different file systems
+#. e.g. Free space: 21.3GB (photos); 14.7GB (videos).
+#: rapid/rapid.py:2997
+msgid "."
+msgstr ","
+
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3003
 #, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "%(free)s free"
 msgstr ""
 
-#: rapid/rapid.py:1573
+#. user manually specified backup location
+#: rapid/rapid.py:3009
 #, python-format
-msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:1601 rapid/rapid.py:2267
-msgid "subfolder and filename"
+#: rapid/rapid.py:3014
+#, python-format
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:1603 rapid/rapid.py:2269
-msgid "filename"
-msgstr ""
+#: rapid/rapid.py:3043
+msgid "Program preferences are invalid"
+msgstr "Uygulama tercihleri geçersiz"
 
-#: rapid/rapid.py:1605 rapid/rapid.py:2271
-msgid "subfolder"
-msgstr ""
-
-#. This refers to when a device like a hard drive is having its contents scanned,
-#. looking for photos or videos. It is visible initially in the progress bar for each device
-#. (which normally holds "x photos and videos").
-#. It maybe displayed only briefly if the contents of the device being scanned is small.
-#: rapid/rapid.py:1693
-msgid "scanning..."
-msgstr ""
+#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr "Fotoğraf"
 
-#: rapid/rapid.py:1804
-msgid "The following download path could not be created:\n"
-msgstr ""
+#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+msgid "Video"
+msgstr "Video"
 
-#: rapid/rapid.py:1805
+#: rapid/rapid.py:3159
 #, python-format
-msgid "%(path)s: "
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:1806 rapid/rapid.py:1807 rapid/rapid.py:1822
-#: rapid/rapid.py:1823 rapid/rapid.py:2084 rapid/rapid.py:2087
-msgid "Download cannot proceed"
-msgstr ""
-
-#: rapid/rapid.py:1820 rapid/rapid.py:4959
-msgid "There is an error in the program preferences."
-msgstr ""
-
-#: rapid/rapid.py:1821
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
-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 photos that can be copied. For example, the user might see the following:
-#. '0 of 512 photos' or '0 of 10 videos' or '0 of 202 photos and videos'.
-#. This particular text is displayed to the user before the download has started.
-#: rapid/rapid.py:1995
+#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
 #, python-format
-msgid "%(number)s %(filetypes)s"
-msgstr ""
+msgid "Folder: %s"
+msgstr "Klasör: %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 photos 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:2006
+#: rapid/rapid.py:3173
 #, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:2013
+#: rapid/rapid.py:3186
 #, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
+msgid "%(file_type)s download folder is not writable"
 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:2034
-msgid "The device can now be safely removed"
-msgstr ""
+#: rapid/rapid.py:3264
+msgid "Thumbnails"
+msgstr "Küçük resimler"
 
-#: rapid/rapid.py:2040
+#. 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:3311
 #, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
+"Uygulama bilgilerini, uygulama çalışırken komut satırında göster(öntanımlı: "
+"%default)"
 
-#: rapid/rapid.py:2043
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr ""
+#: rapid/rapid.py:3312
+msgid "display debugging information when run from the command line"
+msgstr "Komut satırında çalışırken  hata ayıklama bilgisini göster"
 
-#: rapid/rapid.py:2046 rapid/rapid.py:5744
-msgid "warnings"
-msgstr ""
+#: rapid/rapid.py:3313
+msgid "only output errors to the command line"
+msgstr "sadece hataqları komut satırında göster"
 
-#: rapid/rapid.py:2048 rapid/rapid.py:5748
-msgid "errors"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:3315
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:2078
-#, python-format
-msgid "Source: %s\n"
-msgstr ""
+#: rapid/rapid.py:3316
+msgid "reset all program settings and preferences and exit"
+msgstr "Bütün uygulama ayarlarını ve tercihlerini sıfırla ve çık"
 
-#: rapid/rapid.py:2080
-#, python-format
-msgid "Device: %s\n"
-msgstr ""
+#: rapid/rapid.py:3329
+msgid "Photos:"
+msgstr "Fotoğraflar:"
 
-#: rapid/rapid.py:2081
+#: rapid/rapid.py:3329
+msgid "Videos:"
+msgstr "Videolar:"
+
+#: rapid/rapid.py:3334
 #, python-format
-msgid "Destination: %s"
-msgstr ""
+msgid "and %s"
+msgstr "ve %s"
 
-#: rapid/rapid.py:2082 rapid/rapid.py:2085
-msgid "Could not create temporary download directory"
-msgstr ""
+#: rapid/rapid.py:3342
+msgid "All settings and preferences have been reset"
+msgstr "Bütün uygulama ayarları ve tercihleri sıfırlandı"
 
-#: rapid/rapid.py:2085
-msgid "Error:"
+#: rapid/rapid.py:3351
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
 msgstr ""
 
-#: rapid/rapid.py:2109
-msgid "Backup path does not exist"
+#: rapid/backupfile.py:139 rapid/backupfile.py:162
+msgid "Backing up error"
 msgstr ""
 
-#: rapid/rapid.py:2110
+#: rapid/backupfile.py:141
 #, python-format
-msgid "The path %s could not be created"
-msgstr ""
-
-#: rapid/rapid.py:2111
-msgid "No backups can occur"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:2140
+#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
 #, python-format
 msgid ""
 "Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"Destination: %(destination)s"
 msgstr ""
 
-#: rapid/rapid.py:2171 rapid/rapid.py:2517 rapid/rapid.py:2552
-#: rapid/rapid.py:2580 rapid/rapid.py:2611 rapid/rapid.py:2630
+#: rapid/backupfile.py:146 rapid/backupfile.py:166
 #, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+msgid "Error: %(inst)s"
 msgstr ""
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2186
-msgid "Please check your system and try again."
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
+#: rapid/subfolderfile.py:348 rapid/subfolderfile.py:366
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#: rapid/rapid.py:2206
-msgid "Photos detected with the same filenames, but taken at different times"
+#: rapid/device.py:79
+msgid "Device Detected"
 msgstr ""
 
-#: rapid/rapid.py:2246
-msgid "Photo has already been downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:88
+msgid ""
+"Should this device or partition be used to download photos or videos from?"
 msgstr ""
 
-#: rapid/rapid.py:2247 rapid/rapid.py:2646
-#, python-format
-msgid "Source: %(source)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
+#: rapid/device.py:107
+msgid "_Remember this choice"
 msgstr ""
 
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2445
-msgid "New day has started - resetting 'Downloads Today' sequence number"
+#: rapid/downloadtracker.py:268
+msgid "MB/s"
 msgstr ""
 
-#: rapid/rapid.py:2516
-#, python-format
-msgid "Backup of %(file_type)s already exists"
+#: rapid/generatenameconfig.py:145
+msgid "Date time"
 msgstr ""
 
-#: rapid/rapid.py:2520
-#, python-format
-msgid "Backup %(file_type)s overwritten"
+#: rapid/generatenameconfig.py:146
+msgid "Text"
 msgstr ""
 
-#: rapid/rapid.py:2524
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
 msgstr ""
 
-#: rapid/rapid.py:2526
-#, python-format
-msgid "%(file_type)s not backed up"
+#: rapid/generatenameconfig.py:148
+msgid "Metadata"
 msgstr ""
 
-#: rapid/rapid.py:2549 rapid/rapid.py:2577 rapid/rapid.py:2610
-#: rapid/rapid.py:2629
-msgid "Backing up error"
+#: rapid/generatenameconfig.py:149
+msgid "Sequences"
 msgstr ""
 
-#: rapid/rapid.py:2550 rapid/rapid.py:2578
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:549
+msgid "Job code"
 msgstr ""
 
-#: rapid/rapid.py:2554 rapid/rapid.py:2613
-#, python-format
-msgid "Error: %(inst)s"
+#: rapid/generatenameconfig.py:152
+msgid "Image date"
 msgstr ""
 
-#: rapid/rapid.py:2555 rapid/rapid.py:2583 rapid/rapid.py:2614
-#: rapid/rapid.py:2633
-#, python-format
-msgid "The %(file_type)s was not backed up."
+#: rapid/generatenameconfig.py:153
+msgid "Video date"
 msgstr ""
 
-#: rapid/rapid.py:2582 rapid/rapid.py:2632
-#, python-format
-msgid "Error: %(errno)s %(strerror)s"
+#: rapid/generatenameconfig.py:154
+msgid "Today"
 msgstr ""
 
-#: rapid/rapid.py:2645
-#, python-format
-msgid "%(file_type)s could not be backed up"
+#: rapid/generatenameconfig.py:155
+msgid "Yesterday"
 msgstr ""
 
-#: rapid/rapid.py:2648
-msgid "No suitable backup volume was found"
+#. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+#: rapid/generatenameconfig.py:157
+msgid "Download time"
 msgstr ""
 
-#: rapid/rapid.py:2650
-msgid "A backup location was not found"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:159
+msgid "Name + extension"
 msgstr ""
 
-#: rapid/rapid.py:2704
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:161
+msgid "Name"
 msgstr ""
 
-#: rapid/rapid.py:2777
-#, python-format
-msgid "Download has started from %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:163
+msgid "Extension"
 msgstr ""
 
-#: rapid/rapid.py:2780
-#, python-format
-msgid "Attempting to download %s files"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:165
+msgid "Image number"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2813 rapid/rapid.py:2880
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+#: rapid/generatenameconfig.py:166
+msgid "Video number"
 msgstr ""
 
-#: rapid/rapid.py:2876
-#, python-format
-msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:168
+msgid "Aperture"
 msgstr ""
 
-#: rapid/rapid.py:2901 rapid/rapid.py:2905
-msgid "Could not delete photo or video from device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:170
+msgid "ISO"
 msgstr ""
 
-#: rapid/rapid.py:2902
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:172
+msgid "Exposure time"
 msgstr ""
 
-#: rapid/rapid.py:2906
-#, python-format
-msgid "Photo: %(source)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:174
+msgid "Focal length"
 msgstr ""
 
-#: rapid/rapid.py:2908
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:176
+msgid "Camera make"
 msgstr ""
 
-#: rapid/rapid.py:2921
-#, python-format
-msgid "Download complete from %s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:178
+msgid "Camera model"
 msgstr ""
 
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3036 rapid/rapid.py:3505
-msgid "Device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:180
+msgid "Short camera model"
 msgstr ""
 
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3041 rapid/rapid.py:3494
-msgid "Size"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:182
+msgid "Hyphenated short camera model"
 msgstr ""
 
-#: rapid/rapid.py:3044
-msgid "Download Progress"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:184
+msgid "Serial number"
 msgstr ""
 
-#: rapid/rapid.py:3132
-msgid "Downloading From Cameras"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:186
+msgid "Shutter count"
 msgstr ""
 
-#: rapid/rapid.py:3138
-msgid "Downloading directly from a camera may work poorly or not at all"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:188
+msgid "Owner name"
 msgstr ""
 
-#: rapid/rapid.py:3139
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
+#: rapid/generatenameconfig.py:189
+msgid "Codec"
 msgstr ""
 
-#: rapid/rapid.py:3153
-msgid "_Show this message again"
+#: rapid/generatenameconfig.py:190
+msgid "Width"
 msgstr ""
 
-#: rapid/rapid.py:3188
-msgid "Device Detected"
+#: rapid/generatenameconfig.py:191
+msgid "Height"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3197
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
+#: rapid/generatenameconfig.py:192
+msgid "Length"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3216
-msgid "_Remember this choice"
+#: rapid/generatenameconfig.py:193
+msgid "Frames Per Second"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3253
-#, python-format
-msgid "%s selected for downloading from"
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3256
-msgid "This device or partition will always be used to download from"
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3259
-#, python-format
-msgid "%s rejected as a download device"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:197
+msgid "Downloads today"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3262
-msgid "This device or partition will never be used to download from"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:199
+msgid "Session number"
 msgstr ""
 
-#: rapid/rapid.py:3269
-msgid "Remove all Job Codes?"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:201
+msgid "Subfolder number"
 msgstr ""
 
-#: rapid/rapid.py:3286
-msgid "Should all Job Codes be removed?"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
+#: rapid/generatenameconfig.py:203
+msgid "Stored number"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3314
-msgid "Enter a Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
+#: rapid/generatenameconfig.py:205
+msgid "Sequence letter"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3333
-msgid "Enter a new Job Code, or select a previous one"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:207
+msgid "All digits"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3336
-msgid "Enter a new Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:209
+msgid "Last digit"
 msgstr ""
 
-#: rapid/rapid.py:3341 rapid/rapid.py:4496
-msgid "Job Code:"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:211
+msgid "Last 2 digits"
 msgstr ""
 
-#: rapid/rapid.py:3388
-msgid "Job Code entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:213
+msgid "Last 3 digits"
 msgstr ""
 
-#: rapid/rapid.py:3390
-msgid "Job Code not entered"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:215
+msgid "Last 4 digits"
 msgstr ""
 
-#: rapid/rapid.py:3440
-msgid "Status"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:217
+msgid "Original Case"
 msgstr ""
 
-#: rapid/rapid.py:3448
-msgid "Type"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:219
+msgid "UPPERCASE"
 msgstr ""
 
-#: rapid/rapid.py:3457 rapid/rapid.py:4921 rapid/rapid.py:4923
-msgid "Photo"
+#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
+#: rapid/generatenameconfig.py:221
+msgid "lowercase"
 msgstr ""
 
-#: rapid/rapid.py:3459
-msgid "File"
+#: rapid/generatenameconfig.py:222
+msgid "One digit"
 msgstr ""
 
-#: rapid/rapid.py:3474
-msgid "Job Code"
+#: rapid/generatenameconfig.py:223
+msgid "Two digits"
 msgstr ""
 
-#: rapid/rapid.py:3484
-msgid "Date"
+#: rapid/generatenameconfig.py:224
+msgid "Three digits"
 msgstr ""
 
-#: rapid/rapid.py:3516 rapid/renamesubfolderprefs.py:194
-msgid "Filename"
+#: rapid/generatenameconfig.py:225
+msgid "Four digits"
 msgstr ""
 
-#: rapid/rapid.py:3527
-msgid "Path"
+#: rapid/generatenameconfig.py:226
+msgid "Five digits"
 msgstr ""
 
-#: rapid/rapid.py:3918
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#: rapid/generatenameconfig.py:227
+msgid "Six digits"
 msgstr ""
 
-#: rapid/rapid.py:3920
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#: rapid/generatenameconfig.py:228
+msgid "Seven digits"
 msgstr ""
 
-#: rapid/rapid.py:3922
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:230
+msgid "Subseconds"
 msgstr ""
 
-#: rapid/rapid.py:3924
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:232
+msgid "YYYYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:3926
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:234
+msgid "YYYY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:3928
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:236
+msgid "YYMMDD"
 msgstr ""
 
-#: rapid/rapid.py:3930
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:238
+msgid "YY-MM-DD"
 msgstr ""
 
-#: rapid/rapid.py:3932
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:240
+msgid "MMDDYYYY"
 msgstr ""
 
-#: rapid/rapid.py:3934
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "MMDDYY"
 msgstr ""
 
-#: rapid/rapid.py:4303
-msgid "Preview"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:244
+msgid "MMDD"
 msgstr ""
 
-#: rapid/rapid.py:4518
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:246
+msgid "DDMMYYYY"
 msgstr ""
 
-#: rapid/rapid.py:4887
-#, python-format
-msgid "%(free)s available"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "DDMMYY"
 msgstr ""
 
-#. user manually specified backup location
-#: rapid/rapid.py:4894
-#, python-format
-msgid "Backing up to %(path)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:250
+msgid "YYYY"
 msgstr ""
 
-#: rapid/rapid.py:4899
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:252
+msgid "YY"
 msgstr ""
 
-#: rapid/rapid.py:4908
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:254
+msgid "MM"
 msgstr ""
 
-#: rapid/rapid.py:4912
-msgid "Problem with Device Location Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:256
+msgid "DD"
 msgstr ""
 
-#: rapid/rapid.py:4921
-msgid "Video"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:258
+msgid "HHMMSS"
 msgstr ""
 
-#: rapid/rapid.py:4928
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "HHMM"
 msgstr ""
 
-#: rapid/rapid.py:4937
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:262
+msgid "HH-MM-SS"
 msgstr ""
 
-#: rapid/rapid.py:4942
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:264
+msgid "HH-MM"
 msgstr ""
 
-#: rapid/rapid.py:4945
-msgid "Problem with Download Folder"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:266
+msgid "HH"
 msgstr ""
 
-#: rapid/rapid.py:4947
-msgid "Problem with Download Folders"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:268
+msgid "MM (minutes)"
 msgstr ""
 
-#: rapid/rapid.py:4960
-msgid "Some preferences will be reset."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:270
+msgid "SS"
 msgstr ""
 
-#: rapid/rapid.py:4993
-msgid "Displaying warning about downloading directly from camera"
+#: rapid/preferencesdialog.py:370
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5003
+#: rapid/preferencesdialog.py:372
 #, python-format
-msgid "Prompting whether to use %s"
+msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/rapid.py:5030
-msgid "Prompting for Job Code"
+#: rapid/preferencesdialog.py:376
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/rapid.py:5034
-msgid "Already prompting for Job Code, do not prompt again"
+#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/rapid.py:5051
-msgid "Starting downloads"
+#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#. autostart is true
-#: rapid/rapid.py:5055
-msgid "Starting downloads that have been waiting for a Job Code"
+#: rapid/preferencesdialog.py:436
+msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5102
-#, python-format
-msgid "Creating photo download folder %(folder)s"
+#: rapid/preferencesdialog.py:617
+msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/rapid.py:5107
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+#: rapid/preferencesdialog.py:638
+msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5111
-#, python-format
-msgid "Creating video download folder %(folder)s"
+#: rapid/preferencesdialog.py:655
+msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 
-#: rapid/rapid.py:5116
-#, python-format
-msgid "Failed to create default video download folder %(folder)s"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:714
+msgid "Enter a Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5141
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:731
+msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
 
-#: rapid/rapid.py:5143
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:734
+msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5145
-msgid "Sorry, some preferences are invalid and will be reset."
+#: rapid/preferencesdialog.py:739
+msgid "Job Code:"
 msgstr ""
 
-#: rapid/rapid.py:5146
-msgid "Warning:"
+#: rapid/preferencesdialog.py:916
+msgid "Job Code"
 msgstr ""
 
-#: rapid/rapid.py:5151
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
+#: rapid/preferencesdialog.py:998
+msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:5158
-msgid "Preferences were modified."
+#: rapid/preferencesdialog.py:1016
+msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:5159
-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."
+#: rapid/preferencesdialog.py:1107
+#, python-format
+msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5163
-msgid "No preferences needed to be changed."
+#: rapid/preferencesdialog.py:1129
+#, python-format
+msgid "Select a folder in which to backup %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:5165
+#. 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/preferencesdialog.py:1215
 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."
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5175
-msgid "Problem using pynotify."
+#: rapid/preferencesdialog.py:1266
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/rapid.py:5191
-msgid "Failed to receive pynotify server capabilities."
+#. 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/preferencesdialog.py:1269
+#, python-format
+msgid "<i>Example: %s</i>"
 msgstr ""
 
-#: rapid/rapid.py:5202
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1359
+#, python-format
 msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr ""
-
-#: rapid/rapid.py:5250
-msgid "and"
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/rapid.py:5255
-msgid "Using backup devices"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1645
+msgid "externaldrive1"
 msgstr ""
 
-#: rapid/rapid.py:5257
-msgid "Using backup device"
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1647
+msgid "externaldrive2"
 msgstr ""
 
-#: rapid/rapid.py:5259
-msgid "No backup devices detected"
-msgstr ""
+#: rapid/prefsrapid.py:122
+msgid "New York"
+msgstr "New York"
 
-#: rapid/rapid.py:5309 rapid/rapid.py:5471
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Manila"
+msgstr "Manila"
 
-#: rapid/rapid.py:5430
-#, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Prague"
+msgstr "Prag"
 
-#: rapid/rapid.py:5434
-msgid "Automatically start download is true"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Helsinki"
+msgstr "Helsinki"
 
-#: rapid/rapid.py:5436
-msgid "Automatically start download is false"
-msgstr ""
+#: rapid/prefsrapid.py:123
+msgid "Wellington"
+msgstr "Wellington"
 
-#: rapid/rapid.py:5489
-msgid "Using manually specified path"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Tehran"
+msgstr "Tahran"
 
-#. the user is trying to backup to a device that is currently being downloaded from..... we don't normally allow that, but what to do?
-#: rapid/rapid.py:5557
-#, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
+#: rapid/prefsrapid.py:124
+msgid "Kampala"
 msgstr ""
 
-#: rapid/rapid.py:5573
-msgid "D_ownload Selected"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Paris"
+msgstr "Paris"
 
-#: rapid/rapid.py:5665 rapid/rapid.py:5716
-msgid "All downloads complete"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Berlin"
+msgstr "Berlin"
 
-#: rapid/rapid.py:5680
-msgid "MB/s"
-msgstr ""
+#: rapid/prefsrapid.py:124
+msgid "Sydney"
+msgstr "Sidney"
 
-#: rapid/rapid.py:5690
-msgid "About 1 second remaining"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Budapest"
+msgstr "Budapeşte"
 
-#: rapid/rapid.py:5692
-#, python-format
-msgid "About %i seconds remaining"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Rome"
+msgstr "Roma"
 
-#: rapid/rapid.py:5694
-msgid "About 1 minute remaining"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Moscow"
+msgstr "Moskova"
 
-#. 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:5699
-#, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Delhi"
+msgstr "Delhi"
 
-#: rapid/rapid.py:5719 rapid/rapid.py:5725 rapid/rapid.py:5731
-#: rapid/rapid.py:5737 rapid/rapid.py:5742 rapid/rapid.py:5746
-#, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr ""
+#: rapid/prefsrapid.py:125
+msgid "Warsaw"
+msgstr "Varşova"
 
-#: rapid/rapid.py:5721 rapid/rapid.py:5733
-#, python-format
-msgid "%(filetype)s downloaded"
-msgstr ""
+#: rapid/prefsrapid.py:126
+msgid "Jakarta"
+msgstr "Jakarta"
 
-#: rapid/rapid.py:5727 rapid/rapid.py:5739
-#, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
+#: rapid/prefsrapid.py:126
+msgid "Madrid"
+msgstr "Madrid"
 
-#: rapid/rapid.py:5907
-msgid "_Resume"
-msgstr ""
+#: rapid/prefsrapid.py:126
+msgid "Stockholm"
+msgstr "Stockholm"
 
-#: rapid/rapid.py:5910
-msgid "_Download All"
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+msgid "subfolder"
 msgstr ""
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5919
-msgid "_Pause"
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+msgid "filename"
 msgstr ""
 
-#: rapid/rapid.py:6031
-msgid "Download device settings preferences were changed."
+#: rapid/problemnotification.py:80
+#, python-format
+msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/rapid.py:6043
-msgid "Backup preferences were changed."
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
 msgstr ""
 
-#: rapid/rapid.py:6049
-msgid "Subfolder and filename preferences were changed."
+#. a number component is something like the 8346 in IMG_8346.JPG
+#: rapid/problemnotification.py:83
+msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/rapid.py:6060
-msgid "Download folder preferences were changed."
+#: rapid/problemnotification.py:84
+#, python-format
+msgid "Error generating component %s."
 msgstr ""
 
-#: rapid/rapid.py:6259
-msgid "Goodbye"
+#. a generic problem
+#: rapid/problemnotification.py:86
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
 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:6270
+#: rapid/problemnotification.py:88
 #, python-format
-msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
+msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/rapid.py:6271
-msgid "only output errors to the command line"
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6273
-msgid "list photo and video file extensions the program recognizes and exit"
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/rapid.py:6274
-msgid "reset all program settings and preferences and exit"
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Photos:"
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
+"%(image2)s on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
-#: rapid/rapid.py:6283
-msgid "Videos:"
+#: rapid/problemnotification.py:103
+#, python-format
+msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/rapid.py:6288
+#: rapid/problemnotification.py:107
 #, python-format
-msgid "and %s"
+msgid ""
+"The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+"identifier '%(identifier)s' added."
 msgstr ""
 
-#: rapid/rapid.py:6296
-msgid "All settings and preferences have been reset"
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6300 rapid/rapid.py:6301 rapid/rapid.py:6303
-#: rapid/rapid.py:6308 rapid/rapid.py:6312
-msgid "Using"
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#: rapid/rapid.py:6305
-msgid "\n"
-msgstr "\n"
-
-#. this application is already running
-#: rapid/rapid.py:6329
+#: rapid/problemnotification.py:111
 #, python-format
-msgid "%s is already running"
+msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:192
-msgid "Date time"
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:193
-msgid "Text"
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:195
-msgid "Metadata"
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:196
-msgid "Sequences"
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:199
-msgid "Image date"
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:200
-msgid "Video date"
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:201
-msgid "Today"
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
-msgid "Yesterday"
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
-msgid "Name + extension"
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
-msgid "Name"
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
-msgid "Extension"
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:210
-msgid "Image number"
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:211
-msgid "Video number"
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
-msgid "Aperture"
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:215
-msgid "ISO"
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
-msgid "Exposure time"
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
-msgid "Focal length"
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
-msgid "Camera make"
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:223
-msgid "Camera model"
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
-msgid "Short camera model"
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
-msgid "Hyphenated short camera model"
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:229
-msgid "Serial number"
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
-msgid "Shutter count"
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:233
-msgid "Owner name"
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:234
-msgid "Codec"
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:235
-msgid "Width"
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:236
-msgid "Height"
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:237
-msgid "Length"
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
-msgid "Frames Per Second"
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:240
-msgid "Downloads today"
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
-msgid "Session number"
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
-msgid "Subfolder number"
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:246
-msgid "Stored number"
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:248
-msgid "Sequence letter"
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:228
+msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:250
-msgid "All digits"
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
-msgid "Last digit"
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
-msgid "Last 2 digits"
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
-msgid "Last 3 digits"
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:258
-msgid "Last 4 digits"
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:260
-msgid "Original Case"
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
-msgid "UPPERCASE"
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:264
-msgid "lowercase"
+#: rapid/subfolderfile.py:297
+msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:265
-msgid "One digit"
+#: rapid/subfolderfile.py:298
+#, python-format
+msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:266
-msgid "Two digits"
+#: rapid/subfolderfile.py:355
+msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:267
-msgid "Three digits"
+#: rapid/subfolderfile.py:393
+msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:268
-msgid "Four digits"
+#: rapid/subfolderfile.py:394
+#, python-format
+msgid "Path: %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:269
-msgid "Five digits"
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:270
-msgid "Six digits"
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:271
-msgid "Seven digits"
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
-msgid "Subseconds"
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
-msgid "YYYYMMDD"
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
-msgid "YYYY-MM-DD"
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
-msgid "YYMMDD"
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
-msgid "YY-MM-DD"
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
-msgid "MMDDYYYY"
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
-msgid "MMDDYY"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:287
-msgid "MMDD"
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
-msgid "DDMMYYYY"
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
-msgid "DDMMYY"
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:293
-msgid "YYYY"
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:295
-msgid "YY"
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:297
-msgid "MM"
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:299
-msgid "DD"
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:301
-msgid "HHMMSS"
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:303
-msgid "HHMM"
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:305
-msgid "HH-MM-SS"
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:307
-msgid "HH-MM"
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:309
-msgid "HH"
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
-msgid "MM (minutes)"
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
 msgstr ""
 
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:313
-msgid "SS"
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:796
-#, python-format
-msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:803
-#, python-format
-msgid "Preference value '%(value)s' is invalid"
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:807
-msgid "These preferences are not well formed:"
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1517
-#, python-format
-msgid "Subfolder preferences should not start with a %s"
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1519
-#, python-format
-msgid "Subfolder preferences should not end with a %s"
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1523
-#, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/glade3/prefs.ui.h:1
 msgid " "
 msgstr " "
 
-#: rapid/glade3/rapid.glade.h:2
-msgid "      "
-msgstr "      "
-
-#: rapid/glade3/rapid.glade.h:3
+#: rapid/glade3/prefs.ui.h:2
 msgid " hh:mm"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:4
+#: rapid/glade3/prefs.ui.h:3
 msgid ":"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:5
+#: rapid/glade3/prefs.ui.h:4
 msgid "<b>Backup</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/prefs.ui.h:6
 msgid "<b>Download Folder</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:12
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:13
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:14
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:17
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:18
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#: rapid/glade3/prefs.ui.h:19
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:23
+#: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:27
+#: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:29
+#: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:30
+#: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:36
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:38
+#: rapid/glade3/prefs.ui.h:35
 msgid "Backup photos and videos when downloading"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/glade3/prefs.ui.h:36
 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
+#: rapid/glade3/prefs.ui.h:37
 msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:43
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/glade3/prefs.ui.h:42
 msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
 "\n"
-"You can download photos from multiple devices simultaneously, or you can "
-"specify a location on your hard drive.\n"
+"You can download from multiple devices simultaneously, or you can specify a "
+"location on your hard drive.\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 ""
-
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
+"<i>Downloading directly from cameras is currently an experimental feature. "
+"If downloading directly from your camera works poorly or not at all, try "
+"setting it to PTP mode. If that is not possible, a card reader must be "
+"used.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:52
+msgid "Generate thumbnails (slower)"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:57
+#: rapid/glade3/prefs.ui.h:54
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
+"If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:58
+#: rapid/glade3/prefs.ui.h:55
 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."
+"device will be scanned. On large devices, this could take some time.\n"
+"\n"
+"When this option is enabled, and a potential device is detected, you will be "
+"prompted to determine if it should be scanned or not."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths\t"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:61
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:62
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:67
-msgid "Preferences: Rapid Photo Downloader"
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
+#: rapid/glade3/prefs.ui.h:68
+msgid "Preferences: Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:72
-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 ""
-
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Devices"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered devices are those devices you have chosen to always scan or never "
+"scan when automatic detection of Portable Storage Devices is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
+#: rapid/glade3/prefs.ui.h:75
+msgid "Rename Options"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:86
+#: rapid/glade3/prefs.ui.h:78
 msgid ""
 "Sorry, video downloading functionality disabled. To download videos, please "
-"install the <i>kaa metadata</i> package for python."
+"install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for "
+"python."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:79
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1781,136 +1682,90 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: rapid/glade3/prefs.ui.h:82
 msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:83
 msgid ""
 "Specify whether photo, video and folder names should have any characters "
 "removed that are not allowed by other operating systems."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:86
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:87
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:88
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:89
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/prefs.ui.h:90
 msgid "Video Folders"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:91
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:94
 msgid ""
 "When a photo or video of the same name has already been downloaded, choose "
 "whether to skip downloading the file, or to add a unique indentifier."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:95
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:103
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/prefs.ui.h:97
 msgid "_Add..."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
+#: rapid/glade3/prefs.ui.h:98
+msgid "_Use regular expressions"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr ""
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr ""
+#~ msgid "      "
+#~ msgstr "      "
diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index 7c74bb9..06cdcf8 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,9 +1,35 @@
+Version 0.4.2
+-------------
+
+2011-08-xx
+
+Added feature in Prefences window to remove any paths that have previously
+been marked to always be scanned or ignored. These paths can be specified when
+automatic detection of Portable Storage Devices is enabled.
+
+Fixed bug #768026: added option to ignore paths from which to download. 
+
+You can now specify specific paths never to scan for photos or videos. By 
+default, any path ending in .Trash or .thumbnails is ignored.  Advanced users
+can specify python-style regular expressions.
+
+Fixed bug #774488: added manual backup path for videos, in addition to photos.
+
+Fixed bug #789995: crash when --reset-settings option is given on the command 
+line.
+
+Fixed bug #795446: small error in translation template.
+
+Updated Brazilian, Dutch, Français, German, Japanese, Polish, Russian, Spanish 
+and Turkish translations.
+
+
 Version 0.4.1
 -------------
 
 2011-05-19
 
-Added exif Artist and Copyright metadata options to file and subfoler name
+Added exif Artist and Copyright metadata options to file and subfolder name
 generation.
 
 Fixed bug #774476: thumbnails occassionally not sorted by file modification
diff --git a/rapid/config.py b/rapid/config.py
index ce498c0..47ecfff 100644
--- a/rapid/config.py
+++ b/rapid/config.py
@@ -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.4.1'
+version = '0.4.2'
 
 GCONF_KEY="/apps/rapid-photo-downloader"
 
diff --git a/rapid/glade3/about.ui.h b/rapid/glade3/about.ui.h
new file mode 100644
index 0000000..7c721a5
--- /dev/null
+++ b/rapid/glade3/about.ui.h
@@ -0,0 +1 @@
+char *s = N_("Import your photos and videos efficiently and reliably");
diff --git a/rapid/glade3/prefs.ui b/rapid/glade3/prefs.ui
index 8f75f62..d5ff1e0 100644
--- a/rapid/glade3/prefs.ui
+++ b/rapid/glade3/prefs.ui
@@ -1993,8 +1993,10 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="xpad">12</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Devices&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Devices</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -2010,9 +2012,9 @@
                             <property name="xpad">12</property>
                             <property name="label" translatable="yes">Devices are from where to download photos and videos, such as cameras, memory cards or Portable Storage Devices.
 
-You can download photos from multiple devices simultaneously, or you can specify a location on your hard drive.
+You can download from multiple devices simultaneously, or you can specify a location on your hard drive.
 
-&lt;i&gt;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.&lt;/i&gt;</property>
+&lt;i&gt;Downloading directly from cameras is currently an experimental feature. If downloading directly from your camera works poorly or not at all, try setting it to PTP mode. If that is not possible, a card reader must be used.&lt;/i&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
                           </object>
@@ -2083,7 +2085,9 @@ You can download photos from multiple devices simultaneously, or you can specify
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="ypad">6</property>
-                                    <property name="label" translatable="yes">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.</property>
+                                    <property name="label" translatable="yes">If you enable automatic detection of Portable Storage Devices, the entire device will be scanned. On large devices, this could take some time.
+
+When this option is enabled, and a potential device is detected, you will be prompted to determine if it should be scanned or not.</property>
                                     <property name="wrap">True</property>
                                   </object>
                                   <packing>
@@ -2158,7 +2162,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                                     <property name="xalign">0</property>
                                     <property name="xpad">12</property>
                                     <property name="ypad">12</property>
-                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact location of the images and videos.</property>
+                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact location of the photos and videos.</property>
                                     <property name="wrap">True</property>
                                   </object>
                                   <packing>
@@ -2221,6 +2225,420 @@ You can download photos from multiple devices simultaneously, or you can specify
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkVBox" id="device_options_tab">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkHBox" id="exclusions_header_hbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkImage" id="image10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-preferences</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="exclusionlabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;span weight="bold" size="x-large"&gt;Device Options&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHSeparator" id="hseparator3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox15">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="remebered_devices_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Remembered Paths</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="remembered_devices_explanation_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Remembered paths are those that you have chosen to always scan or ignore when automatic detection of Portable Storage Devices is enabled.</property>
+                                <property name="wrap">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="remembered_devices_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="remembered_devices_spacer_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="remembered_devices_scrolledwindow">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="remembered_devices_treeview">
+                                        <property name="width_request">250</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="headers_visible">False</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="remembered_devices_button_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkVButtonBox" id="remembered_devices_vbuttonbox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">12</property>
+                                        <property name="layout_style">start</property>
+                                        <child>
+                                          <object class="GtkButton" id="remove_remembered_device_button">
+                                            <property name="label">gtk-remove</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="use_stock">True</property>
+                                            <signal name="clicked" handler="on_remove_remembered_device_button_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="remove_all_remembered_device_button">
+                                            <property name="label" translatable="yes" comments="The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c'">R_emove All</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="use_underline">True</property>
+                                            <signal name="clicked" handler="on_remove_all_remembered_device_button_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="padding">12</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel" id="ignored_paths_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Ignored Paths</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ignored_paths_explanation_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">12</property>
+                                <property name="label" translatable="yes">Specify any paths you want ignored when scanning devices for photos or videos. Any path ending with the values below will not be scanned.</property>
+                                <property name="wrap">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="ignored_paths_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="ignored_paths_spacer_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="ignored_paths_scrolledwindow">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="ignored_paths_treeview">
+                                        <property name="width_request">250</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="headers_visible">False</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="ignored_paths_button_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkVButtonBox" id="ignored_paths_vbuttonbox">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">12</property>
+                                        <property name="layout_style">start</property>
+                                        <child>
+                                          <object class="GtkButton" id="add_ignored_path_button">
+                                            <property name="label" translatable="yes">_Add...</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="use_underline">True</property>
+                                            <signal name="clicked" handler="on_add_ignored_path_button_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="remove_ignored_path_button">
+                                            <property name="label">gtk-remove</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="use_stock">True</property>
+                                            <signal name="clicked" handler="on_remove_ignored_path_button_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkButton" id="remove_all_ignored_paths_button">
+                                            <property name="label" translatable="yes" comments="The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c'">Re_move All</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="use_underline">True</property>
+                                            <signal name="clicked" handler="on_remove_all_ignored_paths_button_clicked" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="ignored_paths_use_re_checkbutton">
+                                    <property name="label" translatable="yes">Use _python-style regular expressions</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_ignored_paths_use_re_checkbutton_toggled" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">12</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="device_options_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Device Options</property>
+                  </object>
+                  <packing>
+                    <property name="position">7</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkVBox" id="backup_tab">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -2321,7 +2739,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                               <object class="GtkTable" id="backup_table">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="n_rows">9</property>
+                                <property name="n_rows">10</property>
                                 <property name="n_columns">4</property>
                                 <child>
                                   <object class="GtkLabel" id="backup_location_explanation_label">
@@ -2330,7 +2748,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
                                     <property name="ypad">12</property>
-                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact backup location.</property>
+                                    <property name="label" translatable="yes">If you disable automatic detection, choose the exact backup locations.</property>
                                     <property name="wrap">True</property>
                                   </object>
                                   <packing>
@@ -2338,6 +2756,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">7</property>
                                     <property name="bottom_attach">8</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -2415,7 +2834,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Backup location:</property>
+                                    <property name="label" translatable="yes">Photo backup location:</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -2538,6 +2957,28 @@ You can download photos from multiple devices simultaneously, or you can specify
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkLabel" id="video_backup_location_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Video backup location:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">9</property>
+                                    <property name="bottom_attach">10</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
                                   <placeholder/>
                                 </child>
                                 <child>
@@ -2608,7 +3049,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     </child>
                   </object>
                   <packing>
-                    <property name="position">7</property>
+                    <property name="position">8</property>
                   </packing>
                 </child>
                 <child type="tab">
@@ -2618,7 +3059,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     <property name="label" translatable="yes">Backup</property>
                   </object>
                   <packing>
-                    <property name="position">7</property>
+                    <property name="position">8</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -2956,7 +3397,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     </child>
                   </object>
                   <packing>
-                    <property name="position">8</property>
+                    <property name="position">9</property>
                   </packing>
                 </child>
                 <child type="tab">
@@ -2967,7 +3408,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     <property name="label" translatable="yes">Miscellaneous</property>
                   </object>
                   <packing>
-                    <property name="position">8</property>
+                    <property name="position">9</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -3278,7 +3719,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     </child>
                   </object>
                   <packing>
-                    <property name="position">9</property>
+                    <property name="position">10</property>
                   </packing>
                 </child>
                 <child type="tab">
@@ -3289,7 +3730,7 @@ You can download photos from multiple devices simultaneously, or you can specify
                     <property name="label" translatable="yes">Error Handling</property>
                   </object>
                   <packing>
-                    <property name="position">9</property>
+                    <property name="position">10</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
diff --git a/rapid/glade3/prefs.ui.h b/rapid/glade3/prefs.ui.h
new file mode 100644
index 0000000..ef85be3
--- /dev/null
+++ b/rapid/glade3/prefs.ui.h
@@ -0,0 +1,99 @@
+char *s = N_(" ");
+char *s = N_(" hh:mm");
+char *s = N_(":");
+char *s = N_("<b>Backup</b>");
+char *s = N_("<b>Compatibility with Other Operating Systems</b>");
+char *s = N_("<b>Download Folder</b>");
+char *s = N_("<b>Download Subfolders</b>");
+char *s = N_("<b>Example</b>");
+char *s = N_("<b>Job Codes</b>");
+char *s = N_("<b>Photo Rename</b>");
+char *s = N_("<b>Photo and Video Name Conflicts</b>");
+char *s = N_("<b>Program Automation</b>");
+char *s = N_("<b>Sequence Numbers</b>");
+char *s = N_("<i>/media/externaldrive/Photos</i>");
+char *s = N_("<i>Example: /home/user/Pictures</i>");
+char *s = N_("<i>Example:</i>");
+char *s = N_("<i>New:</i>");
+char *s = N_("<i>Original:</i>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Backup</span>	");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Device Options</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Devices</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Error Handling</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Job Codes</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Photo Rename</span>	");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Rename Options</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>");
+char *s = N_("<span weight=\"bold\" size=\"x-large\">Video Rename</span>	");
+char *s = N_("Add unique identifier");
+char *s = N_("Automatically detect Portable Storage Devices");
+char *s = N_("Automatically detect backup devices");
+char *s = N_("Automatically detect devices");
+char *s = N_("Backup");
+char *s = N_("Backup photos and videos when downloading");
+char *s = N_("Choose the download folder. Subfolders for the downloaded photos will be automatically created in this folder using the structure specified below.");
+char *s = N_("Choose the download folder. Subfolders for the downloaded videos will be automatically created in this folder using the structure specified below.");
+char *s = N_("Day start:");
+char *s = N_("Delete photos and videos from device upon download completion");
+char *s = N_("Device Options");
+char *s = N_("Devices");
+char *s = N_("Devices are from where to download photos and videos, such as cameras, memory cards or Portable Storage Devices.\n"
+             "\n"
+             "You can download from multiple devices simultaneously, or you can specify a location on your hard drive.\n"
+             "\n"
+             "<i>Downloading directly from cameras is currently an experimental feature. If downloading directly from your camera works poorly or not at all, try setting it to PTP mode. If that is not possible, a card reader must be used.</i>");
+char *s = N_("Download folder:");
+char *s = N_("Downloads today:");
+char *s = N_("Error Handling");
+char *s = N_("Exit program even if download had warnings or errors");
+char *s = N_("Exit program when download completes");
+char *s = N_("Generate thumbnails (slower)");
+char *s = N_("If you disable automatic detection, choose the exact backup locations.");
+char *s = N_("If you disable automatic detection, choose the exact location of the photos and videos.");
+char *s = N_("If you enable automatic detection of Portable Storage Devices, the entire device will be scanned. On large devices, this could take some time.\n"
+             "\n"
+             "When this option is enabled, and a potential device is detected, you will be prompted to determine if it should be scanned or not.");
+char *s = N_("Ignored Paths");
+char *s = N_("Job Codes");
+char *s = N_("Location:");
+char *s = N_("Miscellaneous");
+char *s = N_("Overwrite");
+char *s = N_("Performance");
+char *s = N_("Photo Folders");
+char *s = N_("Photo Rename");
+char *s = N_("Photo backup folder name:");
+char *s = N_("Photo backup location:");
+char *s = N_("Preferences: Rapid Photo Downloader");
+/* The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c' */
+char *s = N_("R_emove All");
+/* The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c' */
+char *s = N_("Re_move All");
+char *s = N_("Remembered Paths");
+char *s = N_("Remembered paths are those that you have chosen to always scan or ignore when automatic detection of Portable Storage Devices is enabled.");
+char *s = N_("Rename Options");
+char *s = N_("Skip");
+char *s = N_("Skip download");
+char *s = N_("Sorry, video downloading functionality disabled. To download videos, please install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for python.");
+char *s = N_("Specify any paths you want ignored when scanning devices for photos or videos. Any path ending with the values below will not be scanned.");
+char *s = N_("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 one of these names.</i>");
+char *s = N_("Specify the time in 24 hour format at which the <i>Downloads today</i> sequence number should be reset.");
+char *s = N_("Specify whether photo, video and folder names should have any characters removed that are not allowed by other operating systems.");
+char *s = N_("Start downloading at program startup");
+char *s = N_("Start downloading upon device insertion");
+char *s = N_("Stored number:");
+char *s = N_("Strip incompatible characters");
+char *s = N_("Synchronize RAW + JPEG sequence numbers");
+char *s = N_("Unmount (\"eject\") device upon download completion");
+char *s = N_("Use _python-style regular expressions");
+char *s = N_("Video Folders");
+char *s = N_("Video Rename");
+char *s = N_("Video backup folder name:");
+char *s = N_("Video backup location:");
+char *s = N_("When a photo or video of the same name has already been downloaded, choose whether to skip downloading the file, or to add a unique indentifier.");
+char *s = N_("When backing up, choose whether to overwrite a file on the backup device that has the same name, or skip backing it up.");
+char *s = N_("You can have your photos and videos backed up to multiple locations as they are downloaded, e.g. external hard drives.");
+char *s = N_("_Add...");
diff --git a/rapid/glade3/rapid.ui.h b/rapid/glade3/rapid.ui.h
new file mode 100644
index 0000000..7d5efa3
--- /dev/null
+++ b/rapid/glade3/rapid.ui.h
@@ -0,0 +1,32 @@
+char *s = N_("About...");
+char *s = N_("Check All");
+char *s = N_("Check All Photos");
+char *s = N_("Check All Videos");
+char *s = N_("Download");
+char *s = N_("Download / Pause");
+char *s = N_("Get Help Online...");
+char *s = N_("Help");
+char *s = N_("Make a Donation...");
+char *s = N_("Next File");
+char *s = N_("Preferences");
+char *s = N_("Previous File");
+char *s = N_("Quit");
+char *s = N_("Rapid Photo Downloader");
+char *s = N_("Refresh");
+char *s = N_("Report a Problem...");
+char *s = N_("Select All Wit_h Job Code");
+char *s = N_("Select All Without _Job Code");
+char *s = N_("Translate this Application...");
+char *s = N_("Uncheck All");
+char *s = N_("_Check All");
+char *s = N_("_Clear Completed Downloads");
+char *s = N_("_Download");
+char *s = N_("_Error Log");
+char *s = N_("_File");
+char *s = N_("_Help");
+char *s = N_("_Include in download");
+char *s = N_("_Make a Donation...");
+char *s = N_("_Select");
+char *s = N_("_Translate this Application...");
+char *s = N_("_Uncheck All");
+char *s = N_("_View");
diff --git a/rapid/preferencesdialog.py b/rapid/preferencesdialog.py
index 7289d0e..ea66c8d 100644
--- a/rapid/preferencesdialog.py
+++ b/rapid/preferencesdialog.py
@@ -18,7 +18,7 @@
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-import datetime
+import datetime, re
 
 import gtk
 
@@ -384,9 +384,9 @@ class VideoSubfolderPrefs(PhotoSubfolderPrefs):
             pref_defn_L0 = DICT_VIDEO_SUBFOLDER_L0,
             pref_list = pref_list)
 
-class RemoveAllJobCodeDialog(gtk.Dialog):
-    def __init__(self, parent_window, post_choice_callback):
-        gtk.Dialog.__init__(self, _('Remove all Job Codes?'), None,
+class QuestionDialog(gtk.Dialog):
+    def __init__(self, parent_window, title, question, post_choice_callback):
+        gtk.Dialog.__init__(self, title, None,
                    gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                    (gtk.STOCK_NO, gtk.RESPONSE_CANCEL, 
                    gtk.STOCK_YES, gtk.RESPONSE_OK))
@@ -403,7 +403,7 @@ class RemoveAllJobCodeDialog(gtk.Dialog):
             image.set_from_pixbuf(icon)
             prompt_hbox.pack_start(image, False, False, padding = 6)
             
-        prompt_label = gtk.Label(_('Should all Job Codes be removed?'))
+        prompt_label = gtk.Label(question)
         prompt_label.set_line_wrap(True)
         prompt_hbox.pack_start(prompt_label, False, False, padding=6)
                     
@@ -420,11 +420,32 @@ class RemoveAllJobCodeDialog(gtk.Dialog):
 
         
         self.connect('response', self.on_response)
-        
+
     def on_response(self,  device_dialog, response):
         user_selected = response == gtk.RESPONSE_OK
         self.post_choice_callback(self, user_selected)
 
+class RemoveAllJobCodeDialog(QuestionDialog):
+    def __init__(self, parent_window, post_choice_callback):
+        QuestionDialog.__init__(self, parent_window,
+                                _('Remove all Job Codes?'),
+                                _('Should all Job Codes be removed?'),
+                                post_choice_callback)
+                                
+class RemoveAllRemeberedDevicesDialog(QuestionDialog):
+    def __init__(self, parent_window, post_choice_callback):
+        QuestionDialog.__init__(self, parent_window,
+                                _('Remove all Remembered Devices?'),
+                                _('Should all remembered devices be removed?'),
+                                post_choice_callback)
+    
+class RemoveAllIgnoredPathsDialog(QuestionDialog):
+    def __init__(self, parent_window, post_choice_callback):
+        QuestionDialog.__init__(self, parent_window,
+                                _('Remove all Ignored Paths?'),
+                                _('Should all ignored paths be removed?'),
+                                post_choice_callback)
+                                
 class PhotoRenameTable(tpm.TablePlusMinus):
 
     def __init__(self, preferencesdialog, adjust_scroll_window):
@@ -716,7 +737,6 @@ class JobCodeDialog(gtk.Dialog):
                    (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, 
                    gtk.STOCK_OK, gtk.RESPONSE_OK))
                         
-        
         self.set_icon_from_file(paths.share_dir('glade3/rapid-photo-downloader.svg'))
         self.post_job_code_entry_callback = post_job_code_entry_callback
         
@@ -788,6 +808,54 @@ class JobCodeDialog(gtk.Dialog):
             logger.debug("Job Code not entered")
         self.post_job_code_entry_callback(self, user_chose_code, self.get_job_code())
         
+class IgnorePathDialog(gtk.Dialog):
+    """ Dialog prompting for a path to ignore when scanning devices"""
+    
+    def __init__(self, parent_window, post_entry_callback):
+        gtk.Dialog.__init__(self,  _('Enter a Path to Ignore'), None,
+                   gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                   (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, 
+                   gtk.STOCK_OK, gtk.RESPONSE_OK))
+                        
+        self.set_icon_from_file(paths.share_dir('glade3/rapid-photo-downloader.svg'))
+        self.post_entry_callback = post_entry_callback
+        
+        self.path_entry = gtk.Entry(max=0)
+            
+        self.ignored_path_hbox = gtk.HBox(homogeneous = False)
+        
+        task_label = gtk.Label(_('Specify a path that will never be scanned for photos or videos'))            
+        task_label.set_line_wrap(True)
+        task_hbox = gtk.HBox()
+        task_hbox.pack_start(task_label, False, False, padding=6)
+
+        label = gtk.Label(_('Path:'))
+        self.ignored_path_hbox.pack_start(label, False, False, padding=6)
+        self.ignored_path_hbox.pack_start(self.path_entry, True, True, padding=6)
+        
+        self.set_border_width(6)
+        self.set_has_separator(False)
+        
+        # when user hits enter, close the dialog window
+        self.set_default_response(gtk.RESPONSE_OK)
+        self.path_entry.set_activates_default(True)
+
+        self.vbox.pack_start(task_hbox, False, False, padding = 6)
+        self.vbox.pack_start(self.ignored_path_hbox, False, False, padding=12)
+        
+        self.set_transient_for(parent_window)
+        self.show_all()
+        self.connect('response', self.on_ignored_path_resp)
+
+    def on_ignored_path_resp(self, ignored_path_dialog, response):
+        user_chose_path = False
+        if response == gtk.RESPONSE_OK:
+            user_chose_path = True
+            logger.debug("Ignored Path entered")
+        else:
+            logger.debug("Ignored Path not entered")
+        self.post_entry_callback(self, user_chose_path, self.path_entry.get_text())
+
 
 class PreferencesDialog():
     """
@@ -834,6 +902,7 @@ class PreferencesDialog():
         self._setup_rename_options_tab()
         self._setup_job_code_tab()
         self._setup_device_tab()
+        self._setup_device_options_tab()    
         self._setup_backup_tab()
         self._setup_miscellaneous_tab()
         self._setup_error_tab()
@@ -905,6 +974,95 @@ class PreferencesDialog():
         
     def on_device_location_filechooser_button_selection_changed(self, widget):
         self.prefs.device_location = widget.get_current_folder()
+        
+    def on_add_ignored_path_button_clicked(self, widget):
+        i = IgnorePathDialog(parent_window = self.dialog, 
+                             post_entry_callback = self.add_ignored_path)
+        
+    def add_ignored_path(self, dialog, user_chose_path, path):
+        dialog.destroy()
+        if user_chose_path:
+            if path and path not in self.prefs.ignored_paths:
+                self.ignored_paths_liststore.prepend((path,  ))
+                self.update_ignored_paths()
+                selection = self.ignored_paths_treeview.get_selection()
+                selection.unselect_all()
+                selection.select_path((0, ))
+                #scroll to the top
+                adjustment = self.ignored_paths_scrolledwindow.get_vadjustment()
+                adjustment.set_value(adjustment.lower)
+                
+    def on_ignored_paths_use_re_checkbutton_toggled(self, checkbutton):
+        self.prefs.use_re_ignored_paths = checkbutton.get_active()
+        if self.prefs.use_re_ignored_paths and not self.pref_dialog_startup:
+            # check for invalid regular expressions
+            self.update_ignored_paths()
+        
+    def on_remove_ignored_path_button_clicked(self, button):
+        self._remove_from_treeview(self.ignored_paths_treeview)
+        self.update_ignored_paths()
+        
+    def on_remove_all_ignored_paths_button_clicked(self, button):
+        i = RemoveAllIgnoredPathsDialog(self.dialog, self.remove_all_ignored_paths)
+        
+    def remove_all_ignored_paths(self, dialog, user_selected):
+        dialog.destroy()
+        if user_selected:
+            self.ignored_paths_liststore.clear()
+            self.update_ignored_paths()        
+        
+    def on_remove_remembered_device_button_clicked(self, button):
+        """
+        uses remembered devices treeview to delete any removed items from the 
+        device_whitelist and device_blacklist prefs
+        """
+        blacklist = [i for i in self.prefs.device_blacklist if i]
+        whitelist = [i for i in self.prefs.device_whitelist if i]
+        selection = self.remembered_devices_treeview.get_selection()
+        model, selected = selection.get_selected_rows()
+        iters = [model.get_iter(path) for path in selected]
+        # only delete if a value is selected
+        if iters:
+            no = len(iters)
+            path = None
+            for i in range(0, no):
+                iter = iters[i]
+                if i == no - 1:
+                    path = model.get_path(iter) 
+                v = self.remembered_devices_liststore.get_value(iter, 0)
+                if v in blacklist:
+                    blacklist.remove(v)
+                elif v in whitelist:
+                    whitelist.remove(v)
+                else:
+                    logger.debug("Unknown remembered device %s", v)
+                model.remove(iter)
+            
+            # now that we removed the selection, play nice with 
+            # the user and select the next item
+            selection.select_path(path)
+            
+            # if there was no selection that meant the user
+            # removed the last entry, so we try to select the 
+            # last item
+            if not selection.path_is_selected(path):
+                 row = path[0]-1
+                 # test case for empty lists
+                 if row >= 0:
+                    selection.select_path((row,))            
+        
+        self.prefs.device_blacklist = blacklist
+        self.prefs.device_whitelist = whitelist
+        
+    def on_remove_all_remembered_device_button_clicked(self, button):
+        r = RemoveAllRemeberedDevicesDialog(self.dialog, self.remove_all_remembered_devices)
+        
+    def remove_all_remembered_devices(self, dialog, user_selected):
+        dialog.destroy()
+        if user_selected:
+            self.remembered_devices_liststore.clear()
+            self.prefs.device_blacklist = []
+            self.prefs.device_whitelist = []
     
     def _setup_sample_names(self, use_dummy_data = False):
         """
@@ -1085,7 +1243,7 @@ class PreferencesDialog():
         column = gtk.TreeViewColumn()
         rentext = gtk.CellRendererText()
         rentext.connect('edited', self.on_job_code_edited)
-        rentext .set_property('editable', True)
+        rentext.set_property('editable', True)
 
         column.pack_start(rentext, expand=0)
         column.set_attributes(rentext, text=0)
@@ -1101,6 +1259,60 @@ class PreferencesDialog():
         self.remove_all_job_code_button.set_image(gtk.image_new_from_stock(
                                                 gtk.STOCK_CLEAR,
                                                 gtk.ICON_SIZE_BUTTON))  
+    def _setup_device_options_tab(self):
+        """
+        Setup ignored paths and remembered devices tab in prefs dialog
+        """
+
+        self.ignored_paths_use_re_checkbutton.set_active(
+                    self.prefs.use_re_ignored_paths)
+        
+        self.ignored_paths_liststore = gtk.ListStore(str)
+        column = gtk.TreeViewColumn()
+        rentext = gtk.CellRendererText()
+        rentext.connect('edited', self.on_ignored_path_edited)
+        rentext.set_property('editable', True)
+
+        column.pack_start(rentext, expand=0)
+        column.set_attributes(rentext, text=0)
+        self.ignored_paths_treeview_column = column
+        self.ignored_paths_treeview.append_column(column)
+        self.ignored_paths_treeview.props.model = self.ignored_paths_liststore
+        for path in self.prefs.ignored_paths:
+            self.ignored_paths_liststore.append((path, ))
+            
+        self.ignored_paths_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
+        self.remove_all_ignored_paths_button.set_image(gtk.image_new_from_stock(
+                                                gtk.STOCK_CLEAR,
+                                                gtk.ICON_SIZE_BUTTON))
+                                                
+        # Remembered devices are a little different in that they cannot be
+        # edited, and they can only added when the user is prompted by the 
+        # program. Moreover, the list the user sees is a combination of two
+        # lists: device_whitelist and device_blacklist
+        
+        self.remembered_devices_liststore = gtk.ListStore(str)
+        column = gtk.TreeViewColumn()
+        rentext = gtk.CellRendererText()
+        rentext.set_property('editable', False)
+
+        column.pack_start(rentext, expand=0)
+        column.set_attributes(rentext, text=0)
+        self.remembered_devices_treeview_column = column
+        self.remembered_devices_treeview.append_column(column)
+        self.remembered_devices_treeview.props.model = self.remembered_devices_liststore
+        for device in self.prefs.device_whitelist:
+            if device:
+                self.remembered_devices_liststore.append((device, ))
+        for device in self.prefs.device_blacklist:
+            if device:
+                self.remembered_devices_liststore.append((device, ))
+        
+        self.remembered_devices_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
+        self.remove_all_remembered_device_button.set_image(gtk.image_new_from_stock(
+                                                gtk.STOCK_CLEAR,
+                                                gtk.ICON_SIZE_BUTTON))
+                
     def _setup_device_tab(self):
 
         self.device_location_filechooser_button = gtk.FileChooserButton(
@@ -1400,12 +1612,14 @@ class PreferencesDialog():
                 adjustment = self.job_code_scrolledwindow.get_vadjustment()
                 adjustment.set_value(adjustment.lower)
 
-    def on_remove_job_code_button_clicked(self,  button):
-        """ remove selected job codes (can be multiple selection)"""
-        selection = self.job_code_treeview.get_selection()
+    def _remove_from_treeview(self, treeview):
+        """
+        Removes selected items from a treeview, allowing multiple selections
+        """
+        selection = treeview.get_selection()
         model, selected = selection.get_selected_rows()
         iters = [model.get_iter(path) for path in selected]
-        # only delete if a jobe code is selected
+        # only delete if a value is selected
         if iters:
             no = len(iters)
             path = None
@@ -1419,7 +1633,7 @@ class PreferencesDialog():
             # the user and select the next item
             selection.select_path(path)
             
-            #  if there was no selection that meant the user
+            # if there was no selection that meant the user
             # removed the last entry, so we try to select the 
             # last item
             if not selection.path_is_selected(path):
@@ -1427,14 +1641,19 @@ class PreferencesDialog():
                  # test case for empty lists
                  if row >= 0:
                     selection.select_path((row,))
-
+    
+    
+    def on_remove_job_code_button_clicked(self, button):
+        """ remove selected job codes (can be multiple selection)"""
+        
+        self._remove_from_treeview(self.job_code_treeview)
         self.update_job_codes()
         self.update_photo_rename_example()
         self.update_video_rename_example()
         self.update_photo_download_folder_example()
         self.update_video_download_folder_example()
         
-    def on_remove_all_job_code_button_clicked(self,  button):
+    def on_remove_all_job_code_button_clicked(self, button):
         j = RemoveAllJobCodeDialog(self.dialog, self.remove_all_job_code)
         
     def remove_all_job_code(self, dialog, user_selected):
@@ -1456,13 +1675,51 @@ class PreferencesDialog():
         self.update_photo_download_folder_example()
         self.update_video_download_folder_example()
 
+    def _update_prefs_list(self, liststore):
+        replacement_list = []
+        for row in liststore:
+            replacement_list.append(row[0])
+        return replacement_list        
+    
     def update_job_codes(self):
         """ update preferences with list of job codes"""
-        job_codes = []
-        for row in self.job_code_liststore:
-            job_codes.append(row[0])
-        self.prefs.job_codes = job_codes
-        
+        self.prefs.job_codes = self._update_prefs_list(self.job_code_liststore)
+        
+    def on_ignored_path_edited(self, widget, path, new_text):
+        iter = self.ignored_paths_liststore.get_iter(path)
+        self.ignored_paths_liststore.set_value(iter, 0, new_text)
+        self.update_ignored_paths()        
+        
+    def update_ignored_paths(self):
+        ignored_paths = self._update_prefs_list(self.ignored_paths_liststore)
+        
+        # remove any trailing slashes
+        ignored_paths = [path.rstrip('/') for path in ignored_paths if path]
+        # remove any blank values from ignored_paths
+        ignored_paths = [path for path in ignored_paths if path]
+
+        if self.prefs.use_re_ignored_paths:
+            ip = []
+            bad_paths = ''
+            for path in ignored_paths:
+                # check for validity
+                try:
+                    re.match(path, '')
+                    ip.append(path)
+                except:
+                    logger.error("Ignoring invalid regular expression: %s", path)
+                    bad_paths += path + '\n'
+            ignored_paths = ip
+            if bad_paths:
+                bad_paths = bad_paths[:-1]
+                if bad_paths.find('\n') >= 0:
+                    msg = _("The following regular expressions are invalid, and will be removed unless you correct them:\n %s") % bad_paths
+                else:
+                    msg = _("This regular expression is invalid, and will be removed unless you correct it:\n %s") % bad_paths
+                misc.run_dialog(_("Invalid regular expression"), msg, self)
+                
+        self.prefs.ignored_paths = ignored_paths
+                                
     def on_auto_startup_checkbutton_toggled(self, checkbutton):
         self.prefs.auto_download_at_startup = checkbutton.get_active()
         
@@ -1471,7 +1728,6 @@ class PreferencesDialog():
         
     def on_auto_unmount_checkbutton_toggled(self, checkbutton):
         self.prefs.auto_unmount = checkbutton.get_active()
-        
 
     def on_auto_delete_checkbutton_toggled(self, checkbutton):
         self.prefs.auto_delete = checkbutton.get_active()
diff --git a/rapid/prefsrapid.py b/rapid/prefsrapid.py
index f13530f..6fa5f74 100644
--- a/rapid/prefsrapid.py
+++ b/rapid/prefsrapid.py
@@ -17,7 +17,7 @@
 ### along with this program; if not, write to the Free Software
 ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import subprocess, os, datetime
+import subprocess, os, datetime, re
 
 import prefs
 
@@ -91,6 +91,9 @@ class RapidPreferences(prefs.Preferences):
         "device_autodetection_psd": prefs.Value(prefs.BOOL,  False),
         "device_whitelist": prefs.ListValue(prefs.STRING_LIST,  ['']), 
         "device_blacklist": prefs.ListValue(prefs.STRING_LIST,  ['']), 
+        "ignored_paths": prefs.ListValue(prefs.STRING_LIST,  ['.Trash',
+                '.thumbnails']),
+        "use_re_ignored_paths": prefs.Value(prefs.BOOL, False),
         "backup_images": prefs.Value(prefs.BOOL, False),
         "backup_device_autodetection": prefs.Value(prefs.BOOL, True),
         "backup_identifier": prefs.Value(prefs.STRING, 
@@ -412,5 +415,33 @@ def format_pref_list_for_pretty_print(pref_list):
             s = "%s (%s)" % (s, pref_list[i+2])
         v += s + "\n"
     return v
-
-
+    
+    
+def check_and_compile_re(ignored_paths):
+    """
+    configure regular expression to search for, checking to see it is valid
+    
+    returns compiled RE, or None if invalid
+    """
+    
+    pattern = ''
+    for path in ignored_paths:
+        # check for validity
+        try:
+            re.match(path, '')
+            pattern += '.*%s$|' % path
+        except:
+            logger.error("Ignoring invalid regular expression: %s", path)
+    if pattern:
+        pattern = pattern[:-1]
+        
+    logger.debug("Ignored paths regular expression pattern: %s", pattern)
+    if not pattern:
+        logger.warning("No regular expression is specified")
+        return None
+    else:
+        try:
+            return re.compile(pattern)
+        except:
+            logger.error('This regular expression is invalid: %s', pattern)
+            return None
diff --git a/rapid/rapid.py b/rapid/rapid.py
index ce4fa00..237c843 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -1150,16 +1150,22 @@ class TaskManager:
 
 class ScanManager(TaskManager):
     
-    def __init__(self, results_callback, batch_size, generate_folder,
+    def __init__(self, results_callback, batch_size, 
                  add_device_function):
         TaskManager.__init__(self, results_callback, batch_size)
         self.add_device_function = add_device_function
-        self.generate_folder = generate_folder
         
-    def _initiate_task(self, device, task_results_conn, task_process_conn, 
+    def _initiate_task(self, task, task_results_conn, task_process_conn, 
                        terminate_queue, run_event):
-                           
-        scan = scan_process.Scan(device.get_path(), self.batch_size, self.generate_folder, 
+        
+        device = task[0]
+        ignored_paths = task[1]
+        use_re_ignored_paths = task[2]
+        
+        scan = scan_process.Scan(device.get_path(),
+                                ignored_paths,
+                                use_re_ignored_paths,
+                                self.batch_size, 
                                 task_process_conn, terminate_queue, run_event)
         scan.start()
         self._processes.append((scan, terminate_queue, run_event))
@@ -1289,9 +1295,10 @@ class SubfolderFileManager(SingleInstanceTaskManager):
     """
     Manages the daemon process that renames files and creates subfolders
     """
-    def __init__(self, results_callback, sequence_values):
+    def __init__(self, results_callback, sequence_values, focal_length):
         SingleInstanceTaskManager.__init__(self, results_callback)
-        self._subfolder_file = subfolderfile.SubfolderFile(self.task_process_conn, sequence_values)
+        self._subfolder_file = subfolderfile.SubfolderFile(self.task_process_conn, 
+                                                sequence_values, focal_length)
         self._subfolder_file.start()
         logger.debug("SubfolderFile PID: %s", self._subfolder_file.pid)
         
@@ -1427,13 +1434,15 @@ class RapidApp(dbus.service.Object):
     processes.
     """
      
-    def __init__(self,  bus, path, name, taskserver=None): 
+    def __init__(self,  bus, path, name, taskserver=None, focal_length=None): 
         
         dbus.service.Object.__init__ (self, bus, path, name)
         self.running = False
         
         self.taskserver = taskserver
         
+        self.focal_length = focal_length
+        
         # Setup program preferences, and set callback for when they change
         self._init_prefs()
         
@@ -1640,6 +1649,15 @@ class RapidApp(dbus.service.Object):
             name = self.backup_devices[path].get_name()
         return name
         
+    def start_device_scan(self, device):
+        """
+        Commences the scanning of a device using the preference values for 
+        any paths to ignore while scanning
+        """
+        return self.scan_manager.add_task([device, 
+                                          self.prefs.ignored_paths,
+                                          self.prefs.use_re_ignored_paths])
+        
     def setup_devices(self, on_startup, on_preference_change, block_auto_start):
         """
         
@@ -1687,7 +1705,10 @@ class RapidApp(dbus.service.Object):
                             elif (self.prefs.device_autodetection and 
                                  (dv.is_DCIM_device(path) or 
                                   self.search_for_PSD())):
+                                logger.debug("Appending %s", mount.get_name())
                                 mounts.append((path, mount))
+                            else:
+                                logger.debug("Ignoring %s", mount.get_name())
                     
         
         if not self.prefs.device_autodetection:
@@ -1733,7 +1754,7 @@ class RapidApp(dbus.service.Object):
                 # prompt user to see if device should be used or not
                 self.get_use_device(device)
             else:
-                scan_pid = self.scan_manager.add_task(device)
+                scan_pid = self.start_device_scan(device)
                 if mount is not None:
                     self.mounts_by_path[path] = scan_pid
         if not mounts:
@@ -1759,7 +1780,7 @@ class RapidApp(dbus.service.Object):
                     self.prefs.device_whitelist = self.prefs.device_whitelist + [path]
                 else:
                     self.prefs.device_whitelist = [path]
-            scan_pid = self.scan_manager.add_task(device)
+            scan_pid = self.start_device_scan(device)
             self.mounts_by_path[path] = scan_pid
             
         elif permanent_choice and path not in self.prefs.device_blacklist:
@@ -1878,7 +1899,7 @@ class RapidApp(dbus.service.Object):
                         # prompt user if device should be used or not
                         self.get_use_device(device)
                     else:   
-                        scan_pid = self.scan_manager.add_task(device)
+                        scan_pid = self.start_device_scan(device)
                         self.mounts_by_path[path] = scan_pid
             
     def on_mount_removed(self, vmonitor, mount):
@@ -2663,7 +2684,9 @@ class RapidApp(dbus.service.Object):
 
         if key == 'show_log_dialog':
             self.menu_log_window.set_active(value)
-        elif key in ['device_autodetection', 'device_autodetection_psd', 'device_location']:
+        elif key in ['device_autodetection', 'device_autodetection_psd', 
+                     'device_location', 'ignored_paths',
+                     'use_re_ignored_paths', 'device_blacklist']:
             self.rerun_setup_available_image_and_video_media = True
             if not self.preferences_dialog_displayed:
                 self.post_preference_change()
@@ -3223,12 +3246,12 @@ class RapidApp(dbus.service.Object):
                            
         self.subfolder_file_manager = SubfolderFileManager(
                                         self.subfolder_file_results,
-                                        sequence_values)
+                                        sequence_values,
+                                        self.focal_length)
             
         
-        self.generate_folder = False
         self.scan_manager = ScanManager(self.scan_results, self.batch_size, 
-                    self.generate_folder, self.device_collection.add_device)
+                                        self.device_collection.add_device)
         self.copy_files_manager = CopyFilesManager(self.copy_files_results, 
                                                    self.batch_size_MB)
         self.backup_manager = BackupFilesManager(self.backup_results,
@@ -3310,6 +3333,7 @@ def start():
     parser.add_option("-q", "--quiet",  action="store_false", dest="verbose",  help=_("only output errors to the command line"))
     # image file extensions are recognized RAW files plus TIFF and JPG
     parser.add_option("-e",  "--extensions", action="store_true", dest="extensions", help=_("list photo and video file extensions the program recognizes and exit"))
+    parser.add_option("--focal-length", type=int, dest="focal_length", help="If an aperture value of 0.0 is encountered, for file renaming purposes the metadata for that photo will temporarily have its focal length set to the number passed, and its aperture to f8")
     parser.add_option("--reset-settings", action="store_true", dest="reset", help=_("reset all program settings and preferences and exit"))
     (options, args) = parser.parse_args()
     
@@ -3334,14 +3358,23 @@ def start():
         sys.exit(0)
         
     if options.reset:
-        prefs = RapidPreferences()
+        prefs = prefsrapid.RapidPreferences()
         prefs.reset()
         print _("All settings and preferences have been reset")
         sys.exit(0)
+        
+    if options.focal_length:
+        focal_length = options.focal_length
+    else:
+        focal_length = None
 
     logger.info("Rapid Photo Downloader %s", utilities.human_readable_version(config.version))
     logger.info("Using pyexiv2 %s", metadataphoto.pyexiv2_version_info())
     logger.info("Using exiv2 %s", metadataphoto.exiv2_version_info())
+    
+    if focal_length:
+        logger.info("Focal length of %s will be used when an aperture of 0.0 is encountered", focal_length)
+        
     if DOWNLOAD_VIDEO:
         logger.info("Using hachoir %s", metadatavideo.version_info())
     else:
@@ -3350,7 +3383,7 @@ def start():
     bus = dbus.SessionBus ()
     request = bus.request_name (config.DBUS_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
     if request != dbus.bus.REQUEST_NAME_REPLY_EXISTS: 
-        app = RapidApp(bus, '/', config.DBUS_NAME)
+        app = RapidApp(bus, '/', config.DBUS_NAME, focal_length=focal_length)
     else:
         # this application is already running
         print "Rapid Photo Downloader is already running"
diff --git a/rapid/scan.py b/rapid/scan.py
index 5092f0a..0d7182c 100755
--- a/rapid/scan.py
+++ b/rapid/scan.py
@@ -19,6 +19,7 @@
 
 import os
 import multiprocessing
+import re
 
 import gio
 import gtk
@@ -27,6 +28,7 @@ import pyexiv2
 
 import rpdmultiprocessing as rpdmp
 import rpdfile
+import prefsrapid
 
 
 import logging
@@ -48,13 +50,20 @@ class Scan(multiprocessing.Process):
     files in bytes.
     """
     
-    def __init__(self, path, batch_size, generate_folder, results_pipe, 
+    def __init__(self, path, ignored_paths, use_re_ignored_paths,
+                 batch_size, results_pipe, 
                  terminate_queue, run_event):
                      
         """Setup values needed to conduct the scan.
         
         'path' is a string of the path to be scanned, which is passed to gio.
         
+        'ignored_paths' is a list of paths that should not be scanned. Any path
+        ending with one of the values will be ignored.
+        
+        'use_re_ignored_paths': if true, pytho regular expressions will be used
+        to determine which paths to ignore
+        
         'batch_size' is the number of files that should be sent back to the 
         calling function at one time.
         
@@ -69,16 +78,16 @@ class Scan(multiprocessing.Process):
         
         multiprocessing.Process.__init__(self)
         self.path = path
+        self.ignored_paths = ignored_paths
+        self.use_re_ignored_paths = use_re_ignored_paths
         self.results_pipe = results_pipe
         self.terminate_queue = terminate_queue
         self.run_event = run_event
         self.batch_size = batch_size
-        self.generate_folder = generate_folder
         self.counter = 0
         self.files = []
         self.file_type_counter = rpdfile.FileTypeCounter()
-
-
+        
     def _gio_scan(self, path, file_size_sum):
         """recursive function to scan a directory and its subdirectories
         for photos and possibly videos"""
@@ -104,7 +113,8 @@ class Scan(multiprocessing.Process):
                 file_type = child.get_file_type()
                 name = child.get_name()
                 if file_type == gio.FILE_TYPE_DIRECTORY:
-                    file_size_sum = self._gio_scan(path.get_child(name), 
+                    if not self.ignore_this_path(name):
+                        file_size_sum = self._gio_scan(path.get_child(name), 
                                                    file_size_sum)
                     if file_size_sum is None:
                         return None
@@ -150,9 +160,16 @@ class Scan(multiprocessing.Process):
 
     def run(self):
         """start the actual scan."""
+        
+        if self.use_re_ignored_paths and len(self.ignored_paths):
+            self.re_pattern = prefsrapid.check_and_compile_re(self.ignored_paths)
+        
         source = gio.File(self.path)
         try:
-            size = self._gio_scan(source, 0)
+            if not self.ignore_this_path(self.path):
+                size = self._gio_scan(source, 0)
+            else:
+                size = None
         except gio.Error, inst:
             logger.error("Error while scanning %s: %s", self.path, inst)
             size = None
@@ -164,3 +181,21 @@ class Scan(multiprocessing.Process):
             self.results_pipe.send((rpdmp.CONN_COMPLETE, (size, 
                                     self.file_type_counter, self.pid)))
             self.results_pipe.close()                
+
+    def ignore_this_path(self, path):
+        """
+        determines if the path should be ignored according to the preferences
+        chosen by the user
+        """
+        
+        if len(self.ignored_paths):
+            if self.use_re_ignored_paths and self.re_pattern:
+                # regular expressions are being used
+                if self.re_pattern.match(path):
+                    return True
+            else:
+                # regular expressions are not being used
+                if path.endswith(tuple(self.ignored_paths)):
+                    return True
+                    
+        return False
diff --git a/rapid/subfolderfile.py b/rapid/subfolderfile.py
index 35bd74f..4b6cca1 100644
--- a/rapid/subfolderfile.py
+++ b/rapid/subfolderfile.py
@@ -136,7 +136,7 @@ def generate_name(rpd_file):
         
 
 class SubfolderFile(multiprocessing.Process):
-    def __init__(self, results_pipe, sequence_values):
+    def __init__(self, results_pipe, sequence_values, focal_length):
         multiprocessing.Process.__init__(self)
         self.daemon = True
         self.results_pipe = results_pipe
@@ -150,6 +150,8 @@ class SubfolderFile(multiprocessing.Process):
         self.uses_session_sequece_no = sequence_values[6]
         self.uses_sequence_letter = sequence_values[7]
         
+        self.focal_length = focal_length
+        
         logger.debug("Start of day is set to %s", self.day_start.value)
         
     def progress_callback_no_update(self, amount_downloaded, total):
@@ -308,8 +310,9 @@ class SubfolderFile(multiprocessing.Process):
                 else:
                     # Generate subfolder name and new file name
                     generation_succeeded = True
-                    experimental = False
-                    if experimental and rpd_file.file_type == rpdfile.FILE_TYPE_PHOTO:
+                    
+                    # check to see if focal length and aperture data should be manipulated
+                    if self.focal_length is not None and rpd_file.file_type == rpdfile.FILE_TYPE_PHOTO:
                         if load_metadata(rpd_file):
                             a = rpd_file.metadata.aperture()
                             if a == '0.0':