Imported Upstream version 0.4.2upstream/0.4.2

35 files changed, 10783 insertions, 12735 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 2d5d91f..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,8 +0,0 @@
-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
new file mode 100644
index 0000000..6366c9d
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,15 @@
+Metadata-Version: 1.0
+Name: rapid-photo-downloader
+Version: 0.4.2
+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/cs.po b/po/cs.po
index eee5b67..92c2462 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-04 00:18-0500\n"
-"PO-Revision-Date: 2011-04-09 18:48+0000\n"
-"Last-Translator: Vlastimil Ott <vlastimil@e-ott.info>\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-28 07:09+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-11 01:01+0000\n"
-"X-Generator: Launchpad (build 12757)\n"
+"X-Launchpad-Export-Date: 2011-10-01 15:09+0000\n"
+"X-Generator: Launchpad (build 14071)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:103 rapid/glade3/rapid.ui.h:11
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:108
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,49 +31,54 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:113
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:144
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Zařízení"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:158
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Velikost"
 
-#: rapid/rapid.py:161
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Průběh stahování"
 
+#: rapid/rapid.py:316
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s se neodpojilo"
+
 #. 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:974
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "skenování..."
 
-#: rapid/rapid.py:1678
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Stáhnout"
 
-#: rapid/rapid.py:1681
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: rapid/rapid.py:1794
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -84,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:1797
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -93,38 +98,136 @@ msgstr ""
 "Následující složka je neplatná:\n"
 "%s"
 
-#: rapid/rapid.py:1798
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Stahování nemůže pokračovat"
 
-#: rapid/rapid.py:1957
+#: rapid/rapid.py:2503
+msgid "About 1 second remaining"
+msgstr "Zbývá 1 sekunda"
+
+#: rapid/rapid.py:2505
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s z celkem %(total)s %(filetypes)s"
+msgid "About %i seconds remaining"
+msgstr "Zbývá %i sekund"
 
-#: rapid/rapid.py:2302 rapid/preferencesdialog.py:825 rapid/rpdfile.py:120
-msgid "photos"
-msgstr "fotografie"
+#: rapid/rapid.py:2507
+msgid "About 1 minute remaining"
+msgstr "Zbývá 1 minuta"
 
-#: rapid/rapid.py:2304 rapid/rpdfile.py:115
+#. 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:2512
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Zbývá %(minutes)i:%(seconds)02i minut"
+
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+msgid "photos and videos"
+msgstr "fotografie a videa"
+
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "fotografie či videa"
+
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "videa"
 
-#: rapid/rapid.py:2308
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
+
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
+#: rapid/rpdfile.py:120
+msgid "photos"
+msgstr "fotografie"
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "fotografie"
+
+#: rapid/rapid.py:2573
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s staženo"
+
+#: rapid/rapid.py:2577
+#, python-format
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s nebyly staženy"
+
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
+msgid "warnings"
+msgstr "varování"
+
+#: rapid/rapid.py:2589
+msgid "All downloads complete"
+msgstr "Všechna stahování kompletní"
+
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
+#, python-format
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
+
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
+#, python-format
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s staženo"
+
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
+#, python-format
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s nelze stáhnout"
+
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2663
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s z %(total)s %(filetypes)s (%(remaining)s remaining)"
+
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2670
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s z celkem %(total)s %(filetypes)s"
+
+#: rapid/rapid.py:3084
+msgid "and"
+msgstr "a"
+
+#: rapid/rapid.py:3089
+msgid "Using backup devices"
+msgstr "Používání zálohovacích zařízení"
+
+#: rapid/rapid.py:3091
+msgid "Using backup device"
+msgstr "Používání zálohovacího zařízení"
+
+#: rapid/rapid.py:3093
+msgid "No backup devices detected"
+msgstr "Zálohovací zařízení nebylo detekováno"
+
+#: rapid/rapid.py:3120
 msgid "Free space:"
 msgstr "Volné místo:"
 
 #. (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:2320
+#: rapid/rapid.py:3132
 #, 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:2324
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -132,112 +235,128 @@ 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:2329
+#: rapid/rapid.py:3141
 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:2334
+#: rapid/rapid.py:3146
 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:2340
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s volné"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Zálohování fotografií a videí do %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:2346
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Zálohování %(path)s"
 
-#: rapid/rapid.py:2351
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Zálohování fotografií do %(path)s a videí do %(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:2479 rapid/rpdfile.py:247
+#: rapid/rapid.py:3202
+msgid "Program preferences are invalid"
+msgstr "Nastavení programu je nevalidní"
+
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Fotografie"
 
-#: rapid/rapid.py:2481 rapid/rpdfile.py:267
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:2490
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s složka neexistuje"
 
-#: rapid/rapid.py:2492 rapid/rapid.py:2506 rapid/rapid.py:2519
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Složka: %s"
 
-#: rapid/rapid.py:2504
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s složka je neplatná"
 
-#: rapid/rapid.py:2517
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s do složky nelze zapisovat"
 
-#: rapid/rapid.py:2592
+#: rapid/rapid.py:3437
 msgid "Thumbnails"
 msgstr "Náhledy"
 
 #. 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:2633
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr "zobrazit informace o programu na příkazové řádce (default: %default)"
 
-#: rapid/rapid.py:2634
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "Zobrazit ladicí informace při spuštění z příkazové řádky"
 
-#: rapid/rapid.py:2635
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "pouze výstup chyb do příkazové řádky"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:2637
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "zobrazit přípony souborů, které program rozpozná, a skončit"
 
-#: rapid/rapid.py:2638
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "resetovat nastavení programu a skončit"
 
-#: rapid/rapid.py:2651
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Fotografie:"
 
-#: rapid/rapid.py:2651
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Videa:"
 
-#: rapid/rapid.py:2656
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "a %s"
 
-#: rapid/rapid.py:2664
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Všechna nastavení a předvolby byly nastaveny na výchozí hodnoty"
 
-#: rapid/rapid.py:2673
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -247,8 +366,31 @@ msgstr ""
 "Ke stahování videa jsou nutné balíčky hachoir-metadata a kaa-metadata pro "
 "Python."
 
-#: rapid/copyfiles.py:136 rapid/subfolderfile.py:209
-#: rapid/subfolderfile.py:346
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
+msgid "Backing up error"
+msgstr "Chyba zálohování"
+
+#: rapid/backupfile.py:144
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Adresář destinace nelze vytvořit: %(directory)s\n"
+
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Zdroj: %(source)s\n"
+"Destinace: %(destination)s"
+
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "Chyba: %(inst)s"
+
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -272,431 +414,474 @@ msgstr "Nacházejí se na tomto zařízení fotografie nebo videa ke stažení?"
 msgid "_Remember this choice"
 msgstr "_Zapamatovat si tuto volbu"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/downloadtracker.py:298
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Datum a čas"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Text"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sekvence"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:149 rapid/preferencesdialog.py:550
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
 msgid "Job code"
 msgstr "Pracovní kód"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Datum obrázku"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Datum videa"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Dnes"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Včerejšek"
 
 #. 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 "Čas stahování"
 
 #. 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 "Jméno + koncovka"
 
 #. 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 "Název"
 
 #. 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 "Koncovka"
 
 #. 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 "Číslo obrázku"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Číslo videa"
 
 #. 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 "Clona"
 
 #. 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 "Čas expozice"
 
 #. 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 "Vzdálenost ohniska"
 
 #. 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 "Vytvoření fotoaparátu"
 
 #. 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 "Druh fotoaparátu"
 
 #. 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 "Krátký druh kamery"
 
 #. 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 "Model kamery v označení odděleném pomlčkou"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Sériové číslo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:184
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Číslo snímku"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:186
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Vlastníkovo jméno"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Šířka"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Výška"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Délka"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Snímková hodnota"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Umělec"
+
+#: 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 "Dnešní stahování"
 
 #. 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 "Číslo této relace"
 
 #. 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 "Číslo podsložky"
 
 #. 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 "Uskladněné číslo"
 
 #. 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 "Zpráva sekvence"
 
 #. 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 "Všechny číslice"
 
 #. 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 "Poslední číslice"
 
 #. 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 "Poslední 2 číslice"
 
 #. 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 "Poslední 3 číslice"
 
 #. 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 "Poslední 4 číslice"
 
 #. 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 "Originální obal"
 
 #. 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 "Velká písmena (ABCDEFG)"
 
 #. 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 "Malá písmena (abcdefg)"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Jedna číslice"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Dvě číslice"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tři číslice"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Čtyři číslice"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Pět číslic"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Šest číslic"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sedm číslic"
 
 #. 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 "Milisekundy"
 
 #. 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 "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 (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"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:370
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Nastavení podsložky nemělo začít %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:372
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Nastavení podsložky nemělo končit %s"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Nastavení podsložky by nemělo obsahovat dvě %s za sebou"
 
-#: rapid/preferencesdialog.py:390 rapid/preferencesdialog.py:673
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Odstranit všechny pracovní kódy?"
 
-#: rapid/preferencesdialog.py:407 rapid/preferencesdialog.py:690
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Chcete odstranit všechny pracovní kódy?"
 
-#: rapid/preferencesdialog.py:437
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Odstranit všechny zapamatované cesty?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Odstranit všechny ignorované cesty?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Chyba v nastavení přejmenování fotografií"
 
-#: rapid/preferencesdialog.py:618
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Chyba v nastavení přejmenování videí"
 
-#: rapid/preferencesdialog.py:639
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Chyba v nastavení složek pro stahování fotek"
 
-#: rapid/preferencesdialog.py:656
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Chyba v nastavení složek pro stahování videí"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:715
+#: rapid/preferencesdialog.py:735
 msgid "Enter a Job Code"
 msgstr "Vložte pracovní kód"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:732
+#: rapid/preferencesdialog.py:751
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Vložte nový štítek nebo vyberte nějaký existující"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:735
+#: rapid/preferencesdialog.py:754
 msgid "Enter a new Job Code"
 msgstr "Vložte nový pracovní kód"
 
-#: rapid/preferencesdialog.py:740
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Pracovní kód:"
 
-#: rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
-msgid "photos and videos"
-msgstr "fotografie a videa"
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Vložte cestu k ignorování"
+
+#: 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 "Cesta:"
+
+#: rapid/preferencesdialog.py:1078
+msgid "Job Code"
+msgstr "Pracovní kód"
 
-#: rapid/preferencesdialog.py:992
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Vyberte složku do které mají být obrázky staženy"
 
-#: rapid/preferencesdialog.py:1010
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Zvolte adresář do kterého se bude stahovat video"
 
-#: rapid/preferencesdialog.py:1101
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Vyberte složku, která obsahuje %(file_types)s"
 
-#: rapid/preferencesdialog.py:1123
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Vyberte složku, do které se bude zálohovat %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Zvolte složku, ve které bude uložena záloha fotografií"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Zvolte složku ve které budou zálohována videa"
 
 #. 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:1207
+#: rapid/preferencesdialog.py:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -705,7 +890,7 @@ msgstr ""
 "možné vytvořit celé jméno. Použijte prosím pro vytvoření jména  jiné "
 "možnosti.</i>"
 
-#: rapid/preferencesdialog.py:1258
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -715,13 +900,13 @@ msgstr ""
 "možnosti.</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:1261
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Příklad: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1351
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -732,103 +917,114 @@ msgstr ""
 "použít.\n"
 "Použijí se výchozí hodnoty."
 
-#. check subfolder preferences for bad values
-#: rapid/preferencesdialog.py:1365 rapid/rpdfile.py:122 rapid/rpdfile.py:246
-msgid "photo"
-msgstr "fotografie"
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
 
-#: rapid/preferencesdialog.py:1366 rapid/rpdfile.py:117 rapid/rpdfile.py:266
-msgid "video"
-msgstr "video"
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Neplatný regulární výraz"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1637
+#: rapid/preferencesdialog.py:1931
 msgid "externaldrive1"
 msgstr "externídisk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1639
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "externídisk2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praha"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paříž"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlín"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapešť"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Řím"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moskva"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Dílí"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varšava"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:339
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "podsložka"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:337
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "název souboru"
 
@@ -883,11 +1079,9 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s vytvořen %(image1_date)s v %(image1_time)s a %(image2)s  "
-"%(image2_date)s v %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1081,7 +1275,7 @@ msgstr "Při kopírování %(filetype)s došlo k chybě, ale záloha proběhla"
 msgid "Multiple problems were encountered"
 msgstr "Došlo k více problémům"
 
-#: 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 "Byly nalezeny fotky se stejným jménem, ale různým datem vzniku"
 
@@ -1107,10 +1301,6 @@ msgstr "Chyba při zálohování"
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s a %(backinguperror)s"
 
-#: rapid/rpdfile.py:112
-msgid "photos or videos"
-msgstr "fotografie či videa"
-
 #: rapid/rpdfile.py:136
 #, python-format
 msgid "%(number)s %(filetypes)s"
@@ -1121,33 +1311,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:194
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
-msgstr ""
-"Zdroj: %(source)s\n"
-"Destinace: %(destination)s"
-
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "Fotka už byla stažena"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Zdroj: %(source)s"
 
-#: rapid/subfolderfile.py:335
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "podsložka a název souboru"
 
-#: rapid/subfolderfile.py:373
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Nepodařilo se vytvořit podsložku"
 
-#: rapid/subfolderfile.py:374
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Cesta: %s"
@@ -1168,99 +1349,107 @@ msgstr "Zaškrtnout všechny fotky"
 msgid "Check All Videos"
 msgstr "Zaškrtnout všechna videa"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:6
 msgid "Download / Pause"
 msgstr "Stahování / Pauza"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:7
 msgid "Get Help Online..."
 msgstr "Získat online pomoc..."
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Nápověda"
+
+#: rapid/glade3/rapid.ui.h:9
 msgid "Make a Donation..."
 msgstr "Darovat..."
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:10
 msgid "Next File"
 msgstr "Další soubor"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: rapid/glade3/rapid.ui.h:12
 msgid "Previous File"
 msgstr "Předchozí soubor"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:13
 msgid "Quit"
 msgstr "Konec"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:15
 msgid "Refresh"
 msgstr "Aktualizovat"
 
-#: rapid/glade3/rapid.ui.h:13
+#: rapid/glade3/rapid.ui.h:16
 msgid "Report a Problem..."
 msgstr "Nahlásit problém..."
 
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:17
 msgid "Select All Wit_h Job Code"
 msgstr "Vybrat všechny se ští_tkem"
 
-#: rapid/glade3/rapid.ui.h:15
+#: rapid/glade3/rapid.ui.h:18
 msgid "Select All Without _Job Code"
 msgstr "Vybrat všechny _bez štítku"
 
-#: rapid/glade3/rapid.ui.h:16
+#: rapid/glade3/rapid.ui.h:19
 msgid "Translate this Application..."
 msgstr "Přeložit tuto aplikaci..."
 
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:20
 msgid "Uncheck All"
 msgstr "Odškrtnout všechny"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:21
 msgid "_Check All"
 msgstr "Zaškrtnout _všechny"
 
-#: rapid/glade3/rapid.ui.h:19
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Clear Completed Downloads"
 msgstr "_Vyčistit kompletní stahování"
 
-#: rapid/glade3/rapid.ui.h:20
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Download"
 msgstr "_Stáhnout"
 
-#: rapid/glade3/rapid.ui.h:21
+#: rapid/glade3/rapid.ui.h:24
 msgid "_Error Log"
 msgstr "_Záznam chyb"
 
-#: rapid/glade3/rapid.ui.h:22
+#: rapid/glade3/rapid.ui.h:25
 msgid "_File"
 msgstr "_Soubor"
 
-#: rapid/glade3/rapid.ui.h:23
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: rapid/glade3/rapid.ui.h:24
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Include in download"
 msgstr "Vybrat pro stažení"
 
-#: rapid/glade3/rapid.ui.h:25
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Make a Donation..."
 msgstr "_Dejte příspěvek..."
 
-#: rapid/glade3/rapid.ui.h:26
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: rapid/glade3/rapid.ui.h:27
+#: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
 msgstr "_Přeložit tuto aplikaci..."
 
-#: rapid/glade3/rapid.ui.h:28
+#: rapid/glade3/rapid.ui.h:31
 msgid "_Uncheck All"
 msgstr "_Odznačit vše"
 
-#: rapid/glade3/rapid.ui.h:29
+#: rapid/glade3/rapid.ui.h:32
 msgid "_View"
 msgstr "_Zobrazení"
 
@@ -1285,65 +1474,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompaktibilita s jinými operačními systémy</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Zařízení</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Složka stahování</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Podsložky stahování</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Příklad</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Pracovní kódy</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Přejmenování fotografie</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Konflikty jmen fotografií a videa</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatizace programu</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sekvenční čísla</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>Příklad: /home/user/Pictures</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Příklad:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nový:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Originál:</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\">Záloha</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\">Možnosti zařízení</span>"
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Zařízení</span>"
@@ -1403,14 +1592,10 @@ msgid "Backup"
 msgstr "Záloha"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Umístění zálohy:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "Zálohovat fotografie a videa při stahování"
 
-#: 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."
@@ -1418,7 +1603,7 @@ msgstr ""
 "Vyberte složku stahování. Podsložky pro stahované obrázky budou vytvořeny "
 "automaticky v této složce s použitím struktury specifikované níže."
 
-#: 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."
@@ -1426,14 +1611,18 @@ msgstr ""
 "Vyberte složku pro stažení. Podsložky pro stažená videa jsou vytvořena "
 "automaticky podle schématu, které si vytvoříte."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Začátek dne:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Odstranit fotografie a videa ze zařízení po dokončení"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Možnosti zařízení"
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Zařízení"
@@ -1443,20 +1632,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 ""
-"Zařízení obsahující fotky nebo videa jsou fotoaparáty, datové karty nebo "
-"jiné datové nosiče.\n"
-"Stahovat můžete z více zařízení zároveň, nebo můžete určit umístění na "
-"disku.\n"
-"<i>Pokud stahování přímo z fotoaparátu nefunguje nebo je pomalé, nastavte u "
-"něj režim PTP. \n"
-"Pokud to neumíte nebo to nejde, použijte raději čtečku karet.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1479,76 +1662,105 @@ msgid "Exit program when download completes"
 msgstr "Ukončit program po stažení souborů"
 
 #: rapid/glade3/prefs.ui.h:52
-msgid "If you disable automatic detection, choose the exact backup location."
-msgstr ""
-"Máte-li zapnutou automatickou detekci, vyberte přesnou lokaci zálohy."
+msgid "Generate thumbnails (slower)"
+msgstr "Generovat náhledy (pomalé)"
 
 #: rapid/glade3/prefs.ui.h:53
 msgid ""
-"If you disable automatic detection, choose the exact location of the images "
-"and videos."
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Pokud zakážete automatickou detekci, vyberte umístění fotek a videí ručně"
 
 #: rapid/glade3/prefs.ui.h:54
 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."
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
 msgstr ""
-"Jestli povolíte automaticko detekci přenosných paměťových zařízení, tak "
-"budou z tohoto zařízení hledány obrázky. Na zařízeních s větší kapacitou to "
-"bude trvat déle."
 
 #: rapid/glade3/prefs.ui.h:55
+msgid ""
+"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."
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr "Ignorované cesty"
+
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Pracovní kódy"
 
-#: rapid/glade3/prefs.ui.h:56
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Umístění:"
 
-#: rapid/glade3/prefs.ui.h:57
-msgid "Miscillaneous"
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
 msgstr "Různé"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
+msgstr "Výkon"
+
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Složky fotografií"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Přejmenování fotografií"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Název složky pro zálohu fotek"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Umístění zálohy fotografií:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Nastavení: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "O_dstranit vše"
 
-#: rapid/glade3/prefs.ui.h:65
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "_Odstranit vše"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
+msgstr "Zapamatované cesty"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered paths are those associated with devices 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 "Možnosti přejmenování"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Vynechat"
 
-#: rapid/glade3/prefs.ui.h:67
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Vynechat stahování"
 
-#: rapid/glade3/prefs.ui.h:68
+#: 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 "
@@ -1557,7 +1769,14 @@ msgstr ""
 "Není možné stahovat video. Ke stahování videa jsou nutné balíčky <i>hachoir-"
 "metadata</i> a <i>kaa-metadata</i> pro Python."
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of 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"
@@ -1570,7 +1789,7 @@ msgstr ""
 "Na každém zařízení, které chcete pro zálohy použít, vytvořte složku s "
 "některým jménem. </i>"
 
-#: rapid/glade3/prefs.ui.h:72
+#: 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."
@@ -1578,7 +1797,7 @@ msgstr ""
 "Specifikujte čas ve 24 hodinovém formátu aby mohlo být resetováno sekvenční "
 "číslo v <i>Dnešní stahování</i>."
 
-#: rapid/glade3/prefs.ui.h:73
+#: 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."
@@ -1586,43 +1805,51 @@ msgstr ""
 "Určete znaky, které se mohou objevit v názvech souborů, ale mohly by později "
 "působit problémy"
 
-#: rapid/glade3/prefs.ui.h:74
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Start stahování při startu programu"
 
-#: rapid/glade3/prefs.ui.h:75
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Začít stahovat hned po vložení zařízení"
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Uskladněné číslo:"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Odstranit nekompatibilní znaky"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronizovat sekvenční čísla RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Po stažení souborů odpojit zařízení"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Použijte _python-style regulární zkratky"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Složky pro videa"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Přejmenovat videa"
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Název složky pro zálohu videí"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr "Umístění zálohy videí:"
+
+#: 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."
@@ -1630,7 +1857,7 @@ msgstr ""
 "Pokud má fotka nebo video stejný název jako již existující soubor, vyberte, "
 "zda se má stahování přeskočit, nebo přejmenovat."
 
-#: rapid/glade3/prefs.ui.h:84
+#: 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."
@@ -1638,7 +1865,7 @@ msgstr ""
 "Vyberte, zda při zálohování přepsat na cílovém zařízení soubor se stejným "
 "jménem, nebo jeho zálohování přeskočit."
 
-#: rapid/glade3/prefs.ui.h:85
+#: 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."
@@ -1646,7 +1873,7 @@ msgstr ""
 "Při stahování můžete fotky a videa zálohovat na více umístění, např. na "
 "externí disky."
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Přidat..."
 
@@ -1706,15 +1933,9 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Unique identifier '%s' added"
 #~ msgstr "Unikátní identifikátor '%s' přidán"
 
-#~ msgid "Backing up error"
-#~ msgstr "Chyba zálohování"
-
 #~ msgid "The image was not copied."
 #~ msgstr "Obrázek nebyl okopírován."
 
-#~ msgid "warnings"
-#~ msgstr "varování"
-
 #~ msgid "errors"
 #~ msgstr "chyby"
 
@@ -1736,9 +1957,6 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Preferences were modified."
 #~ msgstr "Nastavení bylo modifikováno."
 
-#~ msgid "and"
-#~ msgstr "a"
-
 #~ msgid "images skipped"
 #~ msgstr "obrázky přeskočeny"
 
@@ -1757,12 +1975,6 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Download copying error"
 #~ msgstr "Chyba kopírování obrázků"
 
-#~ msgid "MB/s"
-#~ msgstr "MB/s"
-
-#~ msgid "All downloads complete"
-#~ msgstr "Všechna stahování kompletní"
-
 #~ msgid "_Report a Problem..."
 #~ msgstr "_Ohlásit problém..."
 
@@ -1810,9 +2022,6 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Job Code entered"
 #~ msgstr "Pracovní kód vložen"
 
-#~ msgid "No backup devices detected"
-#~ msgstr "Zálohovací zařízení nebylo detekováno"
-
 #~ msgid "      "
 #~ msgstr "      "
 
@@ -1822,6 +2031,9 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "<i>Example: /home/user/photos</i>"
 #~ msgstr "<i>Příklad: /home/user/photos</i>"
 
+#~ msgid "Backup location:"
+#~ msgstr "Umístění zálohy:"
+
 #~ msgid "Report an error"
 #~ msgstr "Nahlásit chybu"
 
@@ -1887,13 +2099,6 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Problem using pynotify."
 #~ msgstr "Problém používání pynotify."
 
-#, python-format
-#~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-#~ msgstr "Zbývá %(minutes)i:%(seconds)02i minut"
-
-#~ msgid "About 1 minute remaining"
-#~ msgstr "Zbývá 1 minuta"
-
 #~ msgid "<b>Missing Backup Devices</b>"
 #~ msgstr "<b>Chybějící zálohovací zařízení</b>"
 
@@ -1960,13 +2165,6 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ "\n"
 
 #, python-format
-#~ msgid "About %i seconds remaining"
-#~ msgstr "Zbývá %i sekund"
-
-#~ msgid "About 1 second remaining"
-#~ msgstr "Zbývá 1 sekunda"
-
-#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Problem: %(problem)s"
@@ -2170,6 +2368,10 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "Unmount (\"eject\") image device upon download completion"
 #~ msgstr "Odpojit (\"vysunout\") obrázkové zařízení po dokončení stahování"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Máte-li zapnutou automatickou detekci, vyberte přesnou lokaci zálohy."
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
@@ -2181,6 +2383,15 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "image number was specified but image filename has no number"
 #~ msgstr "číslo obrázku bylo rozeznáno, ale obrázek nemá číslo"
 
+#~ 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 ""
+#~ "Jestli povolíte automaticko detekci přenosných paměťových zařízení, tak "
+#~ "budou z tohoto zařízení hledány obrázky. Na zařízeních s větší kapacitou to "
+#~ "bude trvat déle."
+
 #~ msgid "list image file extensions the program recognizes and exit"
 #~ msgstr "program rozpozná typy obrázkových souborů a ukončí"
 
@@ -2306,352 +2517,5 @@ msgstr "Importovat fotky a videa spolehlivě"
 #~ msgid "The device can now be safely removed"
 #~ msgstr "Zařízení nyní nemůže být bezpečně vymazáno"
 
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Chyba: %(source)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Nelze odstranit obrázky z obrázkového zařízení"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Z obrázkového zařízení odstraněno %i obrázků"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Odstranit obrázky ze zařízení po dokončení stahování"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Obrázek: %(source)s\n"
-#~ "Chyba: %(errno)s %(strerror)s"
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Hodnota Skladované číslo není aktualizována, v současné době dochází ke "
-#~ "stažení"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Hodnota Dnešní stahování není aktualizována, v současné době dochází ke "
-#~ "stažení"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid "Using backup device"
-#~ msgstr "Používání zálohovacího zařízení"
-
-#~ msgid "Using backup devices"
-#~ msgstr "Používání zálohovacích zařízení"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Detekovány obrázky se stejnými názvy, ale pořízenými v jiném časovém období:"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "První obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
 #~ msgid "Using manually specified path"
 #~ msgstr "Používání manuálně specifikované cesty"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Obrázkové zařízení: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Zdroj: %s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Zdroj: %(source)s\n"
-#~ "Částečně vygenerovaný název souboru: %(newname)s\n"
-#~ "Destinace: %(destination)s\n"
-#~ "Problém: %(problem)s"
-
-#~ msgid "Error:"
-#~ msgstr "Chyba:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Nelze vytvořit dočasný stahovací adresář"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destinace: %s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Chyba: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Destination directory could not be created: %(directory)s\n"
-#~ msgstr "Adresář destinace nelze vytvořit: %(directory)s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Zdroj: %(source)s\n"
-#~ "Destinace: %(destination)s\n"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problém se stahovací složkou"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problém s lokací obrázkové složky"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Promiňte, stahovací složka neexistuje. Prosím vytvořte ji či upravte "
-#~ "nastavení"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Promiňte, stahovací složka existuje, ale nelze do ní zapisovat. Prosím "
-#~ "zkontrolujte oprávnění či nastavení programu"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Varování: notifikační server prostředí plochy je špatně nakonfigurován."
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Promiňte, tato lokace obrázku neexistuje:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Prosím vyřešte problém či upravte nastavení."
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "%s(filetype)s nelze otevřít"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Sken zařízení kompletní: nalezeno %(number)s %(filetypes)s na %(device)s"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s nemá metadata"
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Záloha %(file_type)s přepsána"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s přeskočeno"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s downloaded"
-#~ msgstr "%(noFiles)s %(filetypes)s staženo"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Umístění zálohy nenalezeno"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Fotografie: %(source)s"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Nemohu otevřít %(filetype)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Záloha %(file_type)s již existuje"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Zařízení: %s\n"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s nebyl zálohován"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Automaticky nebylo detekováno žádné zálohovací zařízení"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Nelze odstranit fotografie či video ze zařízení"
-
-#~ msgid "_Size"
-#~ msgstr "_Velikost"
-
-#~ msgid "_Type"
-#~ msgstr "_Typ"
-
-#~ msgid "_Device"
-#~ msgstr "_Zařízení"
-
-#~ msgid "_Filename"
-#~ msgstr "_Název souboru"
-
-#~ msgid "_Path"
-#~ msgstr "_Cesta"
-
-#~ msgid "_Preview"
-#~ msgstr "_Náhled"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Toto %(file_type)s nebylo zálohováno."
-
-#, python-format
-#~ msgid "Error: %(inst)s"
-#~ msgstr "Chyba: %(inst)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Stahování z kamer"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "File"
-#~ msgstr "Soubor"
-
-#~ msgid "Status"
-#~ msgstr "Stav"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Zobrazit tuto zprávu znovu"
-
-#~ msgid "Path"
-#~ msgstr "Cesta"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s nebylo staženo"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s bylo úspěšně staženo"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s bylo staženo s varováními"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s je připraveno ke stažení"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s nelze stáhnout"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s bude staženo s varováními"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Problém se složkamy stahování"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s je k dispozici"
-
-#, python-format
-#~ msgid "%(filetype)s downloaded"
-#~ msgstr "%(filetype)s staženo"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Nastavení zálohy bylo změněno."
-
-#~ msgid "_Resume"
-#~ msgstr "_Pokračovat"
-
-#~ msgid "_Download All"
-#~ msgstr "_Stáhnout vše"
-
-#~ msgid "Select _All"
-#~ msgstr "Vybr_at vše"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Vybrat všechna Vi_dea"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Vybrat veškeré Foto_grafie"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Sken zařízení kompletní: žádné %(filetypes)s nebyly nalezeny na %(device)s"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Cesta %s nemohla být vytvořena"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Cesta zálohování neexistuje"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s failed to download"
-#~ msgstr "%(noFiles)s %(filetypes)s nebyly staženy"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Následující cesta stahování nemůže být vytvořena:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s nebylo zálohováno do %(volume)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Zdroj: %(source)s\n"
-#~ "Destinace: %(destination)s\n"
-#~ "%(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Fotografie: %(source)s\n"
-#~ "Chyba: %(errno)s %(strerror)s"
-
-#~ msgid "Job Code"
-#~ msgstr "Pracovní kód"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Odstraněno %(number)i %(filetypes)s ze zařízení"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..d4a0f3a
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,1921 @@
+# Danish translation for rapid
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the rapid package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rapid\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 07:43+0000\n"
+"Last-Translator: Torben Gundtofte-Bruun <torben@g-b.dk>\n"
+"Language-Team: Danish <da@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-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
+
+#. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
+msgid "Rapid Photo Downloader"
+msgstr "Rapid Photo Downloader"
+
+#: rapid/rapid.py:111
+#, python-format
+msgid ""
+"%(date)s\n"
+"%(time)s"
+msgstr ""
+"%(date)s\n"
+"%(time)s"
+
+#: rapid/rapid.py:113
+#, python-format
+msgid "%(date)s %(time)s"
+msgstr "%(date)s %(time)s"
+
+#: rapid/rapid.py:116
+#, python-format
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:150
+msgid "Device"
+msgstr "Enhed"
+
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:167
+msgid "Size"
+msgstr "Størrelse"
+
+#: rapid/rapid.py:170
+msgid "Download Progress"
+msgstr "Downloadfremgang"
+
+#: rapid/rapid.py:316
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s kunne ikke afmonteres"
+
+#. 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:1178
+msgid "scanning..."
+msgstr "gennemsøger..."
+
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "Hent"
+
+#: rapid/rapid.py:2089
+msgid "Pause"
+msgstr "Pause"
+
+#: rapid/rapid.py:2190
+#, python-format
+msgid ""
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
+msgstr ""
+"Disse download mapper er ugyldige:\n"
+"%(folder1)s\n"
+"%(folder2)s"
+
+#: rapid/rapid.py:2193
+#, python-format
+msgid ""
+"This download folder is invalid:\n"
+"%s"
+msgstr ""
+"Denne download mappe er ugyldig:\n"
+"%s"
+
+#: rapid/rapid.py:2194
+msgid "Download cannot proceed"
+msgstr "Download kan ikke fortsætte"
+
+#: rapid/rapid.py:2503
+msgid "About 1 second remaining"
+msgstr "Cirka 1 sekund endnu"
+
+#: rapid/rapid.py:2505
+#, python-format
+msgid "About %i seconds remaining"
+msgstr "Cirka %i sekunder endnu"
+
+#: rapid/rapid.py:2507
+msgid "About 1 minute remaining"
+msgstr "Cirka 1 minut endnu"
+
+#. 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:2512
+#, python-format
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Cirka %(minutes)i:%(seconds)02i sekunder endnu"
+
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+msgid "photos and videos"
+msgstr "fotos og videoer"
+
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "fotos eller videoer"
+
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
+msgid "videos"
+msgstr "videoer"
+
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
+
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
+#: rapid/rpdfile.py:120
+msgid "photos"
+msgstr "fotos"
+
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "foto"
+
+#: rapid/rapid.py:2573
+#, python-format
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "%(noFiles)s %(filetypes)s hentet"
+
+#: rapid/rapid.py:2577
+#, python-format
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s kunne ikke hentes"
+
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
+msgid "warnings"
+msgstr "advarsler"
+
+#: rapid/rapid.py:2589
+msgid "All downloads complete"
+msgstr "Alle downloads er afsluttet"
+
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
+#, python-format
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
+
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
+#, python-format
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s hentet"
+
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
+#, python-format
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s kunne ikke hentes"
+
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2663
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s af %(total)s %(filetypes)s (%(remaining)s endnu)"
+
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2670
+#, python-format
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s af %(total)s %(filetypes)s"
+
+#: rapid/rapid.py:3084
+msgid "and"
+msgstr "og"
+
+#: rapid/rapid.py:3089
+msgid "Using backup devices"
+msgstr "Benytter backup enheder"
+
+#: rapid/rapid.py:3091
+msgid "Using backup device"
+msgstr "Benytter backup enhed"
+
+#: rapid/rapid.py:3093
+msgid "No backup devices detected"
+msgstr "Ingen backup enheder fundet"
+
+#: rapid/rapid.py:3120
+msgid "Free space:"
+msgstr "Fri plads:"
+
+#. (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:3132
+#, 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:3136
+#, python-format
+msgid "%(free)s %(file_type)s"
+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:3141
+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:3146
+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:3152
+#, python-format
+msgid "%(free)s free"
+msgstr "%(free)s fri plads"
+
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Sikkerhedskopierer fotos og videoer til %(path)s"
+
+#. user manually specified backup location
+#: rapid/rapid.py:3163
+#, python-format
+msgid "Backing up to %(path)s"
+msgstr "Tager sikkerhedskopi til %(path)s"
+
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Sikkerhedskopierer fotos til %(path)s og videoer til %(path2)s"
+
+#: rapid/rapid.py:3173
+#, python-format
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr "%(freespace)s. %(backuppaths)s."
+
+#: rapid/rapid.py:3202
+msgid "Program preferences are invalid"
+msgstr "Programmets indstillinger er ugyldige"
+
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr "Foto"
+
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
+msgid "Video"
+msgstr "Video"
+
+#: rapid/rapid.py:3332
+#, python-format
+msgid "%(file_type)s download folder does not exist"
+msgstr "%(file_type)s download mappe findes ikke"
+
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
+#, python-format
+msgid "Folder: %s"
+msgstr "Mappe: %s"
+
+#: rapid/rapid.py:3346
+#, python-format
+msgid "%(file_type)s download folder is invalid"
+msgstr "%(file_type)s download mappe er ugyldig"
+
+#: rapid/rapid.py:3359
+#, python-format
+msgid "%(file_type)s download folder is not writable"
+msgstr "%(file_type)s download mappe er skrivebeskyttet"
+
+#: rapid/rapid.py:3437
+msgid "Thumbnails"
+msgstr "Små billeder"
+
+#. 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:3484
+#, python-format
+msgid ""
+"display program information on the command line as the program runs "
+"(default: %default)"
+msgstr ""
+"vis programinformation på kommandolinien mens programmet kører (standard: "
+"%default)"
+
+#: rapid/rapid.py:3485
+msgid "display debugging information when run from the command line"
+msgstr ""
+"vis fejlsøgningsinformation når programmet startes fra kommandolinien"
+
+#: rapid/rapid.py:3486
+msgid "only output errors to the command line"
+msgstr "vis kun fejl på kommandolinien"
+
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:3488
+msgid "list photo and video file extensions the program recognizes and exit"
+msgstr "vis hvilke foto og video formater programmet kender, og afslut"
+
+#: rapid/rapid.py:3490
+msgid "reset all program settings and preferences and exit"
+msgstr "nulstil alle programindstillinger og afslut"
+
+#: rapid/rapid.py:3503
+msgid "Photos:"
+msgstr "Fotos:"
+
+#: rapid/rapid.py:3503
+msgid "Videos:"
+msgstr "Videoer:"
+
+#: rapid/rapid.py:3508
+#, python-format
+msgid "and %s"
+msgstr "og %s"
+
+#: rapid/rapid.py:3516
+msgid "All settings and preferences have been reset"
+msgstr "Alle indstillinger er blevet nulstillet"
+
+#: rapid/rapid.py:3534
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
+msgstr ""
+"Download af videoer er slået fra.\n"
+"For at downloade videoer, venligst installér pakkerne hachoir metadata og "
+"kaa metadata for python."
+
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
+msgid "Backing up error"
+msgstr "Fejl ved sikkerhedskopiering"
+
+#: rapid/backupfile.py:144
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Destinationsmappe kunne ikke oprettes: %(directory)s\n"
+
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Kilde: %(source)s\n"
+"Destination: %(destination)s"
+
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "Fejl: %(inst)s"
+
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
+msgstr ""
+"%(problem)s\n"
+"Fil: %(file)s"
+
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "Enhed fundet"
+
+#. 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 "Skal fotos og videoer hentes fra denne enhed?"
+
+#. 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 "_Husk dette valg"
+
+#: rapid/downloadtracker.py:298
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:145
+msgid "Date time"
+msgstr "Dato og klokkeslæt"
+
+#: rapid/generatenameconfig.py:146
+msgid "Text"
+msgstr "Tekst"
+
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
+msgstr "Filnavn"
+
+#: rapid/generatenameconfig.py:148
+msgid "Metadata"
+msgstr "Metadata"
+
+#: rapid/generatenameconfig.py:149
+msgid "Sequences"
+msgstr "Sekvenser"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
+msgid "Job code"
+msgstr "Job kode"
+
+#: rapid/generatenameconfig.py:152
+msgid "Image date"
+msgstr "Billedets dato"
+
+#: rapid/generatenameconfig.py:153
+msgid "Video date"
+msgstr "Videoens dato"
+
+#: rapid/generatenameconfig.py:154
+msgid "Today"
+msgstr "I dag"
+
+#: rapid/generatenameconfig.py:155
+msgid "Yesterday"
+msgstr "I går"
+
+#. 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 "Download klokkeslæt"
+
+#. 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 "Navn + udvidelse"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:161
+msgid "Name"
+msgstr "Navn"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
+#: rapid/generatenameconfig.py:163
+msgid "Extension"
+msgstr "Udvidelse"
+
+#. 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 "Billedets nummer"
+
+#: rapid/generatenameconfig.py:166
+msgid "Video number"
+msgstr "Videoens nummer"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: rapid/generatenameconfig.py:168
+msgid "Aperture"
+msgstr "Blænde"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
+#: 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:172
+msgid "Exposure time"
+msgstr "Lukkertid"
+
+#. 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 "Brændvidde"
+
+#. 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 "Kameramærke"
+
+#. 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 "Kameramodel"
+
+#. 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 "Forkortet kameramodel"
+
+#. 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 "Forkortet kameramodel med bindestreg"
+
+#. 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 "Serienummer"
+
+#. 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 "Lukker-antal"
+
+#. 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 "Ejernavn"
+
+#: rapid/generatenameconfig.py:189
+msgid "Codec"
+msgstr "Kodning"
+
+#: rapid/generatenameconfig.py:190
+msgid "Width"
+msgstr "Bredde"
+
+#: rapid/generatenameconfig.py:191
+msgid "Height"
+msgstr "Højde"
+
+#: rapid/generatenameconfig.py:192
+msgid "Length"
+msgstr "Længde"
+
+#: rapid/generatenameconfig.py:193
+msgid "Frames Per Second"
+msgstr "Billeder per sekund"
+
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Kunstner"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Ophavsret"
+
+#. 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 "Downloads i dag"
+
+#. 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 "Kørselsnummer"
+
+#. 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 "Undermappe nummer"
+
+#. 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 "Gemt nummer"
+
+#. 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 "Sekvensbogstav"
+
+#. 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 "Alle cifre"
+
+#. 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 "Sidste ciffer"
+
+#. 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 "Sidste 2 cifre"
+
+#. 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 "Sidste 3 cifre"
+
+#. 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 "Sidste 4 cifre"
+
+#. 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 "Oprindelige Store/Små Bogstaver"
+
+#. 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 "STORE BOGSTAVER"
+
+#. 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 "små bogstaver"
+
+#: rapid/generatenameconfig.py:222
+msgid "One digit"
+msgstr "Et ciffer"
+
+#: rapid/generatenameconfig.py:223
+msgid "Two digits"
+msgstr "To cifre"
+
+#: rapid/generatenameconfig.py:224
+msgid "Three digits"
+msgstr "Tre cifre"
+
+#: rapid/generatenameconfig.py:225
+msgid "Four digits"
+msgstr "Fire cifre"
+
+#: rapid/generatenameconfig.py:226
+msgid "Five digits"
+msgstr "Fem cifre"
+
+#: rapid/generatenameconfig.py:227
+msgid "Six digits"
+msgstr "Seks cifre"
+
+#: rapid/generatenameconfig.py:228
+msgid "Seven digits"
+msgstr "Syv cifre"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:230
+msgid "Subseconds"
+msgstr "Delsekunder"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:232
+msgid "YYYYMMDD"
+msgstr "ÅÅÅÅMMDD"
+
+#. 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 "ÅÅÅÅ-MM-DD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:236
+msgid "YYMMDD"
+msgstr "ÅÅMMDD"
+
+#. 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 "ÅÅ-MM-DD"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:240
+msgid "MMDDYYYY"
+msgstr "MMDDÅÅÅÅ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:242
+msgid "MMDDYY"
+msgstr "MMDDÅÅ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:246
+msgid "DDMMYYYY"
+msgstr "DDMMÅÅÅÅ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:248
+msgid "DDMMYY"
+msgstr "DDMMÅÅ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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:252
+msgid "YY"
+msgstr "ÅÅ"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: 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: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:258
+msgid "HHMMSS"
+msgstr "TTMMSS"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:260
+msgid "HHMM"
+msgstr "TTMM"
+
+#. 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 "TT-MM-SS"
+
+#. 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 "TT-MM"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:266
+msgid "HH"
+msgstr "TT"
+
+#. 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 "MM (minutter)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:270
+msgid "SS"
+msgstr "SS"
+
+#: rapid/preferencesdialog.py:370
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr "Undermappe indstillinger bør ikke begynde med et %s"
+
+#: rapid/preferencesdialog.py:372
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr "Undermappe indstillinger bør ikke slutte med et %s"
+
+#: rapid/preferencesdialog.py:376
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr "Undermappe indstillinger bør ikke indeholde to %s efter hinanden"
+
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
+msgid "Remove all Job Codes?"
+msgstr "Fjern alle job koder?"
+
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
+msgid "Should all Job Codes be removed?"
+msgstr "Skal alle job koder fjernes?"
+
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Fjern alle huskede stier?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Skal alle huskede stier fjernes?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Fjern alle ignorerede stier?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Skal alle ignorerede stier fjernes?"
+
+#: rapid/preferencesdialog.py:457
+msgid "Error in Photo Rename preferences"
+msgstr "Fejl i indstillinger til foto omdøbning"
+
+#: rapid/preferencesdialog.py:638
+msgid "Error in Video Rename preferences"
+msgstr "Fejl i indstillinger til video omdøbning"
+
+#: rapid/preferencesdialog.py:659
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Fejl i indstillinger til foto download undermapper"
+
+#: rapid/preferencesdialog.py:676
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Fejl i indstillinger til video download undermapper"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:735
+msgid "Enter a Job Code"
+msgstr "Angiv en jobkode"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:751
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Angiv en ny jobkode eller vælg en eksisterende"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:754
+msgid "Enter a new Job Code"
+msgstr "Angiv en ny jobkode"
+
+#: rapid/preferencesdialog.py:759
+msgid "Job Code:"
+msgstr "Jobkode:"
+
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Angiv en sti der skal ignoreres"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr "Angiv en sti som aldrig skal gennemsøges efter fotos og videoer"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Sti:"
+
+#: rapid/preferencesdialog.py:1078
+msgid "Job Code"
+msgstr "Jobkode"
+
+#: rapid/preferencesdialog.py:1160
+msgid "Select a folder to download photos to"
+msgstr "Vælg en mappe at downloade fotos til"
+
+#: rapid/preferencesdialog.py:1178
+msgid "Select a folder to download videos to"
+msgstr "Vælg en mappe at downloade videoer til"
+
+#: rapid/preferencesdialog.py:1323
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Vælg en mappe der indeholder %(file_types)s"
+
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Vælg en mappe til sikkerhedskopier af fotos"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Vælg en mappe til sikkerhedskopier af videoer"
+
+#. 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:1457
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+"<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere navnet. Vælg "
+"andre muligheder for omdøbning.</i>"
+
+#: rapid/preferencesdialog.py:1508
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
+msgstr ""
+"<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere undermapper. "
+"Vælg andre muligheder for navngivning af undermapper.</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:1511
+#, python-format
+msgid "<i>Example: %s</i>"
+msgstr "<i>Eksempel: %s</i>"
+
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1601
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
+msgstr ""
+"Indstillingerne til %(filetype)s undermappen er ugyldige.\n"
+"De bliver nulstillet til deres standardværdier."
+
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"De følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre du "
+"ændrer dem:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Det følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre du "
+"ændrer det:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Ugyldigt regulært udtryk"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1931
+msgid "externaldrive1"
+msgstr "eksterntdrev1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1933
+msgid "externaldrive2"
+msgstr "eksterntdrev2"
+
+#: rapid/prefsrapid.py:126
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:127
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:127
+msgid "Prague"
+msgstr "Prag"
+
+#: rapid/prefsrapid.py:127
+msgid "Helsinki"
+msgstr "Helsingfors"
+
+#: rapid/prefsrapid.py:127
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:128
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:128
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:128
+msgid "Paris"
+msgstr "Paris"
+
+#: rapid/prefsrapid.py:128
+msgid "Berlin"
+msgstr "Berlin"
+
+#: rapid/prefsrapid.py:128
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:129
+msgid "Budapest"
+msgstr "Budapest"
+
+#: rapid/prefsrapid.py:129
+msgid "Rome"
+msgstr "Rom"
+
+#: rapid/prefsrapid.py:129
+msgid "Moscow"
+msgstr "Moskva"
+
+#: rapid/prefsrapid.py:129
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:129
+msgid "Warsaw"
+msgstr "Warszawa"
+
+#: rapid/prefsrapid.py:130
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:130
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:130
+msgid "Stockholm"
+msgstr "Stockholm"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
+msgid "subfolder"
+msgstr "undermappe"
+
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
+msgid "filename"
+msgstr "filnavn"
+
+#: rapid/problemnotification.py:80
+#, python-format
+msgid "Date time value %s appears invalid."
+msgstr "Værdi for dato og klokkeslæt %s forekommer ugyldigt."
+
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
+msgstr "Filnavnet har ingen udvidelse."
+
+#. 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 "Filnavnet indeholder ingen tal."
+
+#: rapid/problemnotification.py:84
+#, python-format
+msgid "Error generating component %s."
+msgstr "Kunne ikke generere component %s."
+
+#. a generic problem
+#: rapid/problemnotification.py:86
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr "%(filetype)s metadata kan ikke læses"
+
+#: rapid/problemnotification.py:88
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr "%(filetype)s %(area)s kunne ikke genereres"
+
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr "Der opstod en fejl ved kopiering af %(filetype)s"
+
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr "%(filetype)s findes allerede"
+
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
+"Der kunne ikke tages sikkerhedskopi af %(filetype)s, fordi der ikke findes "
+"egnede placeringer til sikkerhedskopierne."
+
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
+msgstr ""
+"%(image1)s blev taget den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
+"den %(image2_date)s kl. %(image2_time)s."
+
+#: rapid/problemnotification.py:103
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr "%(filetype)s er allerede blevet downloadet"
+
+#: 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 ""
+"De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s. "
+"Entydig angivelse '%(identifier)s' blev tilføjet."
+
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+"De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s."
+
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr "Der mangler data til navngivning af %(filetype)sne."
+
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr "Fejl: %(errorno)s %(strerror)s"
+
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
+msgstr "Metadata kan være korrupt."
+
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr ""
+"Filnavnet, udvidelsen og Exif informationerne antyder, at filen allerede er "
+"blevet downloadet."
+
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr " Filen blev sikkerhedskopieret til %(volume)s"
+
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
+msgstr " Filen blev sikkerhedskopieret til disse enheder: "
+
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
+msgstr "%s, "
+
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr "%(volumes)s og %(final_volume)s."
+
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr ""
+"Der findes fotos med ens filnavne men forskellige datoer: %(details)s"
+
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s."
+
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr "Der opstod fejl ved sikkerhedskopiering til de følgende enheder: "
+
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr "%(volume)s (%(inst)s), "
+
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
+msgstr "%(volume)s, "
+
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr "%(volumes)s og %(volume)s (%(inst)s)."
+
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr "%(volumes)s og %(volume)s."
+
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr "Sikkerhedskopi findes allerede på %(volume)s."
+
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
+msgstr "Sikkerhedskopier findes allerede her: "
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr "Sikkerhedskopi blev overskrevet på %(volume)s."
+
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
+msgstr "Sikkerhedskopier blev overskrevet på disse enheder: "
+
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr "Der opstod en fejl ved oprettelse af mapper på %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
+msgstr "Der opstod fejl ved oprettelse af mapper på disse enheder: "
+
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr "%(previousproblem)s Og %(newproblem)s"
+
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr " Desuden opstod der %(problems)s."
+
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr " Desuden opstod der %(problem)s."
+
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr "Der mangler %(type)s metadata."
+
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
+msgstr "Følgende metadata mangler: "
+
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
+
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
+msgstr "Problemer ved generering af undermapper og filnavne"
+
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
+msgstr "Problem ved generering af undermapper og filnavne"
+
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
+msgstr "Problemer ved generering af %s"
+
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
+msgstr "Problem ved generering af %s"
+
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr "%(filetype)s findes allerede, men er sikkerhedskopieret"
+
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+"Der opstod en fejl ved kopiering af %(filetype)s, men det blev "
+"sikkerhedskopieret"
+
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
+msgstr "Der opstod adskillige problemer"
+
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr ""
+"Der findes fotos med ens filnavne men forskellige klokkeslæt: %(details)s"
+
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
+msgstr "der opstod fejl ved sikkerhedskopiering"
+
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
+msgstr "Der opstod fejl ved sikkerhedskopiering"
+
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
+msgstr "der opstod en fejl ved sikkerhedskopiering"
+
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
+msgstr "Der opstod en fejl ved sikkerhedskopiering"
+
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr "%(previousproblem)s, og %(backinguperror)s"
+
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:299
+msgid "Photo has already been downloaded"
+msgstr "Fotoet er allerede blevet downloadet"
+
+#: rapid/subfolderfile.py:300
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Kilde: %(source)s"
+
+#: rapid/subfolderfile.py:358
+msgid "subfolder and filename"
+msgstr "undermappe og filnavn"
+
+#: rapid/subfolderfile.py:396
+msgid "Failed to create download subfolder"
+msgstr "Kunne ikke oprette undermappe"
+
+#: rapid/subfolderfile.py:397
+#, python-format
+msgid "Path: %s"
+msgstr "Sti: %s"
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Om..."
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
+msgstr "Markér alle"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Markér alle fotos"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Markér alle videoer"
+
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
+msgstr "Download / Pause"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
+msgstr "Få hjælp online..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Hjælp"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
+msgstr "Giv et bidrag..."
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
+msgstr "Næste fil"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
+msgstr "Forrige fil"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
+msgstr "Afslut"
+
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
+msgstr "Opdatér"
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
+msgstr "Rapportér et problem..."
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
+msgstr "Markér alle med _jobkode"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
+msgstr "Markér alle _uden jobkode"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
+msgstr "Oversæt dette program..."
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
+msgstr "Afmarkér alle"
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
+msgstr "_Markér alle"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
+msgstr "_Ryd afsluttede downloads"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
+msgstr "_Download"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
+msgstr "_Fejl-log"
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
+msgstr "_Fil"
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
+msgstr "_Indkludér i download"
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
+msgstr "_Giv et bidrag..."
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
+msgstr "_Markér"
+
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
+msgstr "_Oversæt denne applikation..."
+
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
+msgstr "_Afmarkér alle"
+
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
+msgstr "_Vis"
+
+#: rapid/glade3/prefs.ui.h:1
+msgid " "
+msgstr " "
+
+#: rapid/glade3/prefs.ui.h:2
+msgid " hh:mm"
+msgstr " hh:mm"
+
+#: rapid/glade3/prefs.ui.h:3
+msgid ":"
+msgstr ":"
+
+#: rapid/glade3/prefs.ui.h:4
+msgid "<b>Backup</b>"
+msgstr "<b>Sikkerhedskopi</b>"
+
+#: rapid/glade3/prefs.ui.h:5
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Kompatibilitet med andre styresystemer</b>"
+
+#: rapid/glade3/prefs.ui.h:6
+msgid "<b>Download Folder</b>"
+msgstr "<b>Download mappe</b>"
+
+#: rapid/glade3/prefs.ui.h:7
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Download undermappe</b>"
+
+#: rapid/glade3/prefs.ui.h:8
+msgid "<b>Example</b>"
+msgstr "<b>Eksempel</b>"
+
+#: rapid/glade3/prefs.ui.h:9
+msgid "<b>Job Codes</b>"
+msgstr "<b>Jobkoder</b>"
+
+#: rapid/glade3/prefs.ui.h:10
+msgid "<b>Photo Rename</b>"
+msgstr "<b>Photo omdøbning</b>"
+
+#: rapid/glade3/prefs.ui.h:11
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Foto og video navnekonflikter</b>"
+
+#: rapid/glade3/prefs.ui.h:12
+msgid "<b>Program Automation</b>"
+msgstr "<b>Programautomatisering</b>"
+
+#: rapid/glade3/prefs.ui.h:13
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Sekvensnumre</b>"
+
+#: rapid/glade3/prefs.ui.h:14
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/medie/externtdrev/Fotos</i>"
+
+#: rapid/glade3/prefs.ui.h:15
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Eksempel: /home/user/Billeder</i>"
+
+#: rapid/glade3/prefs.ui.h:16
+msgid "<i>Example:</i>"
+msgstr "<i>Eksempel:</i>"
+
+#: rapid/glade3/prefs.ui.h:17
+msgid "<i>New:</i>"
+msgstr "<i>Ny:</i>"
+
+#: rapid/glade3/prefs.ui.h:18
+msgid "<i>Original:</i>"
+msgstr "<i>Original:</i>"
+
+#: rapid/glade3/prefs.ui.h:19
+msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Sikkerhedskopi</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\">Enhedsindstillinger</span>"
+
+#: rapid/glade3/prefs.ui.h:21
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Enheder</span>"
+
+#: rapid/glade3/prefs.ui.h:22
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Fejlhåndtering</span>"
+
+#: rapid/glade3/prefs.ui.h:23
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Jobkoder</span>"
+
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Diverse</span>"
+
+#: rapid/glade3/prefs.ui.h:25
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Foto download mapper</span>"
+
+#: rapid/glade3/prefs.ui.h:26
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Foto omdøbning</span>\t"
+
+#: rapid/glade3/prefs.ui.h:27
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Omdøbningsindstillinger</span>"
+
+#: rapid/glade3/prefs.ui.h:28
+msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Video download mapper</span>"
+
+#: rapid/glade3/prefs.ui.h:29
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Video omdøbning</span>\t"
+
+#: rapid/glade3/prefs.ui.h:30
+msgid "Add unique identifier"
+msgstr "Tilføj entydig angivelse"
+
+#: rapid/glade3/prefs.ui.h:31
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Opdag bærbare enheder automatisk"
+
+#: rapid/glade3/prefs.ui.h:32
+msgid "Automatically detect backup devices"
+msgstr "Opdag backup-enheder automatisk"
+
+#: rapid/glade3/prefs.ui.h:33
+msgid "Automatically detect devices"
+msgstr "Opdag enheder automatisk"
+
+#: rapid/glade3/prefs.ui.h:34
+msgid "Backup"
+msgstr "Sikkerhedskopi"
+
+#: rapid/glade3/prefs.ui.h:35
+msgid "Backup photos and videos when downloading"
+msgstr "Tag sikkerhedskopi af fotos og videoer mens de downloades"
+
+#: 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 ""
+"Vælg download mappen. Undermapper for de downloadede fotos vil automatisk "
+"blive oprettet her ved hjælp af den nedenfor angivne struktur."
+
+#: 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 ""
+"Vælg download mappen. Undermapper for de downloadede videoer vil automatisk "
+"blive oprettet her ved hjælp af den nedenfor angivne struktur."
+
+#: rapid/glade3/prefs.ui.h:38
+msgid "Day start:"
+msgstr "Dagen begynder:"
+
+#: rapid/glade3/prefs.ui.h:39
+msgid "Delete photos and videos from device upon download completion"
+msgstr "Slet fotos og videoer fra enheden når download er afsluttet"
+
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Enhedsindstillinger"
+
+#: rapid/glade3/prefs.ui.h:41
+msgid "Devices"
+msgstr "Enheder"
+
+#: 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 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>"
+msgstr ""
+"Enheder er de steder, hvorfra fotos og videoer downloades, for eksempel "
+"kameraer, hukommelseskort eller bærbare lagermedier.\n"
+"\n"
+"Du kan downloade fra flere enheder samtidigt eller angive en placering på "
+"din harddisk.\n"
+"\n"
+"<i>At downloade direkte fra et kamera er i øjeblikket en eksperimentel "
+"funktionalitet. Hvis dette virker dårligt, eller slet ikke, så prøv at "
+"indstille kameraet til PTP. Hvis det ikke er muligt, skal du benytte en "
+"kortlæser.</i>"
+
+#: rapid/glade3/prefs.ui.h:47
+msgid "Download folder:"
+msgstr "Download mappe:"
+
+#: rapid/glade3/prefs.ui.h:48
+msgid "Downloads today:"
+msgstr "Downloads i dag:"
+
+#: rapid/glade3/prefs.ui.h:49
+msgid "Error Handling"
+msgstr "Fejlhåndtering"
+
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
+msgstr ""
+"Afslut programmet selvom der opstod fejl eller advarsler ved download"
+
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
+msgstr "Afslut programmet når download er afsluttet"
+
+#: rapid/glade3/prefs.ui.h:52
+msgid "Generate thumbnails (slower)"
+msgstr "Dan små billeder"
+
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+"Vælg nøjagtig placering af sikkerhedskopier, hvis du slår automatisk "
+"opdagelse fra."
+
+#: rapid/glade3/prefs.ui.h:54
+msgid ""
+"If you disable automatic detection, choose the exact location of the photos "
+"and videos."
+msgstr ""
+"Vælg nøjagtig placering af fotos og videoer, hvis du slår automatisk "
+"opdagelse fra."
+
+#: rapid/glade3/prefs.ui.h:55
+msgid ""
+"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."
+msgstr ""
+"Hvis du slår automatisk opdagelse fra, bliver hele enheden gennemsøgt. På "
+"store enheder kan det tage lang tid.\n"
+"\n"
+"Når en enhed bliver opdaget mens denne mulighed er valgt, bliver du spurgt "
+"om enheden skal gennemsøges eller ej."
+
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr "Ignorerede stier"
+
+#: rapid/glade3/prefs.ui.h:59
+msgid "Job Codes"
+msgstr "Jobkoder"
+
+#: rapid/glade3/prefs.ui.h:60
+msgid "Location:"
+msgstr "Sted:"
+
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: rapid/glade3/prefs.ui.h:62
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
+msgstr "Ydeevne"
+
+#: rapid/glade3/prefs.ui.h:64
+msgid "Photo Folders"
+msgstr "Foto mapper"
+
+#: rapid/glade3/prefs.ui.h:65
+msgid "Photo Rename"
+msgstr "Foto omdøbning"
+
+#: rapid/glade3/prefs.ui.h:66
+msgid "Photo backup folder name:"
+msgstr "Navn til mappe til foto sikkerhedskopier:"
+
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Placering af foto sikkerhedskopier:"
+
+#: rapid/glade3/prefs.ui.h:68
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Indstillinger: Rapid Photo Downloader"
+
+#: rapid/glade3/prefs.ui.h:70
+msgid "R_emove All"
+msgstr "_Fjern alle"
+
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "_Fjern alle"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
+msgstr "Huskede stier"
+
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
+msgstr ""
+"Huskede stier er stier til bestemte enheder, som enten altid eller aldrig "
+"gennemsøges, når automatisk genkendelse af bærbare enheder er slået til."
+
+#: rapid/glade3/prefs.ui.h:75
+msgid "Rename Options"
+msgstr "Indstillinger for omdøbning"
+
+#: rapid/glade3/prefs.ui.h:76
+msgid "Skip"
+msgstr "Spring over"
+
+#: rapid/glade3/prefs.ui.h:77
+msgid "Skip download"
+msgstr "Spring download over"
+
+#: 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 ""
+"Videoer kan ikke downloades. Installér pakkerne <i>hachoir metadata</i> og "
+"<i>kaa metadata</i> for python for at kunne downloade videoer."
+
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Angiv den sidste del af stier, der skal ignoreres ved gennemsøgning af "
+"enheder. Stier, der ender med disse værdier, vil ikke bliev gennemsøgt."
+
+#: rapid/glade3/prefs.ui.h:80
+msgid ""
+"Specify the folder in which backups are stored on the device.  \n"
+"\n"
+"<i>Note: this will also be used to determine whether or not the device is "
+"used for backups. For each device you wish to use for backing up to, create "
+"a folder in it with one of these names.</i>"
+msgstr ""
+"Angiv den mappe hvor sikkerhedskopier er gemt på enheden.  \n"
+"\n"
+"<i>Bemærk: Dette afgør også, hvorvidt enheden bruges til sikkerhedskopier. "
+"Opret en mappe med en af disse navne på hver enhed, du ønsker at bruge til "
+"sikkerhedskopiering.</i>"
+
+#: 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 ""
+"Angiv på hvilket klokkeslæt <i>Downloads today</i> sekvensnummeret skal "
+"nulstilles. Brug 24-timers format."
+
+#: 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 ""
+"Angiv, om tegn skal fjernes fra foto-, video- og mappenavne, hvis de ikke er "
+"tilladt på andre styresystemer."
+
+#: rapid/glade3/prefs.ui.h:85
+msgid "Start downloading at program startup"
+msgstr "Start download når programmet starter"
+
+#: rapid/glade3/prefs.ui.h:86
+msgid "Start downloading upon device insertion"
+msgstr "Start download når enhed tilsluttes"
+
+#: rapid/glade3/prefs.ui.h:87
+msgid "Stored number:"
+msgstr "Husket nummer:"
+
+#: rapid/glade3/prefs.ui.h:88
+msgid "Strip incompatible characters"
+msgstr "Fjern inkompatible tegn"
+
+#: rapid/glade3/prefs.ui.h:89
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Synchronisér RAW + JPEG sekvensnumre"
+
+#: rapid/glade3/prefs.ui.h:90
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Unmount enhed (\"skub ud\") når download er afsluttet"
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "brug regulære udtryk i _python-style"
+
+#: rapid/glade3/prefs.ui.h:92
+msgid "Video Folders"
+msgstr "Video mapper"
+
+#: rapid/glade3/prefs.ui.h:93
+msgid "Video Rename"
+msgstr "Video omdøbning"
+
+#: rapid/glade3/prefs.ui.h:94
+msgid "Video backup folder name:"
+msgstr "Mappenavn til video sikkerhedskopi:"
+
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr "Placering af video sikkerhedskopi:"
+
+#: 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 ""
+"Vælg, om et foto eller en video skal springes over, eller om der skal "
+"tilføjes en entydig kending, når et foto eller en video med samme navn "
+"allerede er downloadet."
+
+#: 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 ""
+"Vælg, om et foto eller en video skal springes over eller overskrives, når "
+"sikkerhedskopien allerede indeholder et foto eller en video med samme navn."
+
+#: 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 ""
+"Dine fotos og videoer kan sikkerhedskopieres til flere steder mens de "
+"downloades, for eksempel en ekstern harddisk."
+
+#: rapid/glade3/prefs.ui.h:99
+msgid "_Add..."
+msgstr "_Tilføj..."
+
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importér dine fotos og videoer effektivt og pålideligt"
diff --git a/po/de.po b/po/de.po
index fdbbdc7..61a7cca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-13 18:23-0500\n"
-"PO-Revision-Date: 2011-06-20 13:34+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 06:54+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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Laufwerk"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Grösse"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Fortschritt im Download"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s konnte nicht entfernt werden"
@@ -66,19 +66,19 @@ msgstr "%(device)s konnte nicht entfernt werden"
 #. 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:1178
 msgid "scanning..."
 msgstr "Überprüfe Laufwerke ..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Herunterladen"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Anhalten"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, 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:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Der Download kann nicht weitergeführt werden"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "BIlder und Filme"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "Bilder oder Filme"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "Filme"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "Film"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "Bilder"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s konnten nicht heruntergeladen werden"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s heruntergeladen"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, 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:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s von %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, 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:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,89 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s verfügbar"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Erstelle Sicherungskopie von Bildern und Filmen nach %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sicherungskopieren in %(path)s erstellen"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+"Erstelle Sicherungskopie von Bildern nach %(path)s und von Filmen nach "
+"%(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Die Benutzervoreinstellungen sind ungültig"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s Download-Verzeichnis existiert nicht"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Verzeichnis: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s Download-Verzeichnis ist ungültig"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s Download-Verzeichnis ist schreibgeschützt"
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,44 +326,44 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3485
 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:3313
+#: rapid/rapid.py:3486
 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:3315
+#: rapid/rapid.py:3488
 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:3316
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "Alle Einstellungen auf Standardwerte zurücksetzten und beenden"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Filme:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Alle Einstellungen wurden zurückgesetzt"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -359,16 +373,16 @@ msgstr ""
 "Um diese zu aktivieren müssen zuerst die hachoir metadata und kaa metadata "
 "Pakete für Python installiert werden."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Fehler beim Erstellen der Sicherungskopie"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Das Zielverzeichnis konnte nicht erstellt werden: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -377,13 +391,13 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Ziel: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fehler: %(inst)s"
 
-#: 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"
@@ -409,7 +423,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "_Auswahl merken"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
@@ -434,7 +448,7 @@ msgid "Sequences"
 msgstr "Sequenzen"
 
 #. 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 "Auftragsbezeichnung"
 
@@ -781,77 +795,110 @@ msgstr ""
 "Die Unterverzeichnisvoreinstellungen sollten nicht zwei %s nacheinander "
 "enthalten"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Alle Auftragsbezeichnungen löschen?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Sollen alle Auftragsbezeichnungen gelöscht werden?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Alle gespeicherten Pfade löschen?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Sollen alle gespeicherten Pfade gelöscht werden?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Alle ignorierten Pfade löschen?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Sollen alle ignorierten Pfade gelöscht werden?"
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Fehler in den Vorgaben zur Umbennennung von Bildern"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Fehler in den Vorgaben zur Umbennennung von Filmen"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Fehler in den Vorgaben für Bilder-Downloadunterordner"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Fehler in den Vorgaben zur Filme-Downloadunterordner"
 
 #. 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 "Geben Sie eine Auftragsbezeichnung ein"
 
 #. 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 ""
 "Geben Sie eine neue Auftragsbezeichung ein oder wählen Sie eine bestehende "
 "aus"
 
 #. 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 "Geben Sie eine neue Auftragsbezeichung ein"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Auftragsbezeichnung:"
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Geben Sie einen Pfad ein, welcher ignoriert werden sollen"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+"Geben Sie einen Pfad ein, welcher nie nach Bildern oder Filmen durchsucht "
+"werden soll"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Pfad:"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Wählen Sie ein Verzeichnis für den Download der Bilder"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Wählen Sie einen Ordner für den Download von Filmen"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Wählen Sie einen Ordner welcher %(file_types)s enthält"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
 msgstr ""
-"Wählen Sie einen Ordner in welchem die Sicherungskopie von %(file_types)s "
-"erstellt werden soll"
+"Wählen Sie den Order in welchem die Sicherkeitskopien der Bilder abgelegt "
+"werden"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Wählen Sie einen Order für die Sicherungskopien der Filme"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -859,7 +906,7 @@ msgstr ""
 "<i><b>Warnung:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -869,13 +916,13 @@ msgstr ""
 "Benennung der Unterordner.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Beispiel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -886,94 +933,120 @@ msgstr ""
 "und können nicht verwendet werden.\n"
 "Sie werden auf die Standardwerte zurückgesetzt."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Die folgenden regulären Ausdrücke sind ungültig und werden entfernt, sofern "
+"Sie sie nicht korrigieren:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Der folgende reguläre Ausdruck ist ungültig und wird entfernt, sofern Sie "
+"ihn nicht korrigieren:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Ungültiger regulärer Ausdruck"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "ExternesLaufwerk1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "ExternesLaufwerk2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Prag"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Rom"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moskau"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Warschau"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "Unterordner"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "Dateiname"
 
@@ -1029,11 +1102,11 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s wurde am %(image1_date)s um %(image1_time)s und %(image2)s am "
-"%(image2_date)s um %(image2_time)s aufgenommen."
+"%(image1)s wurde am %(image1_date)s um %(image1_time)s aufgenommen und "
+"%(image2)s am %(image2_date)s um %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1243,7 +1316,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Mehrere Probleme sind aufgetreten"
 
-#: 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 ""
 "Bilder mit gleichem Dateinamen aber unterschiedlichen Aufnahmezeiten gefunden"
@@ -1280,24 +1353,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "Das Bild wurde bereits heruntergeladen"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Quelle: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "Unterordner und Dateiname"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Der Download-Unterordner konnte nicht erstellt werden"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Pfad: %s"
@@ -1648,12 +1721,16 @@ msgstr "Vorschaubilder erstellen (langsam)"
 msgid ""
 "If you disable automatic detection, choose the exact backup locations."
 msgstr ""
+"Wenn Sie die automatische Erkennung ausschalten, wählen Sie den Ort zur "
+"Erstellung der Sicherungskopien."
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
 "If you disable automatic detection, choose the exact location of the photos "
 "and videos."
 msgstr ""
+"Wenn Sie die automatische Erkennung ausschalten, wählen Sie den Ort zur "
+"Speicherung von Bildern und Filmen."
 
 #: rapid/glade3/prefs.ui.h:55
 msgid ""
@@ -1663,10 +1740,16 @@ msgid ""
 "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 von transportablen Speichergeräten "
+"einschalten, wird das ganze Gerät durchsucht. Dies kann je nach Grösse "
+"einige Zeit dauern.\n"
+"\n"
+"Ist diese Option eingeschaltet, so werden Sie nach der Erkennung eines "
+"Gerätes gefragt, ob es durchsucht werden soll oder nicht."
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
-msgstr "Ignorierte Pfade\t"
+msgid "Ignored Paths"
+msgstr "Pfade ignorieren"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1702,7 +1785,7 @@ msgstr "Ordner für Sicherungskopien der Bilder:"
 
 #: rapid/glade3/prefs.ui.h:67
 msgid "Photo backup location:"
-msgstr ""
+msgstr "Sicherungsort der Bilder"
 
 #: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
@@ -1714,17 +1797,21 @@ msgstr "_Alle entfernen"
 
 #: rapid/glade3/prefs.ui.h:72
 msgid "Re_move All"
-msgstr ""
+msgstr "Alle _entfernen"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
-msgstr "Bekannte Geräte"
+msgid "Remembered Paths"
+msgstr "Gespeicherte Pfade"
 
 #: 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
+"Gespeicherte Pfade sind Geräten zugeordnet, welche nach Ihren Vorgaben immer "
+"durchsucht oder immer ignoriert werden, sobald die automatische Erkennung "
+"von transportablen Speichergeräten eingeschaltet ist."
 
 #: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
@@ -1750,6 +1837,16 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Spezifizieren Sie den letzten Teil eines Pfades an, welcher beim Durchsuchen "
+"von Geräten nach Bildern oder Filmen ignoriert werden soll. Jegliche Pfade "
+"welche mit diesen Werten enden, werden nicht durchsucht."
+
+#: rapid/glade3/prefs.ui.h:80
+msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1763,7 +1860,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:82
+#: 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."
@@ -1771,7 +1868,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:83
+#: 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."
@@ -1779,48 +1876,52 @@ 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Beginn des Downloads bei Programmstart"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Mit dem Herunterladen beginnen, sobald ein Laufwerk verfügbar ist"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Gespeicherte Nummer"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Entferne nicht kompatible Zeichen"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronisiere RAW + JPEG Sequenznummern"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 "Unmount (\"Auswerfen\") des Laufwerkes, sobald das Herunterladen beendet ist"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Verwende _python-style reguläre Ausdrücke"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Filme Ordner"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Filme Umbenennen"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Sicherungsordner für Filme:"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
-msgstr ""
+msgstr "Sicherungsort für Filme"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1829,7 +1930,7 @@ msgstr ""
 "heruntergeladen wurde, entweder Datei überspringen oder eine eindeutige "
 "Bezeichnung anfügen."
 
-#: rapid/glade3/prefs.ui.h:95
+#: 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."
@@ -1837,7 +1938,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:96
+#: 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."
@@ -1845,14 +1946,10 @@ 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:97
+#: rapid/glade3/prefs.ui.h:99
 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"
@@ -2339,58 +2436,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Starting downloads"
 #~ msgstr "Beginne mit den Downloads"
 
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Bild: %(source)s\n"
-#~ "Fehler: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Bild: %(source)s"
-
 #~ msgid "<b>Image Name Conflicts</b>"
 #~ msgstr "<b>Konflikte der Bildernamen</b>"
 
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Der Wert für gespeicherte Anzahl wurde nicht aktualisiert, da gerade ein "
-#~ "Download stattfindet"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Der Wert für heutige Downloads wurde nicht aktualisiert, da gerade ein "
-#~ "Download stattfindet"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Quelle: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Fehler:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Temporäres Download-Verzeichnis konnte nicht erstellt werden"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Ziel: %s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Fehler: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Quelle: %(source)s\n"
-#~ "Ziel: %(destination)s\n"
-
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient image metadata to fully generate "
 #~ "the name. Please use other renaming options.</i>"
@@ -2399,45 +2447,9 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ "Dateinamen zu erzeugen. Bitte verwenden Sie eine andere Option zur "
 #~ "Umbenennung.</i>"
 
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Bilder mit gleichem Dateinamen aber abweichender Aufnahmezeit gefunden:"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Quelle: %(source)s\n"
-#~ "Teilweise erstellter Dateiname: %(newname)s\n"
-#~ "Ziel: %(destination)s\n"
-#~ "Problem: %(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Erstes Bild: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Zweites Bild: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
 #~ msgid "The image was not copied."
 #~ msgstr "Das Bild wurde nicht kopiert."
 
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Bilder-Laufwerk: %s\n"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Das Bild konnte auf dem Laufwerk nicht gelöscht werden."
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "%i Bilder auf dem Laufwerk gelöscht"
-
 #~ msgid "This device or partition will always be used to download from"
 #~ msgstr "Von diesem Laufwerk oder dieser Partition wird immer heruntergeladen"
 
@@ -2456,17 +2468,6 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgid "Enter a new job code."
 #~ msgstr "Geben Sie eine neue Auftragsbezeichnung an."
 
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problem mit dem Bildverzeichnis"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problem mit dem Dowanloadverzeichnis"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Warnung: Der Desktop-Benachrichtigungsdienst ist falsch konfiguriert."
-
 #, python-format
 #~ msgid "Device %(device)s (%(path)s) ignored"
 #~ msgstr "Laufwerk %(device)s (%(path)s) ignoriert"
@@ -2486,12 +2487,6 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ "Voreingestellter Schlüssel '%(key)s' ist ungültig.\n"
 #~ "Erwarteter Wert %(value)s"
 
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch Oktober 2007-2010"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ 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 "
@@ -2533,18 +2528,6 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ "Bitte überprüfen Sie die Voreinstellungen, starten Sie das Programm neu und "
 #~ "versuchen es erneut."
 
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Dieses Bildverzeichnis existiert nicht:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Erstellen Sie das Verzeichnis oder passen Sie die Voreinstellungen an."
-
 #~ msgid "There is an error in the program preferences."
 #~ msgstr "Fehler in den Programmvoreinstellungen."
 
@@ -2558,13 +2541,6 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgstr "Fehler in den Voreinstellungen zum Umbenennen der Dateien"
 
 #~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Das Downloadverzeichnis extisiert nicht. Erstellen Sie das Verzeichnis oder "
-#~ "passen Sie die Voreinstellungen an."
-
-#~ msgid ""
 #~ "Program preferences appear to be valid, but please check them to ensure "
 #~ "correct operation."
 #~ msgstr ""
@@ -2575,13 +2551,6 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ msgstr "Einige Voreinstellungen werden zurückgesetzt."
 
 #~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Das Downloadverzeichnis ist schreibgeschützt. Ändern Sie die Zugriffsrechte "
-#~ "oder passen Sie die Voreinstellungen an."
-
-#~ msgid ""
 #~ "The subfolder preferences entered are invalid and cannot be used.\n"
 #~ "They will be reset to their default values."
 #~ msgstr ""
@@ -2651,517 +2620,3 @@ msgstr "Importieren Sie Ihre Bilder und Filme schnell und zuverlässig"
 #~ "Laufwerk für Sicherungskopien verwendet wird oder nicht. Bitte erstellen Sie "
 #~ "auf jedem Laufwerk, welches Sie zur Datensicherung verwenden wollen, ein "
 #~ "Verzeichnis mit diesem Namen.</i>"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Durchsuchen der Laufwerke abgeschlossen: Keine %(filetypes)s gefunden auf "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Durchsuchen der Laufwerke abgeschlossen: %(number)s %(filetypes)s gefunden "
-#~ "auf %(device)s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 von %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s enthält keine Metadaten"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Bild übersprungen"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Laufwerk: %s\n"
-
-#~ msgid "Video already exists"
-#~ msgstr "Der Film exisiert bereits"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Das Bild exisiert bereits"
-
-#~ msgid "Video skipped"
-#~ msgstr "Film übersprungen"
-
-#~ msgid "videos skipped"
-#~ msgstr "Filme übersprungen"
-
-#~ msgid "videos downloaded"
-#~ msgstr "Filme heruntergeladen"
-
-#~ msgid "photos skipped"
-#~ msgstr "Bilder übersprungen"
-
-#~ msgid "photos downloaded"
-#~ msgstr "Bilder heruntergeladen"
-
-#~ 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."
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Erstes Bild: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Zweites Bild: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Bilder mit identischen Dateinamen aber unterschiedlichen Aufnahmezeiten "
-#~ "wurden gefunden:"
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "%(filetype)s Dateiname konnte nicht erstellt werden"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Bei den %(filetype)s Unterordner Einstellungen wurden überflüssige Werte "
-#~ "entfernt."
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "%(filetype)s Dateiname konnte nicht richtig erstellt werden. Bitte "
-#~ "überprüfen Sie die Vollständigkeit der Metadaten."
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Der folgende Downloadpfad konnte nicht erstellt werden::\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "%s(filetype)s konnte nicht geöffnet werden"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "%(file_type)s wurde nicht gesichert."
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Sicherungskopie %(file_type)s wurde überschrieben"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s konnte nicht auf %(volume)s gesichert werden"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Sicherungskopie von %(file_type)s exisiert bereits"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Unterordner: %(subfolder)s\n"
-#~ "Datei: %(file)s\n"
-#~ "Problem: %(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Metadata sind notwendig für die Erstellung von Unterordnern und/oder "
-#~ "Dateinamen.\n"
-#~ "Quelle: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Die Namen der Unterordner konnten nicht erstellt werden. Bitte überprüfen "
-#~ "Sie die Vollständigkeit der metadaten."
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s wurde nicht gesichert"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s übersprungen"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Das Laufwerk enthält keine %(types_searched_for)s zum Herunterladen"
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Das Vorschaubild konnte nicht angezeigt werden"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Es können keine Sicherungskopien erstellt werden"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Der Pfad %s konnte nicht erstellt werden"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Der Pfad zum Sicherungsverzeichnis ist ungültig"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Es wurde kein Sicherungsverzeichnis gefunden"
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Es wurde kein verwendbares Sicherungslaufwerk gefunden"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "%(file_type)s konnte nicht gesichert werden"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Es konnten von dem Laufwerk keine Bilder oder Filme gelöscht werden"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Bild: %(source)s\n"
-#~ "Fehler: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Das %(file_type)s Downloadverzeichnis existiert nicht.\n"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "%(number)i %(filetypes)s vom Laufwerk gelöscht"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Es wurde kein Sicherungslaufwerk automatisch erkannt"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Dieser Laufwerkspfad existiert nicht:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Beheben Sie das Problem oder ändern Sie die Voreinstellungen."
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Bild: %(source)s"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Probleme mit dem Laufwerk oder Verzeichnis"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr ""
-#~ "Das %(file_type)s Downloadverzeichnis existiert, ist aber schreibgeschützt.\n"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Mit den Downloadverzeichnissen bestehen Probleme. Bitte beheben Sie diese "
-#~ "oder passen Sie die Voreinstellungen an.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr ""
-#~ "%(folder)s konnte als Standardverzeichnis zum Herunterladen der Filme nicht "
-#~ "erstellt werden"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "%(folder)s für das Herunterladen der Bilder erstellt"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "%(folder)s für das Herunterladen der Filme erstellt"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr ""
-#~ "%(folder)s konnte als Standardverzeichnis zum Herunterladen der Bilder nicht "
-#~ "erstellt werden"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Probleme mit den Downloadverzeichnissen"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "Eine Bild- oder Filmnummer wurde angegeben, aber der Dateiname enthält keine "
-#~ "Nummer"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "%s Metadaten existieren im Bild nicht"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "Ein Dateityp wurde angegeben aber der Dateiname enthält keinen Typen"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Hundertstelssekunden Metadaten sind nicht vorhanden"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "%s Metadaten existieren im Film nicht"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "%s Metadaten sind nicht vorhanden"
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr ""
-#~ "Programm beenden falls das Herunterladen ohne Fehler oder Warnungen "
-#~ "abgeschlossen wird."
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr ""
-#~ "Wählen Sie, ob der Download übersprungen oder eine eindeutige Bezeichnung "
-#~ "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 ""
-#~ "Das Herunterladen von Filmen steht aktuell nicht zur Verfügung. Um dies zu "
-#~ "ermöglichen muss zunächst das Paket <i>kaa metadata</i> für Python "
-#~ "installiert werden."
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Geben Sie an was zu tun ist, falls im Download- oder Sicherungsverzeichnis "
-#~ "bereits eine Datei mit demselben Namen exisiert."
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Konnte %(filetype)s nicht öffnen"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "Die %(filetype)s wurde nicht kopiert."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Quelle: %(source)s\n"
-#~ "Ziel: %(destination)s\n"
-#~ "%(problem)s"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Versuche %s Dateien herunterzuladen"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Bilder werden von der Kamera heruntergeladen"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Das direkte Herunterladen von der Kamera kann unter Umständen schlecht oder "
-#~ "gar nicht funktionieren"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Das Herunterladen über einen Kartenleser generell gut und ist normalerweise "
-#~ "auch viel schneller. Dies ist die dringend empfohlene Methode."
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Meldung erneut anzeigen"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Bitte überprüfen Sie Ihr System und versuchen Sie es erneut"
-
-#~ msgid "Path"
-#~ msgstr "Pfad"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s wurde nicht heruntergeladen"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s wurde erfolgreich heruntergeladen"
-
-#~ msgid "File"
-#~ msgstr "Datei"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Geben Sie eine neue Auftragsbezeichnung ein und drücken Sie EINGABE oder "
-#~ "selektieren Sie eine bestehende Auftragsbezeichnung"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s wurde heruntergeladen, beim Erstellen der Sicherungskopie "
-#~ "traten aber Fehler auf"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s wurde mit Warnungen heruntergeladen"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s ist bereit zum Herunterladen"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s wird mit Warnungen weruntergeladen"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s wird weruntergeladen"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr ""
-#~ "%(filetype)s wurde weder heruntergeladen noch wurde eine Sicherungskopie "
-#~ "erstellt"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr ""
-#~ "Eine Warnung betreffend das direkte Herunterladen von der Kamera wird "
-#~ "angezeigt"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s kann nicht heruntergeladen werden"
-
-#~ msgid "Preview"
-#~ msgstr "Vorschau"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Die Benutzervorgaben für Sicherungslaufwerke wurden geändert."
-
-#~ msgid "_Download All"
-#~ msgstr "_Alle Herunterladen"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "_Herunterladen ausgewählt"
-
-#~ msgid "_Resume"
-#~ msgstr "_Fortsetzen"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Die Benutzervorgaben für Unterordner und Dateinamen wurden geändert."
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "Die Benutzervorgaben für Quellaufwerke wurden geändert."
-
-#~ msgid "Select _All"
-#~ msgstr "_Alles auswählen"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Alle Filme auswählen"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Alle Bilder auswählen"
-
-#~ msgid "Se_lect None"
-#~ msgstr "Keine Auswahl"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Order anzeigen"
-
-#~ msgid "P_review Columns"
-#~ msgstr "Spalten anzeigen"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Die Benutzervorgaben für Downloadordner wurden geändert."
-
-#~ msgid "_Device"
-#~ msgstr "_Laufwerk"
-
-#~ msgid "_Filename"
-#~ msgstr "_Dateiname"
-
-#~ msgid "_Path"
-#~ msgstr "_Pfad"
-
-#~ msgid "_Preview"
-#~ msgstr "_Vorschau"
-
-#~ msgid "_Type"
-#~ msgstr "_Typ"
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Vorsicht: Vom Sicherungslaufwerk %(device)s findet ein Download statt"
-
-#~ msgid "_Size"
-#~ msgstr "_Grösse"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s verfügbar"
-
-#~ msgid "Miscillaneous"
-#~ msgstr "Verschiedenes"
diff --git a/po/es.po b/po/es.po
index 6a3a0c9..55762c0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 12:39+0000\n"
+"Last-Translator: Aiguanachein <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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,54 +31,54 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Tamaño"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
-msgstr "Progreso de descarga"
+msgstr "Progreso de la descarga"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
-msgstr "%(device)s no se extrajo"
+msgstr "%(device)s no se desmontó"
 
 #. 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
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "explorando..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Descargar"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
-msgstr "Pausa"
+msgstr "Pausar"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,136 +98,136 @@ msgstr ""
 "Directorio de descarga incorrecto:\n"
 "%s"
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "No se puede iniciar la descarga"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Aproximadamente 1 segundo restante"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Aproximadamente %i segundos restantes"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Falta %(minutes)i:%(seconds)02i minutos restantes"
+msgstr "Aproximadamente %(minutes)i:%(seconds)02i minutos restantes"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotos y videos"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "fotos y vídeos"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vídeos"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descargados"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s fallo al descargar"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "advertencias"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Todas las descargas completadas"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s descargados"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s fallo en la descarga"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "y"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Usando dispositivo de copia de seguridad"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Dispositivos de copia de seguridad no detectados"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, 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:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,89 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s disponible"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Haciendo un respaldo de las fotografías y vídeos en %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Realizar copia de seguridad en %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+"Haciendo un respaldo de las fotografías en %(path)s y de los vídeos en "
+"%(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Las preferencias son incorrectas"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s directorio de descarga no existe"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Carpeta: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s directorio de descarga es incorrecto"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s imposible escribir en directorio de descarga"
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,46 +326,46 @@ 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:3312
+#: rapid/rapid.py:3485
 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:3313
+#: rapid/rapid.py:3486
 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:3315
+#: rapid/rapid.py:3488
 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:3316
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 "Restablecer todas las configuraciones y preferencias del programa y salir"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Fotografias"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Videos:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "y %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Todas las opciones y preferencias se han reestablecido"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -361,16 +375,16 @@ msgstr ""
 "Para activarla, por favor instale los paquetes hachoir y kaa metadata para "
 "python"
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Error en copia de seguridad"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "El directorio de destino no puede ser creado: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -379,13 +393,13 @@ msgstr ""
 "Origen: %(source)s\n"
 "Destino: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Error: %(inst)s"
 
-#: 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"
@@ -411,7 +425,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "_Recordar esta elección"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
@@ -436,7 +450,7 @@ msgid "Sequences"
 msgstr "Secuencias"
 
 #. 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 "Código de trabajo"
 
@@ -782,75 +796,106 @@ msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Preferencias de subcarpeta no debe contener dos %s una después de la otra"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "¿Borrar todos los Códigos de Trabajo?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "¿Quitar todos los Codigos de Trabajo?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "¿Quitar todas las rutas memorizadas?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "¿Deben de quitarse todas las rutas memorizadas?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "¿Quitar todas las rutas ignoradas?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "¿Deben de quitarse todas las rutas memorizadas?"
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Error en las preferencias de renombrado de fotos"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Error en las preferencias de renombrado de vídeos"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Error en las preferencias en las subcarpetas de descarga de Fotos"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Error en las preferencias en las subcarpetas de descarga de Videos"
 
 #. 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 "Ingrese un Código de trabajo"
 
 #. 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 "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
+#: rapid/preferencesdialog.py:754
 msgid "Enter a new Job Code"
 msgstr "Inserte un nuevo código de trabajo"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Código de trabajo:"
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Introduce una ruta a ignorar"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr "Especifica una ruta que nunca será escaneada para fotos o vídeos"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Ruta:"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Código de trabajo"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Selecciona un directorio donde descargar las fotos"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Selecciona un directorio donde descargar los videos"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(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"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
 msgstr ""
-"Selecciona un directorio donde realizar la copia de seguridad de "
-"%(file_types)s"
+"Seleccione una carpeta en la que se hará una copia de seguridad de las fotos"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr ""
+"Seleccione una carpeta en la que se hará una copia de seguridad de los vídeos"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -858,7 +903,7 @@ 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
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -867,13 +912,13 @@ msgstr ""
 "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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Ejemplo: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -884,94 +929,120 @@ msgstr ""
 "pueden ser utilizadas.\n"
 "Se ajustaran a los valores por defecto"
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Las siguientes expresiones no son válidas y serán eliminadas a no ser que "
+"las corrija:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Esta expresión regular no es válida, y se eliminará a menos que use una "
+"correcta:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Expresión regular inválida"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "dispositivoexterno1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "dispositivoexterno2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "Nueva York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "París"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlín"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sídney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moscú"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varsovia"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Estocolmo"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "subdirectorio"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "nombre de archivo"
 
@@ -1027,11 +1098,9 @@ msgstr ""
 #: 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."
+"%(image1)s was taken 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
@@ -1238,7 +1307,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Varios problemas fueron encontrados"
 
-#: 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 ""
 "Fotos detectadas con el mismo nombre de archivo, pero tomadas a distinta hora"
@@ -1275,24 +1344,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "La fotografia ya ha sido descargada"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origen: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "Subdirectorio y nombre de archivo"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Fallo al crear carpeta para descargas"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Ruta: %s"
@@ -1407,7 +1476,7 @@ msgstr "_Seleccionar"
 
 #: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
-msgstr "_Traducir esta aplicación..."
+msgstr "_Traducir esta aplicación…"
 
 #: rapid/glade3/rapid.ui.h:31
 msgid "_Uncheck All"
@@ -1496,6 +1565,7 @@ 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 ""
+"<span weight=\"bold\" size=\"x-large\">Opciones de Dispositivo</span>"
 
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
@@ -1511,15 +1581,16 @@ msgstr "<span weight=\"bold\" size=\"x-large\">Códigos de trabajo</span>"
 
 #: rapid/glade3/prefs.ui.h:24
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr ""
+msgstr "<span weight=\"bold\" size=\"x-large\">Misceláneo</span>"
 
 #: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Carpeta de Descarga de Fotos</span>"
 
 #: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr ""
+msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar Foto</span>\t"
 
 #: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
@@ -1528,10 +1599,11 @@ msgstr "<span weight=\"bold\" size=\"x-large\">Opciones de renombre</span>"
 #: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Carpetas de Descargas de Vídeos</span>"
 
 #: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-msgstr ""
+msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar Vídeo</span>\t"
 
 #: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
@@ -1620,6 +1692,7 @@ msgstr "Manejo de errores"
 #: rapid/glade3/prefs.ui.h:50
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
+"Salir del programa, incluso si la descarga tiene advertencias o errores"
 
 #: rapid/glade3/prefs.ui.h:51
 msgid "Exit program when download completes"
@@ -1654,8 +1727,8 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
-msgstr ""
+msgid "Ignored Paths"
+msgstr "IRutas ignoradas"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1706,16 +1779,15 @@ msgid "Re_move All"
 msgstr "Re_tirar todo"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
-msgstr "Recordar dispositivos utilizados"
+msgid "Remembered Paths"
+msgstr "Rutas recordadas"
 
 #: 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore 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"
@@ -1741,6 +1813,13 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of 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"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1748,7 +1827,7 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:82
+#: 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."
@@ -1756,53 +1835,59 @@ 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:83
+#: 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 ""
+"Especifique si se debería de retirar algún caracter no permitido por otros "
+"sistemas operativos de los nombres de las fotos, vídeos y carpetas."
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Empezar descargas al iniciar el programa"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Comenzar a descargar al conectar un dispositivo"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Número almacenado:"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Quitar carácteres incompatibles"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizar números de secuencia de RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Extraer (\"eject\") el dispositivo al concluir la descarga"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Carpetas de vídeo"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Renombrar vídeo"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Nombre de la carpeta para copia de seguridad de videos:"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr "Ubicacion de la copia de seguridad de videos:"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1810,29 +1895,30 @@ 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:95
+#: 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 ""
+"Cuando haga copia de seguridad, elija si desea sobrescribir un archivo en el "
+"dispositivo de copia de seguridad que tenga el mismo nombre, o salte hacer "
+"respaldo."
 
-#: rapid/glade3/prefs.ui.h:96
+#: 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 ""
+"Usted puede tener sus copia de seguridad  de fotos y videos en múltiples "
+"lugares, una vez descargados, por ejemplo, discos duros externos."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 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 "descargue sus fotografias y videos de forma eficaz y segura"
+msgstr "Descargue sus fotografías y vídeos de forma eficaz y segura"
 
 #, python-format
 #~ msgid "0 of %s images copied"
@@ -2474,144 +2560,12 @@ msgstr "descargue sus fotografias y videos de forma eficaz y segura"
 #~ "El nombre de la subcarpeta no pudo ser generado correctamente. Compruebe que "
 #~ "existan suficientes metadatos."
 
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Imagen: %(source)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "No se pudo eliminar la imagen del dispositivo de imágenes"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Imagen: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Se eliminaron %i imágenes del dispositivo de imágenes"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr ""
-#~ "Eliminar imágenes de dispositivo de imágenes cuando se completen las "
-#~ "descargas"
-
 #~ msgid "Image has no thumbnail"
 #~ msgstr "La imagen no tiene miniatura"
 
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Imágenes detectadas con el mismo nombre de archivo, pero tomadas en "
-#~ "diferentes momentos"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Primera imagen: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Segunda imagen: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "Error:"
-#~ msgstr "Error:"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Lo sentimos, la Carpeta de Descarga no existe. Por favor, cree la carpeta, o "
-#~ "modifique sus preferencias"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problema con la Carpeta de Descarga"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Lo sentimos, la Carpeta de Descarga existe pero no puede ser escrita. Por "
-#~ "favor compruebe los permisos de la carpeta, o modifique sus preferencias"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Dispositivo de imagen: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Origen: %s\n"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destino: %s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Error: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Origen: %(source)s\n"
-#~ "Destino: %(destination)s\n"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "No se pudo crear el directorio de descarga temporal"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Disculpe, la ubicación de la imagen no existe:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Por favor, resuelva el problema, o modifique sus preferencias."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Origen: %(source)s\n"
-#~ "Archivo generado parcialmente: %(newname)s\n"
-#~ "Destino: %(destination)s\n"
-#~ "Problema: %(problem)s"
-
 #~ msgid "Image filename could not be generated"
 #~ msgstr "No se pudo generar el nombre del archivo de imagen"
 
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "El número de almacenados no se actualizó, pues se está haciendo una descarga "
-#~ "actualmente."
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "El número de descargas de hoy no se actualizó, pues se está haciendo una "
-#~ "descarga actualmente."
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problema con Ubicación de Carpeta de Imagen"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Advertencia: el servidor de notificaciones del entorno de escritorio no está "
-#~ "configurado correctamente."
-
 #~ msgid "_Report a Problem..."
 #~ msgstr "_Reportar problema..."
 
@@ -2621,148 +2575,3 @@ msgstr "descargue sus fotografias y videos de forma eficaz y segura"
 #~ msgstr ""
 #~ "Puede tener respaldos de sus fotos en múltiples ubicaciones, por ejemplo: "
 #~ "discos duros externos."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Primera foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Segunda foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Dispositivo: %s\n"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Foto ya existe"
-
-#~ msgid "Video skipped"
-#~ msgstr "Video saltado"
-
-#~ msgid "Video already exists"
-#~ msgstr "Video ya existe"
-
-#~ msgid "photos skipped"
-#~ msgstr "fotos saltadas"
-
-#~ msgid "photos downloaded"
-#~ msgstr "fotos descargadas"
-
-#~ msgid "videos downloaded"
-#~ msgstr "videos descargados"
-
-#~ 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 ""
-#~ "Escaneo del dispositivo completo: no se encuentran %(filetypes)s en "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Escaneo del dispositivo completo: se encontro %(number)s %(filetypes)s en "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 de %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Origen: %(source)s\n"
-#~ "Destino: %(destination)s\n"
-#~ "%(problem)s"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Foto: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Foto: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Descargando desde las camaras"
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Mostrar este mensaje de nuevo"
-
-#~ msgid "Date"
-#~ msgstr "Fecha"
-
-#~ msgid "File"
-#~ msgstr "Archivo"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Path"
-#~ msgstr "Ruta"
-
-#~ msgid "Preview"
-#~ msgstr "Vista previa"
-
-#~ msgid "_Resume"
-#~ msgstr "_Reanudar"
-
-#~ msgid "_Download All"
-#~ msgstr "_Descargar tod"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Seleccionar todos los ví_deos"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Seleccionar todas las fo_tos"
-
-#~ msgid "Select _All"
-#~ msgstr "Seleccionar _todo"
-
-#~ msgid "_Device"
-#~ msgstr "_Dispositivo"
-
-#~ msgid "_Filename"
-#~ msgstr "Nombre de _archivo"
-
-#~ msgid "_Preview"
-#~ msgstr "Vista _previa"
-
-#~ msgid "_Size"
-#~ msgstr "_Tamaño"
-
-#~ msgid "_Type"
-#~ msgstr "_Tipo"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Descargas directas desde una cámara puede que no funcionen o funcionen mal"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "No se pudo borrar foto o video del dispositivo"
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr "Salir del programa si se completa la descarga sin avisos ni errores"
diff --git a/po/fr.po b/po/fr.po
index 9c10d14..e7e526c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-10-01 08:33+0000\n"
+"Last-Translator: Julien Valroff <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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-10-01 15:09+0000\n"
+"X-Generator: Launchpad (build 14071)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -32,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Périphérique"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Taille"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Progression du transfert"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "Le périphérique %(device)s n'a pas été démonté"
@@ -67,19 +67,19 @@ msgstr "Le périphérique %(device)s n'a pas été démonté"
 #. 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:1178
 msgid "scanning..."
 msgstr "Détection en cours..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Transférer"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -90,7 +90,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, 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:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Impossible de procéder au transfert"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Environ 1 seconde restante"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Environ %i secondes restantes"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Environ %(minutes)i:%(seconds)02i restantes"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "photos et vidéos"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "photos ou vidéos"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vidéos"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vidéo"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "photos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "photo"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s transférés"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "erreur lors du transfert de %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "avertissements"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s téléchargé"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, 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:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s sur %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "et"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Utilisation des volumes de sauvegarde"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Utilisation du volume de sauvegarde"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détécté"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, 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:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,87 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s disponibles"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Sauvegarde des photos et vidéos vers %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sauvegarde sur %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Sauvegarde des photos vers %(path)s et des vidéos vers %(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Les préférences de l'application sont invalides"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Photo"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Vidéo"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, 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:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Répertoire: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, 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:3186
+#: rapid/rapid.py:3359
 #, 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:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,42 +325,42 @@ msgstr ""
 "affiche les informations de l'application sur la ligne de commande lorsque "
 "l'application est active (défaut: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "Affiche les informations de débogage en mode console"
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3486
 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:3315
+#: rapid/rapid.py:3488
 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:3316
+#: rapid/rapid.py:3490
 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:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Photos :"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Vidéos :"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "et %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 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:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -358,16 +370,16 @@ msgstr ""
 "Afin de transférer des vidéos, installez hachoir metadata et kaa metadata "
 "pour python."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Erreur lors de la sauvegarde"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Le dossier de destination n'a pas pu être créé %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -376,13 +388,13 @@ msgstr ""
 "Source : %(source)s\n"
 "Destination : %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Erreur : %(inst)s"
 
-#: 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"
@@ -408,7 +420,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "Se souveni_r de ce choix"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "Mo/s"
 
@@ -433,7 +445,7 @@ 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:151 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
 msgid "Job code"
 msgstr "Étiquette de transfert"
 
@@ -456,7 +468,7 @@ msgstr "Hier"
 #. 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 "Temps de transfert"
+msgstr "Date du transfert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
 #: rapid/generatenameconfig.py:159
@@ -781,75 +793,108 @@ msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Les préférences de sous-dossier ne devraient pas contenir deux %s consécutifs"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Supprimer toutes les étiquettes de transfert ?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer toutes les étiquettes de transfert ?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Supprimer tous les emplacements mémorisés ?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Supprimer tous les emplacements mémorisés ?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Enlever tous les exmplacements exclus ?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Enlever tous les exmplacements exclus ?"
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Erreur dans les préférences de renommage des photos"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Erreur dans les préférences de renommage des vidéos"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Erreur dans les préférences des sous-dossiers de transfert de photos"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Erreur dans les préférences des sous-dossiers de transfert de vidéos"
 
 #. 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 "Entrer une étiquette de transfert"
 
 #. 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 ""
 "Séléctionnez une étiquette de transfert existante ou créez en une nouvelle"
 
 #. 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 "Entrez une nouvelle étiquette de transfert"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Étiquette de transfert"
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Saisissez un emplacement à exclure"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+"Saisissez un emplacement pour lequel les photos et les vidéos ne seront pas "
+"recherchées"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Emplacement :"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Code Tâche"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Sélectionnez le dossier de destination"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Sélectionnez un dossier vers lequel transférer vos vidéos"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Sélectionnez un dossier contenant %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Séléctionnez un dossier dans lequel sauvegarder %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Choisissez un dossier dans lequel sauvegarder les photos"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Choisissez un dossier dans lequel sauvegarder les vidéos"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -857,7 +902,7 @@ msgstr ""
 "<i><b>Attention :</b> Il n'y a pas assez de métadonnées pour générer "
 "correctement le nom. Utilisez d'autres options de renommage.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -867,13 +912,13 @@ msgstr ""
 "nommer les sous-dossiers.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemple : %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -884,94 +929,120 @@ msgstr ""
 "être utilisées.\n"
 "Elles vont être réinitialiseées à leurs valeurs par défaut."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Les expressions rationnelles ci-dessous sont invalides et seront enlevées si "
+"vous ne les corrigez pas :\n"
+"%s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Cette expression rationnelle est invalide et sera enlevée si vous ne la "
+"corrigez pas :\n"
+"%s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Expression rationnelle non valide"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "disqueexterne1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "disqueexterne2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manille"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Prague"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Téhéran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Rome"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moscou"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varsovie"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "sous-dossier"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "nom de fichier"
 
@@ -1027,10 +1098,10 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s à été prise le %(image1_date)s à %(image1_time)s, et %(image2)s "
+"%(image1)s a été prise le %(image1_date)s à %(image1_time)s, et %(image2)s "
 "le %(image2_date)s à %(image2_time)s."
 
 #: rapid/problemnotification.py:103
@@ -1238,7 +1309,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Plusieurs problèmes ont été rencontrés"
 
-#: 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 ""
 "Des photos portant le même nom mais prises à différents moments ont été "
@@ -1276,24 +1347,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "La photo a déjà été téléchargée"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Source : %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "Sous-dossier et nom de fichier"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Echec de création de sous-répertoire de téléchargement"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Chemin: %s"
@@ -1432,7 +1503,7 @@ msgstr ":"
 
 #: rapid/glade3/prefs.ui.h:4
 msgid "<b>Backup</b>"
-msgstr "<b>Sauvegarde</b>"
+msgstr "<b>Sauvegardes</b>"
 
 #: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
@@ -1497,7 +1568,7 @@ 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>"
+"<span weight=\"bold\" size=\"x-large\">Options des périphériques</span>"
 
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
@@ -1578,8 +1649,8 @@ msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
-"Choisissez le dossier de téléchargement. Des sous-dossiers pour les vidéos "
-"téléchargées seront automatiquement créés dans ce dossier en utilisant la "
+"Choisissez le dossier de destination. Des sous-dossiers pour les vidéos "
+"transférées seront automatiquement créés dans ce dossier en utilisant la "
 "structure spécifiée ci-dessous."
 
 #: rapid/glade3/prefs.ui.h:38
@@ -1593,7 +1664,7 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:40
 msgid "Device Options"
-msgstr "Options du périphérique"
+msgstr "Options des périphériques"
 
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
@@ -1626,7 +1697,7 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
-msgstr "Dossier de téléchargement:"
+msgstr "Dossier de destination :"
 
 #: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
@@ -1674,15 +1745,15 @@ msgid ""
 "prompted to determine if it should be scanned or not."
 msgstr ""
 "Si vous activez la détection automatique des volumes de stockage amovibles, "
-"le périphérique sera scanné dans son entièreté. Pour les grands volumes, "
+"le périphérique sera scanné dans son intégralité. 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"
+msgid "Ignored Paths"
+msgstr "Emplacements exclus"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1718,7 +1789,7 @@ msgstr "Dossier de sauvegarde des photos :"
 
 #: rapid/glade3/prefs.ui.h:67
 msgid "Photo backup location:"
-msgstr "Emplacement de sauvegarde photo:"
+msgstr "Emplacement de sauvegarde des photos :"
 
 #: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
@@ -1726,24 +1797,25 @@ msgstr "Préférences : Rapid Photo Downloader"
 
 #: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
-msgstr "Supprim_er tout"
+msgstr "Tout supprim_er"
 
 #: 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"
+msgid "Remembered Paths"
+msgstr "Emplacements 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore 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."
+"Les emplacements mémorisés sont associés aux périphériques que vous avez "
+"choisis de toujours scanner ou ignorer lorsque la détection automatique des "
+"périphériques de stockage amovible est activée."
 
 #: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
@@ -1769,6 +1841,16 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Spécifiez la portion finale de tout emplacement que vous souhaitez ignorer "
+"lors d'une recherche de photos ou de vidéos sur un périphérique. Tout "
+"emplacement se terminant par ces valeurs sera ignoré lors de la recherche."
+
+#: rapid/glade3/prefs.ui.h:80
+msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1782,7 +1864,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:82
+#: 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."
@@ -1790,7 +1872,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:83
+#: 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."
@@ -1799,48 +1881,52 @@ msgstr ""
 "caractères supprimés n'étant pas autorisés par d'autre systèmes "
 "d'exploitation."
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Démarrer le transfert au démarrage de l'application"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Commencer le transfert lors de l'insertion d'un périphérique"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Nombre stocké :"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Enlever les caractères incompatibles"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 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:89
+#: rapid/glade3/prefs.ui.h:90
 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:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Utiliser les expressions rationnelles de type _python"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Dossiers vidéos"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Renommage des vidéos"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Dossier de sauvegarde des vidéos :"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
-msgstr "Emplacement de sauvegarde vidéo:"
+msgstr "Emplacement de sauvegarde des vidéos :"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1849,7 +1935,7 @@ msgstr ""
 "choisissez si vous souhaitez sauter le transfert ou si vous préférez ajouter "
 "un identifiant unique."
 
-#: rapid/glade3/prefs.ui.h:95
+#: 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."
@@ -1857,7 +1943,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:96
+#: 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."
@@ -1865,14 +1951,10 @@ 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:97
+#: rapid/glade3/prefs.ui.h:99
 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"
@@ -2387,127 +2469,6 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgid "Device scan complete: no images found on %s"
 #~ msgstr "Détection terminée : aucune image trouvée sur %s"
 
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Impossible de supprimer l'image du volume"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Image : %(source)s\n"
-#~ "Erreur : %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Image : %(source)s"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "%i images ont été supprimées du volume"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Supprimer les images du volume après le transfert"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Un transfert est en cours : la valeur de 'Transferts journaliers' ne sera "
-#~ "pas mise à jour."
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Un transfert est en cours : la valeur du nombre stocké ne sera pas mise à "
-#~ "jour."
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Images ayant le même nom de fichier, mais prises à des heures différentes :"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Première image : %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Seconde image : %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Source : %(source)s\n"
-#~ "Nom de fichier patiellement généré : %(newname)s\n"
-#~ "Destination : %(destination)s\n"
-#~ "Problème : %(problem)s"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Le dossier de transfert temporaire n'a pas pu être créé"
-
-#~ msgid "Error:"
-#~ msgstr "Erreur :"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destination %s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Erreur : %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Source : %(source)s\n"
-#~ "Destination : %(destination)s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Désolé, l'emplacement de l'image n'existe pas :\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Résolvez le problème ou modifiez vos préférences."
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Avertissement : le serveur de notification de l'environnement de bureau est "
-#~ "incorrectement configuré."
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problème avec le dossier de transfert"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Désolé, le dossier de transfert n'est pas accessible en écriture. Vérifiez "
-#~ "les permissions du dossier ou modifiez vos préférences"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problème avec l'emplacement du dossier de l'image"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Désolé, le dossier de transfert n'existe pas. Créez le dossier ou modifiez "
-#~ "vos préférences"
-
 #~ msgid "The subfolder preferences had some unnecessary values removed."
 #~ msgstr ""
 #~ "Les préférences pour le sous-dossier présentent des valeurs inutiles qui ont "
@@ -2517,309 +2478,12 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ msgstr "Erreur dans les préférences concernant le sous-dossier de transfert"
 
 #, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Source : %s\n"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Volume d'images : %s\n"
-
-#, python-format
 #~ msgid "Prompting whether to use %s"
 #~ msgstr "Affichage du choix d'utilisation ou non de %s"
 
 #~ msgid "Already prompting for Job Code, do not prompt again"
 #~ msgstr "Affiche déjà pour l'étiquette de transfert, n'affichera plus"
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Le périphérique a été entièrement scanné : aucun %(filetypes)s n'a été "
-#~ "trouvé sur %(device)s"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Le chemin de transfert suivant n'a pas pu être créé :\n"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Périphérique: %s\n"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Aucune sauvegarde possible"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Le chemin %s n'a pas pu être créé"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Le chemin de sauvegarde n'existe pas"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Vérifiez votre système et essayez à nouveau"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Le périphérique a été entièrement scanné : %(number)s %(filetypes)s ont été "
-#~ "trouvés sur %(device)s"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s non sauvé sur %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Une sauvegarde de %(file_type)s existe déjà"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Les préférences de dossier %(filetype)s ont des valeurs inutiles qui ont été "
-#~ "enlevées."
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Sauvegarde de %(file_type)s écrasée"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "%(file_type)s n'a pas pu être sauvé"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "%(file_type)s n'a pas été sauvé."
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s non sauvé"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Tentative de téléchargement de %s fichiers"
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Aucun volume de sauvegarde aproprié n'a été trouvé"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Photo : %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Photo : %(source)s\n"
-#~ "Erreur : %(errno)s %(strerror)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Téléchargement depuis les appareils photo"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Télécharger directement depuis un appareil photo peut mal fonctionner, voire "
-#~ "non fonctionner."
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Télécharger depuis un lecteur de carte marche toujours et est généralement "
-#~ "plus rapide. Il est fortement recommandé d'utiliser un lecteur de carte."
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Suprression de %(number)i %(filetypes)s du périphérique"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Impossible de supprimer la photo ou vidéo du périphérique"
-
-#~ msgid "Path"
-#~ msgstr "Chemin"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s n'a pas été téléchargé"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s a été téléchargé avec succès"
-
-#~ msgid "File"
-#~ msgstr "Fichier"
-
-#~ msgid "Status"
-#~ msgstr "État"
-
-#~ msgid "Type"
-#~ msgstr "Type"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s a été téléchargé mais il y a eu des problèmes de sauvegarde"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s a été téléchargé avec des avertissements"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s est prêt à être téléchargé"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s sera téléchargé avec des avertissements"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s va être téléchargé"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s n'a ni été téléchargé ni sauvegardé"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s ne peut être téléchargé"
-
-#~ msgid "Preview"
-#~ msgstr "Aperçu"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Désolé, ce périphérique n'existe pas :\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Veuillez résoudre le problème, ou modifier vos préférences."
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr ""
-#~ "Le dossier de téléchargement de %(file_type)s existe mais on ne peut y "
-#~ "écrire.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Le dossier de téléchargement de %(file_type)s n'existe pas.\n"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Problèmes avec les dossiers de téléchargement."
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Désolé, des problèmes ont été rencontrés avec vos dossiers de "
-#~ "téléchargement. Veuillez réparer les problèmes ou modifier les préférences.\n"
-#~ "\n"
-
-#~ msgid "_Resume"
-#~ msgstr "_Reprendre"
-
-#~ msgid "_Show this message again"
-#~ msgstr "Continuer d'afficher ce me_ssage"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr ""
-#~ "Échec de la création du dossier de destination par défaut des vidéos "
-#~ "%(folder)s"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Création du dossier de destination des photos %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Création du dossier de destination des viédos %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr ""
-#~ "Échec de la création du dossier de destination par défaut des photos "
-#~ "%(folder)s"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr ""
-#~ "Les préférences de sous-dossier et de nom de fichier ont été modifiées."
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Les préférences de sauvegarde ont été modifiées."
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr ""
-#~ "Quitter le programme après un transfert réussi, sans erreur ni avertissement"
-
-#~ 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"
-
-#~ msgid "_Preview"
-#~ msgstr "A_perçu"
-
-#~ msgid "Select _All"
-#~ msgstr "Sélectionner t_out"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Sélectionner toutes les Vi_déos"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Sélectionner toutes les Pho_tos"
-
-#~ msgid "Se_lect None"
-#~ msgstr "Sé_lectionner Aucun"
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Désolé, la fonctionnalité de téléchargement de vidéos est désactivée. Pour "
-#~ "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"
-
 #~ msgid "There is an error in the program preferences."
 #~ msgstr "Il y a une erreur dans les préférences du programme."
 
@@ -2955,29 +2619,6 @@ msgstr "Transférez vos photos et vidéos de façon simple et fiable"
 #~ 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."
diff --git a/po/hu.po b/po/hu.po
index c5a75fc..5da37d2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,22 +7,22 @@ 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-04 20:59+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 19:20+0000\n"
 "Last-Translator: loriand <level.andrasnak@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Eszköz"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Méret"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Letöltés Folyamatban"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s eszköz nem lett csatlakoztatva"
@@ -66,19 +66,19 @@ msgstr "%(device)s eszköz nem lett csatlakoztatva"
 #. 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:1178
 msgid "scanning..."
 msgstr "keresés..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Letöltés"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Megállítás"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2190
 #, 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:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,95 +98,95 @@ msgstr ""
 "Nem jó a letöltési könyvtár:\n"
 "%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "A letöltés megszakadt."
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Kb. 1 másodperc van hátra"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Kb. %i másodperc van hátra"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2507
 msgid "About 1 minute remaining"
 msgstr "Kb. 1 perc van hátra"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2394
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Kb. %(minutes)i:%(seconds)02i perc van hátra"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fényképek és videók"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "fénykép vagy videó"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "videók"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "videó"
 
-#: rapid/rapid.py:2426 rapid/rapid.py:2963 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fényképek"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "fénykép"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Letöltve: %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s : sikertelen letöltés"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "figyelmeztetések"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Minden letöltés befejeződött"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s letöltve"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s letöltése sikertelen volt"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2663
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
@@ -194,42 +194,42 @@ msgstr ""
 "hátra van)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(total)s %(filetypes)s összesen.  Letöltve: %(number)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "és"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "A biztonsági mentés eszközök használata"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "A biztonsági mentés eszköz használata"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Nincs elérhető biztonsági mentés eszköz"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:3120
 msgid "Free space:"
 msgstr "Szabad hely:"
 
 #. (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:3132
 #, 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:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -237,75 +237,89 @@ 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:2990
+#: rapid/rapid.py:3141
 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:3146
 msgid "."
-msgstr ""
+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:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s üres"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Fotók és videók biztonsági mentésének helye: %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Biztonsági mentés készül az alábbi helyre: %(path)s"
 
-#: rapid/rapid.py:3012
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+"A fotók biztonsági mentése a %(path)s könyvtárba és a videók biztonsági "
+"mentése a %(path2)s könyvtárba"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "A program beállítása nem jó."
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Fénykép"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Videó"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s letöltési könyvtár nem létezik"
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "könyvtár: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s letöltési könyvtár nem jó"
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s letöltési könyvtár nem írható"
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3437
 msgid "Thumbnails"
 msgstr "Előnézeti képek"
 
 #. 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:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -314,43 +328,43 @@ msgstr ""
 "futás közben program információ megjelenítése a terminálban (default: "
 "%default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "Mutassa a hibakeresési információkat parancssoros futtatásnál."
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "csak a hibák megjelenítése a terminálban"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "A program által felismerhető kép és videó kiterjesztések listázása, majd "
 "kilépés"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "A program beállításainak visszaállítása, majd kilépés"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Fényképek:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Videók:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "és %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Minden beállítás visszaállításra került"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -360,16 +374,16 @@ msgstr ""
 "Kérlek telepítsd fel a \"hachoir metadata\" és a \"kaa metadata\" csomagokat "
 "a python-hoz."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "A biztonsági másolat készítése során hiba történt."
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "A cél könyvtár nem hozható létre: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -378,13 +392,13 @@ msgstr ""
 "Forrás: %(source)s\n"
 "Cél: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Hiba: %(inst)s"
 
-#: 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"
@@ -410,350 +424,358 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "_Emlékezzen erre a választásra"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Dátum és idő"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Szöveg"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sorozatok"
 
 #. 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:570
 msgid "Job code"
 msgstr "Munka-szám"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Kép dátuma"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Videó dátum"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Ma"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. 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 "Letöltési idő"
 
 #. 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 "Név + kiterjesztés"
 
 #. 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 "Név"
 
 #. 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 "Kiterjesztés"
 
 #. 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 "Kép száma"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Videó sorszám"
 
 #. 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 "Rekesz"
 
 #. 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 "Expozíciós idő"
 
 #. 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 "Fókusztávolság"
 
 #. 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 "Fényképezőgép gyártója"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:176
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Fényképezőgép"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Rövid típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Bővített típusmegnevezés"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Sorozatszám"
 
 #. 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 "Zár számláló"
 
 #. 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 "A tulajdonos neve"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Szélesség"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Magasság"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Hossz"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Képkoca/másodperc"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Készítette"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Szerzői jog"
+
 #. 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 "Mai letöltések"
 
 #. 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 "Munkamenetszám"
 
 #. 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 "Alkönyvtár száma"
 
 #. 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 "Tárolt szám"
 
 #. 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 "Sorozat betű"
 
 #. 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 "Minden számjegy"
 
 #. 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 "Utolsó számjegy"
 
 #. 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 "Utolsó 2 számjegy"
 
 #. 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 "Utolsó 3 számjegy"
 
 #. 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 "Utolsó 4 számjegy"
 
 #. 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 "Eredeti kisbetű / nagybetű"
 
 #. 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 "NAGYBETŰS"
 
 #. 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 "kisbetűs"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Egyszámjegyű"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Kétszámjegyű"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Háromszámjegyű"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Négyszámjegyű"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Ötszámjegyű"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Hatszámjegyű"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Hét számjegy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Millimásodperc"
 
 #. 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 "ÉÉÉÉHHNN"
 
 #. 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 "ÉÉÉÉ-HH-NN"
 
 #. 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 "ÉÉHHNN"
 
 #. 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 "ÉÉ-HH-NN"
 
 #. 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 "HHNNÉÉÉÉ"
 
 #. 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 "HHNNÉÉ"
 
 #. 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 "HHNN"
 
 #. 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 "NNHHÉÉÉÉ"
 
 #. 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 "NNHHÉÉ"
 
 #. 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 "HH"
 
 #. 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 "NN"
 
 #. 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 "ÓÓPPMM"
 
 #. 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 "ÓÓPP"
 
 #. 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 "ÓÓ-PP-MM"
 
 #. 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 "ÓÓ-PP"
 
 #. 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 "PP"
 
 #. 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 "MM"
 
@@ -773,74 +795,106 @@ msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Alkönyvtár beállítások nem tartalmazhatnak két %s értéket egymás után"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Minden Munka-szám eltávolítása?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Minden Munka-szám el legyen távolítva?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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 "Hiba a fénykép átnevezési beállításoknál"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Hiba a videó átnevezési beállításoknál"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Hiba a fénykép letöltési alkönyvtár beállításoknál"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Hiba a videó letöltési alkönyvtár beállításoknál"
 
 #. 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 "Adjon meg munka-számot"
 
 #. 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 "Adjon meg új munka-kódot, vagy válasszon egyet a korábbiakból."
 
 #. 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 "Adjon meg új munka-kódot"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Munka-szám:"
 
-#: 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 ""
+"Kérlek add meg azt a könyvtárt ahol soha ne keressek fényképeket vagy "
+"videókat"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Útvonal:"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Munka kód"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Válasszon egy letöltési könyvtárat"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Válasz egy könyvtárat ahova letöltöd a videókat"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Válasszon egy könyvtárt az alábbiaknak: %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 msgstr ""
-"Válasszon egy könyvtárt az alábbiaknak: %(file_types)s biztonsági másolata"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -848,7 +902,7 @@ msgstr ""
 "<i><b>Figyelem:</b> Nincs elegendő metaadat a fájl teljes átnevezéshez. "
 "Kérem válasszon más metaadatot az átnevezéshez.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -857,13 +911,13 @@ msgstr ""
 "Kérem válasszon más metaadatot az alkönyvtár létrehozáshoz.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Példa: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -873,94 +927,119 @@ msgstr ""
 "A %(filetype)s alkönyvtár beállítások érvénytelenek, nem használhatóak.\n"
 "Az alapértelmezett értékek kerülnek visszaállításra."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"A következő reguláris kifejezések hibásak, és távolításra kerülnek, ha nem "
+"javítod ki őket:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Ez a reguláris kifejezés hibás,  és távolításra kerül, ha nem javítod ki:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Érvénytelen reguláris kifejezés"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "külső_meghajtó1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "külső_meghajtó2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Prága"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teherán"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Párizs"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Róma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moszkva"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varsó"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "alkönyvtár"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "fájlnév"
 
@@ -1016,11 +1095,11 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s  készült  %(image1_date)s  %(image1_time)s-kor, és %(image2)s "
-"készült %(image2_date)s  %(image2_time)s-kor."
+"A %(image1)s kép %(image1_date)s %(image1_time)s kor készült és, a "
+"%(image2)s kép %(image2_date)s %(image2_time)s kor készült."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1217,7 +1296,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Több probléma lépett fel."
 
-#: 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 ""
 "A program egyező nevű, de különböző időpontban készített képeket talált."
@@ -1254,24 +1333,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "A kép már korábban le lett töltve."
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Forrás: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "alkönyvtár és file neve"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Nem sikerült az alkönyvtár létrehozás"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Path: %s"
@@ -1417,65 +1496,65 @@ msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilitás egyéb operációs rendszerekkel</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Eszközök</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
 msgstr "<b>Letöltési könyvtár</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Letöltési alkönyvtár</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Példa</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Munka-szám</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Fénykép Átnevezés</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Fénykép és Videó név összeütközés</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatizálás</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sorozat szám</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>Például: /home/jozsef/Képek</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Példa:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Új:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Eredeti:</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 ""
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Eszközök</span>"
@@ -1535,14 +1614,10 @@ msgid "Backup"
 msgstr "Biztonsági mentés"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Biztonsági mentés helye:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
 msgstr "A fényképek és vidók biztonsági mentése letöltés közben"
 
-#: 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."
@@ -1550,7 +1625,7 @@ msgstr ""
 "Válasszon letöltési könyvtárat. Az alkönyvtárak automatikusan lesznek "
 "létrehozva, a lent található beállítások szerint."
 
-#: 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."
@@ -1558,14 +1633,18 @@ msgstr ""
 "Válaszd ki a letöltési könyvtárat. Az alkönyvtárak automatikusan létre "
 "fognak jönni az általad megadott könyvtár alá."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Nap kezdete:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "A képek és videók törlése a készülékről a sikeres letöltést követően"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Eszközök"
@@ -1575,24 +1654,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 ""
-"Az eszközök azok amelyekről letöltheted a fényképeket vagy videókat, például "
-"fényképező gépek, memória kártyák, vagy hordozható tárolók (pendrive, usb "
-"kulcs).\n"
-"\n"
-"Letelhetsz fényképeket több helyről egyszerre, vagy meghatározhatsz egy "
-"helyet a merevlemezeden.\n"
-"\n"
-"\n"
-"<i>Ha közvetlenül a fényképezőgépedről töltesz le, és lassú vagy egyáltalán "
-"nem működik próbáld a fényképező gépedet  PTP módba állítani. Ha ez nem "
-"lehetséges fontold meg egy kártyaolvasó használatát</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1619,82 +1688,110 @@ msgid "Generate thumbnails (slower)"
 msgstr "Bélyegkép létrehozás (lassabb)"
 
 #: 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 ""
-"Ha kikapcsolja az automatikus érzékelést, válasszon pontos biztonsági mentés "
-"helyet."
+"Kérlek válassz könyvtárt a biztonsági mentésnek, ha nem akarod hogy "
+"automatikusan kerüljön meghatározásra (disable auto detection)."
 
 #: 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 ""
-"Ha letiltod az automatikus érzékelést, válassz ki a fényképek és videók "
-"pontos helyét."
+"Kérlek válassz könyvtárt a fotók és a videók számára, ha nem akarod hogy "
+"automatikusan kerüljenek meghatározásra (disable auto detection)."
 
 #: 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 ""
-"Ha engedélyezi a mobil adattárolók automatikus érzékelését, akkor az egész "
-"eszközről össze lesznek gyűjtve a képek. Nagy tárhely esetén ez több időt "
-"vesz igénybe."
+"Ha engedélyezed az automatikus felderítést a hordozható eszközre, akkor az "
+"egész eszközön fogok keresni. Nagy méretű eszközön ez sokáig tarthat. \n"
+"\n"
+"Ha ez a lehetőség engedélyezve van, akkor a lehetséges eszköz érzékelésekor "
+"rá fogok kérdezni, hogy akarod-e az automatikus felderítést ezen az eszközön."
 
-#: 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 "Munka-szám"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Hely:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
 msgstr "Egyebek"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
 msgstr "Teljesítmény"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Fénykép Könyvtár"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Fénykép Átnevezés"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "A biztonsági másolat mappa neve:"
 
-#: rapid/glade3/prefs.ui.h:64
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Fotók biztonsági mentésének helye:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Beállítások: Gyors Fénykép Letöltő"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "Összes törlése"
 
-#: 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 associated with devices 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 "Átnevezési lehetőségek"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "A letöltés kihagyása"
 
-#: 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 "
@@ -1703,7 +1800,14 @@ msgstr ""
 "Sajnálom, a videó letöltés nem lehetséges. Kérlek telepítsd a  <i>hachoir "
 "metadata</i> és a <i>kaa metadata</i> csomagokat a python-hoz."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of 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"
@@ -1712,7 +1816,7 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr "Adja meg a könyvtárat, ahová a biztonsági másolatok készülnek."
 
-#: 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."
@@ -1720,7 +1824,7 @@ msgstr ""
 "Határozza meg azt az időt 24 órás formában, ahol a <i>Downloads today</i> "
 "sorozatszámot vissza kell állítani."
 
-#: 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."
@@ -1728,43 +1832,51 @@ msgstr ""
 "Adja meg, hogy a képek és videók nevéből el legyenek-e távolítva az egyéb "
 "operációs rendszerek által nem megengedett karakterek."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "A letöltés megkezdése a program indításakor"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Azonnali letöltés a készülék csatlakoztatását követően."
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Tárolt szám:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Az inkompatibilis karakterek kihagyása"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "RAW és JPEG fájlok számkiosztásának szinkronizálása"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "A készülék lecsatlakoztatása a letöltést követően."
 
-#: 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 "Videó Könyvtár"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Videó Átnevezés"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "A videó biztonsági mentési könyvtára"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr "Videó biztonsági mentésének helye:"
+
+#: 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."
@@ -1772,7 +1884,7 @@ msgstr ""
 "Ha egyező nevű kép vagy videó már le lett töltve, ajánlja fel a kihagyást, "
 "vagy a letöltés folytatását egyedi azonosító hozzáadásával"
 
-#: 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."
@@ -1780,7 +1892,7 @@ msgstr ""
 "Adja meg, hogy a biztonsági másolatok készítésekor felül legyenek-e írva az "
 "azonos néven létező fájlok, vagy át legyenek ugorva."
 
-#: 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."
@@ -1788,7 +1900,7 @@ msgstr ""
 "A képekről és videókról letöltés közben több másolat készülhet, különböző "
 "helyekre, például külső merevlemezre."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Hozzáadás…"
 
@@ -2186,6 +2298,9 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 #~ msgid "Backup folder name:"
 #~ msgstr "Biztonsági mentés könyvtár:"
 
+#~ msgid "Backup location:"
+#~ msgstr "Biztonsági mentés helye:"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
@@ -2201,12 +2316,26 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 #~ msgid "Image location:"
 #~ msgstr "Képek helye:"
 
+#~ 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 ""
+#~ "Ha engedélyezi a mobil adattárolók automatikus érzékelését, akkor az egész "
+#~ "eszközről össze lesznek gyűjtve a képek. Nagy tárhely esetén ez több időt "
+#~ "vesz igénybe."
+
 #~ msgid "Image Rename"
 #~ msgstr "Kép átnevezés"
 
 #~ msgid "Image Devices"
 #~ msgstr "Kép eszköz"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Ha kikapcsolja az automatikus érzékelést, válasszon pontos biztonsági mentés "
+#~ "helyet."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Kilépés a programból a letöltések sikeres befejezését követően."
 
@@ -2420,584 +2549,3 @@ msgstr "Importáld a fényképeidet és videóidat hatékonyan és megbízhatóa
 
 #~ msgid "Should this device or partition be used to download images from?"
 #~ msgstr "Erről az eszközről vagy partícióról le legyenek töltve a képek?"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Kép: %(source)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "A kép törlése az eszközről sikertelen."
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Kép: %(source)s\n"
-#~ "Hiba: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "A következő képek le lettek törölve az eszközről: %i images"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Képek törlése az eszközről a sikeres letöltést követően."
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "A program azonos névvel, de különböző készítési dátummal rendelkező képeket "
-#~ "talált."
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Első kép: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Második kép: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr "Letöltés folyamatban, a mai letöltések száma nem aktuális."
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr "Letöltés folyamatban, a tárolt érték nem aktuális."
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Kép eszköz: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Forrás: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Hiba:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Nem tudtam az átmeneti letöltési könyvtárat létrehozni"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Cél: %s"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Figyelem: a munkaasztal környezet értesítő szerver nincs jól beállítva."
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Hiba a letöltési könyvtárral"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Sajnálom,  a letöltési könyvtár létezik, de nem írható.  Kérlek ellenőrizd a "
-#~ "könyvtár jogosultsági beállítását, vagy módosítsd a beállításokat."
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Sajnálom, a letöltési könyvtár nem létezik. Kérlek hozd létre a könyvtárat, "
-#~ "vagy módosítsd a beállításokat."
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "A megadott elérési útvonalon nem található kép:\n"
-#~ "%(path)s\n"
-#~ "A probléma megoldásához kérlek ellenőrizd a beállításokat."
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "A képeket tároló könyvtár hibás"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Hiba: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Forrás: %(source)s\n"
-#~ "Cél: %(destination)s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Forrás: %(source)s\n"
-#~ "Részlegesen generált file név: %(newname)s\n"
-#~ "Cél: %(destination)s\n"
-#~ "Hiba: %(problem)s"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Ez a letöltési útvonal nem hozható létre:\n"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "A metaadat alapvető az átnevezéshez és/vagy az alkönyvtár létrehozáshoz.\n"
-#~ "Forrás: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Az alkönyvtár nevet nem lehetett megfelelően létrehozni. Ellenőrizd, hogy a "
-#~ "metaadatok megfelelőek-e."
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Fényképek találtam azonos fájlnévvel, de különböző keletkezési idővel."
-
-#~ msgid "Photo already exists"
-#~ msgstr "A fénykép már létezik"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Fénykép kihagyva"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Eszköz: %s\n"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Az elérési utat %s nem lehet létrehozni"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "A biztonsági mentés könyvtár nem létezik"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Nincs automatikusan érzékelt eszköz a biztonsági mentéshez"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Nem tudom a fényképet vagy a videót az eszközről letörölni"
-
-#~ msgid "Video skipped"
-#~ msgstr "Videó kihagyva"
-
-#~ msgid "Video already exists"
-#~ msgstr "A videó már létezik"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Probléma az eszköz könyvtárának a helyével"
-
-#~ msgid "photos downloaded"
-#~ msgstr "fényképek letöltve"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Probléma a letöltési könyvtárral"
-
-#~ msgid "photos skipped"
-#~ msgstr "fényképek kihagyva"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "a kép vagy videó sorszám meg van adva, de a fájlnévnek nincs sorszáma"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "a kiterjesztés meg van adva, de a fájlnévnek nincs kiterjesztése"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Tizedmásodperc metaadat információ nincs a fényképben"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "%s típusú metaadat nincs"
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr ""
-#~ "A program lépjen ki, hiba vagy figyelmeztetés nélküli sikeres letöltés után"
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr ""
-#~ "Válassz, hogy vajon kihagyjuk a fájlt, vagy adjunk hozzá egyedi azonosítót."
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Sajnálom, a videó letöltési funkció letiltva. Videó letöltéshez, légyszíves  "
-#~ "telepítsd a <i>kaa metadata</i> csomagot a python számára. (pl.: sudo apt-"
-#~ "get install python-kaa-metadata)"
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "A %(filetype)s neve nem volt generálható."
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Az eszköz átvizsgálása kész: nem található %(filetypes)s az %(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Az eszköz átvizsgálása kész: %(number)s %(filetypes)s talált a %(device)s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 of %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "A %(filetype)s neve nem volt helyesen generálható. Ellenőrizze, hogy "
-#~ "rendelkezésre áll-e elegendő meta-adat."
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "A %(filetype)s nem rendelkezik meta-adatokkal"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "A %(filetype)s nem volt megnyitható."
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr ""
-#~ "A %(file_type)s biztonsági mentése az alábbi helyre nem készül el: %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "A %(file_type)s biztonsági másolata már létezik"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Alkönyvtár: %(subfolder)s\n"
-#~ "Fájl: %(file)s\n"
-#~ "Hiba: %(problem)s"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "A %(file_type)s biztonsági másolata nem készült el"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "A %(filetype)s nem lett átmásolva."
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "A %(file_type)s biztonsági másolata nem készült el"
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "A %(file_type)s biztonsági másolata felül lesz írva"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Első kép: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Második kép: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "Átugorva: %(noFiles)s %(filetypes)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Kép: %(source)s\n"
-#~ "Hiba: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Az eszközön nem található letöltendő %(types_searched_for)s"
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "A kép mozaik nézete nem volt előállítható"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Biztonsági másolat nem készülhet"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "A biztonsági másolatok helye nem volt elérhető."
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Biztonsági másolatoknak alkalmas hely nem volt elérhető."
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "A %(file_type)s biztonsági másolata nem volt elkészíthető."
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Kép: %(source)s"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "A %(file_type)s letöltési könyvtár létezik, de nem írható.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "A %(file_type)s letöltési könyvtár nem létezik.\n"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "A letöltési könyvtárak beállításai  hibásak. Módosítson a beállításokon.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr "A %(folder)s videó letöltési könyvtár létrehozása sikertelen"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "A %(folder)s kép letöltési könyvtár létrehozása folyamatban"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "A %(folder)s videó letöltési könyvtár létrehozása folyamatban"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr "A %(folder)s kép letöltési könyvtár létrehozása sikertelen"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Az eszközről %(number)i %(filetypes)s lett törölve"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Az elérési útvonal nem létezik:\n"
-#~ "%(path)s"
-
-#~ msgid "videos skipped"
-#~ msgstr "videók átugorva"
-
-#~ msgid "videos downloaded"
-#~ msgstr "videók letöltve"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "%s metadata nem található a fényképhez"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "%s metadata nem található a videóhoz"
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Adja meg, mi történjen azokkal a videókkal és képekkel, melyek már le lettek "
-#~ "töltve, vagy biztonsági másolat készült róluk."
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "A %(filetype)s alkönyvtár beállítások felesleges értékei el lettek távolítva."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Forrás: %(source)s\n"
-#~ "Cél: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Kérem, ellenőrizze a rendszert, majd próbálja meg újra."
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Letöltés a fényképezőgépekről."
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "A képek letöltése közvetlenül a fényképezőgépről elöfordulhat, hogy hibásan, "
-#~ "vagy egyáltalán nem működik."
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "A képek letöltése kártyaolvasóval mindig működik, általában gyorsabb. Erősen "
-#~ "ajánlott a kártyaolvasó használata."
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Az üzenet jelenjen meg legközelebb is."
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "A következő fájlok letöltése folyamatban: %s"
-
-#~ msgid "Path"
-#~ msgstr "Útvonal"
-
-#~ msgid "Date"
-#~ msgstr "Dátum"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s letöltése sikertelen volt"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s letöltése sikeres volt"
-
-#~ msgid "File"
-#~ msgstr "Fájl"
-
-#~ msgid "Status"
-#~ msgstr "Állapot"
-
-#~ msgid "Type"
-#~ msgstr "Típus"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s letöltésénél figyelmeztetések"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s letöltése sikeres volt, de a biztonsági másolat készítésénél "
-#~ "hibák léptek fel."
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s készen áll a letöltésre"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s le lesz töltve, figyelmeztetésekkel"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s most lesz letöltve"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s nem lett letöltve, biztonsági másolat sem készült."
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Adjon meg egy új munka-kódot, majd nyomja meg az Entert, vagy válasszon egy "
-#~ "létező munka-kódot"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s nem tölthető le"
-
-#~ msgid "Preview"
-#~ msgstr "Előnézet"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s elérhető"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr ""
-#~ "Figyelmeztetés megjelenítése a közvetlen fényképezőgépről történő letöltés "
-#~ "miatt"
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Figyelmeztetés: a biztonsági mentés eszköze éppen használatban van: "
-#~ "%(device)s"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "_Letöltés kiválasztva"
-
-#~ msgid "_Resume"
-#~ msgstr "_Folytatás"
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "A letöltő eszköz beállításai meg lettek változtatva"
-
-#~ msgid "_Download All"
-#~ msgstr "_Mindegyik letöltése"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "A biztonsági mentés eszköz beállításai meg lettek változtatva"
-
-#~ msgid "Select _All"
-#~ msgstr "Összes _kijelölése"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Minden vi_deó kijelölése"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Minden kép_kijelölése"
-
-#~ msgid "Se_lect None"
-#~ msgstr "_Kijelölés nélkül"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Könyvtárak_előnézete"
-
-#~ msgid "P_review Columns"
-#~ msgstr "_Oszlopok előnézete"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "A letöltő könyvtárra vonatkozó beállítások meg lettek változtatva"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr ""
-#~ "Alkönyvtár és fájl elnevezésre vonatkozó beállítások meg lettek változtatva"
-
-#~ msgid "_Device"
-#~ msgstr "_Eszköz"
-
-#~ msgid "_Filename"
-#~ msgstr "_Fájlnév"
-
-#~ msgid "_Path"
-#~ msgstr "_Útvonal"
-
-#~ msgid "_Preview"
-#~ msgstr "_Előnézet"
-
-#~ msgid "_Size"
-#~ msgstr "_Méret"
-
-#~ msgid "_Type"
-#~ msgstr "_Típus"
diff --git a/po/it.po b/po/it.po
index f0b6846..63b9aff 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,22 +7,22 @@ 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-04 21:11+0000\n"
-"Last-Translator: Martino Barbon <Unknown>\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-23 20:06+0000\n"
+"Last-Translator: caccolangrifata <caccolangrifata@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-11 03:48+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Dimensione"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Avanzamento del download"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -66,239 +66,256 @@ 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:1178
 msgid "scanning..."
 msgstr "scansione in corso..."
 
-#: rapid/rapid.py:1986 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
-msgstr "Scarica"
+msgstr "Download"
 
-#: rapid/rapid.py:1989
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Sospendi"
 
-#: rapid/rapid.py:2092
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
+"Queste cartelle per il download non sono valide:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 
-#: rapid/rapid.py:2095
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
+"Questa cartelle per il download non è valida:\n"
+"%s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Il download non può procedere"
 
-#: rapid/rapid.py:2385
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Circa 1 secondo rimanente"
 
-#: rapid/rapid.py:2387
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Circa %i secondi rimanenti"
 
-#: rapid/rapid.py:2389
+#: rapid/rapid.py:2507
 msgid "About 1 minute remaining"
-msgstr "Manca circa 1 minuto"
+msgstr "Circa 1 minuto rimanente"
 
 #. 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:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Circa %(minutes)i:%(seconds)02i minuti rimanenti"
 
-#: rapid/rapid.py:2416 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "foto e video"
 
-#: rapid/rapid.py:2418 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "foto o video"
 
-#: rapid/rapid.py:2421 rapid/rapid.py:2965 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "video"
 
-#: rapid/rapid.py:2423 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 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:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "foto"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2428 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "photo"
 
-#: rapid/rapid.py:2455
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s scaricati"
 
-#: rapid/rapid.py:2459
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Impossibile scaricare %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2462 rapid/rapid.py:2514
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "avvertenze"
 
-#: rapid/rapid.py:2471
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Tutti i download completati"
 
-#: rapid/rapid.py:2477 rapid/rapid.py:2486 rapid/rapid.py:2495
-#: rapid/rapid.py:2504 rapid/rapid.py:2512
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2479 rapid/rapid.py:2497
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s scaricati"
 
-#: rapid/rapid.py:2488 rapid/rapid.py:2506
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "impossibile scaricare %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2545
+#: rapid/rapid.py:2663
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s di %(total)s %(filetypes)s (%(remaining)s rimanenti)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2552
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s di %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:2938
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Si utilizzano dispositivi di backup"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Si utilizza un dispositivo di backup"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Non è stato rilevato nessun dispositivo di backup"
 
-#: rapid/rapid.py:2969
+#: rapid/rapid.py:3120
 msgid "Free space:"
 msgstr "Spazio libero:"
 
 #. (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:3132
 #, python-format
 msgid "(%(file_type)s)"
-msgstr ""
+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:3136
 #, 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:3141
 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:3146
 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:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s liberi"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3007
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
-msgstr "Salvataggio su %(path)s"
+msgstr "Backup su %(path)s"
+
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
 
-#: rapid/rapid.py:3012
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3041
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
-msgstr ""
+msgstr "Le preferenze del programma non sono valide"
 
-#: rapid/rapid.py:3146 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3157
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3159 rapid/rapid.py:3173 rapid/rapid.py:3186
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Cartella: %s"
 
-#: rapid/rapid.py:3171
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3184
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3262
+#: rapid/rapid.py:3437
 msgid "Thumbnails"
-msgstr ""
+msgstr "Miniature"
 
 #. 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:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -307,59 +324,62 @@ msgstr ""
 "visualizza informazioni sul programma sulla riga comando quando il programma "
 "è in esecuzione (default: %default)"
 
-#: rapid/rapid.py:3310
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "visualizza informazioni di debug quando eseguito dalla riga comando"
 
-#: rapid/rapid.py:3311
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "visualizza solo gli errori sulla riga comando"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
-"elenca le le estensioni file delle foto e dei video che il programma "
-"riconosce ed esce"
+"elenca le estensioni delle foto e dei video riconosciute dal programma ed "
+"esce"
 
-#: rapid/rapid.py:3314
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "resetta tutte le impostazioni e preferenze del programma ed esce"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Foto:"
 
-#: rapid/rapid.py:3327
+#: rapid/rapid.py:3503
 msgid "Videos:"
-msgstr "Video"
+msgstr "Video:"
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3340
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Tutte le impostazioni e preferenze sono state resettate"
 
-#: rapid/rapid.py:3349
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr ""
+"Funzionalità di download dei video è disabilitata.\n"
+"Per scaricare i video, installare i pacchetti hachoir metadata e kaa "
+"metadata per python."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Errore durante il backup"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Non si è potuto creare la cartella di destinazione: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -368,18 +388,20 @@ msgstr ""
 "Origine: %(source)s\n"
 "Destinazione: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Errore: %(inst)s"
 
-#: 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"
 "File: %(file)s"
 msgstr ""
+"%(problem)s\n"
+"File: %(file)s"
 
 #: rapid/device.py:79
 msgid "Device Detected"
@@ -390,358 +412,366 @@ msgstr "Dispositivo rilevato"
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
-"Si vuole utilizzare questo dispositivo o partizione some sorgente da cui "
-"scaricare foto o vodeo?"
+"Si vuole utilizzare questo dispositivo o partizione come sorgente da cui "
+"scaricare foto o video?"
 
 #. 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 "_Ricorda questa scelta"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:143
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Data e ora"
 
-#: rapid/generatenameconfig.py:144
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Testo"
 
-#: rapid/generatenameconfig.py:145
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Nome file"
 
-#: rapid/generatenameconfig.py:146
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadati"
 
-#: rapid/generatenameconfig.py:147
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Ordinamenti"
 
 #. 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:570
 msgid "Job code"
 msgstr "Codice lavoro"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Data dell'immagine"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Data del video"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Oggi"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. 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 "Tempo di scaricamento"
+msgstr "Tempo del 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 + estensione"
 
 #. 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 "Estensione"
 
 #. 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 "Numero immagine"
 
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
-msgstr "Numero del video"
+msgstr "Numero 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 "Tempo di esposizione"
 
 #. 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 "Lunghezza 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 "Marca della fotocamera"
 
 #. 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 "Modello della fotocamera (es.: Canon EOS-1Ds Mark III)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:178
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Modello brevissimo della fotocamera (es.: D300)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:180
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Modello breve della fotocamera (es.: DSC-P92)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:182
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Numero seriale"
 
 #. 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 "Contatore dell'otturatore"
 
 #. 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 del proprietario"
 
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:188
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Larghezza"
 
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Altezza"
 
-#: rapid/generatenameconfig.py:190
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Lunghezza"
 
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Fotogrammi per secondo"
 
+#: 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 "Downloads oggi"
+msgstr "Download oggi"
 
 #. 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 "Numero della sessione"
 
 #. 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 "Numero della sottocartella"
 
 #. 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 "Numero memorizzato"
 
 #. 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 "Lettera di sequenza"
 
 #. 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 "Tutte le cifre"
 
 #. 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 "Ultima cifra"
 
 #. 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 "Ultime 2 cifre"
 
 #. 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 "Ultime 3 cifre"
 
 #. 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 "Ultime 4 cifre"
 
 #. 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 "Caso 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 "MAIUSCOLO"
 
 #. 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 "minuscolo"
 
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Una cifra"
 
-#: rapid/generatenameconfig.py:219
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Due cifre"
 
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: rapid/generatenameconfig.py:221
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Quattro cifre"
 
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Cinque cifre"
 
-#: rapid/generatenameconfig.py:223
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Sei cifre"
 
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sette cifre"
 
 #. 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 "Sotto-secondi"
 
 #. 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 "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-GG"
 
 #. 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 "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 "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 "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 "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 "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 "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 "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 "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 (minuti)"
 
 #. 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"
 
@@ -761,73 +791,104 @@ msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Le preferenze sottocartella non dovrebbero contenere due %s uno dopo l'altro"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Elimina tutti i Codici Lavoro?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Occorre rimuovere tutti i Codici Lavoro?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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 "Errore nelle preferenze di Rinomina Foto"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Errore nelle preferenze di Rinomina Video"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Errore nelle preferenze di Scarica Sottocartelle Foto"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Errore nelle preferenze di Scarica Sottocartelle Video"
 
 #. 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 "Inserire un Codice Lavoro"
 
 #. 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 "Inserire un nuovo Codice Lavoro, o selezionarne uno precedente"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:734
+#: rapid/preferencesdialog.py:754
 msgid "Enter a new Job Code"
 msgstr "Inserire un nuovo Codice Lavoro"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Codice Lavoro:"
 
-#: 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:1078
 msgid "Job Code"
 msgstr "Codice Lavoro"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
-msgstr "Scegliere la cartella in cui scaricare le foto"
+msgstr "Selezionare una cartella in cui scaricare le foto"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Selezionare una cartella in cui scaricare i video"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selezionare una cartella contenente %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Selezionare una cartella in cui salvare %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -836,7 +897,7 @@ msgstr ""
 "completamente il nome. Si prega di utilizzare altre opzioni per la "
 "rinomina.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -846,13 +907,13 @@ msgstr ""
 "nominare le sottocartelle.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esempio: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -863,115 +924,135 @@ msgstr ""
 "non possono essere utilizzate.\n"
 "Saranno reimpostate ai loro valori di default."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+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:1931
 msgid "externaldrive1"
 msgstr "driveesterno1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "driveesterno1"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Parigi"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlino"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sidney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Mosca"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varsavia"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Giacarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stoccolma"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "sottocartella"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "nome del file"
 
 #: rapid/problemnotification.py:80
 #, python-format
 msgid "Date time value %s appears invalid."
-msgstr ""
+msgstr "Il valore del tempo %s sembra essere non valido"
 
 #: rapid/problemnotification.py:81
 msgid "Filename does not have an extension."
-msgstr ""
+msgstr "Il nome del file non ha un'estensione."
 
 #. 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 "Il nome del file non ha una componente numerica."
 
 #: rapid/problemnotification.py:84
 #, python-format
 msgid "Error generating component %s."
-msgstr ""
+msgstr "Errore nel generare la componente %s."
 
 #. a generic problem
 #: rapid/problemnotification.py:86
@@ -982,17 +1063,17 @@ msgstr ""
 #: rapid/problemnotification.py:88
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
-msgstr ""
+msgstr "%(filetype)s %(area)s non può essere generato"
 
 #: rapid/problemnotification.py:90 rapid/problemnotification.py:91
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
-msgstr ""
+msgstr "Si è verificato un errore durante la copia di %(filetype)s"
 
 #: rapid/problemnotification.py:93 rapid/problemnotification.py:94
 #, python-format
 msgid "%(filetype)s already exists"
-msgstr ""
+msgstr "%(filetype)s esiste già"
 
 #: rapid/problemnotification.py:97
 #, python-format
@@ -1000,18 +1081,20 @@ msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 msgstr ""
+"Non si può effettuare il backup di %(filetype)s in quanto non è stata "
+"travata nessuna posizione adatta."
 
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
 #: rapid/problemnotification.py:103
 #, python-format
 msgid "%(filetype)s was already downloaded"
-msgstr ""
+msgstr "%(filetype)s è stato già scaricato"
 
 #: rapid/problemnotification.py:107
 #, python-format
@@ -1023,7 +1106,7 @@ msgstr ""
 #: rapid/problemnotification.py:108
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
-msgstr ""
+msgstr "Il %(filetype)s è stato modificato il %(date)s alle %(time)s."
 
 #: rapid/problemnotification.py:109
 #, python-format
@@ -1033,26 +1116,28 @@ msgstr ""
 #: rapid/problemnotification.py:111
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
-msgstr ""
+msgstr "Errore: %(errorno)s %(strerror)s"
 
 #: rapid/problemnotification.py:201
 msgid "The metadata might be corrupt."
-msgstr ""
+msgstr "I metadata potrebbero essere corrotti."
 
 #: rapid/problemnotification.py:204
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
+"Il nome del file, l'estensione e le informazioni Exif indicano che è già "
+"stato scaricato."
 
 #: rapid/problemnotification.py:223
 #, python-format
 msgid " It was backed up to %(volume)s"
-msgstr ""
+msgstr " È stato effettuato il backup su %(volume)s"
 
 #: rapid/problemnotification.py:225
 msgid " It was backed up to these devices: "
-msgstr ""
+msgstr " È stato effettuato il backup su questi di dispositivi: "
 
 #: rapid/problemnotification.py:227 rapid/problemnotification.py:288
 #: rapid/problemnotification.py:300
@@ -1072,6 +1157,8 @@ msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
+"Sono state rilevato foto con lo stesso nome del file, ma scattate in ore "
+"differenti: %(details)s"
 
 #: rapid/problemnotification.py:257
 #, python-format
@@ -1086,35 +1173,37 @@ msgstr ""
 #: rapid/problemnotification.py:261
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
+"Si sono verificati degli errori durante il backup sui seguenti dispositivi "
+"di backup: "
 
 #: 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 e %(volume)s (%(inst)s)."
 
 #: rapid/problemnotification.py:276
 #, python-format
 msgid "%(volumes)s and %(volume)s."
-msgstr ""
+msgstr "%(volumes)s e %(volume)s."
 
 #: rapid/problemnotification.py:284
 #, python-format
 msgid "Backup already exists on %(volume)s."
-msgstr ""
+msgstr "Il backup esiste già su %(volume)s."
 
 #: rapid/problemnotification.py:286
 msgid "Backups already exist in these locations: "
-msgstr ""
+msgstr "Il backup esiste già in queste posizioni: "
 
 #: rapid/problemnotification.py:296
 #, python-format
@@ -1129,11 +1218,15 @@ msgstr ""
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
+"Si è verificato un errore durante la creazione delle directory su "
+"%(volume)s: %(inst)s."
 
 #: rapid/problemnotification.py:311
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
+"Si è verificato un errore durante la creazione delle directory sui seguenti "
+"dispositivi di backup: "
 
 #: rapid/problemnotification.py:322
 #, python-format
@@ -1143,7 +1236,7 @@ msgstr ""
 #: rapid/problemnotification.py:330
 #, python-format
 msgid " Furthermore, there were %(problems)s."
-msgstr ""
+msgstr " Inoltre, si è verificato %(problems)s."
 
 #: rapid/problemnotification.py:332
 #, python-format
@@ -1153,24 +1246,24 @@ msgstr ""
 #: rapid/problemnotification.py:341
 #, python-format
 msgid "The %(type)s metadata is missing."
-msgstr ""
+msgstr "Il %(type)s metadata è mancante."
 
 #: rapid/problemnotification.py:343
 msgid "The following metadata is missing: "
-msgstr ""
+msgstr "I seguenti metadata sono mancanti: "
 
 #: rapid/problemnotification.py:346
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-msgstr ""
+msgstr "%(missing_metadata_elements)s e %(final_missing_metadata_element)s."
 
 #: rapid/problemnotification.py:363
 msgid "Problems in subfolder and filename generation"
-msgstr ""
+msgstr "Problemi nella generazione della sottocartella e del nome del file"
 
 #: rapid/problemnotification.py:365
 msgid "Problem in subfolder and filename generation"
-msgstr ""
+msgstr "Problema nella generazione della sottocartella e del nome del file"
 
 #: rapid/problemnotification.py:368
 #, python-format
@@ -1185,18 +1278,20 @@ msgstr ""
 #: rapid/problemnotification.py:379
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
-msgstr ""
+msgstr "%(filetype)s esiste già, ma si è effettuato il backup"
 
 #: rapid/problemnotification.py:381
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
+"Si è verificato un errore durante la copia di %(filetype)s, ma ne è stato "
+"effettuato il backup"
 
 #: rapid/problemnotification.py:401
 msgid "Multiple problems were encountered"
-msgstr ""
+msgstr "Si sono verificati molteplici errori"
 
-#: 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 ""
 "Sono state rilevate fotografie con gli stessi nomi di file, ma prese ad "
@@ -1222,7 +1317,7 @@ msgstr ""
 #: rapid/problemnotification.py:416
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
-msgstr ""
+msgstr "%(previousproblem)s, e %(backinguperror)s"
 
 #: rapid/rpdfile.py:136
 #, python-format
@@ -1234,24 +1329,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
-msgstr "La fotografia è già stata scaricata"
+msgstr "La fotografia è stata già scaricata"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origine: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "sottocartella e nome del file"
 
-#: 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 "Percorso: %s"
@@ -1262,23 +1357,23 @@ msgstr "Informazioni su..."
 
 #: rapid/glade3/rapid.ui.h:2
 msgid "Check All"
-msgstr "Controlla Tutto"
+msgstr "Seleziona tutto"
 
 #: rapid/glade3/rapid.ui.h:3
 msgid "Check All Photos"
-msgstr "Controlla Tutte le Foto"
+msgstr "Seleziona tutte le foto"
 
 #: rapid/glade3/rapid.ui.h:4
 msgid "Check All Videos"
-msgstr "Controlla Tutti i Video"
+msgstr "Seleziona tutti i video"
 
 #: rapid/glade3/rapid.ui.h:6
 msgid "Download / Pause"
-msgstr "Download / Pausa"
+msgstr "Download / Sospendi"
 
 #: rapid/glade3/rapid.ui.h:7
 msgid "Get Help Online..."
-msgstr "Ottieni Aiuto Online..."
+msgstr "Ottieni aiuto anline..."
 
 #: rapid/glade3/rapid.ui.h:8
 msgid "Help"
@@ -1286,7 +1381,7 @@ msgstr "Guida"
 
 #: rapid/glade3/rapid.ui.h:9
 msgid "Make a Donation..."
-msgstr "Effettua una Donazione..."
+msgstr "Effettua una donazione..."
 
 #: rapid/glade3/rapid.ui.h:10
 msgid "Next File"
@@ -1306,11 +1401,11 @@ msgstr "Esci"
 
 #: rapid/glade3/rapid.ui.h:15
 msgid "Refresh"
-msgstr "Aggiornare"
+msgstr "Aggiorna"
 
 #: rapid/glade3/rapid.ui.h:16
 msgid "Report a Problem..."
-msgstr "Segnala un Problema..."
+msgstr "Segnala un problema..."
 
 #: rapid/glade3/rapid.ui.h:17
 msgid "Select All Wit_h Job Code"
@@ -1322,15 +1417,15 @@ msgstr "Seleziona Tutto _Senza il Codice _Lavoro"
 
 #: rapid/glade3/rapid.ui.h:19
 msgid "Translate this Application..."
-msgstr "Traduci questa Applicazione..."
+msgstr "Traduci questa applicazione..."
 
 #: rapid/glade3/rapid.ui.h:20
 msgid "Uncheck All"
-msgstr "Deseleziona Tutto"
+msgstr "Deseleziona tutto"
 
 #: rapid/glade3/rapid.ui.h:21
 msgid "_Check All"
-msgstr ""
+msgstr "Seleziona _tutto"
 
 #: rapid/glade3/rapid.ui.h:22
 msgid "_Clear Completed Downloads"
@@ -1338,11 +1433,11 @@ msgstr "_Svotare i Downloads Completati"
 
 #: rapid/glade3/rapid.ui.h:23
 msgid "_Download"
-msgstr ""
+msgstr "_Download"
 
 #: rapid/glade3/rapid.ui.h:24
 msgid "_Error Log"
-msgstr "_Registrazione Errori"
+msgstr "_Registro errori"
 
 #: rapid/glade3/rapid.ui.h:25
 msgid "_File"
@@ -1358,7 +1453,7 @@ msgstr ""
 
 #: rapid/glade3/rapid.ui.h:28
 msgid "_Make a Donation..."
-msgstr "_Fai una Donazione..."
+msgstr "_Fai una donazione..."
 
 #: rapid/glade3/rapid.ui.h:29
 msgid "_Select"
@@ -1374,7 +1469,7 @@ msgstr ""
 
 #: rapid/glade3/rapid.ui.h:32
 msgid "_View"
-msgstr "_Visualizzazione"
+msgstr "_Visualizza"
 
 #: rapid/glade3/prefs.ui.h:1
 msgid " "
@@ -1394,75 +1489,75 @@ msgstr "<b>Backup</b>"
 
 #: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Compatibilità con Altri Sistemi Operativi</b>"
+msgstr "<b>Compatibilità con altri sistemi operativi</b>"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Devices</b>"
-msgstr "<b>Dispositivi</b>"
-
-#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
-msgstr "<b>Cartella di Download</b>"
+msgstr "<b>Cartella di download</b>"
 
-#: rapid/glade3/prefs.ui.h:8
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
-msgstr "<b>Sottocartella di Download</b>"
+msgstr "<b>Sottocartella di download</b>"
 
-#: rapid/glade3/prefs.ui.h:9
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Esempio</b>"
 
-#: rapid/glade3/prefs.ui.h:10
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Codici Lavoro</b>"
 
-#: rapid/glade3/prefs.ui.h:11
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
-msgstr "<b>Rinomina Foto</b>"
+msgstr "<b>Rinomina foto</b>"
 
-#: rapid/glade3/prefs.ui.h:12
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Nomi di Foto e Video Name in conflitto</b>"
+msgstr "<b>Nomi di foto e video in conflitto</b>"
 
-#: rapid/glade3/prefs.ui.h:13
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
-msgstr "<b>Automazione Programma</b>"
+msgstr "<b>Automazione programma</b>"
 
-#: rapid/glade3/prefs.ui.h:14
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Numeri di Sequenza</b>"
+msgstr "<b>Numeri di sequenza</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>Esempio: /home/user/Foto</i>"
+msgstr "<i>Esempio: /home/user/Immagini</i>"
 
-#: rapid/glade3/prefs.ui.h:17
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Esempio:</i>"
 
-#: rapid/glade3/prefs.ui.h:18
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nuovo:</i>"
 
-#: rapid/glade3/prefs.ui.h:19
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Originale:</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 ""
+
 #: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi</span>"
 
 #: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Gestione Errori</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Gestione degli errori</span>"
 
 #: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
@@ -1470,31 +1565,31 @@ msgstr "<span weight=\"bold\" size=\"x-large\">Codici Lavoro</span>"
 
 #: rapid/glade3/prefs.ui.h:24
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr ""
+msgstr "<span weight=\"bold\" size=\"x-large\">Varie</span>"
 
 #: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Cartelle per il Download delle "
-"Foto</span>"
+"<span weight=\"bold\" size=\"x-large\">Cartelle per il download delle "
+"foto</span>"
 
 #: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Foto</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina foto</span>\t"
 
 #: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni di Rinomina</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni di rinomina</span>"
 
 #: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Cartelle per il Download dei "
-"Video</span>"
+"<span weight=\"bold\" size=\"x-large\">Cartelle per il download dei "
+"video</span>"
 
 #: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina Video</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina video</span>\t"
 
 #: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
@@ -1502,7 +1597,7 @@ msgstr "Aggiunta di un identificatore univoco"
 
 #: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
-msgstr "Rileva automaticamente i Dispositivi di Memorizzazione Portatile"
+msgstr "Rileva automaticamente i dispositivi di memorizzazione portatile"
 
 #: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
@@ -1517,14 +1612,10 @@ msgid "Backup"
 msgstr "Backup"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup location:"
-msgstr "Locazione del backup:"
-
-#: rapid/glade3/prefs.ui.h:36
 msgid "Backup photos and videos when downloading"
-msgstr "Salva le foto ed i video quando si fa il download"
+msgstr "Effettua il backup delle foto e dei video durante il download"
 
-#: 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."
@@ -1533,7 +1624,7 @@ msgstr ""
 "saranno create automaticamente in questa cartella utilizzando la struttura "
 "specificata sotto."
 
-#: 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."
@@ -1542,14 +1633,18 @@ msgstr ""
 "scaricati saranno create automaticamente in questa cartella utilizzando la "
 "struttura specificata sotto."
 
-#: rapid/glade3/prefs.ui.h:39
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Giorno iniziale:"
 
-#: rapid/glade3/prefs.ui.h:40
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Eliminare le foto ed i video dal dispositivo al termine del download"
 
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr ""
+
 #: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Dispositivi"
@@ -1559,22 +1654,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 ""
-"I dispositivi sono le sorgenti da cui si scaricano le foto ed i video, come "
-"macchine fotografiche, schede di memoria o Portable Storage Devices.\n"
-"\n"
-"Si possono scaricare foto da dispositivi multipli simultaneamente, oppure si "
-"può spefificare una posizione sul proprio disco fisso.\n"
-"\n"
-"<i>Se lo scarico diretto propria macchina fotografica funzionasse male o per "
-"nulla, provare ad impostarla in modalità PTP. Se ciò non fosse possibile, "
-"considerare di utilizzare un lettore di schede di memoria.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1586,107 +1673,135 @@ msgstr "Downloads oggi:"
 
 #: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
-msgstr "Gestione Errori"
+msgstr "Gestione degli errori"
 
 #: rapid/glade3/prefs.ui.h:50
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
+"Esce dal programma anche se si sono verificati errori e avvisi durante il "
+"download"
 
 #: rapid/glade3/prefs.ui.h:51
 msgid "Exit program when download completes"
-msgstr ""
+msgstr "Esce dal programma quando il download è completo"
 
 #: rapid/glade3/prefs.ui.h:52
 msgid "Generate thumbnails (slower)"
-msgstr ""
+msgstr "Generazione delle miniature (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 si disabilita il rilevamento automatico, scegliere l'esatta locazione del "
-"backup."
 
 #: 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 si disabilita il rilevamento automatico, scegliere la posizione esatta "
-"delle immagini e dei video."
 
 #: 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 abiliti il riconoscimento automatico dei dispositivi di memorizzazione "
-"portatile (PSD), tutto il dispositivo sarà sottoposto a scansione per le "
-"immagini. Su dispositivi capienti ciò potrebbe richiedere tempo."
 
-#: 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 "Codici Lavoro"
 
-#: rapid/glade3/prefs.ui.h:57
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Posizione:"
 
-#: rapid/glade3/prefs.ui.h:58
+#: rapid/glade3/prefs.ui.h:61
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varie"
 
-#: rapid/glade3/prefs.ui.h:59
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: rapid/glade3/prefs.ui.h:60
+#: rapid/glade3/prefs.ui.h:63
 msgid "Performance"
-msgstr ""
+msgstr "Prestazioni"
 
-#: rapid/glade3/prefs.ui.h:61
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
-msgstr "Cartelle delle Foto"
+msgstr "Cartelle delle foto"
 
-#: rapid/glade3/prefs.ui.h:62
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
-msgstr "Rinomina Foto"
+msgstr "Rinomina foto"
 
-#: rapid/glade3/prefs.ui.h:63
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
-msgstr "Nome della cartella di salvataggio delle foto:"
+msgstr "Nome della cartella del backup delle foto:"
 
-#: 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 "Preferenze: Rapid Photo Downloader"
 
-#: rapid/glade3/prefs.ui.h:66
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "R_imuovi Tutto"
 
-#: 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 associated with devices 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 "Opzioni di Rinomina"
+msgstr "Opzioni di rinomina"
 
-#: rapid/glade3/prefs.ui.h:68
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Salta"
 
-#: rapid/glade3/prefs.ui.h:69
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Salta il 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 "
 "python."
 msgstr ""
-"Le funzionalità di scaricamento dei video sono purtroppo disabilitate. Per "
-"scaricare i video installa i pacchetti <i>hachoir metadata</i> e <i>kaa "
-"metadata</i> per python."
+"Le funzionalità di download dei video sono disabilitate. Per scaricare i "
+"video installare i pacchetti <i>hachoir metadata</i> e <i>kaa metadata</i> "
+"per python."
+
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of 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:71
+#: rapid/glade3/prefs.ui.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1694,15 +1809,13 @@ msgid ""
 "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>"
 msgstr ""
-"Specificare la cartella in cui si memorizzare i salvataggi per il "
-"dispositivo.  \n"
+"Specificare la cartella in cui memorizzare i backup sul dispositivo.  \n"
 "\n"
-"<i>Nota: questo valore sarà anche utilizzato per determinare se il "
-"dispositivo è utilizzato o meno per i salvataggi. Per ogni dispositivo che "
-"vuoi utilizzare per i salvataggi, crea una cartella al suo interno con uno "
-"di questi nomi.</i>"
+"<i>Nota: sarà usato anche per determinare se il dispositivo è utilizzato o "
+"meno per i backup. Per ogni dispositivo che vuoi utilizzare per i backup, "
+"crea una cartella al suo interno con uno di questi nomi.</i>"
 
-#: 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."
@@ -1710,7 +1823,7 @@ msgstr ""
 "Specificare l'ora nel formato 24 ore a cui il numero di sequenza "
 "<i>Downloads oggi</i> dovrebbe essere reimpostato."
 
-#: 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."
@@ -1718,51 +1831,59 @@ msgstr ""
 "Specificare se dai nomi delle foto, dei video e delle cartelle occorre "
 "rimuovere qualche carattere non ammesso da altri sistemi operativi."
 
-#: rapid/glade3/prefs.ui.h:76
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Inizia il download all'avvio del programma"
 
-#: rapid/glade3/prefs.ui.h:77
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
-msgstr "Iniziare a scaricare quando il dispositivo viene inserito"
+msgstr "Inizia il download quando il dispositivo viene inserito"
 
-#: rapid/glade3/prefs.ui.h:78
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Numero memorizzato:"
 
-#: rapid/glade3/prefs.ui.h:79
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Elimina caratteri incompatibili"
 
-#: rapid/glade3/prefs.ui.h:80
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:81
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Smontare (\"eject\") il dispositivo al completamento del download"
+msgstr "Smonta (\"espelli\") il dispositivo al completamento del download"
+
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr ""
 
-#: rapid/glade3/prefs.ui.h:82
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
-msgstr "Cartelle Video"
+msgstr "Cartelle video"
 
-#: rapid/glade3/prefs.ui.h:83
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
-msgstr "Rinomina Video"
+msgstr "Rinomina video"
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
-msgstr "Nome della cartella di salvataggio dei video:"
+msgstr "Nome della cartella di backup dei video:"
 
-#: 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 ""
-"Quando una fotografia o un video dello stesso nome è già stata scaricata, "
-"scegli se saltare lo scarico oppure aggiungere un identificatore unico."
+"Quando una fotografia o un video con lo stesso nome è già stata scaricata, "
+"scegli se saltare il download oppure aggiungere un identificatore unico."
 
-#: 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."
@@ -1770,17 +1891,17 @@ msgstr ""
 "Scegliere se, durante un salvataggio, si vuole sovrascrivere un file che "
 "abbia lo stesso nome sul dispositivo di salvataggio, o ignorarne la copia."
 
-#: 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 ""
-"Si possono salvare le proprie foto o video in posizioni multiple mentre sono "
-"scaricati, per esempio su dischi esterni."
+"Durante il download è possibile effettuare il backup delle foto e dei video "
+"in posizioni multiple, come ad esempio su dischi esterni."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
-msgstr "_Aggiungere"
+msgstr "_Aggiungere..."
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
@@ -2433,601 +2554,19 @@ msgstr "Importa le tue foto ed i video in modo efficiente ed affidabile"
 #~ msgid "Already prompting for Job Code, do not prompt again"
 #~ msgstr "Si sta già richiedendo un Codice Lavoro, non si richiede di nuovo"
 
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Immagine: %(source)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Impossibile eliminare l'immagine dal dispositivo"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "%i immagini eliminate dal dispositivo"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Eliminare le immagini dal dispositivo al termine dello scarico"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Immagine: %(source)s\n"
-#~ "Errori: %(errno)s %(strerror)s"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr "Rilevate immagini con lo stesso nome, ma scattate ad ore diverse"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Prima immagine: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Seconda immagine: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Il numero dei downloads di oggi non è stato aggiornato, in quanto è in corso "
-#~ "un download"
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Il numero delle archiviazioni non è stato aggiornato, in quanto è in corso "
-#~ "un download"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Dispositivo immagini: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Sorgente: %s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Sorgente: %(source)s\n"
-#~ "Nome file generato parzialmente: %(newname)s\n"
-#~ "Destinazione: %(destination)s\n"
-#~ "Problema: %(problem)s"
-
-#~ msgid "Error:"
-#~ msgstr "Errore:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Impossibile creare la cartella temporanea"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Errore: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Sorgente: %(source)s\n"
-#~ "Destinazione: %(destination)s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Spiacenti, la locazione di questa immagine non esiste:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Si prega di risolvere il problema, oppure modificare le proprie preferenze."
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Attenzione: il server delle notifiche dell'ambiente desktop è configurato in "
-#~ "modo scorretto."
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problema con la Cartella di Download"
+#~ msgid "Backup location:"
+#~ msgstr "Posizione del backup:"
 
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
+#~ msgid "If you disable automatic detection, choose the exact backup location."
 #~ msgstr ""
-#~ "Spiacenti, la Cartella di Download esiste ma non è scrivibile. Si prega di "
-#~ "controllare i permessi della cartella, oppure modificare le proprie "
-#~ "preferenze."
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Spiacenti, la Cartella di Download non esiste. Si prega di creare la "
-#~ "cartella, oppure modificare le proprie preferenze."
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problema con la Cartella della Locazione Immagini"
+#~ "Se si disabilita il rilevamento automatico, scegliere l'esatta posizione del "
+#~ "backup."
 
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destinazione: %s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 di %(number)s %(filetypes)s"
-
-#, python-format
 #~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
+#~ "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 ""
-#~ "Alcuni valori non necessari sono stati rimossi dalle preferenze della "
-#~ "sottocartella %(filetype)s."
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Il seguente percorso per lo scarico non ha potuto essere creato:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "Impossibile aprire %s(filetype)s"
-
-#, python-format
-#~ msgid "The %s(filetype)s was not copied."
-#~ msgstr "Il %s(filetype)s non è stato copiato."
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Scansione del dispositivo completata: nessun %(filetypes)s trovato su "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Scansione del dispositivo completata: trovati %(number)s %(filetypes)s su "
-#~ "%(device)s"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Rilevate foto con gli stessi nomi di file, ma scattate ad ore diverse:"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Prima foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Seconda foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s non ha metadati"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Il %(file_type)s non è stato salvato."
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Sovrascritta copia di salvataggio di %(file_type)s"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s non salvati in %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Una copia di salvataggio di %(file_type)s esiste già"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Sottocartella: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problema: %(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "I metadati sono essenziali per generare le sottocartelle e/o i nomi dei "
-#~ "files.\n"
-#~ "Sorgente: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Il nome della sottocartella no ha potuto essere generato correttamente. "
-#~ "Controllre che ci siano metadati sufficienti."
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Non trovato alcun volume di salvataggio adatto"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s non salvati"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "%(file_type)s non ha potuto essere salvato"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s ignorati"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Questo dispositivo non ha %(types_searched_for)s da cui scaricare."
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "La miniatura della foto non ha potuto essere estratta"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Dispositivo: %s\n"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Non può avvenire alcun salvataggio"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Il percorso %s could not be created"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Il percorso di salvataggio non esiste"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Una locazione per il salvataggio non è stata trovata"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Nessun dispositivo di salvataggio è stato rilevato automaticamente"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Impossibile eliminare la foto o il video dal dispositivo"
-
-#~ msgid "Video skipped"
-#~ msgstr "Video ignorato"
-
-#~ msgid "Video already exists"
-#~ msgstr "Il video esiste già"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Foto: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Foto: %(source)s\n"
-#~ "Errore: %(errno)s %(strerror)s"
-
-#~ msgid "Photo already exists"
-#~ msgstr "La foto esiste già"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Foto ignorata"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "La Cartella di Download di %(file_type)s non è scrivibile.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "La Cartella di Download di %(file_type)s non esiste.\n"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Problema con le Cartelle di Download"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Spiacenti, si sono verificati problemi con le tue cartelle di download. Si "
-#~ "prega di risolvere i problemi oppure modificare le tue preferenze.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Si crea la cartella di download delle foto %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr ""
-#~ "Impossibile creare la cartella di download delle foto di default %(folder)s"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Eliminati %(number)i %(filetypes)s dal dispositivo"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Spiacenti, questo dispositivo non esiste:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Si prega di risolvere il problema, oppure modificare le tue preferenze."
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Problema con la Cartella della Posizione del Dispositivo"
-
-#~ msgid "videos skipped"
-#~ msgstr "video ignorati"
-
-#~ msgid "videos downloaded"
-#~ msgstr "video scaricati"
-
-#~ msgid "photos skipped"
-#~ msgstr "foto ignorate"
-
-#~ msgid "photos downloaded"
-#~ msgstr "foto scaricate"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr "Impossibile creare la cartella di download per i video %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Si crea la cartella di download per i video %(folder)s"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Metadato subsecond non presente nella foto"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "numero della foto o del video specificata ma il nome del file non ha numero"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "metadato %s non è presente nella foto"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "estensione specificata ma il nome del file non ha un'estensione"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "metadato %s non è presente nel video"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "%s metadati non è presente"
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr ""
-#~ "Scegliere se ignorare il download del file, o se aggiungere un "
-#~ "identificatore univoco."
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr "Esci dal programma se il download si completa senza avvisi od errori"
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Spiacente, la funzionalità di download dei video è disabilitata. Per "
-#~ "scaricare i video, si prega di installare il pacchetto <i>kaa metadata</i> "
-#~ "per python."
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Specificare cosa fare quando una foto o un video con lo stesso nome sono "
-#~ "stati scaricati o salvati."
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "Il nome di file %(filetype)s non ha potuto essere generato"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "Il nome di file %(filetype)s non ha potuto essere generato correttamente. "
-#~ "Verificare che ci siano sufficienti metadati."
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Could not open %(filetype)s"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "Il %(filetype)s non è stato copiato."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Sorgente: %(source)s\n"
-#~ "Destinazione: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Scarico dalle Macchine Fotografiche"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Lo scarico diretto da una macchina fotografica può funzionare male o per "
-#~ "nulla"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Lo scarico da un lettore di schede funziona sempre ed è generalmente molto "
-#~ "più veloce. E' fortemente raccomandato l'utilizzo di un lettore di schede."
-
-#~ msgid "_Show this message again"
-#~ msgstr "Ri_mostra questo messaggio"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Tentativo di scaricare %s files"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Si prega di controllare il proprio sistema e riprovare."
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s è stato scaricato con successo"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s non è stato scaricato"
-
-#~ msgid "File"
-#~ msgstr "File"
-
-#~ msgid "Status"
-#~ msgstr "Stato"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Path"
-#~ msgstr "Percorso"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr "%(filetype)s è stato scaricato ma ci sono stati problemi nel backup"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s è stato scaricato con messaggi di avvertimento"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s è pronto per lo scarico"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s sarà scaricato con messaggi di avvertimento"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s sta per essere scaricato"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s non è stato scaricato nè è stato effettuato il backup"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Inserire un nuovo Codice Lavoro e premere Invio, oppure selezionare un "
-#~ "Lavoro esistente"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr ""
-#~ "Si visualizza un messaggio a proposito dello scarico diretto dalla macchina "
-#~ "fotografica"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s non può essere scaricato"
-
-#~ msgid "Preview"
-#~ msgstr "Anteprima"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Le preferenze del backup sono state modificate."
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr "Attenzione: si sta scaricando dal dispositivo di backup %(device)s"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "_Scarico della Selezione"
-
-#~ msgid "_Resume"
-#~ msgstr "_Riprendi"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr ""
-#~ "Le preferenze delle sottocartelle e del nome del file sono state modificate."
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr ""
-#~ "Le preferenze delle impostazioni del dispositivo di scarico sono state "
-#~ "modificate."
-
-#~ msgid "_Download All"
-#~ msgstr "Scarica _Tutto"
-
-#~ msgid "Select _All"
-#~ msgstr "Seleziona _Tutto"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Seleziona Tutti i Vi_deo"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Seleziona Tutte le Fo_tografie"
-
-#~ msgid "Se_lect None"
-#~ msgstr "Se_leziona Nessuna"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "_Cartelle Anteprima"
-
-#~ msgid "P_review Columns"
-#~ msgstr "Colonne _Anteprima"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Le preferenze della cartella di scarico sono state modificate."
-
-#~ msgid "_Device"
-#~ msgstr "_Dispositivo"
-
-#~ msgid "_Filename"
-#~ msgstr "Nome del _file"
-
-#~ msgid "_Path"
-#~ msgstr "_Percorso"
-
-#~ msgid "_Preview"
-#~ msgstr "_Anteprima"
-
-#~ msgid "_Size"
-#~ msgstr "_Dimensione"
-
-#~ msgid "_Type"
-#~ msgstr "_Tipo"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s disponibile"
+#~ "Se si abilita il riconoscimento automatico dei dispositivi di memorizzazione "
+#~ "portatile, tutto il dispositivo sarà sottoposto a scansione per le immagini. "
+#~ "Su dispositivi capienti ciò potrebbe richiedere tempo."
diff --git a/po/ja.po b/po/ja.po
index 1e33650..67b4146 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,55 +7,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"POT-Creation-Date: 2011-09-08 06:50-0500\n"
+"PO-Revision-Date: 2011-08-24 15:52+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\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: 2011-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-19 19:06+0000\n"
+"X-Generator: Launchpad (build 13980)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "デバイス"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "サイズ"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "ダウンロードの進行状況"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -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:1178
 msgid "scanning..."
 msgstr "スキャン中…"
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2077 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "ダウンロード"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2080
 msgid "Pause"
 msgstr "一時停止"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2181
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -84,143 +84,143 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2184
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2185
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2490
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2492
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2494
 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:2395
+#: rapid/rapid.py:2499
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2521 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2523 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2526 rapid/rapid.py:3103 rapid/rpdfile.py:115
 msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2528 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2531 rapid/rapid.py:3101 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr ""
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2533 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2560
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2564
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2567 rapid/rapid.py:2619
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2576
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2582 rapid/rapid.py:2591 rapid/rapid.py:2600
+#: rapid/rapid.py:2609 rapid/rapid.py:2617
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2584 rapid/rapid.py:2602
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2593 rapid/rapid.py:2611
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2546
+#: rapid/rapid.py:2650
 #, 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:2553
+#: rapid/rapid.py:2657
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3071
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3076
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3078
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3080
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3107
 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:2983
+#: rapid/rapid.py:3119
 #, 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:2987
+#: rapid/rapid.py:3123
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -228,145 +228,157 @@ 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:2992
+#: rapid/rapid.py:3128
 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
+#: rapid/rapid.py:3133
 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
+#: rapid/rapid.py:3139
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3147
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3150
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3153
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3160
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3189
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3308 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3310 rapid/rpdfile.py:271
 msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3319
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3321 rapid/rapid.py:3335 rapid/rapid.py:3348
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3333
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3424
 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:3311
+#: rapid/rapid.py:3471
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3472
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3473
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3315
+#: rapid/rapid.py:3475
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3316
+#: rapid/rapid.py:3477
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3490
 msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3490
 msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3495
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3503
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3521
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr ""
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 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:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 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"
@@ -388,7 +400,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr ""
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:291
 msgid "MB/s"
 msgstr ""
 
@@ -413,7 +425,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 +770,123 @@ 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 Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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:1078
 msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "写真をダウンロードする先のフォルダを選択してください"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 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:1457
 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:1508
 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:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -851,94 +894,114 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+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:1931
 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/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "外部ドライブ2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "ニューヨーク"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "マニラ"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "プラハ"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "ヘルシンキ"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "ウェリントン"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "テヘラン"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "カンパラ"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "パリ"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "ベルリン"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "シドニー"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "ブダペスト"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "ローマ"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "モスクワ"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "デリー"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "ワルシャワ"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "ジャカルタ"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "マドリッド"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 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 ""
 
@@ -992,8 +1055,8 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
 #: rapid/problemnotification.py:103
@@ -1184,7 +1247,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 +1283,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 ""
@@ -1589,7 +1652,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
+msgid "Ignored Paths"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:59
@@ -1641,13 +1704,14 @@ msgid "Re_move All"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
+msgid "Remembered Paths"
 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."
+"Remembered paths are those associated with devices 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
@@ -1671,6 +1735,13 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of 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"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1678,84 +1749,84 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:82
+#: 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:83
+#: 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:90
+#: 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:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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:95
+#: 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:96
+#: 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:97
+#: rapid/glade3/prefs.ui.h:99
 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 ""
@@ -1778,8 +1849,5 @@ msgstr ""
 #~ msgid "Select a folder in which to backup images"
 #~ msgstr "画像をバックアップする先のフォルダを選択してください"
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
 #~ msgid "      "
 #~ msgstr "      "
diff --git a/po/nl.po b/po/nl.po
index db1a7ab..6ffb046 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-13 18:23-0500\n"
-"PO-Revision-Date: 2011-06-17 05:02+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 04:40+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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Apparaat"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Grootte"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Downloadvoortgang"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s werd niet ontkoppeld"
@@ -66,19 +66,19 @@ msgstr "%(device)s werd niet ontkoppeld"
 #. 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:1178
 msgid "scanning..."
 msgstr "Aan het scannen..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Pauze"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,137 +98,137 @@ msgstr ""
 "Deze downloadmap is ongeldig:\n"
 "%s"
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Download kan niet plaatsgrijpen"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "foto's en video's"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "foto's of video's"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "video's"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 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/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "foto's"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kon niet gedownload worden"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s gedownload"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, 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:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s van %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, 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:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,87 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s vrij"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Foto's en video's aan het backuppen naar %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Backuppen naar %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Foto's naar %(path)s en video's naar %(path2)s aan het backuppen"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Programma voorkeuren zijn ongeldig"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s downloadmap bestaat niet"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Map: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s downloadmap is ongeldig"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s downloadmap is niet beschrijfbaar"
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,43 +325,43 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "vertoon debug informatie wanneer uitgevoerd vanop de commando prompt"
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3486
 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:3315
+#: rapid/rapid.py:3488
 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:3316
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "reset alle programma instellingen en verlaat het programma"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Foto's:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Video's:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Alle instellingen en voorkeuren werden gereset"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -359,16 +371,16 @@ msgstr ""
 "Om video's te downloaden moet u de hachoir metadata en de kaa metadata "
 "pakketten voor python installeren."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Backup fout"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Doelmap kon niet aangemaakt worden: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -377,13 +389,13 @@ msgstr ""
 "Bron: %(source)s\n"
 "Doel: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fout: %(inst)s"
 
-#: 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"
@@ -409,7 +421,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "_Herinner deze keuze"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
@@ -434,7 +446,7 @@ msgid "Sequences"
 msgstr "Reeksen"
 
 #. 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 "Job code"
 
@@ -779,74 +791,104 @@ msgstr "Submap voorkeuren mogen niet eindigen op een %s"
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Submap voorkeuren mogen geen twee opeenvolgende %s bevatten"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Verwijder alle Job Codes?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Moeten alle Job Codes verwijderd worden?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Verwijder alle onthouden paden?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Moeten alle onthouden paden verwijderd worden?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Verwijder alle genegeerde paden?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Moeten alle genegeerde paden verwijderd worden?"
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Fout in de voorkeuren van Foto Hernoemen"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Fout in de voorkeuren Video Hernoemen"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Fout in de voorkeuren van Foto Download Submappen"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Fout in de voorkeuren Video Download Subfolders"
 
 #. 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 "Geef een Job Code op"
 
 #. 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 "Geef een nieuwe Job Code in of selecteer een bestaande"
 
 #. 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 "Geef een nieuwe Job Code in"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Job Code:"
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Geef het te negeren pad op"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr "Geef een pad op dat nooit op foto's of video's gescand zal worden"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Pad:"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Job Code"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Duid een map aan om de foto's naar toe te downloaden"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Selecteer een folder om de video's naar toe te downloaden"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selecteer een map die %(file_types)s bevat"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr ""
-"Selecteer een map waar %(file_types)s naar toe gebackuped moeten worden"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -854,7 +896,7 @@ msgstr ""
 "<i><b>Opgepast:</b> Er is onvoldoende metadata om een volledige naam aan te "
 "maken. Gelieve andere hernoemings opties te gebruiken.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -863,13 +905,13 @@ msgstr ""
 "te maken. Kies andere subfolder benoemings opties.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Voorbeeld: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -880,94 +922,120 @@ msgstr ""
 "gebruikt worden.\n"
 "Ze zullen naar de standaard waardes worden teruggezet."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"De volgende reguliere expressies zijn ongeldig en zullen verwijderd worden "
+"tenzij ze verbeterd worden:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Deze volgende reguliere expressie is ongeldig en zal verwijderd worden "
+"tenzij ze verbeterd wordt:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Ongeldige reguliere expressie"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "extern apparaat 1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "extern apparaat 2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manilla"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praag"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Parijs"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlijn"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Boedapest"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Rome"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moskou"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Warschau"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "subfolder"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "bestandsnaam"
 
@@ -1023,11 +1091,11 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s werd genomen op %(image1_date)s om %(image1_time)s en %(image2)s "
-"op %(image2_date)s om %(image2_time)s."
+"%(image1)s werd genomen op %(image1_date)s om %(image1_time)s, en %(image2)s "
+"op %(image2_date)s omOm %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1228,7 +1296,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Meerdere problemen tegengekomen"
 
-#: 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 ""
 "Foto's gevonden met dezelfde bestandsnaam, maar op een verschillend tijdstip "
@@ -1266,24 +1334,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "Foto werd al eens gedownload"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Bron: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "subfolder en bestandsnaam"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Kon downloadmap niet aanmaken"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Pad: %s"
@@ -1660,8 +1728,8 @@ msgstr ""
 "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"
+msgid "Ignored Paths"
+msgstr "Genegeerde paden"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1712,17 +1780,18 @@ msgid "Re_move All"
 msgstr "_Alles verwijderen"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
-msgstr "Onthouden Apparaten"
+msgid "Remembered Paths"
+msgstr "Onthouden paden"
 
 #: 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore 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."
+"Onthouden paden zijn deze verbonden met apparaten die je gekozen hebt om "
+"steeds gescand of genegeerd te worden, wanneer de automatische herkenning "
+"van Draagbare Opslag Apparaten aangezet is."
 
 #: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
@@ -1748,6 +1817,16 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Geef het gedeelte op het einde van een pad op waarvan je wenst dat dit pad "
+"genegeerd moet worden wanneer er gescand wordt naar foto's of video's.  Elk "
+"pad dat eindigt met de tekens hieronder zal niet gescand worden."
+
+#: rapid/glade3/prefs.ui.h:80
+msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1760,7 +1839,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:82
+#: 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."
@@ -1768,7 +1847,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:83
+#: 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."
@@ -1776,47 +1855,51 @@ 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Start de download tijdens het opstarten van het programma"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Start de download zodra het apparaat wordt aangekoppeld"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Opgeslagen nummer:"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Verwijder niet-compatibele karakters"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchroniseer RAW + JPEG volgnummers"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Ontkoppen (\"eject\") apparaat na beëindigen van de download"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Gebruik '_python-style regular expressions'"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Video Mappen"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Video Hernoemen"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Video backup foldernaam:"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr "Video backup locatie:"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1825,7 +1908,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:95
+#: 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."
@@ -1833,7 +1916,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:96
+#: 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."
@@ -1841,14 +1924,10 @@ 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:97
+#: rapid/glade3/prefs.ui.h:99
 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"
@@ -2010,21 +2089,6 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(number)s van %(total)s afbeeldingen gekopieerd"
 
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Kon afbeelding niet verwijderen van afbeeldingsapparaat"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Afbeelding: %(source)s\n"
-#~ "Fout: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Afbeelding: %(source)s"
-
 #~ msgid "Thumbnail cannot be displayed"
 #~ msgstr "Miniatuur kan niet getoond worden"
 
@@ -2185,9 +2249,6 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ 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"
 
@@ -2377,10 +2438,6 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ msgid "Download complete from %s"
 #~ msgstr "Download van %s afgelopen"
 
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "%i afbeeldingen van afbeeldingsapparaat verwijderd"
-
 #~ msgid "Enter a new job code, or select a previous one."
 #~ msgstr "Geef een nieuwe job code op, of kies een vorige."
 
@@ -2508,20 +2565,6 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 #~ "Specifieer of tekens dienen verwijderd te worden van een afbeeldings- of "
 #~ "mapnaam  die niet door andere besturingssystemen toegestaan zijn."
 
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Waarde opgeslagen nummer niet aangepast, daar er momenteel een download "
-#~ "bezig is"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "'Downloads Vandaag' waarde niet aangepast, daar er momenteel een download "
-#~ "bezig is"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
 #~ msgid "Starting downloads"
 #~ msgstr "Downloaden aanvangen"
 
@@ -2540,594 +2583,3 @@ msgstr "Importeer je foto's en video's efficiënt en betrouwbaar"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Afbeeldings Apparaten</span>"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Afbeeldingen gevonden met identieke bestandsnamen, maar op verschillend "
-#~ "tijdstip genomen"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Eerste afbeelding: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Tweede afbeelding: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Afbeeldingsapparaat: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Bron: %s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Bron: %(source)s\n"
-#~ "Gedeeltelijke aangemaakte bestandsnaam: %(newname)s\n"
-#~ "Doel: %(destination)s\n"
-#~ "Probleem: %(problem)s"
-
-#~ msgid "Error:"
-#~ msgstr "Fout:"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Doel: %s"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Kon de tijdelijke downloadfolder niet aanmaken"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Fout: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Bron: %(source)s\n"
-#~ "Doel: %(destination)s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Sorry, deze afbeeldingsplaats bestaat niet:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Los het probleem op, of verander je voorkeuren."
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Opgelet: de desktop environment notification server is verkeerd ingesteld."
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Probleem met de Download Map"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Sorry, de Download Map bestaat maar is niet beschrijfbaar. Controlleer de "
-#~ "schrijfrechten van de map, of pas je voorkeuren aan"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Sorry, de Download map bestaat niet. Maak de map aan, of verander je "
-#~ "voorkeuren"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Probleem met de Afbeeldingsplaats Map"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 van %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Er werden overbodige waardes verwijderd van de voorkeuren voor de "
-#~ "%(filetype)s subfolder"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Het volgende downloadpad kon niet aangemaakt worden:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "Kon %s(filetype)s niet openen"
-
-#, python-format
-#~ msgid "The %s(filetype)s was not copied."
-#~ msgstr "De %s(filetype)s werd niet gekopiëerd"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr "Apparaten scan afgelopen: geen %(filetypes)s gevonden op %(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Apparaten scan afgelopen: %(number)s %(filetypes)s op %(device)s gevonden"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Foto's met dezelfde naam ontdekt, maar gemaakt op verschillende tijden:"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "%(filetype)s bestandsnaam kon niet correct aangemaakt worden. Controller of "
-#~ "er voldoende metadata is."
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Eerste foto: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Tweede foto: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "%(filetype)s bestandsnaam kon niet aangemaakt worden"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s heeft geen metadata"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Kon %(filetype)s niet openen"
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Backup van %(file_type)s overschreven"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s niet gebackuped op %(volume)s"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Metadata is essentieel om subfolder en.of bestandsnamen aan te maken.\n"
-#~ "Bron: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Subfolder naam kon niet correct aangemaakt worden. Ga na of er voldoende "
-#~ "metadata is."
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "Bestand: %(file)s\n"
-#~ "Probleem: %(problem)s"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s overgeslagen"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Dit apparaat heeft geen %(types_searched_for)s om te downloaden"
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Foto icoontje kon niet opgehaald worden"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Apparaat: %s\n"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Een backup locatie werd niet gevonden"
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Geen geldig backup volume gevonden"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "%(file_type)s kon niet gebackuped worden"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "De %(file_type)s werd niet gebackuped"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s niet gebackuped"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Backup van %(file_type)s bestaat reeds"
-
-#~ msgid "Video skipped"
-#~ msgstr "Video overgeslagen"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Foto bestaat reeds"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Foto overgeslagen"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Backups kunnen niet plaatsgrijpen"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Het pad %s kon niet aangemaakt worden"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Backup pad bestaat niet"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Er werd geen backup apparaat automatisch ontdekt"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Kon foto of video niet verwijderen van apparaat"
-
-#~ msgid "Video already exists"
-#~ msgstr "Video bestaat reeds"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Foto: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Foto: %(source)s\n"
-#~ "Fout: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "De %(file_type)s Download Map bestaat niet\n"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Verwijderde %(number)i %(filetypes)s van apparaat"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Sorry, deze apparaat locatie bestaat niet:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Los het probleem op, of pas de voorkeuren aan."
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Probleem met de Apparaat Locatie Map"
-
-#~ msgid "photos skipped"
-#~ msgstr "foto's overgeslagen"
-
-#~ msgid "photos downloaded"
-#~ msgstr "foto's gedownload"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Prbleem met de Download Mappen"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Sorry, er waren problemen met je download mappen. Los deze problemen op of "
-#~ "pas de voorkeuren aan.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr "Kon de standaard video download map %(folder)s niet aanmaken"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Foto download map %(folder)s wordt aangemaakt"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Video download map %(folder)s wordt aangemaakt"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr "Kon de standaard foto download map %(folder)s niet aanmaken"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "De %(file_type)s Download Map bestaat maar is niet beschrijfbaar.\n"
-
-#~ msgid "videos skipped"
-#~ msgstr "video's overgeslagen"
-
-#~ msgid "videos downloaded"
-#~ msgstr "video's gedownload"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "beeld- of videonummer werd opgegeven maar de bestandsnaam heeft geen nummer"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "%s metadata ontbreekt in de foto"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "extentie werd opgegeven maar de bestandsnaam heeft geen extentie"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Subsecond metadata ontbreekt in de foto"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "%s metadata ontbreekt in de video"
-
-#, python-format
-#~ 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 "
-#~ "uniek nummer aan toe te kennen."
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Sorry, de video download functie is afgezet. Om video's te downloaden moet "
-#~ "je het <i>kaa metadata</i> pakket voor python binnenhalen"
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Duid aan wat te doen als er een foto of video met dezelfde naam reeds "
-#~ "gedownload of gebackuped werd."
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "De %(filetype)s werd niet gekopiëerd"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Bron: %(source)s\n"
-#~ "Doel: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Het downloaden van een kaartlezer werkt altijd en is meestal sneller. Het "
-#~ "wordt tenstelligste aanbevolen een kaartlezer te gebruiken."
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Downloaden van Camera's"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Het rechtstreeks downloaden vanaf een camera kan slecht, tot helemaal niet "
-#~ "werken"
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Toon dit bericht opnieuw"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Proberen om %s bestanden te downloaden"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Controlleer je systeem en probeer opnieuw"
-
-#~ msgid "Path"
-#~ msgstr "Pad"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s werd niet gedownload"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s was met succes gedownload"
-
-#~ msgid "File"
-#~ msgstr "Bestand"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Type"
-#~ msgstr "Type"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s werd gedownload maar er waren problemen tijdens het backuppen"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s werd gedownload met opmerkingen"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s is klaar om gedownload te worden"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s zal gedownload worden met opmerkingen"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s staat op het punt gedownload te worden"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s werd niet gedownload noch gebackupped"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Geef een nieuwe Job Code op en druk op Enter, of selecteer een bestaande Job "
-#~ "Code"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr ""
-#~ "Opmerking vertonen betreffende het rechtstreeks downloaden vanaf een camera"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s kan niet gedownload worden"
-
-#~ msgid "Preview"
-#~ msgstr "Voorbeeld"
-
-#~ msgid "_Download All"
-#~ msgstr "_Alles Downloaden"
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Opmerking: er wordt momenteel gedownload vanaf backup apparaat %(device)s"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "D_ownload geselecteerd"
-
-#~ msgid "_Resume"
-#~ msgstr "_Hervatten"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Subfolder en bestandsnaam voorkeuren zijn veranderd."
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "De download apparaat instellingen zijn veranderd"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Backup voorkeuren zijn veranderd."
-
-#~ msgid "Select _All"
-#~ msgstr "Selecteer _Alles"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Selecteer Alle Vi_deo's"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Selecteer Alle Fo_to's"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Preview _Mappen"
-
-#~ msgid "P_review Columns"
-#~ msgstr "P_review Kolommen"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Downloadmap voorkeuren zijn veranderd."
-
-#~ msgid "Se_lect None"
-#~ msgstr "Se_lecteer Geen Enkele"
-
-#~ msgid "_Device"
-#~ msgstr "_Apparaat"
-
-#~ msgid "_Path"
-#~ msgstr "_Pad"
-
-#~ msgid "_Preview"
-#~ msgstr "_Voorbeeld"
-
-#~ msgid "_Filename"
-#~ msgstr "_Bestandsnaam"
-
-#~ msgid "_Size"
-#~ msgstr "_Grootte"
-
-#~ msgid "_Type"
-#~ msgstr "_Type"
-
-#, python-format
-#~ 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/nn.po b/po/nn.po
index ed39bdd..b957dd9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,244 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-22 21:26-0500\n"
-"PO-Revision-Date: 2010-10-25 07:14+0000\n"
-"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 09:02+0000\n"
+"Last-Translator: Kevin Brubeck Unhammer <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn@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-12-05 16:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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:6353 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: 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 "Praha"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Teheran"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "Paris"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Berlin"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "Budapest"
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "Roma"
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "Moskva"
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "Delhi"
-
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "Warszawa"
-
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "Madrid"
-
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
-msgstr "Ugyldig verdi for Nedlastingar idag.\n"
-
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr "Nullstiller verdien.\n"
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr "Ugyldig innstillingsverdi for «Byrjar av dag»\n"
-
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr "Nullstiller verdien til midnatt.\n"
-
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
-msgstr "Feil i innstillingane til biletomdøping"
-
-#: rapid/rapid.py:592 rapid/rapid.py:1714
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "Orsak, det er ein feil i innstillingane:\n"
-
-#: rapid/rapid.py:603
-msgid "Resetting to default values."
-msgstr "Nullstiller til standardverdiar."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:678 rapid/renamesubfolderprefs.py:199
-msgid "Job code"
-msgstr "Jobbnamn"
-
-#: rapid/rapid.py:746
-msgid "Error in Video Rename preferences"
-msgstr "Feil i innstillingane til videoomdøping"
-
-#: rapid/rapid.py:764
-msgid "Error in Photo Download Subfolders preferences"
-msgstr "Feil i innstillingane til undermapper for biletnedlasting"
-
-#: rapid/rapid.py:781
-msgid "Error in Video Download Subfolders preferences"
-msgstr "Feil i innstillingane til undermapper for videonedlasting"
-
-#: rapid/rapid.py:814 rapid/rapid.py:1545
-msgid "photos and videos"
-msgstr "bilete og videoar"
-
-#: rapid/rapid.py:816 rapid/rapid.py:1555 rapid/rapid.py:1683
-msgid "photos"
-msgstr "bilete"
-
-#: rapid/rapid.py:949
-msgid "Select a folder to download photos to"
-msgstr "Vel ei mappe å laste inn bilete til"
-
-#: rapid/rapid.py:967
-msgid "Select a folder to download videos to"
-msgstr "Vel ei mappe å laste inn video til"
-
-#: rapid/rapid.py:1049
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr "Vel ei mappe med %(file_types)s"
-
-#: rapid/rapid.py:1071
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Vel ei mappe kor du vil ta tryggleikskopi av %(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
-#: rapid/rapid.py:1152
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-"<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
-"generere namnet. Ver vennleg og nytt andre omdøpingsval.</i>"
-
-#: rapid/rapid.py:1188
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
-"<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
-"generere undermappene. Ver vennleg og nytt andre omdøpingsval.</i><"
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1192
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Døme: %s</i>"
-
-#: rapid/rapid.py:1218
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr "Oppdaterte ikkje «Nedlastingar idag», sidan ei nedlasting skjer no"
-
-#: rapid/rapid.py:1234
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr "Oppdaterte ikkje lagra talverdi, sidan ei nedlasting skjer no"
-
-#: rapid/rapid.py:1264
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr ""
-"Fjerna nokre overflødige verdiar frå undermappeinnstillingane for "
-"%(filetype)s."
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1269
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-"Innstillingane til undermapper for filtypen %(filetype)s er ugyldige\n"
-"og kan ikkje nyttast.\n"
-"Dei blir endra til standardverdiar."
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1283 rapid/rapid.py:1557
-msgid "photo"
-msgstr "bilete"
-
-#: rapid/rapid.py:1284 rapid/rapid.py:1552
-msgid "video"
-msgstr "video"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1521
-msgid "externaldrive1"
-msgstr "eksterndisk1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1523
-msgid "externaldrive2"
-msgstr "eksterndisk2"
-
-#: rapid/rapid.py:1547 rapid/rapid.py:1681
-msgid "photos or videos"
-msgstr "bilete eller videoar"
-
-#: rapid/rapid.py:1550
-msgid "videos"
-msgstr "videoar"
-
-#: rapid/rapid.py:1562
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -253,825 +31,291 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:1564
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:1567
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-
-#: rapid/rapid.py:1574
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/rapid.py:1602 rapid/rapid.py:2278
-msgid "subfolder and filename"
-msgstr "undermappe og filnamn"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:150
+msgid "Device"
+msgstr "Eining"
 
-#: rapid/rapid.py:1604 rapid/rapid.py:2280
-msgid "filename"
-msgstr "filnamn"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:167
+msgid "Size"
+msgstr "Storleik"
 
-#: rapid/rapid.py:1606 rapid/rapid.py:2282
-msgid "subfolder"
-msgstr "undermappe"
+#: rapid/rapid.py:170
+msgid "Download Progress"
+msgstr "Nedlastingsframgang"
+
+#: rapid/rapid.py:316
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s vart ikkje avmontert"
 
 #. 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:1697
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "leiter..."
 
-#: rapid/rapid.py:1812
-msgid "The following download path could not be created:\n"
-msgstr "Klarte ikkje å lage følgjande nedlastingssti:\n"
-
-#: rapid/rapid.py:1813
-#, python-format
-msgid "%(path)s: "
-msgstr "%(path)s: "
-
-#: rapid/rapid.py:1814 rapid/rapid.py:1815 rapid/rapid.py:1830
-#: rapid/rapid.py:1831 rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Download cannot proceed"
-msgstr "Kan ikkje gå vidare med nedlasting"
-
-#: rapid/rapid.py:1828 rapid/rapid.py:4999
-msgid "There is an error in the program preferences."
-msgstr "Det er ein feil i innstillingane."
-
-#: rapid/rapid.py:1829
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
-msgstr ""
-"\n"
-"Vennligst kontroller innstillingane, start programmet på nytt, og prøv igjen."
-
-#. 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:2006
-#, python-format
-msgid "%(number)s %(filetypes)s"
-msgstr "%(number)s %(filetypes)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:2017
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-msgstr "Einingssøk fullført: fann %(number)s %(filetypes)s på %(device)s"
-
-#: rapid/rapid.py:2024
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-msgstr "Einingssøk fullført: fann ingen %(filetypes)s på %(device)s"
-
-#. This message informs the user that the device (e.g. camera, hard drive or memory card) was automatically unmounted and they can now remove it
-#: rapid/rapid.py:2045
-msgid "The device can now be safely removed"
-msgstr "Du kan no trygt fjerne eininga"
-
-#: rapid/rapid.py:2051
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr "Lasta ned %(noFiles)s %(filetypes)s"
-
-#: rapid/rapid.py:2054
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr "Klarte ikkje å laste ned %(noFiles)s %(filetypes)s"
-
-#: rapid/rapid.py:2057 rapid/rapid.py:5792
-msgid "warnings"
-msgstr "åtvaringar"
-
-#: rapid/rapid.py:2059 rapid/rapid.py:5796
-msgid "errors"
-msgstr "feil"
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "Last ned"
 
 #: rapid/rapid.py:2089
-#, python-format
-msgid "Source: %s\n"
-msgstr "Kjelde: %s\n"
+msgid "Pause"
+msgstr "Pause"
 
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Device: %s\n"
-msgstr "Eining: %s\n"
-
-#: rapid/rapid.py:2092
-#, python-format
-msgid "Destination: %s"
-msgstr "Mål: %s"
-
-#: rapid/rapid.py:2093 rapid/rapid.py:2096
-msgid "Could not create temporary download directory"
-msgstr "Klarte ikkje å opprette midlertidig nedlastingsmappe"
-
-#: rapid/rapid.py:2096
-msgid "Error:"
-msgstr "Feil:"
-
-#: rapid/rapid.py:2120
-msgid "Backup path does not exist"
-msgstr "Tryggleikskopieringsstien finst ikkje"
-
-#: rapid/rapid.py:2121
-#, python-format
-msgid "The path %s could not be created"
-msgstr "Klarte ikkje å opprette stien %s"
-
-#: rapid/rapid.py:2122
-msgid "No backups can occur"
-msgstr "Kan ikkje ta tryggleikskopi"
-
-#: rapid/rapid.py:2151
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
-"Kjelde: %(source)s\n"
-"Mål: %(destination)s\n"
-"%(problem)s"
+"Følgjande mapper er ugyldige:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 
-#: rapid/rapid.py:2182 rapid/rapid.py:2528 rapid/rapid.py:2563
-#: rapid/rapid.py:2591 rapid/rapid.py:2622 rapid/rapid.py:2641
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
-"Kjelde: %(source)s\n"
-"Mål: %(destination)s"
+"Mappa er ugyldig:\n"
+"%s"
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2197
-msgid "Please check your system and try again."
-msgstr "Ver vennleg og kontroller systemet ditt og prøv igjen."
-
-#: rapid/rapid.py:2217
-msgid "Photos detected with the same filenames, but taken at different times"
-msgstr "Fann bilete med like filnamn, tatt på ulike datoar"
+#: rapid/rapid.py:2194
+msgid "Download cannot proceed"
+msgstr "Kan ikkje gå vidare med nedlasting"
 
-#: rapid/rapid.py:2257
-msgid "Photo has already been downloaded"
-msgstr "Biletet er allereie lasta ned"
+#: rapid/rapid.py:2503
+msgid "About 1 second remaining"
+msgstr "Omtrent eitt sekund igjen"
 
-#: rapid/rapid.py:2258 rapid/rapid.py:2657
+#: rapid/rapid.py:2505
 #, python-format
-msgid "Source: %(source)s"
-msgstr "Kjelde: %(source)s"
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2456
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr ""
-"Ei ny dag har byrja - nullstiller sekvensnummeret «Nedlastingar idag»"
+msgid "About %i seconds remaining"
+msgstr "Omtrent %i sekund igjen"
 
-#: rapid/rapid.py:2527
-#, python-format
-msgid "Backup of %(file_type)s already exists"
-msgstr "Det finst allereie tryggleikskopi av %(file_type)s"
+#: rapid/rapid.py:2507
+msgid "About 1 minute remaining"
+msgstr "Omtrent eitt minutt igjen"
 
-#: rapid/rapid.py:2531
+#. 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:2512
 #, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr "Skreiv over tryggleikskopi av %(file_type)s"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Omtrent %(minutes)i minutt og %(seconds)02i sekund igjen"
 
-#: rapid/rapid.py:2535
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr "%(file_type)s ikkje kopiert til %(volume)s"
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+msgid "photos and videos"
+msgstr "bilete og videoar"
 
-#: rapid/rapid.py:2537
-#, python-format
-msgid "%(file_type)s not backed up"
-msgstr "Tok ikkje tryggleikskopi av %(file_type)s"
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "bilete eller videoar"
 
-#: rapid/rapid.py:2560 rapid/rapid.py:2588 rapid/rapid.py:2621
-#: rapid/rapid.py:2640
-msgid "Backing up error"
-msgstr "Feil ved tryggleikskopiering"
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
+msgid "videos"
+msgstr "videoar"
 
-#: rapid/rapid.py:2561 rapid/rapid.py:2589
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr "Klarte ikkje å opprette målmappa %(directory)s\n"
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
 
-#: rapid/rapid.py:2565 rapid/rapid.py:2624
-#, python-format
-msgid "Error: %(inst)s"
-msgstr "Feil: %(inst)s"
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
+#: rapid/rpdfile.py:120
+msgid "photos"
+msgstr "bilete"
 
-#: rapid/rapid.py:2566 rapid/rapid.py:2594 rapid/rapid.py:2625
-#: rapid/rapid.py:2644
-#, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr "Lagte ikkje tryggleikskopi av %(file_type)s."
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "bilete"
 
-#: rapid/rapid.py:2593 rapid/rapid.py:2643
+#: rapid/rapid.py:2573
 #, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr "Feil: %(errno)s %(strerror)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
+msgstr "Lasta ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2656
+#: rapid/rapid.py:2577
 #, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr "Klarte ikkje å tryggleikskopiere %(file_type)s"
-
-#: rapid/rapid.py:2659
-msgid "No suitable backup volume was found"
-msgstr "Fann ingen passande disk å lage tryggleikskopi til"
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "Klarte ikkje å laste ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2661
-msgid "A backup location was not found"
-msgstr "Fann ingen stader å lage tryggleikskopi til"
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
+msgid "warnings"
+msgstr "åtvaringar"
 
-#: rapid/rapid.py:2715
-#, python-format
-msgid "This device has no %(types_searched_for)s to download from."
-msgstr "Eininga har ingen %(types_searched_for)s å laste ned."
+#: rapid/rapid.py:2589
+msgid "All downloads complete"
+msgstr "Alle nedlastingar er ferdige"
 
-#: rapid/rapid.py:2788
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
-msgid "Download has started from %s"
-msgstr "Byrja å laste ned frå %s"
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2799
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
-msgid "Attempting to download %s files"
-msgstr "Prøver å laste ned %s filer"
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s lasta ned"
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2831 rapid/rapid.py:2898
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
-msgstr "%(number)s av %(total)s %(filetypes)s"
+msgid "%(filetype)s failed to download"
+msgstr "Klarte ikkje å laste ned %(filetype)s"
 
-#: rapid/rapid.py:2894
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2663
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s igjen)"
 
-#: rapid/rapid.py:2919 rapid/rapid.py:2923
-msgid "Could not delete photo or video from device"
-msgstr "Klarte ikkje å slette bilete/video frå eininga"
-
-#: rapid/rapid.py:2920
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
-"Bilete: %(source)s\n"
-"Feil: %(errno)s %(strerror)s"
-
-#: rapid/rapid.py:2924
-#, python-format
-msgid "Photo: %(source)s"
-msgstr "Bilete: %(source)s"
-
-#: rapid/rapid.py:2926
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
-msgstr "Sletta %(number)i %(filetypes)s frå eininga"
-
-#: rapid/rapid.py:2939
-#, python-format
-msgid "Download complete from %s"
-msgstr "Ferdig med å laste ned frå %s"
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3054 rapid/rapid.py:3523
-msgid "Device"
-msgstr "Eining"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3059 rapid/rapid.py:3512
-msgid "Size"
-msgstr "Storleik"
-
-#: rapid/rapid.py:3062
-msgid "Download Progress"
-msgstr "Nedlastingsframgang"
-
-#: rapid/rapid.py:3150
-msgid "Downloading From Cameras"
-msgstr "Lastar ned frå kamera"
-
-#: rapid/rapid.py:3156
-msgid "Downloading directly from a camera may work poorly or not at all"
-msgstr ""
-"Nedlasting direkte frå kamera kan fungere dårleg eller ikkje i det heile"
-
-#: rapid/rapid.py:3157
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
-msgstr ""
-"Nedlasting frå kortlesarar fungerer alltid, og dette er generelt mykje "
-"raskare; det er tilrådeleg å nytte ein kortlesar."
-
-#: rapid/rapid.py:3171
-msgid "_Show this message again"
-msgstr "_Vis denne meldinga igjen"
-
-#: rapid/rapid.py:3206
-msgid "Device Detected"
-msgstr "Oppdaga eining"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3215
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr "Vil du laste ned bilete eller videoar frå denne eininga/partisjonen?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
-msgid "_Remember this choice"
-msgstr "_Hugs dette valet"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3271
-#, python-format
-msgid "%s selected for downloading from"
-msgstr "%s velt for nedlasting"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3274
-msgid "This device or partition will always be used to download from"
-msgstr "Nyttar alltid denne eininga/partisjonen for nedlasting"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3277
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2670
 #, python-format
-msgid "%s rejected as a download device"
-msgstr "%s ikkje godkjend som nedlastingseining"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3280
-msgid "This device or partition will never be used to download from"
-msgstr "Nyttar aldri denne eininga/partisjonen til nedlasting"
-
-#: rapid/rapid.py:3287
-msgid "Remove all Job Codes?"
-msgstr "Fjern alle jobbnamn?"
-
-#: rapid/rapid.py:3304
-msgid "Should all Job Codes be removed?"
-msgstr "Skal alle jobbnamn fjernast?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3332
-msgid "Enter a Job Code"
-msgstr "Skriv inn eit jobbnamn"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3351
-msgid "Enter a new Job Code, or select a previous one"
-msgstr "Skriv inn eit jobbnamn, eller vel eit du har nytta tidlegare"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3354
-msgid "Enter a new Job Code"
-msgstr "Skriv inn eit nytt jobbnamn"
-
-#: rapid/rapid.py:3359 rapid/rapid.py:4534
-msgid "Job Code:"
-msgstr "Jobbnamn:"
-
-#: rapid/rapid.py:3406
-msgid "Job Code entered"
-msgstr "Jobbnamn lagra"
-
-#: rapid/rapid.py:3408
-msgid "Job Code not entered"
-msgstr "Jobbnamn ikkje lagra"
-
-#: rapid/rapid.py:3458
-msgid "Status"
-msgstr "Status"
-
-#: rapid/rapid.py:3466
-msgid "Type"
-msgstr "Type"
-
-#: rapid/rapid.py:3475 rapid/rapid.py:4961 rapid/rapid.py:4963
-msgid "Photo"
-msgstr "Bilete"
-
-#: rapid/rapid.py:3477
-msgid "File"
-msgstr "Fil"
-
-#: rapid/rapid.py:3492
-msgid "Job Code"
-msgstr "Jobbnamn"
-
-#: rapid/rapid.py:3502
-msgid "Date"
-msgstr "Dato"
-
-#: rapid/rapid.py:3534 rapid/renamesubfolderprefs.py:195
-msgid "Filename"
-msgstr "Filnamn"
-
-#: rapid/rapid.py:3545
-msgid "Path"
-msgstr "Sti"
-
-#: rapid/rapid.py:3955
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
-msgstr "%(filetype)s blei lasta ned"
-
-#: rapid/rapid.py:3957
-#, python-format
-msgid "%(filetype)s was not downloaded"
-msgstr "%(filetype)s blei ikkje lasta ned"
-
-#: rapid/rapid.py:3959
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
-msgstr "%(filetype)s blei lasta ned med åtvaringar"
-
-#: rapid/rapid.py:3961
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
-msgstr ""
-"%(filetype)s blei lasta ned, men det var problem med tryggleikskopieringa"
-
-#: rapid/rapid.py:3963
-#, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
-msgstr "%(filetype)s blei korkje lasta ned eller tryggleikskopiert"
-
-#: rapid/rapid.py:3965
-#, python-format
-msgid "%(filetype)s is ready to be downloaded"
-msgstr "%(filetype)s er klar for nedlasting"
-
-#: rapid/rapid.py:3967
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
-msgstr "%(filetype)s skal no lastast ned"
-
-#: rapid/rapid.py:3969
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
-msgstr "%(filetype)s blir lasta ned med åtvaringar"
-
-#: rapid/rapid.py:3971
-#, python-format
-msgid "%(filetype)s cannot be downloaded"
-msgstr "%(filetype)s kan ikkje lastast ned"
-
-#: rapid/rapid.py:4341
-msgid "Preview"
-msgstr "Førehandsvising"
-
-#: rapid/rapid.py:4556
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-msgstr ""
-"Skriv inn eit jobbnamn og trykk linjeskift, eller vel eit tidlegare jobbnamn"
-
-#: rapid/rapid.py:4928
-#, python-format
-msgid "%(free)s available"
-msgstr "%(free)s tilgjengeleg"
-
-#. user manually specified backup location
-#: rapid/rapid.py:4934
-#, python-format
-msgid "Backing up to %(path)s"
-msgstr "Tek tryggleikskopi til %(path)s"
-
-#: rapid/rapid.py:4939
-#, python-format
-msgid "%(freespace)s. %(backuppaths)s."
-msgstr "%(freespace)s. %(backuppaths)s."
-
-#: rapid/rapid.py:4948
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
-msgstr ""
-"Orsak, denne einingsstien finst ikkje:\n"
-"%(path)s\n"
-"\n"
-"Ver vennleg og løys dette problemet, eller endre innstillingane dine."
-
-#: rapid/rapid.py:4952
-msgid "Problem with Device Location Folder"
-msgstr "Problem med mappa til einingsstien"
-
-#: rapid/rapid.py:4961
-msgid "Video"
-msgstr "Video"
-
-#: rapid/rapid.py:4968
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
-msgstr "Nedlastingsmappa for %(file_type)s finst ikkje\n"
-
-#: rapid/rapid.py:4977
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-"Nedlastingsmappa for %(file_type)s finst, men har ikkje skrivetilgang.\n"
-
-#: rapid/rapid.py:4982
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
-msgstr ""
-"Orsak, det oppsto problem med nedlastingsmappene. Ver vennleg og løys "
-"problema, eller endre innstillingane.\n"
-"\n"
-
-#: rapid/rapid.py:4985
-msgid "Problem with Download Folder"
-msgstr "Problem med nedlastingsmappe"
-
-#: rapid/rapid.py:4987
-msgid "Problem with Download Folders"
-msgstr "Problem med nedlastingsmapper"
-
-#: rapid/rapid.py:5000
-msgid "Some preferences will be reset."
-msgstr "Visse innstillingar blir nullstilt."
-
-#: rapid/rapid.py:5033
-msgid "Displaying warning about downloading directly from camera"
-msgstr "Viser åtvaring om nedlasting direkte frå kamera"
-
-#: rapid/rapid.py:5043
-#, python-format
-msgid "Prompting whether to use %s"
-msgstr "Spør om å nytte %s"
-
-#: rapid/rapid.py:5070
-msgid "Prompting for Job Code"
-msgstr "Spør om jobbnamn"
-
-#: rapid/rapid.py:5074
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr "Spør allereie om jobbnamn, ikkje spør igjen"
-
-#: rapid/rapid.py:5091
-msgid "Starting downloads"
-msgstr "Byrjar nedlasting"
-
-#. autostart is true
-#: rapid/rapid.py:5095
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr "Byrjar nedlastingar som har venta på jobbnamn"
-
-#: rapid/rapid.py:5142
-#, python-format
-msgid "Creating photo download folder %(folder)s"
-msgstr "Lagar mappa %(folder)s, til biletnedlasting"
-
-#: rapid/rapid.py:5147
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr "Klarte ikkje å lage standardmappa for biletnedlasting %(folder)s"
-
-#: rapid/rapid.py:5151
-#, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr "Lagar mappa %(folder)s for videonedlasting"
-
-#: rapid/rapid.py:5156
-#, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr "Klarte ikkje å lage standardmappa for videonedlasting %(folder)s"
-
-#: rapid/rapid.py:5181
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-"Ei nyare utgåve av dette programmet har køyrt tidlegare på denne maskinen.\n"
-"\n"
-
-#: rapid/rapid.py:5183
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
-msgstr ""
-"Programinnstillingane kan synast å vere gyldige, men ver vennleg og "
-"kontroller dei for å vere sikker på at alt er som det skal vere."
-
-#: rapid/rapid.py:5185
-msgid "Sorry, some preferences are invalid and will be reset."
-msgstr "Orsak, visse innstillingar var ugyldige og blir nullstilt."
-
-#: rapid/rapid.py:5186
-msgid "Warning:"
-msgstr "Åtvaring:"
-
-#: rapid/rapid.py:5191
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
-msgstr ""
-"Denne utgåva av programmet er nyare enn den som køyrte tidlegare. "
-"Kontrollerer innstillingar."
-
-#: rapid/rapid.py:5198
-msgid "Preferences were modified."
-msgstr "Innstillingane blei endra."
-
-#: rapid/rapid.py:5199
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
-msgstr ""
-"Denne utgåva av programmet nyttar andre innstillingar enn den gamle utgåva. "
-"Innstillingane dine er oppdatert.\n"
-"\n"
-"Ver vennleg og kontroller dei for å sjå til at alt er som det skal vere."
-
-#: rapid/rapid.py:5203
-msgid "No preferences needed to be changed."
-msgstr "Trengte ikkje å endre nokon innstillingar."
-
-#: rapid/rapid.py:5205
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
-msgstr ""
-"Denne utgåva av programmet nyttar andre innstillingar enn den gamle utgåva. "
-"Visse gamle innstillingar var ugyldige, og kunne ikkje oppdaterast. Dei blir "
-"nullstilt."
-
-#: rapid/rapid.py:5215
-msgid "Problem using pynotify."
-msgstr "Problem med pynotify."
-
-#: rapid/rapid.py:5231
-msgid "Failed to receive pynotify server capabilities."
-msgstr "Klarte ikkje å hente inn eigenskapane til pynotify-tenaren."
-
-#: rapid/rapid.py:5242
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr ""
-"Åtvaring: meldingstenaren til skrivebordsmiljøet er ikkje rett innstilt."
+msgid "%(number)s of %(total)s %(filetypes)s"
+msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:5290
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:5295
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Nyttar einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:5297
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Nyttar eining for tryggleikskopiering"
 
-#: rapid/rapid.py:5299
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Fann ingen einingar for tryggleikskopiering"
 
-#: rapid/rapid.py:5349 rapid/rapid.py:5511
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr "Ignorerte eininga %(device)s (%(path)s)"
+#: rapid/rapid.py:3120
+msgid "Free space:"
+msgstr "Ledig plass:"
+
+#. (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:3132
+#, 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:3136
+#, python-format
+msgid "%(free)s %(file_type)s"
+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:3141
+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:3146
+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:3152
+#, python-format
+msgid "%(free)s free"
+msgstr "%(free)s tilgjengeleg"
 
-#: rapid/rapid.py:5470
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr "Fann %(device)s med sti %(path)s"
-
-#: rapid/rapid.py:5474
-msgid "Automatically start download is true"
-msgstr "Byrjar automatisk nedlasting"
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Tek tryggleikskopi av bilete og videoar til %(path)s"
 
-#: rapid/rapid.py:5476
-msgid "Automatically start download is false"
-msgstr "Byrjar ikkje automatisk nedlasting"
-
-#: rapid/rapid.py:5529
-msgid "Using manually specified path"
-msgstr "Nytt manuelt oppgitt sti"
-
-#. 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:5597
+#. user manually specified backup location
+#: rapid/rapid.py:3163
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr ""
-"Åtvaring: lastar no ned frå eininga for tryggleikskopiering %(device)s"
-
-#: rapid/rapid.py:5613
-msgid "D_ownload Selected"
-msgstr "N_edlasting valt"
+msgid "Backing up to %(path)s"
+msgstr "Tek tryggleikskopi til %(path)s"
 
-#: rapid/rapid.py:5713 rapid/rapid.py:5764
-msgid "All downloads complete"
-msgstr "Alle nedlastingar er ferdige"
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Tek tryggleikskopi av bilete  til %(path)s og videoar til %(path2)s"
 
-#: rapid/rapid.py:5728
-msgid "MB/s"
-msgstr "MB/s"
+#: rapid/rapid.py:3173
+#, python-format
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:5738
-msgid "About 1 second remaining"
-msgstr "Omtrent eitt sekund igjen"
+#: rapid/rapid.py:3202
+msgid "Program preferences are invalid"
+msgstr "Programinnstillingane er ugyldige"
 
-#: rapid/rapid.py:5740
-#, python-format
-msgid "About %i seconds remaining"
-msgstr "Omtrent %i sekund igjen"
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr "Bilete"
 
-#: rapid/rapid.py:5742
-msgid "About 1 minute remaining"
-msgstr "Omtrent eitt minutt igjen"
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
+msgid "Video"
+msgstr "Video"
 
-#. 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:5747
+#: rapid/rapid.py:3332
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Omtrent %(minutes)i minutt og %(seconds)02i sekund igjen"
+msgid "%(file_type)s download folder does not exist"
+msgstr "Nedlastingsmappa til %(file_type)s finst ikkje"
 
-#: rapid/rapid.py:5767 rapid/rapid.py:5773 rapid/rapid.py:5779
-#: rapid/rapid.py:5785 rapid/rapid.py:5790 rapid/rapid.py:5794
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
-msgstr "%(number)s %(numberdownloaded)s"
+msgid "Folder: %s"
+msgstr "Mappe: %s"
 
-#: rapid/rapid.py:5769 rapid/rapid.py:5781
+#: rapid/rapid.py:3346
 #, python-format
-msgid "%(filetype)s downloaded"
-msgstr "%(filetype)s lasta ned"
+msgid "%(file_type)s download folder is invalid"
+msgstr "Nedlastingsmappa til %(file_type)s er ugyldig"
 
-#: rapid/rapid.py:5775 rapid/rapid.py:5787
+#: rapid/rapid.py:3359
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr "Klarte ikkje å laste ned %(filetype)s"
-
-#: rapid/rapid.py:5955
-msgid "_Resume"
-msgstr "_Fortsett"
-
-#: rapid/rapid.py:5958
-msgid "_Download All"
-msgstr "_Last ned alle"
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5967
-msgid "_Pause"
-msgstr "_Pause"
-
-#: rapid/rapid.py:6079
-msgid "Download device settings preferences were changed."
-msgstr "Endra innstillingar for nedlastingseining."
-
-#: rapid/rapid.py:6091
-msgid "Backup preferences were changed."
-msgstr "Endra innstillingar for tryggleikskopiering."
+msgid "%(file_type)s download folder is not writable"
+msgstr "Nedlastingsmappa til %(file_type)s er ikkje skrivbar"
 
-#: rapid/rapid.py:6097
-msgid "Subfolder and filename preferences were changed."
-msgstr "Endra innstillingar for undermapper og filnamn."
-
-#: rapid/rapid.py:6108
-msgid "Download folder preferences were changed."
-msgstr "Endra innstillingar for nedlastingsmappe."
-
-#: rapid/rapid.py:6307
-msgid "Goodbye"
-msgstr "Ha det bra"
+#: rapid/rapid.py:3437
+msgid "Thumbnails"
+msgstr "Miniatyrbilete"
 
 #. 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:6318
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -1080,577 +324,1290 @@ msgstr ""
 "vis programinformasjon på kommandolinja når programmet køyrer \n"
 "(standard: %default)"
 
-#: rapid/rapid.py:6319
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "vis avlusingsinformasjon ved køyring frå kommandolinja"
 
-#: rapid/rapid.py:6320
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "vis berre feil på kommandolinja"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6322
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "vis kva for bilet- og videofiltypane programmet gjenkjenner, og avslutt"
 
-#: rapid/rapid.py:6323
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "nullstill alle programinnstillingar og avslutt"
 
-#: rapid/rapid.py:6337
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Bilete:"
 
-#: rapid/rapid.py:6337
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Videoar:"
 
-#: rapid/rapid.py:6342
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:6350
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Alle innstillingar er nullstilte"
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6354 rapid/rapid.py:6355 rapid/rapid.py:6357
-#: rapid/rapid.py:6362 rapid/rapid.py:6366
-msgid "Using"
-msgstr "Nyttar"
+#: rapid/rapid.py:3534
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
+msgstr ""
+"Videonedlasting er ikkje aktivert.\n"
+"For å kunna lasta ned video må du installera Python-pakkene hachoir metadata "
+"og kaa metadata."
+
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
+msgid "Backing up error"
+msgstr "Feil ved tryggleikskopiering"
 
-#: rapid/rapid.py:6359
-msgid "\n"
-msgstr "\n"
+#: rapid/backupfile.py:144
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Klarte ikkje å opprette målmappa %(directory)s\n"
 
-#. this application is already running
-#: rapid/rapid.py:6383
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
-msgid "%s is already running"
-msgstr "%s køyrer allereie"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Kjelde: %(source)s\n"
+"Mål: %(destination)s"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "Feil: %(inst)s"
+
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
+#, python-format
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
+msgstr ""
+"%(problem)s\n"
+"Fil: %(file)s"
+
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "Oppdaga eining"
+
+#. 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 "Vil du laste ned bilete eller videoar frå denne eininga/partisjonen?"
+
+#. 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 "_Hugs dette valet"
+
+#: rapid/downloadtracker.py:298
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Dato tid"
 
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
+msgstr "Filnamn"
+
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:197
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sekvensar"
 
-#: rapid/renamesubfolderprefs.py:200
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
+msgid "Job code"
+msgstr "Jobbnamn"
+
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Biletdato"
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Videodato"
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/renamesubfolderprefs.py:203
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:205
+#: rapid/generatenameconfig.py:157
 msgid "Download time"
 msgstr "Nedlastingstidspunkt"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:207
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Namn + filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:209
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Bilettal"
 
-#: rapid/renamesubfolderprefs.py:214
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Videotal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:216
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Blenderopning"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: 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/renamesubfolderprefs.py:220
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Lukketid"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Brennvidde"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:224
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Kameramerke"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:226
+#: 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/renamesubfolderprefs.py:228
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Kort kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:230
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Bindestrek, kort kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:232
+#: 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/renamesubfolderprefs.py:234
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Eksponeringsteljar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Namn på eigar"
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Breidd"
 
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Høgd"
 
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Lengd"
 
-#: rapid/renamesubfolderprefs.py:241
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Bilet per sekund"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Kunstnar"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Opphavsrett"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:243
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Nedlastingar idag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Øktteljar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:247
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Undermappeteljar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:249
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Lagra tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:251
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:253
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Alle tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:255
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Siste tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:257
+#: rapid/generatenameconfig.py:211
 msgid "Last 2 digits"
 msgstr "Siste to tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/generatenameconfig.py:213
 msgid "Last 3 digits"
 msgstr "Siste tre tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/generatenameconfig.py:215
 msgid "Last 4 digits"
 msgstr "Siste fire tal"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/generatenameconfig.py:217
 msgid "Original Case"
 msgstr "Opphavleg Versalisering"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "STORE BOKSTAVAR"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "små bokstavar"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Eitt tal"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "To tal"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tre tal"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Fire tal"
 
-#: rapid/renamesubfolderprefs.py:272
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Fem tal"
 
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Seks tal"
 
-#: rapid/renamesubfolderprefs.py:274
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sju tal"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:276
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Delsekund"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:278
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:280
+#: rapid/generatenameconfig.py:234
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:282
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:284
+#: rapid/generatenameconfig.py:238
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:286
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:288
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:290
+#: 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/renamesubfolderprefs.py:292
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:294
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:296
+#: 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/renamesubfolderprefs.py:298
+#: 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/renamesubfolderprefs.py:300
+#: 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/renamesubfolderprefs.py:302
+#: 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/renamesubfolderprefs.py:304
+#: rapid/generatenameconfig.py:258
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:306
+#: rapid/generatenameconfig.py:260
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:308
+#: rapid/generatenameconfig.py:262
 msgid "HH-MM-SS"
 msgstr "TT-MM-SS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:310
+#: rapid/generatenameconfig.py:264
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:312
+#: rapid/generatenameconfig.py:266
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:314
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minutt)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:316
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:801
+#: rapid/preferencesdialog.py:370
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr "Innstillingane for undermapper burde ikkje byrje med %s"
+
+#: rapid/preferencesdialog.py:372
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr "Innstillingane for undermapper burde ikkje ende med %s"
+
+#: rapid/preferencesdialog.py:376
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr "Innstillingane for undermapper burde ikkje ha to %s etter kvarandre"
+
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
+msgid "Remove all Job Codes?"
+msgstr "Fjern alle jobbnamn?"
+
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
+msgid "Should all Job Codes be removed?"
+msgstr "Skal alle jobbnamn fjernast?"
+
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Fjern alle hugsa søkjestiar?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Skal alle hugsa søkjestiar fjernast?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Fjern alle oversedde søkjestiar?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Skal alle oversedde søkjestiar fjernast?"
+
+#: rapid/preferencesdialog.py:457
+msgid "Error in Photo Rename preferences"
+msgstr "Feil i innstillingane til biletomdøping"
+
+#: rapid/preferencesdialog.py:638
+msgid "Error in Video Rename preferences"
+msgstr "Feil i innstillingane til videoomdøping"
+
+#: rapid/preferencesdialog.py:659
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Feil i innstillingane til undermapper for biletnedlasting"
+
+#: rapid/preferencesdialog.py:676
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Feil i innstillingane til undermapper for videonedlasting"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:735
+msgid "Enter a Job Code"
+msgstr "Skriv inn eit jobbnamn"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:751
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Skriv inn eit jobbnamn, eller vel eit du har nytta tidlegare"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:754
+msgid "Enter a new Job Code"
+msgstr "Skriv inn eit nytt jobbnamn"
+
+#: rapid/preferencesdialog.py:759
+msgid "Job Code:"
+msgstr "Jobbnamn:"
+
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Oppgi ein søkjesti å oversjå"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+"Oppgi ein sti som du vil aldri skal gjennomsøkjast etter bilete eller videoar"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Sti:"
+
+#: rapid/preferencesdialog.py:1078
+msgid "Job Code"
+msgstr "Jobbnamn"
+
+#: rapid/preferencesdialog.py:1160
+msgid "Select a folder to download photos to"
+msgstr "Vel ei mappe å laste inn bilete til"
+
+#: rapid/preferencesdialog.py:1178
+msgid "Select a folder to download videos to"
+msgstr "Vel ei mappe å laste inn video til"
+
+#: rapid/preferencesdialog.py:1323
 #, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Vel ei mappe med %(file_types)s"
+
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Vel ei mappe kor du vil tryggleikskopiera bilete"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Vel ei mappe kor du vil tryggleikskopiera videoar"
+
+#. 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:1457
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+"<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
+"generere namnet. Ver vennleg og nytt andre omdøpingsval.</i>"
+
+#: rapid/preferencesdialog.py:1508
 msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"Innstillingsnøkkelen '%(key)s' er ugyldig.\n"
-"Venta ein av %(value)s"
+"<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
+"generere undermappene. Ver vennleg og nytt andre omdøpingsval.</i><"
 
-#: rapid/renamesubfolderprefs.py:808
+#. 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:1511
 #, python-format
-msgid "Preference value '%(value)s' is invalid"
-msgstr "Innstillingsnøkkelen '%(value)s' er ugyldig"
+msgid "<i>Example: %s</i>"
+msgstr "<i>Døme: %s</i>"
 
-#: rapid/renamesubfolderprefs.py:812
-msgid "These preferences are not well formed:"
-msgstr "Desse innstillingane er ikkje velforma:"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1601
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
+msgstr ""
+"Innstillingane til undermapper for filtypen %(filetype)s er ugyldige\n"
+"og kan ikkje nyttast.\n"
+"Dei blir endra til standardverdiar."
 
-#: rapid/renamesubfolderprefs.py:1525
+#: rapid/preferencesdialog.py:1746
 #, python-format
-msgid "Subfolder preferences should not start with a %s"
-msgstr "Innstillingane for undermapper burde ikkje byrje med %s"
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Dei følgjande regulære uttrykka er ugyldige, og vil bli fjerna om du ikkje "
+"endrar dei:\n"
+"%s"
 
-#: rapid/renamesubfolderprefs.py:1527
+#: rapid/preferencesdialog.py:1748
 #, python-format
-msgid "Subfolder preferences should not end with a %s"
-msgstr "Innstillingane for undermapper burde ikkje ende med %s"
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Det følgjande regulære uttrykket er ugyldig, og vil bli fjerna om du ikkje "
+"endrar det:\n"
+"%s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Ugyldig regulært uttrykk"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1931
+msgid "externaldrive1"
+msgstr "eksterndisk1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1933
+msgid "externaldrive2"
+msgstr "eksterndisk2"
 
-#: rapid/renamesubfolderprefs.py:1531
+#: rapid/prefsrapid.py:126
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:127
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:127
+msgid "Prague"
+msgstr "Praha"
+
+#: rapid/prefsrapid.py:127
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#: rapid/prefsrapid.py:127
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:128
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:128
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:128
+msgid "Paris"
+msgstr "Paris"
+
+#: rapid/prefsrapid.py:128
+msgid "Berlin"
+msgstr "Berlin"
+
+#: rapid/prefsrapid.py:128
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:129
+msgid "Budapest"
+msgstr "Budapest"
+
+#: rapid/prefsrapid.py:129
+msgid "Rome"
+msgstr "Roma"
+
+#: rapid/prefsrapid.py:129
+msgid "Moscow"
+msgstr "Moskva"
+
+#: rapid/prefsrapid.py:129
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:129
+msgid "Warsaw"
+msgstr "Warszawa"
+
+#: rapid/prefsrapid.py:130
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:130
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:130
+msgid "Stockholm"
+msgstr "Stockholm"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
+msgid "subfolder"
+msgstr "undermappe"
+
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
+msgid "filename"
+msgstr "filnamn"
+
+#: rapid/problemnotification.py:80
 #, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Innstillingane for undermapper burde ikkje ha to %s etter kvarandre"
+msgid "Date time value %s appears invalid."
+msgstr "Dato-/tidsverdien %s synest ugyldig."
+
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
+msgstr "Filnamnet manglar filending."
+
+#. 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 "Filnamnet manglar nummerdelen."
+
+#: rapid/problemnotification.py:84
+#, python-format
+msgid "Error generating component %s."
+msgstr "Feil ved oppretting av %s-komponenten."
+
+#. a generic problem
+#: rapid/problemnotification.py:86
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr "Klarte ikkje å lesa metadata i %(filetype)s."
+
+#: rapid/problemnotification.py:88
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr "Klarte ikkje å oppretta %(filetype)s %(area)s."
+
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr "Ein feil oppstod ved kopiering av %(filetype)s"
+
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr "%(filetype)s finst allereie"
+
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
+"Kunne ikkje ta tryggleikskopi av %(filetype)s, fann inga målmappe for "
+"tryggleikskopiar."
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
+msgstr ""
+"%(image1)s vart teke den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
+"den %(image2_date)s kl. %(image2_time)s."
+
+#: rapid/problemnotification.py:103
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr "%(filetype)s er allereie lasta ned"
+
+#: 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 ""
+"Den eksisterande %(filetype)s-en vart sist endra sist den %(date)s kl. "
+"%(time)s, og har fått «%(identifier)s» som unik ID."
+
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+"Den eksisterande %(filetype)s-en var sist endra den %(date)s kl. %(time)s."
+
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr "Manglar data for å namngi %(filetype)s."
+
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr "Feil: %(errorno)s %(strerror)s"
+
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
+msgstr "Metadataen kan vera korrupt."
+
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr "Filnamnet, filendinga og Exif-informasjonen er allereie overført."
+
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr " Han vart tryggleikskopiert til %(volume)s"
+
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
+msgstr " Han vart tryggleikskopiert til dei følgjande einingane: "
+
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
+msgstr "%s, "
+
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr "%(volumes)s og %(final_volume)s."
+
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr "Fann bilete med same filnamn, men tekne ved ulike tider: %(details)s"
+
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s."
+
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr "Ein feil oppstod ved tryggleikskopiering til følgjande einingar: "
+
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr "%(volume)s (%(inst)s), "
+
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
+msgstr "%(volume)s, "
+
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr "%(volumes)s og %(volume)s (%(inst)s)."
+
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr "%(volumes)s og %(volume)s."
+
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr "Tryggleikskopien finst allereie på %(volume)s."
+
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
+msgstr "Tryggleikskopien finst allereie på følgjande stader: "
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr "Tryggleikskopien vart overskriven på %(volume)s."
+
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
+msgstr "Tryggleikskopien vart overskriven på følgjande einingar: "
+
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr "Ein feil oppstod ved oppretting av mapper på %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
+msgstr ""
+"Feil oppstod ved oppretting av mapper på følgjande einingar for "
+"tryggleikskopiering: "
+
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr "%(previousproblem)s I tillegg, %(newproblem)s"
+
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr " I tillegg oppstod %(problems)s."
+
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr " I tillegg oppstod %(problem)s."
+
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr "%(type)s-metadataen manglar."
+
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
+msgstr "Følgjande metadata manglar: "
+
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
+
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
+msgstr "Problem ved oppretting av undermappe og filnamn"
+
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
+msgstr "Problem ved oppretting av undermappe og filnamn"
+
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
+msgstr "Problem ved oppretting av %s"
+
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
+msgstr "Problem ved oppretting av %s"
+
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr "%(filetype)s finst allereie, men blei tryggleikskopiert"
+
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+"Ein feil oppstod ved kopiering av %(filetype)s-en, men han blei "
+"tryggleikskopiert"
+
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
+msgstr "Fleire feil oppstod"
+
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr "Fann bilete med like filnamn, tatt på ulike datoar"
+
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
+msgstr "det oppstod feil i tryggleikskopieringa"
+
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
+msgstr "Det oppstod feil i tryggleikskopieringa"
+
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
+msgstr "det oppstod ein feil i tryggleikskopieringa"
+
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
+msgstr "Det oppstod ein feil i tryggleikskopieringa"
+
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr "%(previousproblem)s, og %(backinguperror)s"
+
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:299
+msgid "Photo has already been downloaded"
+msgstr "Biletet er allereie lasta ned"
+
+#: rapid/subfolderfile.py:300
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Kjelde: %(source)s"
+
+#: rapid/subfolderfile.py:358
+msgid "subfolder and filename"
+msgstr "undermappe og filnamn"
+
+#: rapid/subfolderfile.py:396
+msgid "Failed to create download subfolder"
+msgstr "Klarte ikkje å lasta ned undermappa"
+
+#: rapid/subfolderfile.py:397
+#, python-format
+msgid "Path: %s"
+msgstr "Sti: %s"
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Om …"
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
+msgstr "Merk alle"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Merk alle bilete"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Merk alle videoar"
+
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
+msgstr "Last ned / Pause"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
+msgstr "Få hjelp på nettet …"
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Hjelp"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
+msgstr "Doner …"
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
+msgstr "Neste fil"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr "Innstillingar"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
+msgstr "Førre fil"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
+msgstr "Avslutt"
+
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
+msgstr "Rapporter eit problem …"
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
+msgstr "Vel alle med _jobbnamn"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
+msgstr "Vel alle _utan jobbnamn"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
+msgstr "Omsett dette programmet …"
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
+msgstr "Merk ingen"
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
+msgstr "_Merk alle"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
+msgstr "_Fjern fullførte nedlastingar"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
+msgstr "_Last ned"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
+msgstr "_Feillogg"
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
+msgstr "_Fil"
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
+msgstr "Inkluder i _nedlastinga"
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
+msgstr "_Doner..."
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
+msgstr "_Vel"
+
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
+msgstr "_Omset dette programmet..."
+
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
+msgstr "Merk _ingen"
+
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
+msgstr "_Vis"
+
+#: 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 " tt:mm"
 
-#: 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 "<b>Tryggleikskopi</b>"
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilitet med andre operativsystem</b>"
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr "<b>Einingar</b>"
-
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/prefs.ui.h:6
 msgid "<b>Download Folder</b>"
 msgstr "<b>Nedlastingsmappe</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Nedlastingsundermapper</b>"
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Døme</b>"
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Jobbnamn</b>"
 
-#: rapid/glade3/rapid.glade.h:12
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Omdøping av bilete</b>"
 
-#: rapid/glade3/rapid.glade.h:13
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Namnekonfliktar i bilete og video</b>"
 
-#: rapid/glade3/rapid.glade.h:14
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatisering</b>"
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sekvenstal</b>"
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/eksterndisk/Bilete</i>"
 
-#: rapid/glade3/rapid.glade.h:17
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Døme: /home/brukar/Bilete</i>"
 
-#: rapid/glade3/rapid.glade.h:18
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Døme:</i>"
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Ny:</i>"
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Opphavleg:</i>"
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Automatisering</span>"
-
-#: rapid/glade3/rapid.glade.h:22
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Tryggleikskopi</span>\t"
 
-#: rapid/glade3/rapid.glade.h:23
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Einingsinnstillingar</span>"
+
+#: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Einingar</span>"
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Feilhandtering</span>"
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</span>"
+
+#: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
 
-#: rapid/glade3/rapid.glade.h:27
+#: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
 
-#: rapid/glade3/rapid.glade.h:29
+#: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
 
-#: rapid/glade3/rapid.glade.h:30
+#: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av videoar</span>\t"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
 msgstr "Legg til unik identifikator"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Oppdag portable lagringseiningar automatisk"
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr "Oppdag einingar for tryggleikskopiering automatisk"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
 msgstr "Oppdag einingar automatisk"
 
-#: rapid/glade3/rapid.glade.h:35
-msgid "Automation"
-msgstr "Automatisering"
-
-#: rapid/glade3/rapid.glade.h:36
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr "Tryggleikskopi"
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr "Kopier til:"
-
-#: rapid/glade3/rapid.glade.h:38
+#: rapid/glade3/prefs.ui.h:35
 msgid "Backup photos and videos when downloading"
 msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
 
-#: 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."
@@ -1658,7 +1615,7 @@ msgstr ""
 "Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
 "automatisk oppretta undermapper for dei nedlasta bileta i denne mappa."
 
-#: 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."
@@ -1666,214 +1623,193 @@ msgstr ""
 "Vel ei nedlastingsmappe. Når du nyttar strukturen nedanfor blir det \n"
 "automatisk oppretta undermapper for dei nedlasta videoane i denne mappa."
 
-#: rapid/glade3/rapid.glade.h:41
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "Opphavsrett Damon Lynch 2007-10"
-
-#: rapid/glade3/rapid.glade.h:42
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Dag byrjar:"
 
-#: rapid/glade3/rapid.glade.h:43
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Slette bilete og videoar frå eininga når nedlastinga er ferdig"
 
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Val for einingar"
+
+#: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Einingar"
 
-#: 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 ""
-"Einingar er det du lastar ned bilete og videoar frå, t.d. fotoapperat, "
-"minnekort, \n"
-"eller portable lagringseiningar (t.d. minnepinnar).\n"
+"Einingar er der du lastar ned bilete og videoar frå, til dømes fotoapparat, "
+"minnekort eller berbare lagringseiningar.\n"
 "\n"
-"Du kan laste ned bilete frå fleire einingar samtidig, eller oppgi ein stad "
-"på harddisken.\n"
+"Du kan lasta ned frå fleire einingar samtidig, eller oppgi ein stad på "
+"harddisken din.\n"
 "\n"
-"<i>Viss det er vanskeleg eller umogleg å laste ned direkte frå kameraet kan "
-"du prøve \n"
-"å setje det i PTP-modus. Viss det ikkje fungerer bør du tenkje på å få ein "
-"kortlesar.</i>"
-
-#: rapid/glade3/rapid.glade.h:50
-msgid "Download / Pause"
-msgstr "Last ned / Pause"
+"<i>Nedlasting rett frå fotoapparat er ein eksperimentell funksjon for no. "
+"Viss det fungerer dårleg eller ikkje i det heile, prøv å setja apparatet i "
+"PTP-modus. Viss det ikkje går an, må du bruka ein kortlesar.</i>"
 
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr "Nedlastingsmappe:"
 
-#: rapid/glade3/rapid.glade.h:52
+#: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
 msgstr "Nedlastingar idag:"
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
 msgstr "Feilhandtering"
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
-msgstr "Feillogg"
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
+msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
 
-#: rapid/glade3/rapid.glade.h:55
-msgid "Exit program if download completes without any warnings or errors"
-msgstr ""
-"Avslutt programmet viss nedlastinga blir fullført utan feil eller åtvaringar."
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
+msgstr "Avslutt programmet når nedlastinga er ferdig"
 
-#: 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 "Lag miniatyrbilete (treigare)"
+
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Viss du skrur av automatisk oppdaging må du oppgi nøyaktig kor du vil ta "
-"tryggleikskopien."
+"Viss du skrur av automatisk oppdaging, må du oppgi kor du vil ta "
+"tryggleikskopi til."
 
-#: 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 ""
-"Viss du skrur av automatisk oppdaging må du oppgi nøyaktig sti til bilete og "
-"videoar."
+"Viss du skrur av automatisk oppdaging, må du oppgi kor bileta og videoane er."
 
-#: 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 ""
-"Viss du skrur på automatisk oppdaging av portable lagringseiningar blir "
-"heile eininga gjennomsøkt etter bilete. På store einingar kan dette ta ein "
-"del tid."
+"Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil heile "
+"eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
+"Når dette er skrudd på, og programmet oppdagar ei mogleg eining, vil det "
+"spørja deg om du vil søkja gjennom eininga eller ikkje."
 
-#: rapid/glade3/rapid.glade.h:59
-msgid "Import your photos and videos efficiently and reliably"
-msgstr "Importer bileta og videoane dine trygt og effektivt"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr "Oversedde stiar"
 
-#: rapid/glade3/rapid.glade.h:60
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Jobbnamn"
 
-#: rapid/glade3/rapid.glade.h:61
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Stad:"
 
-#: rapid/glade3/rapid.glade.h:62
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr "Ymse"
+
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: rapid/glade3/rapid.glade.h:63
-msgid "P_review Columns"
-msgstr "Kolonner i f_ørehandsvisinga"
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
+msgstr "Yting"
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Biletmapper"
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Omdøping av bilete"
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Mappenamn for tryggleikskopiering av bilete:"
 
-#: rapid/glade3/rapid.glade.h:67
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Ta tryggleikskopi av bilete til:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Innstillingar: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
-msgstr "Førehandsvis _mapper"
-
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "_Fjern alle"
 
-#: rapid/glade3/rapid.glade.h:72
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "_Fjern alle"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
+msgstr "Hugsa stiar"
+
+#: rapid/glade3/prefs.ui.h:74
 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
-"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."
+"Hugsa stiar er kopla til einingar som du har valt å alltid søkja gjennom, "
+"eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
 
-#: rapid/glade3/rapid.glade.h:77
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Omdøpingsval"
 
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr "Vel _ingen"
-
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr "Vel alle _bilete"
-
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
-msgstr "Vel alle _videoar"
-
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
-msgstr "Vel alle med _jobbnamn"
-
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
-msgstr "Vel alle _utan jobbnamn"
-
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr "Vel _alle"
-
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Hopp over"
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
 
-#: 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 ""
-"Orsak, videonedlastingsfunksjonen er skrudd av. For å laste ned videoar må "
-"du innstallere python-pakka <i>kaa metadata</i>."
+"Orsak, videonedlasting er skrudd av. For å lasta ned videoar må du "
+"innstallera Python-pakkene <i>hachoir metadata</i> og <i>kaa metadata</i>."
 
-#: rapid/glade3/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Oppgi endinga av stiane som du vil oversjå når du søkjer gjennom einingar "
+"etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
+"gjennomsøkt."
+
+#: rapid/glade3/prefs.ui.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1887,7 +1823,7 @@ msgstr ""
 "tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
 "du vil ta tryggleikskopi til.</i>"
 
-#: rapid/glade3/rapid.glade.h:90
+#: 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."
@@ -1895,7 +1831,7 @@ msgstr ""
 "Oppgi tida i 24-timarsformat som sekvensteljaren <i>Nedlastingar idag</i> "
 "skal nullstillast til."
 
-#: rapid/glade3/rapid.glade.h:91
+#: 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."
@@ -1903,43 +1839,51 @@ msgstr ""
 "Oppgi om du vil fjerne teikn som andre operativsystem ikkje forstår frå "
 "bilete, videoar eller mappenamn."
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Gå i gang med å laste ned bilete når programmet startar"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Gå i gang med å laste ned når einingar blir kopla til"
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Lagra tal:"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Fjern inkompatible teikn"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synkroniser sekvenstal for RAW og JPEG"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Avmonter (kople ut) eining når nedlastinga er fullført"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Bruk _python sine regulære uttrykk"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Videomapper"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Omdøping av videoar"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Mappenamn for tryggleikskopiering av video:"
 
-#: rapid/glade3/rapid.glade.h:101
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr "Ta tryggleikskopi av videoar til:"
+
+#: 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."
@@ -1947,7 +1891,7 @@ msgstr ""
 "Vel om du skal hoppe over fila eller leggje til ein unik identifikator når "
 "eit bilete eller ein video med det same namnet allereie er lasta ned."
 
-#: rapid/glade3/rapid.glade.h:102
+#: 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."
@@ -1955,7 +1899,7 @@ msgstr ""
 "Ved tryggleikskopiering, vel om du skal overskrive filer på eininga som har "
 "same namn, eller hoppe over den fila."
 
-#: rapid/glade3/rapid.glade.h:103
+#: 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."
@@ -1963,70 +1907,263 @@ msgstr ""
 "Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
 "lastar ned, t.d. til eksterne harddisker."
 
-#: rapid/glade3/rapid.glade.h:104
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Legg til..."
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr "_Fjern fullførte nedlastingar"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Importer bileta og videoane dine trygt og effektivt"
 
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr "_Eining"
+#~ msgid "Invalid Downloads Today value.\n"
+#~ msgstr "Ugyldig verdi for Nedlastingar idag.\n"
 
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr "_Feillogg"
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "Nullstiller verdien.\n"
 
-#: rapid/glade3/rapid.glade.h:108
-msgid "_File"
-msgstr "_Fil"
+#~ msgid "'Start of day' preference value is corrupted.\n"
+#~ msgstr "Ugyldig innstillingsverdi for «Byrjar av dag»\n"
 
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Filename"
-msgstr "_Filnamn"
+#~ msgid "Resetting to midnight.\n"
+#~ msgstr "Nullstiller verdien til midnatt.\n"
 
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Get Help Online..."
-msgstr "_Få hjelp på nettet..."
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Orsak, det er ein feil i innstillingane:\n"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "_Hjelp"
+#~ msgid "Resetting to default values."
+#~ msgstr "Nullstiller til standardverdiar."
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "_Doner..."
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "Det er ein feil i innstillingane."
 
-#: rapid/glade3/rapid.glade.h:113
-msgid "_Path"
-msgstr "_Sti"
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Vennligst kontroller innstillingane, start programmet på nytt, og prøv igjen."
 
-#: rapid/glade3/rapid.glade.h:114
-msgid "_Preview"
-msgstr "_Førehandsvising"
+#~ msgid "The device can now be safely removed"
+#~ msgstr "Du kan no trygt fjerne eininga"
 
-#: rapid/glade3/rapid.glade.h:115
-msgid "_Report a Problem..."
-msgstr "_Meld frå om eit problem"
+#~ msgid "errors"
+#~ msgstr "feil"
 
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr "_Vel"
+#~ msgid "New day has started - resetting 'Downloads Today' sequence number"
+#~ msgstr ""
+#~ "Ei ny dag har byrja - nullstiller sekvensnummeret «Nedlastingar idag»"
 
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
-msgstr "_Storleik"
+#, python-format
+#~ msgid "Download has started from %s"
+#~ msgstr "Byrja å laste ned frå %s"
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "_Omset dette programmet..."
+#, python-format
+#~ msgid "Download complete from %s"
+#~ msgstr "Ferdig med å laste ned frå %s"
 
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr "_Type"
+#, python-format
+#~ msgid "%s selected for downloading from"
+#~ msgstr "%s velt for nedlasting"
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "_Vis"
+#~ msgid "This device or partition will always be used to download from"
+#~ msgstr "Nyttar alltid denne eininga/partisjonen for nedlasting"
+
+#, python-format
+#~ msgid "%s rejected as a download device"
+#~ msgstr "%s ikkje godkjend som nedlastingseining"
+
+#~ msgid "This device or partition will never be used to download from"
+#~ msgstr "Nyttar aldri denne eininga/partisjonen til nedlasting"
+
+#~ msgid "Job Code entered"
+#~ msgstr "Jobbnamn lagra"
+
+#~ msgid "Job Code not entered"
+#~ msgstr "Jobbnamn ikkje lagra"
+
+#~ msgid "Some preferences will be reset."
+#~ msgstr "Visse innstillingar blir nullstilt."
+
+#, python-format
+#~ msgid "Prompting whether to use %s"
+#~ msgstr "Spør om å nytte %s"
+
+#~ msgid "Prompting for Job Code"
+#~ msgstr "Spør om jobbnamn"
+
+#~ msgid "Already prompting for Job Code, do not prompt again"
+#~ msgstr "Spør allereie om jobbnamn, ikkje spør igjen"
+
+#~ msgid "Starting downloads"
+#~ msgstr "Byrjar nedlasting"
+
+#~ msgid "Starting downloads that have been waiting for a Job Code"
+#~ msgstr "Byrjar nedlastingar som har venta på jobbnamn"
+
+#~ msgid ""
+#~ "A newer version of this program was previously run on this computer.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ei nyare utgåve av dette programmet har køyrt tidlegare på denne maskinen.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Program preferences appear to be valid, but please check them to ensure "
+#~ "correct operation."
+#~ msgstr ""
+#~ "Programinnstillingane kan synast å vere gyldige, men ver vennleg og "
+#~ "kontroller dei for å vere sikker på at alt er som det skal vere."
+
+#~ msgid "Sorry, some preferences are invalid and will be reset."
+#~ msgstr "Orsak, visse innstillingar var ugyldige og blir nullstilt."
+
+#~ msgid "Warning:"
+#~ msgstr "Åtvaring:"
+
+#~ msgid ""
+#~ "This version of the program is newer than the previously run version. "
+#~ "Checking preferences."
+#~ msgstr ""
+#~ "Denne utgåva av programmet er nyare enn den som køyrte tidlegare. "
+#~ "Kontrollerer innstillingar."
+
+#~ msgid "Preferences were modified."
+#~ msgstr "Innstillingane blei endra."
+
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Your preferences have been updated.\n"
+#~ "\n"
+#~ "Please check them to ensure correct operation."
+#~ msgstr ""
+#~ "Denne utgåva av programmet nyttar andre innstillingar enn den gamle utgåva. "
+#~ "Innstillingane dine er oppdatert.\n"
+#~ "\n"
+#~ "Ver vennleg og kontroller dei for å sjå til at alt er som det skal vere."
+
+#~ msgid "No preferences needed to be changed."
+#~ msgstr "Trengte ikkje å endre nokon innstillingar."
+
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Some of your previous preferences were invalid, and could not be updated. "
+#~ "They will be reset."
+#~ msgstr ""
+#~ "Denne utgåva av programmet nyttar andre innstillingar enn den gamle utgåva. "
+#~ "Visse gamle innstillingar var ugyldige, og kunne ikkje oppdaterast. Dei blir "
+#~ "nullstilt."
+
+#~ msgid "Problem using pynotify."
+#~ msgstr "Problem med pynotify."
+
+#~ msgid "Failed to receive pynotify server capabilities."
+#~ msgstr "Klarte ikkje å hente inn eigenskapane til pynotify-tenaren."
+
+#, python-format
+#~ msgid "Device %(device)s (%(path)s) ignored"
+#~ msgstr "Ignorerte eininga %(device)s (%(path)s)"
+
+#, python-format
+#~ msgid "Detected %(device)s with path %(path)s"
+#~ msgstr "Fann %(device)s med sti %(path)s"
+
+#~ msgid "Automatically start download is true"
+#~ msgstr "Byrjar automatisk nedlasting"
+
+#~ msgid "Automatically start download is false"
+#~ msgstr "Byrjar ikkje automatisk nedlasting"
+
+#~ msgid "Using manually specified path"
+#~ msgstr "Nytt manuelt oppgitt sti"
+
+#~ msgid "_Pause"
+#~ msgstr "_Pause"
+
+#~ msgid "Goodbye"
+#~ msgstr "Ha det bra"
+
+#~ msgid "Using"
+#~ msgstr "Nyttar"
+
+#, python-format
+#~ msgid "%s is already running"
+#~ msgstr "%s køyrer allereie"
+
+#, python-format
+#~ msgid ""
+#~ "Preference key '%(key)s' is invalid.\n"
+#~ "Expected one of %(value)s"
+#~ msgstr ""
+#~ "Innstillingsnøkkelen '%(key)s' er ugyldig.\n"
+#~ "Venta ein av %(value)s"
+
+#, python-format
+#~ msgid "Preference value '%(value)s' is invalid"
+#~ msgstr "Innstillingsnøkkelen '%(value)s' er ugyldig"
+
+#~ msgid "These preferences are not well formed:"
+#~ msgstr "Desse innstillingane er ikkje velforma:"
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Automatisering</span>"
+
+#~ msgid "Automation"
+#~ msgstr "Automatisering"
+
+#~ msgid "Backup location:"
+#~ msgstr "Kopier til:"
+
+#~ msgid "Error Log"
+#~ msgstr "Feillogg"
+
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Viss du skrur av automatisk oppdaging må du oppgi nøyaktig kor du vil ta "
+#~ "tryggleikskopien."
+
+#~ 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 ""
+#~ "Viss du skrur på automatisk oppdaging av portable lagringseiningar blir "
+#~ "heile eininga gjennomsøkt etter bilete. På store einingar kan dette ta ein "
+#~ "del tid."
+
+#~ 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 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."
+
+#~ msgid "_Get Help Online..."
+#~ msgstr "_Få hjelp på nettet..."
+
+#~ msgid "_Report a Problem..."
+#~ msgstr "_Meld frå om eit problem"
diff --git a/po/pl.po b/po/pl.po
index 195daeb..161b841 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-13 18:23-0500\n"
-"PO-Revision-Date: 2011-06-10 09:24+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 21:22+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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Urządzenie"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Rozmiar"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Postęp pobierania"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "Nie odmontowano %(device)s"
@@ -66,19 +66,19 @@ msgstr "Nie odmontowano %(device)s"
 #. 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:1178
 msgid "scanning..."
 msgstr "wyszukiwanie..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Pobierz"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,137 +98,137 @@ msgstr ""
 "Nieprawidłowy katalog pobierania:\n"
 "%s"
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Pobieranie nie może się odbyć"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "zdjęcia i filmy"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "zdjęcia lub filmy"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "filmy"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "film"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "zdjęcia"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "zdjęcie"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Pobrane pliki typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Nieudanych pobrań plików typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "Plik typu %(filetype)s został pobrany"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, 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:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, 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:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -236,75 +236,87 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s wolnego miejsca"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Tworzenie kopii zapasowej zdjęć i filmów w %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tworzenie kopii zapasowej w %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Tworzenie kopii zapasowej zdjęć w %(path)s a filmów w %(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Preferencje programu są nieprawidłowe"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "katalog pobierania %(file_type)s nie istnieje"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Katalog: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "katalog pobierania %(file_type)s jest nieprawidłowy"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "katalog pobierania %(file_type)s nie jest zapisywalny"
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -313,42 +325,42 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3485
 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:3313
+#: rapid/rapid.py:3486
 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:3315
+#: rapid/rapid.py:3488
 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:3316
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Zdjęcia:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Filmy:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Wszystkie ustawienia oraz preferencje zostały zresetowane"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -358,16 +370,16 @@ msgstr ""
 "Aby pobierać filmy, proszę zainstalować pakiety hachoir metadata oraz kaa "
 "metadata  dla pythona."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Błąd tworzenia kopii zapasowej"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Katalog docelowy nie mógł zostać utworzony:  %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -376,13 +388,13 @@ msgstr ""
 "Źródło: %(source)s\n"
 "Cel: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Błąd: %(inst)s"
 
-#: 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"
@@ -406,7 +418,7 @@ msgstr "Pobierać zdjęcia lub filmy z tego urządzenia lub partycji?"
 msgid "_Remember this choice"
 msgstr "Zapa_miętaj ten wybór"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "MB/s"
 
@@ -431,7 +443,7 @@ msgid "Sequences"
 msgstr "Sekwencje"
 
 #. 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 "Kod pracy"
 
@@ -777,73 +789,106 @@ msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Preferencje podkatalogu nie powinny zawierać dwóch %s jeden po drugim"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Usunąć wszystkie kody pracy?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Usunąć wszystkie kody pracy?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Usunąć wszystkie Ścieżki pamiętane?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Czy wszystkie zapamiętane ścieżki powinny zostać usunięte?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Usunąć wszystkie Ścieżki ignorowane?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Czy wszystkie ignorowane ścieżki powinny zostać usunięte?"
+
+#: rapid/preferencesdialog.py:457
 msgid "Error in Photo Rename preferences"
 msgstr "Błąd w preferencjach zmiany nazw obrazów"
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Błąd w preferencjach zmiany nazw filmów"
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Błąd w preferencjach podkatalogów pobierania zdjęć"
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Błąd w preferencjach podkatalogów pobierania filmów"
 
 #. 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 "Wprowadzenie kodu pracy"
 
 #. 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 "Proszę wprowadzić nowy kod pracy, lub wybrać poprzedni"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:734
+#: rapid/preferencesdialog.py:754
 msgid "Enter a new Job Code"
 msgstr "Proszę wprowadzić nowy kod pracy"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Kod pracy:"
 
-#: rapid/preferencesdialog.py:916
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Wprowadź Ścieżkę ignorowaną"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+"Proszę określić ścieżkę, która nigdy nie będzie sprawdzana w poszukiwaniu "
+"zdjęć lub obrazów"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Scieżka:"
+
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr "Kod pracy"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Wybór katalogu dla pobieranych zdjęć"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Wybór katalogu dla pobieranych filmów"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Wybór katalogu zawierającego %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Wybór katalogu do którego będą kopiowane %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Proszę wybrać katalog dla tworzenia kopii zapasowej zdjęć"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Proszę wybrać katalog dla tworzenia kopii zapasowej filmów"
 
 #. 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:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -851,7 +896,7 @@ msgstr ""
 "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego wygenerowania "
 "nazwy. Proszę użyć innej opcji zmiany nazwy.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -860,13 +905,13 @@ msgstr ""
 "podkatalogów. Proszę użyć innej opcji określenia nazw podkatalogów.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1269
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Przykład: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -877,94 +922,120 @@ msgstr ""
 "zostać użyte.\n"
 "Zostaną przywrócone ich domyślne wartości."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Następujące wyrażenia regularne są niepoprawne, i zostaną usunięte, jeśli "
+"nie będą poprawione:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"To wyrażenie regularne są niepoprawne, i zostanie usunięte, jeśli nie będzie "
+"poprawione:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Nieprawidłowe wyrażenie regularne"
+
 #. 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:1931
 msgid "externaldrive1"
 msgstr "dyskzewnętrzny1"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "dyskzewnętrzny2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "Nowy Jork"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paryż"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapeszt"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Rzym"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moskwa"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Warszawa"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Dżakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madryt"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Sztokholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "podkatalog"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "nazwa pliku"
 
@@ -1020,10 +1091,10 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s zrobiono %(image1_date)s o %(image1_time)s, a %(image2)s zrobiono "
+"%(image1)s zostało zrobione %(image1_date)s o %(image1_time)s, a %(image2)s  "
 "%(image2_date)s o %(image2_time)s."
 
 #: rapid/problemnotification.py:103
@@ -1226,7 +1297,7 @@ msgstr ""
 msgid "Multiple problems were encountered"
 msgstr "Wystąpiło kilka problemów"
 
-#: 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 "Zdjęcia z taką samą nazwą, ale zrobione w różnym czasie"
 
@@ -1262,24 +1333,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "Zdjęcie zostało już pobrane"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Źródło: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "podkatalog i nazwa pliku"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Nie udało się utworzyć podkatalogu pobierania"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Ścieżka: %s"
@@ -1659,8 +1730,8 @@ msgstr ""
 "pojawi się komunikat z pytaniem o przeprowadzenie skanowania."
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
-msgstr "Ignorowane ścieżki\t"
+msgid "Ignored Paths"
+msgstr "Ścieżki ignorowane"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1708,17 +1779,21 @@ msgstr "U_suń wszystko"
 
 #: rapid/glade3/prefs.ui.h:72
 msgid "Re_move All"
-msgstr ""
+msgstr "U_suń wszystkie"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
-msgstr "Zapamiętane urządzenia"
+msgid "Remembered Paths"
+msgstr "Ścieżki pamiętane"
 
 #: 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
+"Zapamiętane ścieżki to te przypisane do urządzeń, które zostały wybrane do "
+"ignorowania lub sprawdzania zawsze, kiedy Automatyczne wykrywanie "
+"przenośnych magazynów danych jest aktywne."
 
 #: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
@@ -1744,6 +1819,16 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr ""
+"Proszę określić końcowy fragment dowolnej ścieżki, która ma być ignorowana "
+"podczas skanowania urządzeń. Każda ścieżka mająca na końcu poniższe wartości "
+"nie będzie skanowana."
+
+#: rapid/glade3/prefs.ui.h:80
+msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1758,7 +1843,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:82
+#: 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."
@@ -1766,7 +1851,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:83
+#: 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."
@@ -1774,47 +1859,51 @@ 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Rozpocznij pobieranie przy uruchomieniu programu"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Rozpocznij pobieranie po podłączeniu urządzenia"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Numer zachowany:"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Usuń niezgodne znaki"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synchronizuj numery sekwencji RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Odmontuj (\"wysuń\") urządzenie po ukończeniu pobierania"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Używaj wyrażeń regularnych w stylu _python"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Katalogi filmów"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Zmiana nazw filmów"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Nazwa katalogu z kopią zapasową filmów:"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr "Położenie kopii zapasowej filmów:"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1822,7 +1911,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:95
+#: 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."
@@ -1830,7 +1919,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:96
+#: 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."
@@ -1838,14 +1927,10 @@ 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:97
+#: rapid/glade3/prefs.ui.h:99
 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"
@@ -2506,648 +2591,3 @@ msgstr "Importuj zdjęcia i wideo wydajnie i niezawodnie"
 #, python-format
 #~ msgid "%s rejected as a download device"
 #~ msgstr "urządzenie %s odrzucone jako źródło pobierania"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Obraz: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Obraz: %(source)s\n"
-#~ "Błąd: %(errno)s %(strerror)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Nie można usunąć obrazów z urządzenia"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Usunięto %i obrazów z urządzenia"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Usuń obrazy z urządzenia po ukończeniu pobierania"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Znalezione zdjęcia, które mają taką samą nazwę, ale zostały zrobione w "
-#~ "różnym czasie:"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Pierwsze zdjęcie: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Drugie zdjęcie: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Copyright Damon Lynch 2007-10"
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Wartość \"Numer zachowany\" nie została zaktualizowana, ponieważ właśnie "
-#~ "trwa pobieranie"
-
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Wartość \"Pobierań dzisiaj\" nie została zaktualizowana, ponieważ właśnie "
-#~ "trwa pobieranie"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Źródło: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Błąd:"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Cel: %s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Błąd: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Przepraszamy, takie położenie obrazu nie istnieje:\n"
-#~ "%(path)s"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problem z katalogiem pobierania"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Przepraszamy, katalog pobierania istnieje, ale nie można nic w nim zapisać. "
-#~ "Proszę sprawdzić uprawnienia katalogu lub zmienić preferencje"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Przepraszamy, katalog pobierania nie istnieje. Proszę utworzyć katalog lub "
-#~ "zmienić preferencje"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problem z katalogiem położenia obrazów"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Nośnik obrazów: %s\n"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Ostrzeżenie: serwer powiadomień środowiska graficznego jest skonfigurowany "
-#~ "niepoprawnie."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Źródło: %(source)s\n"
-#~ "Częściowo wygenerowana nazwa pliku: %(newname)s\n"
-#~ "Cel: %(destination)s\n"
-#~ "Problem: %(problem)s"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Nie można utworzyć tymczasowego katalogu pobierania"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Źródło: %(source)s\n"
-#~ "Cel: %(destination)s\n"
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr ""
-#~ "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."
-#~ msgstr ""
-#~ "Pewne niepotrzebne wartości zostały usunięte z preferencji podkatalogu "
-#~ "%(filetype)s."
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Następująca ścieżka pobierania nie mogła zostać utworzona:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "Nie można otworzyć %s(filetype)s"
-
-#, python-format
-#~ msgid "The %s(filetype)s was not copied."
-#~ msgstr "Nie skopiowano %s(filetype)s."
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "Nazwa pliku %(filetype)s nie mogła zostać wygenerowana"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Znalezione zdjęcia mające taką samą nazwę, ale zrobione w różnym czasie:"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s nie posiada metadanych"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "Nazwa pliku %(filetype)s nie mogła zostać prawidłowo wygenerowana. Proszę "
-#~ "sprawdzić, czy metadane są wystarczające."
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Pierwsze zdjęcie: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Drugie zdjęcie: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Nie znaleziono odpowiedniego nośnika dla kopii zapasowych"
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Kopia zapasowa %(file_type)s nadpisana"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s nie został skopiowany do %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Kopia zapasowa %(file_type)s już istnieje"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Podkatalog: %(subfolder)s\n"
-#~ "Plik: %(file)s\n"
-#~ "Problem: %(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Metadane są niezbędne aby wygenerować nazwy podkatalogów oraz/lub plików.\n"
-#~ "Źródło:%s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Nazwa podkatalogu nie mogła zostać prawidłowo wygenerowana. Proszę "
-#~ "sprawdzić, czy metadane są wystarczające."
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "Kopia zapasowa %(file_type)s nie mogła zostać utworzona"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "Kopia zapasowa %(file_type)s nie utworzona"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr ""
-#~ "Urządzenie nie posiada %(types_searched_for)s z których można pobierać."
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Nie udało się wyodrębnić miniatur zdjęć"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Urządzenie: %s\n"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Kopia zapasowa nie może być utworzona"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Ścieżka kopii zapasowej nie istnieje"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Nie znaleziono położenia kopii zapasowej"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Nie wykryto urządzenia do utworzenia kopii zapasowej"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "NIe można utworzyć ścieżki %s"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Nie można usunąć zdjęcia lub filmu z urządzenia"
-
-#~ msgid "Video skipped"
-#~ msgstr "Film pominięto"
-
-#~ msgid "Video already exists"
-#~ msgstr "FIlm już istnieje"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Zdjęcie: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Zdjęcie: %(source)s\n"
-#~ "Błąd: %(errno)s %(strerror)s"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Zdjęcie już istnieje"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Zdjęcie pominięto"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Problem z katalogami pobierania"
-
-#~ msgid "videos skipped"
-#~ msgstr "filmy pominięte"
-
-#~ msgid "videos downloaded"
-#~ msgstr "filmy pobrane"
-
-#~ msgid "photos skipped"
-#~ msgstr "zdjęcia pominięte"
-
-#~ msgid "photos downloaded"
-#~ msgstr "zdjęcia pobrane"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "numer obrazu lub filmu został określony ale nazwa pliku nie posiada żadnego "
-#~ "numeru"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "Zdjęcie nie zawiera metadanych %s"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "Film nie zawiera metadanych %s"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr ""
-#~ "rozszerzenie zostało określone ale nazwa pliku nie posiada żadnego "
-#~ "rozszerzenia"
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Obraz nie zawiera metadanych części sekundy"
-
-#, python-format
-#~ 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 ""
-#~ "Proszę wybrać czy pominąć pobieranie pliku, czy dodać unikatowy "
-#~ "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"
-#~ msgstr ""
-#~ "Przepraszamy, wystąpiły problemy z katalogami pobierania. Prosimy je "
-#~ "rozwiązać lub zmienić preferencje.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr ""
-#~ "Nie udało się utworzyć domyślnego katalogu pobierania filmów %(folder)s"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Tworzenie katalogu pobierania zdjęć %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Tworzenie katalogu pobierania filmów %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr ""
-#~ "Nie udało się utworzyć domyślnego katalogu pobierania zdjęć %(folder)s"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Przepraszamy, to położenie urządzenia nie istnieje:\n"
-#~ "%(path)s"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Problem z katalogiem położenia urządzenia"
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Proszę określić zachowanie w przypadku, kiedy obraz lub film o tej samej "
-#~ "nazwie został już pobrany lub posiada kopię zapasową."
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Przepraszamy, funkcja pobierania filmów jest nieaktywna. Prosimy "
-#~ "zainstalować pakiet <i>kaa metadata</i>, aby mieć możliwość pobierania "
-#~ "filmów."
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Wyszukiwanie zakończone: nie znaleziono plików typu %(filetypes)s w katalogu "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Wyszukiwanie zakończone: w katalogu %(device)s znaleziono %(number)s plików "
-#~ "typu %(filetypes)s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 z %(number)s plików typu %(filetypes)s"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Kopia zapasowa %(file_type)s nie została utworzona."
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Usuniętych plików typu %(filetypes)s z urządzenia: %(number)i"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(filetypes)s pominięte: %(noFiles)s"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr ""
-#~ "Katalog pobierania %(file_type)s istnieje ale nie ma możliwości zapisu w "
-#~ "nim.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Katalog pobierania %(file_type)s nie istnieje.\n"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "%(filetype)s nie mógł zostać otwarty"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "%(filetype)s nie został skopiowany."
-
-#~ msgid "Path"
-#~ msgstr "Ścieżka"
-
-#~ msgid "File"
-#~ msgstr "Plik"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Preview"
-#~ msgstr "Podgląd"
-
-#~ msgid "Select _All"
-#~ msgstr "Zaznacz _wszystkie"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Zaznacz wszystkie _zdjęcia"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "P_obierz zaznaczone"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Zaznacz wszystkie _filmy"
-
-#~ msgid "_Download All"
-#~ msgstr "Po_bierz wszystkie"
-
-#~ msgid "_Filename"
-#~ msgstr "_Nazwa pliku"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "_Device"
-#~ msgstr "_Urządzenie"
-
-#~ msgid "Se_lect None"
-#~ msgstr "B_rak zaznaczenia"
-
-#~ msgid "_Type"
-#~ msgstr "_Typ"
-
-#~ msgid "_Path"
-#~ msgstr "Ś_cieżka"
-
-#~ msgid "_Size"
-#~ msgstr "_Rozmiar"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Podgląd _katalogów"
-
-#~ msgid "_Preview"
-#~ msgstr "_Podgląd"
-
-#~ msgid "P_review Columns"
-#~ msgstr "Podgląd ko_lumn"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Źródło: %(source)s\n"
-#~ "Cel: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Pobieranie z aparatów"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Pobieranie bezpośrednio z aparatu może działać mało wydajnie lub całkowicie "
-#~ "nie działać"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Pobieranie z czytnika kart działa zawsze i zasadniczo dużo szybciej. "
-#~ "Używanie czytnika kart jest zalecane."
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Proszę sprawdzić system i spróbować ponownie."
-
-#~ msgid "Status"
-#~ msgstr "Stan"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Proszę wprowadzić nowy kod pracy i wcisnąć Enter, lub wybrać istniejący kod "
-#~ "pracy"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr "Wyświetlanie ostrzeżenia o pobieraniu bezpośrednio z aparatu"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Preferencje katalogu pobierania zostały zmienione."
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Preferencje podkatalogów i nazw plików zostały zmienione."
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Preferencje kopii zapasowej zostały zmienione."
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "Preferencje urządzeń pobierania zostały zmienione."
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "Plik typu %(filetype)s jest gotowy do pobrania"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "Plik typu %(filetype)s nie został pobrany"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "Pobieranie pliku typu %(filetype)s zakończone powodzeniem"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "Plik typu %(filetype)s został pobrany ale są problemy z utworzeniem kopii "
-#~ "zapasowej"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "Plik typu %(filetype)s za chwilę będzie pobierany"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "Plik typu %(filetype)s został pobrany z ostrzeżeniami"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr ""
-#~ "Plik typu %(filetype)s nie został pobrany ani nie została utworzona jego "
-#~ "kopia zapasowa"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "Plik typu %(filetype)s zostanie pobrany z ostrzeżeniami"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "Plik typu %(filetype)s nie może zostać pobrany"
-
-#~ msgid "_Resume"
-#~ msgstr "_Wznów"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Przystępowanie do pobierania plików w liczbie %s"
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Wyświetl tę wiadomość ponownie"
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Ostrzeżenie: pobieranie obecnie odbywa się z urządzenia do tworzenia kopii "
-#~ "zapasowej  %(device)s"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "dostepne: %(free)s"
-
-#~ 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 4222409..7687840 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"POT-Creation-Date: 2011-09-08 06:50-0500\n"
+"PO-Revision-Date: 2011-08-24 15:53+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-19 19:06+0000\n"
+"X-Generator: Launchpad (build 13980)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Tamanho"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Progresso da transferência"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s não desmontado"
@@ -66,19 +66,19 @@ msgstr "%(device)s não desmontado"
 #. 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:1178
 msgid "scanning..."
 msgstr "verificando..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2077 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2080
 msgid "Pause"
 msgstr "Pausar"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2181
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2184
 #, 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:2097
+#: rapid/rapid.py:2185
 msgid "Download cannot proceed"
 msgstr "A descarga não pôde ser levada a cabo"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2490
 msgid "About 1 second remaining"
 msgstr "Faltando 1 segundo aproximadamente"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2492
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Faltando %i segundos aproximadamente"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2494
 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:2395
+#: rapid/rapid.py:2499
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Faltando %(minutes)i:%(seconds)02i minutos aproximadamente"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2521 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotos e vídeos"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2523 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "fotos ou vídeos"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2526 rapid/rapid.py:3103 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "vídeos"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2528 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "vídeo"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2531 rapid/rapid.py:3101 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotos"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2533 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2560
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2564
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2567 rapid/rapid.py:2619
 msgid "warnings"
 msgstr "avisos"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2576
 msgid "All downloads complete"
 msgstr "Todos os downloads completos"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2582 rapid/rapid.py:2591 rapid/rapid.py:2600
+#: rapid/rapid.py:2609 rapid/rapid.py:2617
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2584 rapid/rapid.py:2602
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s downloaded"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2593 rapid/rapid.py:2611
 #, 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:2546
+#: rapid/rapid.py:2650
 #, 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:2553
+#: rapid/rapid.py:2657
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s de %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3071
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3076
 msgid "Using backup devices"
 msgstr "Usando dispositivos de backup"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3078
 msgid "Using backup device"
 msgstr "Usando o dispositivo de backup"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3080
 msgid "No backup devices detected"
 msgstr "Nenhum dispositivo de backup detectado"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3107
 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:2983
+#: rapid/rapid.py:3119
 #, 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:2987
+#: rapid/rapid.py:3123
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,87 @@ 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:2992
+#: rapid/rapid.py:3128
 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
+#: rapid/rapid.py:3133
 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
+#: rapid/rapid.py:3139
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s livres"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3147
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3150
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "A criar cópias de segurança em %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3153
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3160
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3189
 msgid "Program preferences are invalid"
 msgstr "Preferências do programa são inválidas"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3308 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Fotografia"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3310 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Vídeo"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3319
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s pasta de download não existe"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3321 rapid/rapid.py:3335 rapid/rapid.py:3348
 #, python-format
 msgid "Folder: %s"
 msgstr "Pasta: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3333
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s pasta de download e inválida"
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3346
 #, 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:3264
+#: rapid/rapid.py:3424
 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:3311
+#: rapid/rapid.py:3471
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,60 +324,60 @@ msgstr ""
 "exibir informaçṍes do programa na linha de comando enquando o programa é "
 "executado (default: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3472
 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:3313
+#: rapid/rapid.py:3473
 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:3315
+#: rapid/rapid.py:3475
 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:3316
+#: rapid/rapid.py:3477
 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:3329
+#: rapid/rapid.py:3490
 msgid "Photos:"
 msgstr "Fotos:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3490
 msgid "Videos:"
 msgstr "Vídeos:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3495
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3503
 msgid "All settings and preferences have been reset"
 msgstr "Todas as configurações e preferências foram redefinidas"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3521
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr "Função de baixar video está desativada."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Erro ao criar cópias de segurança"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Diretório de destino não pôde ser criado: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -374,13 +386,13 @@ msgstr ""
 "Origem: %(source)s\n"
 "Destino: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Erro: %(inst)s"
 
-#: 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"
@@ -406,7 +418,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr "_Relembrar esta escolha"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:291
 msgid "MB/s"
 msgstr "MB/s"
 
@@ -431,7 +443,7 @@ 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:151 rapid/preferencesdialog.py:549
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
 msgid "Job code"
 msgstr "Etiqueta"
 
@@ -776,78 +788,107 @@ msgstr "Preferências subpasta não deve terminar com uma %s"
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Preferências subpasta não deve conter dois %s um após o outro"
 
-#: rapid/preferencesdialog.py:389 rapid/preferencesdialog.py:672
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
 msgid "Remove all Job Codes?"
 msgstr "Remover todas as etiquetas?"
 
-#: rapid/preferencesdialog.py:406 rapid/preferencesdialog.py:689
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
 msgid "Should all Job Codes be removed?"
 msgstr "Deseja realmente remover todas as etiquetas?"
 
-#: rapid/preferencesdialog.py:436
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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 "Erro causado pelas preferêcias em \"renomear fotografias\""
 
-#: rapid/preferencesdialog.py:617
+#: rapid/preferencesdialog.py:638
 msgid "Error in Video Rename preferences"
 msgstr "Erro causado pelas preferêcias em \"renomear vídeos\""
 
-#: rapid/preferencesdialog.py:638
+#: rapid/preferencesdialog.py:659
 msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 "Erro causado pelas preferêcias de subdiretórios em \"diretórios de "
 "fotografias\""
 
-#: rapid/preferencesdialog.py:655
+#: rapid/preferencesdialog.py:676
 msgid "Error in Video Download Subfolders preferences"
 msgstr ""
 "Erro causado pelas preferêcias de subdiretórios em \"diretórios de vídeo\""
 
 #. 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 "Definir uma etiqueta"
 
 #. 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 "Defina uma nova etiqueta or selecione uma já presente"
 
 #. 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 "Defina uma nova etiqueta"
 
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:759
 msgid "Job Code:"
 msgstr "Etiqueta:"
 
-#: 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:1078
 msgid "Job Code"
 msgstr "Etiqueta"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Selecione o diretório para baixar as fotos para"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Selecione o diretório para baixar os vídeos para"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Escolha um diretório que contenha %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 msgstr ""
-"Escolha um diretório para o armazenamento de cópias de segurança 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
-#: rapid/preferencesdialog.py:1215
+#: rapid/preferencesdialog.py:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -855,7 +896,7 @@ msgstr ""
 "<i><b>Aviso:</b> As meta-Informações disponíveis são insuficientes para "
 "gerar um nome de arquivo. Por favor, use outras opções de renomeação.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -865,13 +906,13 @@ msgstr ""
 "nomeação.</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
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Exemplo: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -882,94 +923,114 @@ msgstr ""
 "inválidas e não poderão ser usadas.\n"
 "Elas serão redefinidas para seus valores padrão."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+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:1931
 msgid "externaldrive1"
 msgstr "disco_externo_1"
 
 #. 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:1933
 msgid "externaldrive2"
 msgstr "disco_externo_2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "Nova Iorque"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinque"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Teerã"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlim"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapeste"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moscou"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Deli"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varsóvia"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jacarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madri"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Estocolmo"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:359
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "subdiretório"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "nome de arquivo"
 
@@ -1025,11 +1086,9 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and "
-"%(image2)s on %(image2_date)s at %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1227,7 +1286,7 @@ msgstr "Ocorreu um erro ao copiar %(filetype)s, mas foi feito backup"
 msgid "Multiple problems were encountered"
 msgstr "Vários problemas foram encontrados"
 
-#: 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 ""
 "Foram detectadas fotografias de mesmo nome, mas de horários diferentes"
@@ -1264,24 +1323,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:297
+#: rapid/subfolderfile.py:299
 msgid "Photo has already been downloaded"
 msgstr "A foto já foi baixada"
 
-#: rapid/subfolderfile.py:298
+#: rapid/subfolderfile.py:300
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origem: %(source)s"
 
-#: rapid/subfolderfile.py:355
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "subdiretório e nome de arquivo"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Falha ao criar subpasta download"
 
-#: rapid/subfolderfile.py:394
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Caminho: %s"
@@ -1640,8 +1699,8 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
-msgstr "Caminhos ignorados\t"
+msgid "Ignored Paths"
+msgstr ""
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1692,13 +1751,14 @@ msgid "Re_move All"
 msgstr "Re_mover todos"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
+msgid "Remembered Paths"
 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."
+"Remembered paths are those associated with devices 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
@@ -1725,6 +1785,13 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of 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"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1737,7 +1804,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:82
+#: 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."
@@ -1745,7 +1812,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:83
+#: 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."
@@ -1753,48 +1820,52 @@ 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Iniciar a descarga após o início do programa"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Iniciar a descarga ao conectar o dispositivo"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Número acumulado:"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Omitir caracteres incompatíveis"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Sincronizar números seqüênciais em pares RAW-JPEG"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 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:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Pasta de Vídeo"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Renomear Vídeo"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Nome da pasta para cópia de segurança de vídeos:"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1802,7 +1873,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:95
+#: 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."
@@ -1810,7 +1881,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:96
+#: 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."
@@ -1819,42 +1890,20 @@ 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:97
+#: rapid/glade3/prefs.ui.h:99
 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"
 
-#~ msgid "_Type"
-#~ msgstr "_Tipo"
-
 #~ msgid "_Get Help Online..."
 #~ msgstr "_Ajuda Online..."
 
-#~ msgid "_Filename"
-#~ msgstr "_Nome do arquivo"
-
-#~ msgid "_Path"
-#~ msgstr "_Caminho"
-
-#~ msgid "_Preview"
-#~ msgstr "Pre_visão"
-
 #~ msgid "_Report a Problem..."
 #~ msgstr "_Reportar um problema..."
 
-#~ msgid "_Size"
-#~ msgstr "Ta_manho"
-
-#~ msgid "_Device"
-#~ msgstr "_Dispositivo"
-
 #~ 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. "
@@ -1875,58 +1924,18 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "Sorry, some preferences are invalid and will be reset."
 #~ msgstr "Algumas preferências são inválidas e serão portanto restabelecidas."
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
 #~ msgid "      "
 #~ msgstr "      "
 
 #~ msgid "Invalid Downloads Today value.\n"
 #~ msgstr "Valor de \"Descargas Hoje\" é inválido.\n"
 
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Apesar da execução de descargas, o valor de \"descargas hoje\" não foi "
-#~ "atualizado."
-
 #~ msgid "'Start of day' preference value is corrupted.\n"
 #~ msgstr "Valor de \"começo do dia\" é inválido.\n"
 
 #~ msgid "Sorry,these preferences contain an error:\n"
 #~ msgstr "Erro encontrado nas seguintes preferências:\n"
 
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Alguns valores foram julgados desnecessários e foram, conseqüentemente, "
-#~ "removidos das prefências de subdiretórios de %(filetype)s."
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Apesar da execução de descargas, o valor de \"número acumulado\" não foi "
-#~ "atualizado."
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "O seguinte destino de descarga não pôde ser criado:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Varredura do dispositivo completa: não foram encontrados %(filetypes)s em "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Varredura do dispositivo completa: %(number)s %(filetypes)s encontrados em "
-#~ "%(device)s"
-
 #~ msgid ""
 #~ "\n"
 #~ "Please check preferences, restart the program, and try again."
@@ -1944,190 +1953,23 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "The device can now be safely removed"
 #~ msgstr "O dispositivo poderá agora ser removido com segurança"
 
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Origem: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Erro:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "O diretório temporário de descarga não pôde ser criado"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Destino: %s"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Dispositivo: %s\n"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Não foi possível a criação de cópias de segurança"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Diretório %s não pôde ser criado"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Diretório para armazenamento de cópias de segurança é inexistente"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Origem: %(source)s\n"
-#~ "Destino: %(destination)s\n"
-#~ "%(problem)s"
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "As cópias de segurança de %(file_type)s foram sobrescritas"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "Não foram feitas cópias de segurança de %(file_type)s em %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Já existem cópias de segurança de %(file_type)s"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "Não foram feitas cópias de segurança de %(file_type)s"
-
 #~ msgid "New day has started - resetting 'Downloads Today' sequence number"
 #~ msgstr ""
 #~ "Um novo dia teve início - o número seqüencial \"descargas hoje\" foi "
 #~ "restabelecido."
 
-#~ msgid "Please check your system and try again."
-#~ msgstr "Por favor, tente novamente após uma revisão do sistema."
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr ""
-#~ "Não há %(types_searched_for)s presentes nesse dispositivo, o que torna uma "
-#~ "descarga desnecessária."
-
-#~ msgid "A backup location was not found"
-#~ msgstr ""
-#~ "Um dos locais destinado ao armazenamento de cópias de segurança não pôde ser "
-#~ "encontrado"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Erro: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "Não puderam ser feitas cópias de segurança de %(file_type)s."
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Não foram feitas cópias de segurança de %(file_type)s."
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Não foi encontrado um volume adequado às cópias de seguraça."
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Foram apagados(as) %(number)i %(filetypes)s do dispositivo"
-
 #~ msgid "This device or partition will always be used to download from"
 #~ msgstr "Este dispositivo ou partição será recordado para futuras descargas"
 
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Descarregar arquivos diretamente de uma câmera pode ser muito problemático"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "O uso de leitores de cartão é recomendado. Eles funcionam sempre e são "
-#~ "geralmente mais rápidos."
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Exibir esta mensagem novamente"
-
 #~ msgid "Job Code entered"
 #~ msgstr "Etiqueta definida"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "This device or partition will never be used to download from"
 #~ msgstr "Este dispositivo ou partição será rejeitado para futuras descargas"
 
 #~ msgid "Job Code not entered"
 #~ msgstr "Etiqueta não definida"
 
-#~ msgid "Path"
-#~ msgstr "Caminho"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s não foi descarregado(a)."
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s foi descarregado(a) com ressalvas."
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s foi descarregado(a) com êxito."
-
-#~ msgid "File"
-#~ msgstr "Arquivo"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s foi descarregado(a), mas houve problemas durante a criação de "
-#~ "cópias de segurança."
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s está proto para a descarga"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s será descarregado(a) com ressalvas"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s será descarregado"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr ""
-#~ "%(filetype)s não foi descarregado(a), nem cópias de segurança foram criadas."
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr ""
-#~ "Defina uma nova etiqueta e confirme com a tecla Enter, ou selecione uma "
-#~ "etiqueta já existente"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s não pode ser descarregado(a)."
-
-#~ msgid "Preview"
-#~ msgstr "Previsão"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s disponíveis ao uso"
-
 #~ msgid ""
 #~ "The subfolder preferences entered are invalid and cannot be used.\n"
 #~ "They will be reset to their default values."
@@ -2299,31 +2141,9 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgstr "Redefinindo valor para zero.\n"
 
 #, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Tentando baixar %s arquivos"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Não foi possível apagar as fotos ou vídeos do dispositivo"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Foto: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Foto: %(source)s\n"
-#~ "Erro: %(errno)s %(strerror)s"
-
-#, python-format
 #~ msgid "%s rejected as a download device"
 #~ msgstr "%s foi rejeitado como um dispositivo de transferência"
 
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Baixando das câmeras"
-
 #, python-format
 #~ msgid "Download has started from %s"
 #~ msgstr "Transferência foi iniciada em %s"
@@ -2408,49 +2228,6 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "Prompting for Job Code"
 #~ msgstr "Solicitando o código de trabalho"
 
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "A %(file_type)s Pasta de Download existe mas não pode ser escrita.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "A %(file_type)s Pasta de Download não existe.\n"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Problemas com as Pastas de Download"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Desculpe, alguns problemas foram encontrados com as suas pastas de download. "
-#~ "Por favor, corrija os problemas ou modifique as preferências.\n"
-#~ "\n"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr "Resultados de aviso sobre o download diretamente da câmera"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Criando pasta de download de fotos %(folder)s"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Problema com a Pasta de Download"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Desculpe, esta localização do dispositivo não existe:\n"
-#~ "%(path)s"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Problema com o dispositivo local da pasta"
-
 #~ msgid "Warning:"
 #~ msgstr "Atenção:"
 
@@ -2481,27 +2258,9 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "Problem using pynotify."
 #~ msgstr "Problema com pynotify."
 
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr "Falha ao criar pasta padrão de download de vídeo %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Criando pasta de download de vídeo %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr "Falha ao criar pasta padrão de download de fotos %(folder)s"
-
 #~ msgid "Failed to receive pynotify server capabilities."
 #~ msgstr "Falha ao receber recursos do servidor pynotify."
 
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Atenção: servidor de notificações ambiente desktop está configurado "
-#~ "incorretamente."
-
 #~ msgid "Using manually specified path"
 #~ msgstr "Usando o caminho especificado manualmente"
 
@@ -2519,49 +2278,10 @@ msgstr "Importar fotos e vídeos de forma eficiente e confiável"
 #~ msgid "Automatically start download is true"
 #~ msgstr "Iniciar download automaticamente é verdadeiro"
 
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Atenção: dispositivo de backup %(device)s atualmente está sendo baixado"
-
-#~ 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."
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index 70514a4..b133185 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-08-24 19:49+0600\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\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"
@@ -18,44 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr ""
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr ""
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -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:1177
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr ""
 
-#: rapid/rapid.py:2007 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:2010
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2111
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -84,143 +84,143 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2114
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2115
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2404
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2406
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2408
+#: rapid/rapid.py:2507
 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:2413
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2435 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2437 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2440 rapid/rapid.py:2987 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:2442 rapid/preferencesdialog.py:1586 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2445 rapid/rapid.py:2985 rapid/preferencesdialog.py:893
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr ""
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2447 rapid/preferencesdialog.py:1585 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2474
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2478
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2481 rapid/rapid.py:2533
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2490
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2496 rapid/rapid.py:2505 rapid/rapid.py:2514
-#: rapid/rapid.py:2523 rapid/rapid.py:2531
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2498 rapid/rapid.py:2516
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2507 rapid/rapid.py:2525
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2564
+#: rapid/rapid.py:2663
 #, 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:2571
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2955
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:2960
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:2962
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:2964
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:2991
+#: rapid/rapid.py:3120
 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:3003
+#: rapid/rapid.py:3132
 #, 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:3007
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -228,139 +228,151 @@ 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:3012
+#: rapid/rapid.py:3141
 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:3017
+#: rapid/rapid.py:3146
 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:3023
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3029
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3034
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3063
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3168 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:3170 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:3179
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3181 rapid/rapid.py:3195 rapid/rapid.py:3208
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3193
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3206
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3284
+#: rapid/rapid.py:3437
 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:3331
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3332
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3333
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3335
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3337
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:3350
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3350
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3355
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:3363
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr ""
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:196
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr ""
@@ -388,7 +400,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr ""
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr ""
 
@@ -767,11 +779,11 @@ msgid "Should all Job Codes be removed?"
 msgstr ""
 
 #: rapid/preferencesdialog.py:438
-msgid "Remove all Remembered Devices?"
+msgid "Remove all Remembered Paths?"
 msgstr ""
 
 #: rapid/preferencesdialog.py:439
-msgid "Should all remembered devices be removed?"
+msgid "Should all remembered paths be removed?"
 msgstr ""
 
 #: rapid/preferencesdialog.py:445
@@ -829,49 +841,52 @@ msgstr ""
 msgid "Path:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1074
+#: rapid/preferencesdialog.py:1078
 msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1156
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1174
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1319
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1341
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 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:1427
+#: rapid/preferencesdialog.py:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1478
+#: rapid/preferencesdialog.py:1508
 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:1481
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1571
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -879,7 +894,7 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
-#: rapid/preferencesdialog.py:1716
+#: rapid/preferencesdialog.py:1746
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -887,7 +902,7 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1718
+#: rapid/preferencesdialog.py:1748
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -895,89 +910,89 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1719
+#: rapid/preferencesdialog.py:1749
 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:1901
+#: rapid/preferencesdialog.py:1931
 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:1903
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr ""
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr ""
 
@@ -1040,8 +1055,8 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
 #: rapid/problemnotification.py:103
@@ -1693,8 +1708,9 @@ 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."
+"Remembered paths are those associated with devices 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
@@ -1718,8 +1734,9 @@ msgstr ""
 
 #: 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."
+"Specify the ending portion of 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
diff --git a/po/ru.po b/po/ru.po
index 16d9862..e5d325d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-13 18:23-0500\n"
-"PO-Revision-Date: 2011-07-22 09:11+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-27 09:23+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-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Носитель"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Размер"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Ход загрузки"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s не отсоединён"
@@ -66,19 +66,19 @@ msgstr "%(device)s не отсоединён"
 #. 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:1178
 msgid "scanning..."
 msgstr "поиск файлов..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Загрузка"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2089
 msgid "Pause"
 msgstr "Пауза"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,136 +98,136 @@ msgstr ""
 "Неправильно указанная папка загрузки:\n"
 "%s"
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2194
 msgid "Download cannot proceed"
 msgstr "Невозможно загрузить"
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2503
 msgid "About 1 second remaining"
 msgstr "Осталась примерно 1 секунда"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2505
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Осталось %i  секунд"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2507
 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:2395
+#: rapid/rapid.py:2512
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Осталось примерно %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "фото и видео"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "фото или видео"
 
-#: rapid/rapid.py:2422 rapid/rapid.py:2967 rapid/rpdfile.py:115
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "видео"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "видео"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2965 rapid/preferencesdialog.py:825
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "фото"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "фото"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s загружено"
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2577
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не удалось загрузить"
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "предупреждения"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2589
 msgid "All downloads complete"
 msgstr "Все загрузки завершены"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s загружено"
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не удалось загрузить"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2546
+#: rapid/rapid.py:2663
 #, 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:2553
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s из %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Использование носителя для резервного копирования"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Не обнаружен носитель для резервных копий"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3120
 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:2983
+#: rapid/rapid.py:3132
 #, python-format
 msgid "(%(file_type)s)"
-msgstr ""
+msgstr "(%(file_type)s)"
 
 #. Freespace available on the filesystem for downloading to
 #. Displayed in status bar message on main window
-#: rapid/rapid.py:2987
+#: rapid/rapid.py:3136
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "Доступно %(free)s для %(file_type)s"
@@ -235,75 +235,88 @@ 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:2992
+#: rapid/rapid.py:3141
 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
+#: rapid/rapid.py:3146
 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
+#: rapid/rapid.py:3152
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s свободно"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Резервное копирование фотографий и видеозаписей в %(path)s"
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Резервное копирование в  %(path)s"
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+"Резервное копирование фотографий в %(path)s и видеозаписей в %(path2)s"
+
+#: rapid/rapid.py:3173
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3202
 msgid "Program preferences are invalid"
 msgstr "Настройки программы не корректны"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Фото"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Видео"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3332
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Указанный для загрузки каталог %(file_type)s не существует"
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
 msgid "Folder: %s"
 msgstr "Каталог: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "для %(file_type)s папка загрузки указана неверно."
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3359
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "каталог для %(file_type)s доступен только для чтения"
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3437
 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:3311
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,42 +325,42 @@ msgstr ""
 "выводить информацию в командной строке во время выполнения программы (по "
 "умолчанию: %default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3485
 msgid "display debugging information when run from the command line"
 msgstr "отображать отладочную информацию при запуске из командной строки"
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "выводить в командную строку только ошибки"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3315
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "вывести расширения фото- и видеофайлов, которые распознает программа, и выйти"
 
-#: rapid/rapid.py:3316
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "сбросить все настройки и выйти"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Фото:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Видео:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Все установки и настройки были сброшены"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3534
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -357,16 +370,16 @@ msgstr ""
 "Для загрузки видеороликов, пожалуйста, установите пакеты метаданных hachoir "
 "и kaa."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Ошибка резервного копирования"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Каталог назначения не может быть создан: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -375,13 +388,13 @@ msgstr ""
 "Источник: %(source)s\n"
 "Назначение: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Ошибка: %(inst)s"
 
-#: 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"
@@ -405,7 +418,7 @@ msgstr "Следует ли загрузить фото или видео с э�
 msgid "_Remember this choice"
 msgstr "_Запомнить мой выбор"
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:298
 msgid "MB/s"
 msgstr "МБ/с"
 
@@ -430,7 +443,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 "Метка"
 
@@ -775,74 +788,107 @@ msgstr "Имя каталога не должно закачинаться на
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Имя каталога не может содержать две %s, одну за другой"
 
-#: 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 Paths?"
+msgstr "Удалить все запомненные расположения?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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:1078
 msgid "Job Code"
 msgstr "Метка"
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Выберите каталог для загрузки фото"
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Выберите каталог для загрузки видео"
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Выберите каталог, содержащий %(file_types)s"
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Выберите папку в которой будут хранить резервные копии фотографий"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 msgstr ""
-"Выберите каталог в котором будут храниться резервные копии %(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
-#: rapid/preferencesdialog.py:1215
+#: rapid/preferencesdialog.py:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -850,7 +896,7 @@ msgstr ""
 "<i><b>Внимание:</b> Недостаточно метаданных для создания имен файлов. "
 "Пожалуйста, используйте другие варианты переименования.</i>"
 
-#: rapid/preferencesdialog.py:1266
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -860,13 +906,13 @@ msgstr ""
 "подкаталогов.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1269
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -877,94 +923,119 @@ msgstr ""
 "использованы.\n"
 "Они сброшены до значений по умолчанию."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Следующие регулярные выражения недопустимы и будут удалены, если вы не "
+"исправите их:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Регулярное выражение недопустимо и будет удалено, если вы не исправите его:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+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:1931
 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/preferencesdialog.py:1647
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "внешнийдиск2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "Нью-Йорк"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Манила"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Прага"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Хельсинки"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Веллингтон"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Тегеран"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Кампала"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Париж"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Берлин"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Сидней"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Будапешт"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Рим"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Москва"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Дели"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Варшава"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Джакарта"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Мадрид"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 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 "имя файла"
 
@@ -1020,11 +1091,11 @@ msgstr ""
 #: 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."
+"%(image1)s was taken 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."
+"%(image1)s было создано %(image1_date)s в %(image1_time)s и %(image2)s "
+"создано %(image2_date)s в %(image2_time)s."
 
 #: rapid/problemnotification.py:103
 #, python-format
@@ -1222,7 +1293,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 ""
 "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время"
@@ -1259,24 +1330,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: 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 "Источник: %(source)s"
 
-#: 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 "Путь: %s"
@@ -1658,8 +1729,8 @@ msgstr ""
 "спросит вас, нужно ли его сканировать."
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
-msgstr "Папки, из которых не будет производится загрузка\t"
+msgid "Ignored Paths"
+msgstr "Пропускаемые расположения"
 
 #: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
@@ -1710,18 +1781,19 @@ msgid "Re_move All"
 msgstr "У_далить все"
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
-msgstr "Выбранные устройства"
+msgid "Remembered Paths"
+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."
+"Remembered paths are those associated with devices 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"
@@ -1747,6 +1819,16 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of 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"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1759,7 +1841,7 @@ msgstr ""
 "резервного копирования. На каждом носителе, который вы хотите использовать "
 "для резервного копирования, создайте каталог с одним из этих имен.</i>"
 
-#: rapid/glade3/prefs.ui.h:82
+#: 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."
@@ -1767,7 +1849,7 @@ msgstr ""
 "Укажите время в 24-часовом формате, когда следует обнулять параметр "
 "<i>Загрузок сегодня</i>."
 
-#: rapid/glade3/prefs.ui.h:83
+#: 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."
@@ -1775,48 +1857,52 @@ msgstr ""
 "Укажите, следует ли удалить символы в названиях фото, видео, каталогов, "
 "которые не распознаются в других операционных системах."
 
-#: rapid/glade3/prefs.ui.h:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr ""
 "Начать загрузку фотографий и видеороликов сразу после запуска программы"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Начать загрузку сразу после подключения носителя"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Сквозная нумерация:"
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Убрать несовместимые символы"
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Синхронизировать последовательность номеров при загрузке RAW + JPEG"
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Отключить (\"извлечь\") носитель после завершения загрузки"
 
-#: rapid/glade3/prefs.ui.h:90
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Использовать регулярные выражения стиля _python"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Каталоги видео"
 
-#: rapid/glade3/prefs.ui.h:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Переименование видео"
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Название каталога резервного копирования видео"
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr "Размещение для резервного копирования видео:"
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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."
@@ -1824,7 +1910,7 @@ msgstr ""
 "Если фотография или видеоролик с таким названием уже загружен, выберите, "
 "пропустить загрузку или добавить уникальный идентификатор."
 
-#: rapid/glade3/prefs.ui.h:95
+#: 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."
@@ -1832,7 +1918,7 @@ msgstr ""
 "Во время резервного копирования следует перезаписать файл, имеющий тоже "
 "самое название, или пропустить его?"
 
-#: rapid/glade3/prefs.ui.h:96
+#: 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."
@@ -1840,14 +1926,10 @@ msgstr ""
 "Имеется возможность создания резервной копии ваших фотографий и видеороликов "
 "прямо во время загрузки, в том числе на внешних жёстких дисках."
 
-#: rapid/glade3/prefs.ui.h:97
+#: rapid/glade3/prefs.ui.h:99
 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 "Импортируйте ваши фото и видео быстро и надёжно"
@@ -2278,31 +2360,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Job Code entered"
 #~ msgstr "Метка введена"
 
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Изображение: %(source)s"
-
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Не удалось удалить изображение с устройства хранения"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Изображение: %(source)s\n"
-#~ "Ошибка: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Удалены %i изображений с устройства хранения"
-
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Удалить изображения с устройства хранения после завершения закачки"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Авторские права Damon Lynch 2007-2010"
-
 #~ msgid ""
 #~ "When backing up, choose whether to overwrite an image on the backup device "
 #~ "that has the same name, or skip backing it up."
@@ -2310,69 +2367,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Во время резервного копирования могут встретиться фотографии с одинаковыми "
 #~ "названиями. Выберите, перезаписать ли такую фотографию или пропустить её."
 
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Обнаружены изображения с одними и теми же названиями, но принятыми в разное "
-#~ "время:"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Первое изображение: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Второе изображение: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Носитель изображений: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Источник: %s\n"
-
-#~ msgid "Error:"
-#~ msgstr "Ошибка:"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Ошибка: %(errno)s %(strerror)s"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Извините, каталог для закачки существует, но он защищен от записи. "
-#~ "Пожалуйста, проверьте права на каталог или измените свои настройки"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Извините, каталог для закачки не существует. Пожалуйста, создайте каталог "
-#~ "или измените свои настройки"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Проблема с каталогом для закачки фотографий"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Извините, этот путь для хранения изображений не существует:\n"
-#~ "%(path)s\n"
-#~ "Пожалуйста, решите эту проблему или измените настройки"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr ""
-#~ "Внимание: сервер уведомлений вашего рабочего окружения не настроен "
-#~ "надлежащим образом."
-
 #, python-format
 #~ msgid "0 of %s images copied"
 #~ msgstr "0 из %s фотографий скачано"
@@ -2384,103 +2378,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(number)s из %(total)s фотографий скачано"
 
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Носитель: %s\n"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr ""
-#~ "Не удалось автоматически обнаружить носитель для резервного копирования"
-
-#~ msgid "Video skipped"
-#~ msgstr "Видеоролик пропущен"
-
-#~ msgid "Video already exists"
-#~ msgstr "Такой видеоролик уже существует"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Фотография пропущена"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Такая фотография уже существует"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Подкаталог: %(subfolder)s\n"
-#~ "Файл: %(file)s\n"
-#~ "Проблема: %(problem)s"
-
-#~ msgid "photos skipped"
-#~ msgstr "фотографий пропущено"
-
-#~ msgid "videos skipped"
-#~ 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 ""
-#~ "Сканирование носителя завершено: %(filetypes)s не найдено на %(device)s"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 из %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Первая фотография: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Вторая фотография: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s не имеет метаданных"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Невозможно открыть %(filetype)s"
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "Невозможно открыть %s(filetype)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Резервная копия %(file_type)s уже существует"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "%s нет метаданных в видеоролике"
-
 #~ msgid "Invalid Downloads Today value.\n"
 #~ msgstr "Неверное значение 'Загрузок сегодня'.\n"
 
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Значение \"Загрузок сегодня\" не обновлено, так как загрузка идёт прямо "
-#~ "сейчас"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время:"
-
 #~ msgid "Download copying error"
 #~ msgstr "Ошибка при загрузке файлов"
 
@@ -2493,9 +2393,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Начался новый день - сброшена последовательность номеров параметра 'Загрузок "
 #~ "сегодня'"
 
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Не удалось создать временный каталог для загрузки"
-
 #, python-format
 #~ msgid "Download has started from %s"
 #~ msgstr "Начата загрузка с %s"
@@ -2518,12 +2415,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "This device or partition will never be used to download from"
 #~ msgstr "Этот носитель или раздел никогда не будет использован для загрузки"
 
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Проблема с каталогами для загрузки"
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Проблема с каталогом для загрузки"
-
 #~ msgid "Starting downloads"
 #~ msgstr "Начинаются загрузки"
 
@@ -2536,86 +2427,10 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "Automatically start download is true"
 #~ msgstr "Автоматически начинать загрузку - да"
 
-#~ msgid "videos downloaded"
-#~ msgstr "видеороликов загружено"
-
-#~ msgid "photos downloaded"
-#~ msgstr "фотографий загружено"
-
 #~ msgid "_Download "
 #~ msgstr "_Загрузить "
 
 #~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Извините, возможность загрузки видео не работает. Необходимо установить "
-#~ "пакет <i>kaa metadata</i> для python."
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s пропущен"
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "%(filetype)s название файла не удалось сгенерировать"
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Невозможно извлечь миниатюру фотографии"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Путь резервного копирования не существует"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "%s метаданные не представлены"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Не удаётся сгенерировать название подкаталога. Проверьте, хватает ли "
-#~ "метаданных."
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Удалено %(number)i %(filetypes)s с носителя"
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr ""
-#~ "Выберите, следует ли пропустить загрузку файла или следует добавить к его "
-#~ "названию уникальную метку."
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "The %(filetype)s не скопирован."
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Метаданных достаточно для генерирования названий подкаталогов и/или файлов.\n"
-#~ "Источник: %s"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "%(filetype)s название файла не удалось сгенерировать правильно. Проверьте, "
-#~ "что метаданных хватает."
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "%(file_type)s не скопирован в резервную копию на %(volume)s"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "%(file_type)s не скопирован в резервную копию"
-
-#~ msgid ""
 #~ "\n"
 #~ "Please check preferences, restart the program, and try again."
 #~ msgstr ""
@@ -2626,27 +2441,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgstr "Обнаружена ошибка в настройках программы."
 
 #, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Сканирование носителя завершено: найдено %(number)s %(filetypes)s на "
-#~ "%(device)s"
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Указанный путь для загрузки файлов не может быть создан:\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Источник: %(source)s\n"
-#~ "Частичное название файла: %(newname)s\n"
-#~ "Назначение: %(destination)s\n"
-#~ "Проблема: %(problem)s"
-
-#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2657,10 +2451,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Ошибка: %(errorno)s %(strerror)s"
 
 #, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Резервная копия %(file_type)s перезаписана"
-
-#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s\n"
@@ -2670,52 +2460,12 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Назначение: %(destination)s\n"
 #~ "Ошибка: %(errno)s %(strerror)s"
 
-#~ msgid "A backup location was not found"
-#~ msgstr "Не найдено указанное размещение для сохранения резервных копий"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "Резервная копия %(file_type)s не может быть создана."
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Резервная копия %(file_type)s не была создана."
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Источник: %(source)s\n"
-#~ "Назначение: %(destination)s\n"
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Не найдено подходящего раздела для сохранения резервных копий"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Назначение: %s"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Носитель не содержит %(types_searched_for)s для загрузки."
-
 #~ msgid "Backup device missing"
 #~ msgstr "Отсутствует носитель для резервного копирования"
 
-#~ msgid "No backups can occur"
-#~ msgstr "Резервное копирование невозможно"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Не удалось создать путь %s"
-
 #~ msgid "Enter a new job code, or select a previous one."
 #~ msgstr "Введите новую метку или выберите существующую."
 
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Проблема с расположением носителя"
-
 #, python-format
 #~ msgid "Prompting whether to use %s"
 #~ msgstr "Спрашивать, использовать ли %s"
@@ -2768,9 +2518,6 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ msgid "These preferences are not well formed:"
 #~ msgstr "Эти настройки не очень хорошо подобраны:"
 
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Метаданные о долях секунд отсутствуют в фотографии"
-
 #, python-format
 #~ msgid "Preference value '%(value)s' is invalid"
 #~ msgstr "Неверное значение настроек '%(value)s'"
@@ -2783,26 +2530,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Неверен ключ настроек '%(key)s'.\n"
 #~ "Ожидался один из %(value)s"
 
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr ""
-#~ "было обозначено использование номера фото или видео, но имя файл не содержит "
-#~ "номера"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "%s метаданные отсутствуют в фотографии"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "было указано расширение, но название файла не имеет расширения"
-
 #~ msgid "<b>Missing Backup Devices</b>"
 #~ msgstr "Отсутствует носитель для резервного копирования"
 
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ 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 "
@@ -2842,256 +2572,9 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
 #~ "1301, USA."
 
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Укажите, что следует сделать, если фотография или видеоролик с таким же "
-#~ "названием уже были РАНЕЕ загружены или сохранены в резервную копию"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr "Некоторые излишние настройки подкаталога %(filetype)s удалены."
-
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Счетчик сквозной нумерации не обновлен, так как прямо сейчас идёт загрузка"
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Показывать это сообщение снова"
-
-#~ msgid "Status"
-#~ msgstr "Статус"
-
-#~ msgid "File"
-#~ msgstr "Файл"
-
-#~ msgid "Type"
-#~ msgstr "Тип"
-
-#~ msgid "Path"
-#~ msgstr "Путь"
-
-#~ msgid "Date"
-#~ msgstr "Дата"
-
-#~ msgid "Preview"
-#~ msgstr "Предварительный просмотр"
-
-#~ msgid "_Resume"
-#~ msgstr "_Продолжить"
-
-#~ msgid "_Download All"
-#~ msgstr "_Загрузить всё"
-
-#~ msgid "_Device"
-#~ msgstr "_Носитель"
-
-#~ msgid "_Path"
-#~ msgstr "_Путь"
-
-#~ msgid "_Preview"
-#~ msgstr "П_редпросмотр"
-
-#~ msgid "_Size"
-#~ msgstr "_Размер"
-
-#~ msgid "_Type"
-#~ msgstr "_Тип"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Попытка загрузить %s файлов"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Пожалуйста, проверьте вашу систему и попробуйте снова."
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Загрузка с камеры"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Загрузка непосредственно с камеры может работать плохо или не работать вовсе"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr "Введите новую метку и нажмите Enter или выберите существующую метку"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "З_агрузить отмеченное"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s не загружено"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s успешно загружено"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr ""
-#~ "%(filetype)s загружено, но возникли проблемы с его резервным копированием"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s загружено с ошибками"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s будет загружено с предупреждениями"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s не был ни скачан, ни резервно скопирован"
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Внимание: с устройства для резервного копирования %(device)s в данный момент "
-#~ "идет загрузка"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Источник: %(source)s\n"
-#~ "Назначение: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Настройки резвервного копирования были изменены."
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Выбрать все _видеоролики"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Выбрать все _фотографии"
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "Настройки устройства загрузки были изменены."
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr "Отображает предупреждения о прямой загрузке с камеры"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr ""
-#~ "Каталог для загрузки %(file_type)s существует, но недоступен для записи.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Каталог для загрузки %(file_type)s не существует.\n"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Показывать _каталоги"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Настройки каталогов и названий файлов были изменены."
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Фото: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Фото: %(source)s\n"
-#~ "Ошибка: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Создание каталога для загрузки фото %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr "Не удалось создать каталог для загрузки фото %(folder)s"
-
-#~ 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"
-
-#, python-format
-#~ 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 готово к загрузке"
-
 #~ msgid "Resetting to midnight.\n"
 #~ msgstr "Вернуть значение \"полночь\".\n"
 
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Загрузка через картридер работает устойчиво и намного быстрее. Настоятельно "
-#~ "рекомендуется использовать картридер."
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s ожидает загрузки"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s не может быть загружено"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Извините, указанное расположение на носителя не существует:\n"
-#~ "%(path)s\n"
-#~ "Пожалуйста, исправьте ошибку или измените настройки"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Извините, были обнаружены проблемы с каталогами для загрузки. Пожалуйста, "
-#~ "исправьте их или измените настройки.\n"
-#~ "\n"
-
 #~ msgid "Sorry, some preferences are invalid and will be reset."
 #~ msgstr "Извините, некоторые настройки неверны и будут сброшены."
 
@@ -3103,33 +2586,3 @@ msgstr "Импортируйте ваши фото и видео быстро и
 #~ "Эта версия программы использует несколько другие настройки, чем предыдущая. "
 #~ "Некоторые ваши настройки неверны и не могут быть обновлены. Они будут "
 #~ "сброшены."
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Настройки каталога для загрузки были изменены."
-
-#~ msgid "P_review Columns"
-#~ msgstr "Показывать к_олонки"
-
-#~ msgid "Select _All"
-#~ msgstr "Выделить вс_ё"
-
-#~ msgid "Se_lect None"
-#~ msgstr "_Снять выделение"
-
-#~ msgid "_Filename"
-#~ msgstr "Имя файла"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "%(free)s доступно"
-
-#~ 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/sk.po b/po/sk.po
index c384fb6..892aca1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,1800 +7,1742 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-22 21:26-0500\n"
-"PO-Revision-Date: 2010-09-23 05:02+0000\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 15:40+0000\n"
 "Last-Translator: Marcel <marceliqq@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-25 03:12+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\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:6353 rapid/glade3/rapid.glade.h:71
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: 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 "Praha"
-
-#: rapid/rapid.py:457
-msgid "Helsinki"
-msgstr "Helsinki"
-
-#: rapid/rapid.py:457
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:458
-msgid "Tehran"
-msgstr "Teherán"
-
-#: rapid/rapid.py:458
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:458
-msgid "Paris"
-msgstr "Paríž"
-
-#: rapid/rapid.py:458
-msgid "Berlin"
-msgstr "Berlín"
-
-#: rapid/rapid.py:458
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:459
-msgid "Budapest"
-msgstr "Budapešť"
-
-#: rapid/rapid.py:459
-msgid "Rome"
-msgstr "Rím"
-
-#: rapid/rapid.py:459
-msgid "Moscow"
-msgstr "Moskva"
-
-#: rapid/rapid.py:459
-msgid "Delhi"
-msgstr "Dillí"
-
-#: rapid/rapid.py:459
-msgid "Warsaw"
-msgstr "Varšava"
-
-#: rapid/rapid.py:460
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: rapid/rapid.py:460
-msgid "Madrid"
-msgstr "Madrid"
-
-#: rapid/rapid.py:460
-msgid "Stockholm"
-msgstr "Štokholm"
-
-#: rapid/rapid.py:493
-msgid "Invalid Downloads Today value.\n"
-msgstr "Dnešná hodnota sťahovanie je invalidní.\n"
-
-#: rapid/rapid.py:494
-msgid "Resetting value to zero.\n"
-msgstr "Resetovanie hodnoty na nulu.\n"
-
-#: rapid/rapid.py:533
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr "Hodnota nastavenia 'Začiatok dňa' je poškodená.\n"
-
-#: rapid/rapid.py:534
-msgid "Resetting to midnight.\n"
-msgstr "Resetovanie do polnoci.\n"
-
-#: rapid/rapid.py:560
-msgid "Error in Photo Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:592 rapid/rapid.py:1714
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "Prepáčte, v nastavení je chyba:\n"
-
-#: rapid/rapid.py:603
-msgid "Resetting to default values."
-msgstr "Resetovanie na výchozí hodnoty."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:678 rapid/renamesubfolderprefs.py:199
-msgid "Job code"
-msgstr "Pracovný kód"
-
-#: rapid/rapid.py:746
-msgid "Error in Video Rename preferences"
-msgstr ""
-
-#: rapid/rapid.py:764
-msgid "Error in Photo Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:781
-msgid "Error in Video Download Subfolders preferences"
-msgstr ""
-
-#: rapid/rapid.py:814 rapid/rapid.py:1545
-msgid "photos and videos"
-msgstr "fotografie a videá"
-
-#: rapid/rapid.py:816 rapid/rapid.py:1555 rapid/rapid.py:1683
-msgid "photos"
-msgstr "fotografie"
-
-#: rapid/rapid.py:949
-msgid "Select a folder to download photos to"
-msgstr "Vyberte zložku do ktorej majú byť obrázky stiahnuté"
-
-#: rapid/rapid.py:967
-msgid "Select a folder to download videos to"
-msgstr "Vyberte priečinok pre stiahnuté videá"
-
-#: rapid/rapid.py:1049
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr ""
-
-#: rapid/rapid.py:1071
-#, 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/rapid.py:1152
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-
-#: rapid/rapid.py:1188
-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/rapid.py:1192
-#, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Príklad: %s</i>"
-
-#: rapid/rapid.py:1218
-msgid ""
-"Downloads today value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1234
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr ""
-
-#: rapid/rapid.py:1264
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr ""
-
-#. Preferences list is now empty
-#: rapid/rapid.py:1269
-#, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1283 rapid/rapid.py:1557
-msgid "photo"
-msgstr "fotografia"
-
-#: rapid/rapid.py:1284 rapid/rapid.py:1552
-msgid "video"
-msgstr "video"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1521
-msgid "externaldrive1"
-msgstr "externýdisk1"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1523
-msgid "externaldrive2"
-msgstr "externýdisk2"
-
-#: rapid/rapid.py:1547 rapid/rapid.py:1681
-msgid "photos or videos"
-msgstr "fotografie a videá"
-
-#: rapid/rapid.py:1550
-msgid "videos"
-msgstr "videá"
-
-#: rapid/rapid.py:1562
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:1564
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:1567
-#, python-format
-msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr ""
-
-#: rapid/rapid.py:1574
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/rapid.py:1602 rapid/rapid.py:2278
-msgid "subfolder and filename"
-msgstr "podpriečinok a meno súboru"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:150
+msgid "Device"
+msgstr "Zariadenie"
 
-#: rapid/rapid.py:1604 rapid/rapid.py:2280
-msgid "filename"
-msgstr "názov súboru"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:167
+msgid "Size"
+msgstr "Veľkosť"
 
-#: rapid/rapid.py:1606 rapid/rapid.py:2282
-msgid "subfolder"
-msgstr "podpriečinok"
+#: rapid/rapid.py:170
+msgid "Download Progress"
+msgstr "Priebeh sťahovania"
+
+#: rapid/rapid.py:316
+#, python-format
+msgid "%(device)s did not unmount"
+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:1697
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "skenovanie..."
 
-#: rapid/rapid.py:1812
-msgid "The following download path could not be created:\n"
-msgstr ""
-
-#: rapid/rapid.py:1813
-#, python-format
-msgid "%(path)s: "
-msgstr ""
-
-#: rapid/rapid.py:1814 rapid/rapid.py:1815 rapid/rapid.py:1830
-#: rapid/rapid.py:1831 rapid/rapid.py:2095 rapid/rapid.py:2098
-msgid "Download cannot proceed"
-msgstr "Sťahovanie nemôže pokračovať"
-
-#: rapid/rapid.py:1828 rapid/rapid.py:4999
-msgid "There is an error in the program preferences."
-msgstr "Vyskytla sa chyba v nastavenie programu."
-
-#: rapid/rapid.py:1829
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
-msgstr ""
-"\n"
-"Prosím skontrolujte nastavenia, reštartujte program a skúste to znova."
-
-#. 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:2006
-#, python-format
-msgid "%(number)s %(filetypes)s"
-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:2017
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-msgstr ""
-
-#: rapid/rapid.py:2024
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-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:2045
-msgid "The device can now be safely removed"
-msgstr "Zariadenie teraz nemôže byť bezpečne vymazané"
-
-#: rapid/rapid.py:2051
-#, python-format
-msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr ""
-
-#: rapid/rapid.py:2054
-#, python-format
-msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:2057 rapid/rapid.py:5792
-msgid "warnings"
-msgstr "varovania"
-
-#: rapid/rapid.py:2059 rapid/rapid.py:5796
-msgid "errors"
-msgstr "chyby"
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "Stiahnuť"
 
 #: rapid/rapid.py:2089
-#, python-format
-msgid "Source: %s\n"
-msgstr "Zdroj: %s\n"
-
-#: rapid/rapid.py:2091
-#, python-format
-msgid "Device: %s\n"
-msgstr "Zariadenie: %s\n"
-
-#: rapid/rapid.py:2092
-#, python-format
-msgid "Destination: %s"
-msgstr "Destinácia: %s"
-
-#: rapid/rapid.py:2093 rapid/rapid.py:2096
-msgid "Could not create temporary download directory"
-msgstr "Nemožno vytvoriť dočasný priečinok pre sťahovanie"
-
-#: rapid/rapid.py:2096
-msgid "Error:"
-msgstr "Chyba:"
+msgid "Pause"
+msgstr "Pozastaviť"
 
-#: rapid/rapid.py:2120
-msgid "Backup path does not exist"
-msgstr ""
-
-#: rapid/rapid.py:2121
-#, python-format
-msgid "The path %s could not be created"
-msgstr ""
-
-#: rapid/rapid.py:2122
-msgid "No backups can occur"
-msgstr ""
-
-#: rapid/rapid.py:2151
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"%(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2182 rapid/rapid.py:2528 rapid/rapid.py:2563
-#: rapid/rapid.py:2591 rapid/rapid.py:2622 rapid/rapid.py:2641
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
-"Zdroj: %(source)s\n"
-"Destinácia: %(destination)s"
 
-#. hopefully inst will never be None, but just to be safe...
-#: rapid/rapid.py:2197
-msgid "Please check your system and try again."
-msgstr "Prosím skontrolujte váš systém a skúste znova."
-
-#: rapid/rapid.py:2217
-msgid "Photos detected with the same filenames, but taken at different times"
-msgstr "Fotografie detekované s rovnakým názvom, ale urobené v rozličný čas"
+#: rapid/rapid.py:2194
+msgid "Download cannot proceed"
+msgstr "Sťahovanie nemôže pokračovať"
 
-#: rapid/rapid.py:2257
-msgid "Photo has already been downloaded"
-msgstr "Fotografie už boli stiahnuté"
+#: rapid/rapid.py:2503
+msgid "About 1 second remaining"
+msgstr "Zostáva približne 1 sekunda"
 
-#: rapid/rapid.py:2258 rapid/rapid.py:2657
+#: rapid/rapid.py:2505
 #, python-format
-msgid "Source: %(source)s"
-msgstr "Zdroj: %(source)s"
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2456
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr "Nový deň začal - resetovanie 'Dnešná sťahovania' sekvenčné číslo"
+msgid "About %i seconds remaining"
+msgstr "Zostáva približné %i sekúnd"
 
-#: rapid/rapid.py:2527
-#, python-format
-msgid "Backup of %(file_type)s already exists"
+#: rapid/rapid.py:2507
+msgid "About 1 minute remaining"
 msgstr ""
 
-#: rapid/rapid.py:2531
+#. 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:2512
 #, python-format
-msgid "Backup %(file_type)s overwritten"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2535
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr ""
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+msgid "photos and videos"
+msgstr "fotografie a videá"
 
-#: rapid/rapid.py:2537
-#, python-format
-msgid "%(file_type)s not backed up"
-msgstr ""
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "fotografie a videá"
 
-#: rapid/rapid.py:2560 rapid/rapid.py:2588 rapid/rapid.py:2621
-#: rapid/rapid.py:2640
-msgid "Backing up error"
-msgstr "Chyba zálohovanie"
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
+msgid "videos"
+msgstr "videá"
 
-#: rapid/rapid.py:2561 rapid/rapid.py:2589
-#, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr ""
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
 
-#: rapid/rapid.py:2565 rapid/rapid.py:2624
-#, python-format
-msgid "Error: %(inst)s"
-msgstr ""
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
+#: rapid/rpdfile.py:120
+msgid "photos"
+msgstr "fotografie"
 
-#: rapid/rapid.py:2566 rapid/rapid.py:2594 rapid/rapid.py:2625
-#: rapid/rapid.py:2644
-#, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr ""
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "fotografia"
 
-#: rapid/rapid.py:2593 rapid/rapid.py:2643
+#: rapid/rapid.py:2573
 #, python-format
-msgid "Error: %(errno)s %(strerror)s"
+msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2656
+#: rapid/rapid.py:2577
 #, python-format
-msgid "%(file_type)s could not be backed up"
+msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2659
-msgid "No suitable backup volume was found"
-msgstr ""
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
+msgid "warnings"
+msgstr "varovania"
 
-#: rapid/rapid.py:2661
-msgid "A backup location was not found"
-msgstr ""
+#: rapid/rapid.py:2589
+msgid "All downloads complete"
+msgstr "Všetka sťahovania bola dokončená"
 
-#: rapid/rapid.py:2715
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
-msgid "This device has no %(types_searched_for)s to download from."
+msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2788
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
-msgid "Download has started from %s"
-msgstr "Sťahovanie z %s začalo"
-
-#: rapid/rapid.py:2799
-#, python-format
-msgid "Attempting to download %s files"
+msgid "%(filetype)s downloaded"
 msgstr ""
 
-#. reset the progress bar to update the status of this download attempt
-#: rapid/rapid.py:2831 rapid/rapid.py:2898
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
-msgid "%(number)s of %(total)s %(filetypes)s"
+msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2894
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2663
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr ""
 
-#: rapid/rapid.py:2919 rapid/rapid.py:2923
-msgid "Could not delete photo or video from device"
-msgstr "Nemožno vymazať fotografiu alebo video zo zariadenia"
-
-#: rapid/rapid.py:2920
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
-
-#: rapid/rapid.py:2924
-#, python-format
-msgid "Photo: %(source)s"
-msgstr ""
-
-#: rapid/rapid.py:2926
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
-msgstr ""
-
-#: rapid/rapid.py:2939
-#, python-format
-msgid "Download complete from %s"
-msgstr "Sťahovanie z %s dokončené"
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:3054 rapid/rapid.py:3523
-msgid "Device"
-msgstr "Zariadenie"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:3059 rapid/rapid.py:3512
-msgid "Size"
-msgstr "Veľkosť"
-
-#: rapid/rapid.py:3062
-msgid "Download Progress"
-msgstr "Priebeh sťahovania"
-
-#: rapid/rapid.py:3150
-msgid "Downloading From Cameras"
-msgstr "Sťahovanie Z Kamier"
-
-#: rapid/rapid.py:3156
-msgid "Downloading directly from a camera may work poorly or not at all"
-msgstr "Sťahovanie priamo z kamier môže fungovať zle alebo vôbec."
-
-#: rapid/rapid.py:3157
-msgid ""
-"Downloading from a card reader always works and is generally much faster. It "
-"is strongly recommended to use a card reader."
-msgstr ""
-"Sťahovanie z čítačky pamäťových kariet funguje vždy a je obecne omnoho "
-"rýchlejšie. Je silno doporučené požívať čítačku pamäťových kariet."
-
-#: rapid/rapid.py:3171
-msgid "_Show this message again"
-msgstr "_Zobraz túto správu znova"
-
-#: rapid/rapid.py:3206
-msgid "Device Detected"
-msgstr "Zariadenie detekované"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3215
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3234
-msgid "_Remember this choice"
-msgstr "_Zapamatovať si túto voľbu"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3271
-#, python-format
-msgid "%s selected for downloading from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3274
-msgid "This device or partition will always be used to download from"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3277
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2670
 #, python-format
-msgid "%s rejected as a download device"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:3280
-msgid "This device or partition will never be used to download from"
-msgstr ""
-
-#: rapid/rapid.py:3287
-msgid "Remove all Job Codes?"
-msgstr ""
-
-#: rapid/rapid.py:3304
-msgid "Should all Job Codes be removed?"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3332
-msgid "Enter a Job Code"
-msgstr "Vložte pracovný kód"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3351
-msgid "Enter a new Job Code, or select a previous one"
-msgstr ""
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3354
-msgid "Enter a new Job Code"
-msgstr ""
-
-#: rapid/rapid.py:3359 rapid/rapid.py:4534
-msgid "Job Code:"
-msgstr "Pracovný kód:"
-
-#: rapid/rapid.py:3406
-msgid "Job Code entered"
-msgstr "Pracovný kód bol vložen"
-
-#: rapid/rapid.py:3408
-msgid "Job Code not entered"
-msgstr "Pracovný kód nebol vložen"
-
-#: rapid/rapid.py:3458
-msgid "Status"
-msgstr "Stav"
-
-#: rapid/rapid.py:3466
-msgid "Type"
-msgstr "Typ"
-
-#: rapid/rapid.py:3475 rapid/rapid.py:4961 rapid/rapid.py:4963
-msgid "Photo"
-msgstr "Fotografia"
-
-#: rapid/rapid.py:3477
-msgid "File"
-msgstr "Súbor"
-
-#: rapid/rapid.py:3492
-msgid "Job Code"
+msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:3502
-msgid "Date"
-msgstr "Dátum"
-
-#: rapid/rapid.py:3534 rapid/renamesubfolderprefs.py:195
-msgid "Filename"
-msgstr "Názov súboru"
-
-#: rapid/rapid.py:3545
-msgid "Path"
-msgstr "Cesta"
+#: rapid/rapid.py:3084
+msgid "and"
+msgstr "a"
 
-#: rapid/rapid.py:3955
-#, python-format
-msgid "%(filetype)s was downloaded successfully"
+#: rapid/rapid.py:3089
+msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3957
-#, python-format
-msgid "%(filetype)s was not downloaded"
+#: rapid/rapid.py:3091
+msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3959
-#, python-format
-msgid "%(filetype)s was downloaded with warnings"
+#: rapid/rapid.py:3093
+msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3961
-#, python-format
-msgid "%(filetype)s was downloaded but there were problems backing up"
+#: rapid/rapid.py:3120
+msgid "Free space:"
 msgstr ""
 
-#: rapid/rapid.py:3963
+#. (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:3132
 #, python-format
-msgid "%(filetype)s was neither downloaded nor backed up"
+msgid "(%(file_type)s)"
 msgstr ""
 
-#: rapid/rapid.py:3965
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3136
 #, python-format
-msgid "%(filetype)s is ready to be downloaded"
+msgid "%(free)s %(file_type)s"
 msgstr ""
 
-#: rapid/rapid.py:3967
-#, python-format
-msgid "%(filetype)s is about to be downloaded"
+#. 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:3141
+msgid "; "
 msgstr ""
 
-#: rapid/rapid.py:3969
-#, python-format
-msgid "%(filetype)s will be downloaded with warnings"
+#. 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:3146
+msgid "."
 msgstr ""
 
-#: rapid/rapid.py:3971
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3152
 #, python-format
-msgid "%(filetype)s cannot be downloaded"
+msgid "%(free)s free"
 msgstr ""
 
-#: rapid/rapid.py:4341
-msgid "Preview"
-msgstr "Náhľad"
-
-#: rapid/rapid.py:4556
-msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-msgstr ""
-
-#: rapid/rapid.py:4928
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
 #, python-format
-msgid "%(free)s available"
+msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:4934
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:4939
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
 #, python-format
-msgid "%(freespace)s. %(backuppaths)s."
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:4948
+#: rapid/rapid.py:3173
 #, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
+msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:4952
-msgid "Problem with Device Location Folder"
+#: rapid/rapid.py:3202
+msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:4961
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr "Fotografia"
+
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:4968
+#: rapid/rapid.py:3332
 #, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
+msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:4977
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
 #, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-
-#: rapid/rapid.py:4982
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:4985
-msgid "Problem with Download Folder"
-msgstr ""
-
-#: rapid/rapid.py:4987
-msgid "Problem with Download Folders"
-msgstr ""
-
-#: rapid/rapid.py:5000
-msgid "Some preferences will be reset."
-msgstr "Niektoré nastavenia budú resetované."
-
-#: rapid/rapid.py:5033
-msgid "Displaying warning about downloading directly from camera"
+msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:5043
+#: rapid/rapid.py:3346
 #, python-format
-msgid "Prompting whether to use %s"
+msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:5070
-msgid "Prompting for Job Code"
-msgstr ""
-
-#: rapid/rapid.py:5074
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr ""
-
-#: rapid/rapid.py:5091
-msgid "Starting downloads"
-msgstr "Sťahovanie začína"
-
-#. autostart is true
-#: rapid/rapid.py:5095
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr ""
-
-#: rapid/rapid.py:5142
+#: rapid/rapid.py:3359
 #, python-format
-msgid "Creating photo download folder %(folder)s"
+msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:5147
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
+#: rapid/rapid.py:3437
+msgid "Thumbnails"
 msgstr ""
 
-#: rapid/rapid.py:5151
-#, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr ""
-
-#: rapid/rapid.py:5156
+#. 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:3484
 #, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr ""
-
-#: rapid/rapid.py:5181
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-
-#: rapid/rapid.py:5183
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
-msgstr ""
-
-#: rapid/rapid.py:5185
-msgid "Sorry, some preferences are invalid and will be reset."
-msgstr ""
-
-#: rapid/rapid.py:5186
-msgid "Warning:"
-msgstr "Varovanie:"
-
-#: rapid/rapid.py:5191
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
-msgstr ""
-
-#: rapid/rapid.py:5198
-msgid "Preferences were modified."
-msgstr "Nastavenie bolo upravené."
-
-#: rapid/rapid.py:5199
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
-msgstr ""
-
-#: rapid/rapid.py:5203
-msgid "No preferences needed to be changed."
-msgstr ""
-
-#: rapid/rapid.py:5205
 msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
-msgstr ""
-
-#: rapid/rapid.py:5215
-msgid "Problem using pynotify."
-msgstr "Problém používania pynotify."
-
-#: rapid/rapid.py:5231
-msgid "Failed to receive pynotify server capabilities."
-msgstr ""
-
-#: rapid/rapid.py:5242
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr ""
-
-#: rapid/rapid.py:5290
-msgid "and"
-msgstr "a"
-
-#: rapid/rapid.py:5295
-msgid "Using backup devices"
+"display program information on the command line as the program runs "
+"(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:5297
-msgid "Using backup device"
+#: rapid/rapid.py:3485
+msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:5299
-msgid "No backup devices detected"
+#: rapid/rapid.py:3486
+msgid "only output errors to the command line"
 msgstr ""
 
-#: rapid/rapid.py:5349 rapid/rapid.py:5511
-#, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr "Zariadenia %(device)s (%(path)s) bolo ignorované"
-
-#: rapid/rapid.py:5470
-#, python-format
-msgid "Detected %(device)s with path %(path)s"
+#. image file extensions are recognized RAW files plus TIFF and JPG
+#: rapid/rapid.py:3488
+msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:5474
-msgid "Automatically start download is true"
+#: rapid/rapid.py:3490
+msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:5476
-msgid "Automatically start download is false"
+#: rapid/rapid.py:3503
+msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:5529
-msgid "Using manually specified path"
+#: rapid/rapid.py:3503
+msgid "Videos:"
 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:5597
+#: rapid/rapid.py:3508
 #, python-format
-msgid "Warning: backup device %(device)s is currently being downloaded from"
-msgstr ""
-
-#: rapid/rapid.py:5613
-msgid "D_ownload Selected"
-msgstr ""
-
-#: rapid/rapid.py:5713 rapid/rapid.py:5764
-msgid "All downloads complete"
-msgstr "Všetka sťahovania bola dokončená"
-
-#: rapid/rapid.py:5728
-msgid "MB/s"
-msgstr "MB/s"
-
-#: rapid/rapid.py:5738
-msgid "About 1 second remaining"
-msgstr ""
+msgid "and %s"
+msgstr "a %s"
 
-#: rapid/rapid.py:5740
-#, python-format
-msgid "About %i seconds remaining"
+#: rapid/rapid.py:3516
+msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/rapid.py:5742
-msgid "About 1 minute remaining"
+#: rapid/rapid.py:3534
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
 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:5747
-#, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr ""
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
+msgid "Backing up error"
+msgstr "Chyba zálohovanie"
 
-#: rapid/rapid.py:5767 rapid/rapid.py:5773 rapid/rapid.py:5779
-#: rapid/rapid.py:5785 rapid/rapid.py:5790 rapid/rapid.py:5794
+#: rapid/backupfile.py:144
 #, python-format
-msgid "%(number)s %(numberdownloaded)s"
+msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/rapid.py:5769 rapid/rapid.py:5781
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
-msgid "%(filetype)s downloaded"
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
 msgstr ""
+"Zdroj: %(source)s\n"
+"Destinácia: %(destination)s"
 
-#: rapid/rapid.py:5775 rapid/rapid.py:5787
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
-msgid "%(filetype)s failed to download"
-msgstr ""
-
-#: rapid/rapid.py:5955
-msgid "_Resume"
-msgstr ""
-
-#: rapid/rapid.py:5958
-msgid "_Download All"
-msgstr ""
-
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:5967
-msgid "_Pause"
-msgstr "_Pauza"
-
-#: rapid/rapid.py:6079
-msgid "Download device settings preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6091
-msgid "Backup preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6097
-msgid "Subfolder and filename preferences were changed."
-msgstr ""
-
-#: rapid/rapid.py:6108
-msgid "Download folder preferences were changed."
+msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/rapid.py:6307
-msgid "Goodbye"
-msgstr "Hezký den"
-
-#. Translators: this text is displayed to the user when they request information on the command line options.
-#. The text %default should not be modified or left out.
-#: rapid/rapid.py:6318
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
 #, python-format
 msgid ""
-"display program information on the command line as the program runs "
-"(default: %default)"
-msgstr ""
-
-#: rapid/rapid.py:6319
-msgid "display debugging information when run from the command line"
-msgstr ""
-
-#: rapid/rapid.py:6320
-msgid "only output errors to the command line"
+"%(problem)s\n"
+"File: %(file)s"
 msgstr ""
 
-#. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:6322
-msgid "list photo and video file extensions the program recognizes and exit"
-msgstr ""
-
-#: rapid/rapid.py:6323
-msgid "reset all program settings and preferences and exit"
-msgstr ""
-
-#: rapid/rapid.py:6337
-msgid "Photos:"
-msgstr ""
-
-#: rapid/rapid.py:6337
-msgid "Videos:"
-msgstr ""
-
-#: rapid/rapid.py:6342
-#, python-format
-msgid "and %s"
-msgstr "a %s"
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "Zariadenie detekované"
 
-#: rapid/rapid.py:6350
-msgid "All settings and preferences have been reset"
+#. 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 ""
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:6354 rapid/rapid.py:6355 rapid/rapid.py:6357
-#: rapid/rapid.py:6362 rapid/rapid.py:6366
-msgid "Using"
-msgstr "Používanie"
-
-#: rapid/rapid.py:6359
-msgid "\n"
-msgstr ""
+#. 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 "_Zapamatovať si túto voľbu"
 
-#. this application is already running
-#: rapid/rapid.py:6383
-#, python-format
-msgid "%s is already running"
-msgstr "%s nie je pripravené na používanie"
+#: rapid/downloadtracker.py:298
+msgid "MB/s"
+msgstr "MB/s"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Dátum a čas"
 
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:196
+#: rapid/generatenameconfig.py:147
+msgid "Filename"
+msgstr "Názov súboru"
+
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: rapid/renamesubfolderprefs.py:197
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sekvencie"
 
-#: rapid/renamesubfolderprefs.py:200
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
+msgid "Job code"
+msgstr "Pracovný kód"
+
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Dátum obrázku"
 
-#: rapid/renamesubfolderprefs.py:201
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Dnes"
 
-#: rapid/renamesubfolderprefs.py:203
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Včera"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/renamesubfolderprefs.py:205
+#: 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/renamesubfolderprefs.py:207
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Názov + koncovka"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:209
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Názov"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Koncovka"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:213
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Číslo obrázka"
 
-#: rapid/renamesubfolderprefs.py:214
+#: 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/renamesubfolderprefs.py:216
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Clona"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:218
+#: 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/renamesubfolderprefs.py:220
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Čas expozície"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:222
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Ohnisková vzdialenosť"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:224
+#: 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/renamesubfolderprefs.py:226
+#: rapid/generatenameconfig.py:178
 msgid "Camera model"
 msgstr "Model kamery"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:228
+#: 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/renamesubfolderprefs.py:230
+#: 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/renamesubfolderprefs.py:232
+#: rapid/generatenameconfig.py:184
 msgid "Serial number"
 msgstr "Sériové číslo"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:234
+#: 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/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Meno vlastníka"
 
-#: rapid/renamesubfolderprefs.py:237
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:239
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:241
+#: 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/renamesubfolderprefs.py:243
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Dnešné stiahnutie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:245
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Číslo relácie"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:247
+#: 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/renamesubfolderprefs.py:249
+#: 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/renamesubfolderprefs.py:251
+#: 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/renamesubfolderprefs.py:253
+#: 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/renamesubfolderprefs.py:255
+#: 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/renamesubfolderprefs.py:257
+#: rapid/generatenameconfig.py:211
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:259
+#: rapid/generatenameconfig.py:213
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:261
+#: rapid/generatenameconfig.py:215
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:263
+#: 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/renamesubfolderprefs.py:265
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "VEĽKÉ PÍSMENÁ"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "malé písmená"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "Jedna číslica"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Dve číslice"
 
-#: rapid/renamesubfolderprefs.py:270
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tri číslice"
 
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Štyri číslice"
 
-#: rapid/renamesubfolderprefs.py:272
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Päť číslic"
 
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Šesť číslic"
 
-#: rapid/renamesubfolderprefs.py:274
+#: 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/renamesubfolderprefs.py:276
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Subsekundy"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:278
+#: 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/renamesubfolderprefs.py:280
+#: 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/renamesubfolderprefs.py:282
+#: 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/renamesubfolderprefs.py:284
+#: 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/renamesubfolderprefs.py:286
+#: 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/renamesubfolderprefs.py:288
+#: 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/renamesubfolderprefs.py:290
+#: 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/renamesubfolderprefs.py:292
+#: 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/renamesubfolderprefs.py:294
+#: 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/renamesubfolderprefs.py:296
+#: 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/renamesubfolderprefs.py:298
+#: 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/renamesubfolderprefs.py:300
+#: 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/renamesubfolderprefs.py:302
+#: 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/renamesubfolderprefs.py:304
+#: 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/renamesubfolderprefs.py:306
+#: 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/renamesubfolderprefs.py:308
+#: 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/renamesubfolderprefs.py:310
+#: 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/renamesubfolderprefs.py:312
+#: 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/renamesubfolderprefs.py:314
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minúty)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:316
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:801
+#: rapid/preferencesdialog.py:370
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:372
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:376
 #, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr ""
+
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
+msgid "Remove all Job Codes?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
+msgid "Should all Job Codes be removed?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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:638
+msgid "Error in Video Rename preferences"
+msgstr ""
+
+#: rapid/preferencesdialog.py:659
+msgid "Error in Photo Download Subfolders preferences"
+msgstr ""
+
+#: 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:735
+msgid "Enter a Job Code"
+msgstr "Vložte pracovný kód"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/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:754
+msgid "Enter a new Job Code"
+msgstr ""
+
+#: rapid/preferencesdialog.py:759
+msgid "Job Code:"
+msgstr "Pracovný kód:"
+
+#: 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:1078
+msgid "Job Code"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1160
+msgid "Select a folder to download photos to"
+msgstr "Vyberte zložku do ktorej majú byť obrázky stiahnuté"
+
+#: rapid/preferencesdialog.py:1178
+msgid "Select a folder to download videos to"
+msgstr "Vyberte priečinok pre stiahnuté videá"
+
+#: rapid/preferencesdialog.py:1323
+#, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+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:1457
 msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1508
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:808
+#. 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:1511
 #, python-format
-msgid "Preference value '%(value)s' is invalid"
+msgid "<i>Example: %s</i>"
+msgstr "<i>Príklad: %s</i>"
+
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1601
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:812
-msgid "These preferences are not well formed:"
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1525
+#: rapid/preferencesdialog.py:1748
 #, python-format
-msgid "Subfolder preferences should not start with a %s"
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1527
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1931
+msgid "externaldrive1"
+msgstr "externýdisk1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1933
+msgid "externaldrive2"
+msgstr "externýdisk2"
+
+#: rapid/prefsrapid.py:126
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:127
+msgid "Manila"
+msgstr "Manila"
+
+#: rapid/prefsrapid.py:127
+msgid "Prague"
+msgstr "Praha"
+
+#: rapid/prefsrapid.py:127
+msgid "Helsinki"
+msgstr "Helsinki"
+
+#: rapid/prefsrapid.py:127
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:128
+msgid "Tehran"
+msgstr "Teherán"
+
+#: rapid/prefsrapid.py:128
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:128
+msgid "Paris"
+msgstr "Paríž"
+
+#: rapid/prefsrapid.py:128
+msgid "Berlin"
+msgstr "Berlín"
+
+#: rapid/prefsrapid.py:128
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:129
+msgid "Budapest"
+msgstr "Budapešť"
+
+#: rapid/prefsrapid.py:129
+msgid "Rome"
+msgstr "Rím"
+
+#: rapid/prefsrapid.py:129
+msgid "Moscow"
+msgstr "Moskva"
+
+#: rapid/prefsrapid.py:129
+msgid "Delhi"
+msgstr "Dillí"
+
+#: rapid/prefsrapid.py:129
+msgid "Warsaw"
+msgstr "Varšava"
+
+#: rapid/prefsrapid.py:130
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: rapid/prefsrapid.py:130
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:130
+msgid "Stockholm"
+msgstr "Štokholm"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
+msgid "subfolder"
+msgstr "podpriečinok"
+
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
+msgid "filename"
+msgstr "názov súboru"
+
+#: rapid/problemnotification.py:80
 #, python-format
-msgid "Subfolder preferences should not end with a %s"
+msgid "Date time value %s appears invalid."
+msgstr ""
+
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
 msgstr ""
 
-#: rapid/renamesubfolderprefs.py:1531
+#. 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/problemnotification.py:84
 #, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
+msgid "Error generating component %s."
+msgstr ""
+
+#. a generic problem
+#: rapid/problemnotification.py:86
+#, python-format
+msgid "%(filetype)s metadata cannot be read"
+msgstr ""
+
+#: rapid/problemnotification.py:88
+#, python-format
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr ""
+
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#, python-format
+msgid "An error occurred when copying the %(filetype)s"
+msgstr ""
+
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#, python-format
+msgid "%(filetype)s already exists"
+msgstr ""
+
+#: rapid/problemnotification.py:97
+#, python-format
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
+
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
+msgstr ""
+
+#: rapid/problemnotification.py:103
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr ""
+
+#: 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 ""
+
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr ""
+
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr ""
+
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
+msgstr ""
+
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr ""
+
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr ""
+
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
+msgstr ""
+
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr ""
+
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
+msgstr ""
+
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr ""
+
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
+msgstr ""
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr ""
+
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr ""
+
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
+msgstr ""
+
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr ""
+
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr ""
+
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr ""
+
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr ""
+
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
+msgstr ""
+
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr ""
+
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
+msgstr ""
+
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
+msgstr ""
+
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
+msgstr ""
+
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr "Fotografie detekované s rovnakým názvom, ale urobené v rozličný čas"
+
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
+msgstr ""
+
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
+msgstr ""
+
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr ""
+
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr ""
+
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr ""
+
+#: rapid/subfolderfile.py:299
+msgid "Photo has already been downloaded"
+msgstr "Fotografie už boli stiahnuté"
+
+#: rapid/subfolderfile.py:300
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Zdroj: %(source)s"
+
+#: rapid/subfolderfile.py:358
+msgid "subfolder and filename"
+msgstr "podpriečinok a meno súboru"
+
+#: rapid/subfolderfile.py:396
+msgid "Failed to create download subfolder"
+msgstr ""
+
+#: rapid/subfolderfile.py:397
+#, python-format
+msgid "Path: %s"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
+msgstr "Stiahnutie / Pauza"
+
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
+msgstr "_Vyčistit kompletné sťahovanie"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
+msgstr "_Záznam chyb"
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Nápoveda"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
+msgstr "_Dejte príspevok ..."
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
+msgstr "_Přeložit túto aplikáciu ..."
+
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
+msgstr ""
+
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
+msgstr "_Zobraziť"
+
+#: 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 " hh:mm"
 
-#: 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 "<b>Záloha</b>"
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilita s inými operačnými systémami</b>"
 
-#: 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 "<b>Zložka sťahovanie</ b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Podzložky sťahovanie</b>"
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Príklad</b>"
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Pracovné kódy</ b>"
 
-#: 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 "<b>Automatizácia programu</ b>"
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sekvenčná čísla</ b>"
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/externaldrive/Photos</i>"
 
-#: 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 "<i>Príklad:</i>"
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Nový:</i>"
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Originálný:</i>"
 
-#: rapid/glade3/rapid.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Automatizácia</span>"
-
-#: rapid/glade3/rapid.glade.h:22
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Záloha</span>\t"
 
-#: rapid/glade3/rapid.glade.h:23
+#: 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 ""
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Obsluha chýb</span>"
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Pracovné kódy</span>"
 
-#: 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 "<span weight=\"bold\" size=\"x-large\">Možnosti premenovanie</span>"
 
-#: 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 "Pridať unikátny identifikátor"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Automatická detekcia vreckových pamäťových zariadení"
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr "Automatická detekcia zálohovacích zariadení"
 
-#: 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 "Automatizácia"
-
-#: rapid/glade3/rapid.glade.h:36
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr "Záloha"
 
-#: rapid/glade3/rapid.glade.h:37
-msgid "Backup location:"
-msgstr "Umiestnenie zálohy:"
-
-#: 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 "Stiahnutie / Pauza"
-
-#: rapid/glade3/rapid.glade.h:51
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr "Adresár pre stahované súbory:"
 
-#: 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 "Obsluha chýb"
 
-#: rapid/glade3/rapid.glade.h:54
-msgid "Error Log"
-msgstr "Správa o chybách"
+#: 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"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:60
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Pracovné kódy"
 
-#: 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 "Prapísať"
 
-#: 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
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr ""
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Nastavenie: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:68
-msgid "Preview _Folders"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:70
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "O_dstrániť všetko"
 
-#: 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 Photo Downloader je otvorený softvér; môžete ho šíriť a / alebo "
-"modifikovať za podmienok GNU General Public License publikovanej Free "
-"Software Foundation; vo verzii 2, alebo (podľa vašich nárokov) v inej novšie "
-"verzi.\n"
-"\n"
-"Rapid Photo Downloader je distribuovaný v nádeji že bude používaný, ale BEZ "
-"AKEJKOĽVEK ZÁRUKY; neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI "
-"alebo VHODNOSTI PRE KONKRÉTNY ÚČEL. Pozrite GNU General Public License pre "
-"viac detailov.\n"
-"\n"
-"Mali by ste dostať kópiu GNU General Public Licence spolu s Rapid Photo "
-"Downloader. Ak ju neobržíte napíšte na: Free Software Foundation, Inc, 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#: rapid/glade3/rapid.glade.h:77
-msgid "Rename Options"
-msgstr "Nastavenie premenovanie"
-
-#: rapid/glade3/rapid.glade.h:78
-msgid "Se_lect None"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:79
-msgid "Select All Pho_tos"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:80
-msgid "Select All Vi_deos"
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:81
-msgid "Select All Wit_h Job Code"
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:82
-msgid "Select All Without _Job Code"
+#: rapid/glade3/prefs.ui.h:74
+msgid ""
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:83
-msgid "Select _All"
-msgstr ""
+#: rapid/glade3/prefs.ui.h:75
+msgid "Rename Options"
+msgstr "Nastavenie premenovanie"
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Preskočiť"
 
-#: rapid/glade3/rapid.glade.h:85
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Vynechať sťahovanie"
 
-#: 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/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of 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/rapid.glade.h:87
+#: rapid/glade3/prefs.ui.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1809,139 +1751,93 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:90
+#: 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/rapid.glade.h:91
+#: 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/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Štart sťahovania pri štarte programu"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Skladované číslo:"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Odstrániť nekompatibilné znaky"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:98
+#: 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/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:101
+#: 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/rapid.glade.h:102
+#: 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/rapid.glade.h:103
+#: 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/rapid.glade.h:104
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Pridať..."
 
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Clear Completed Downloads"
-msgstr "_Vyčistit kompletné sťahovanie"
-
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Device"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Error Log"
-msgstr "_Záznam chyb"
-
-#: 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 "_Nápoveda online..."
-
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Help"
-msgstr "_Nápoveda"
-
-#: rapid/glade3/rapid.glade.h:112
-msgid "_Make a Donation..."
-msgstr "_Dejte príspevok ..."
-
-#: 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 "_Ohlásiť problém"
-
-#: rapid/glade3/rapid.glade.h:116
-msgid "_Select"
-msgstr ""
-
-#: rapid/glade3/rapid.glade.h:117
-msgid "_Size"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
 msgstr ""
 
-#: rapid/glade3/rapid.glade.h:118
-msgid "_Translate this Application..."
-msgstr "_Přeložit túto aplikáciu ..."
-
-#: rapid/glade3/rapid.glade.h:119
-msgid "_Type"
-msgstr ""
+#~ msgid "      "
+#~ msgstr "      "
 
-#: rapid/glade3/rapid.glade.h:120
-msgid "_View"
-msgstr "_Zobraziť"
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "Resetovanie hodnoty na nulu.\n"
 
 #, python-format
 #~ msgid "0 of %s images copied"
@@ -1955,6 +1851,9 @@ msgstr "_Zobraziť"
 #~ msgid "%s images skipped"
 #~ msgstr "%s obrázkov preskočených"
 
+#~ msgid "errors"
+#~ msgstr "chyby"
+
 #~ msgid "The image was not copied."
 #~ msgstr "Obrázky neboli okopírované."
 
@@ -1968,6 +1867,9 @@ msgstr "_Zobraziť"
 #~ msgid "Image skipped"
 #~ msgstr "Obrázok preskočený"
 
+#~ msgid "Warning:"
+#~ msgstr "Varovanie:"
+
 #~ msgid "Select an image folder"
 #~ msgstr "Vyberte zložku obrázkov"
 
@@ -1984,24 +1886,51 @@ msgstr "_Zobraziť"
 #~ "Destinácia: %(destination)s\n"
 #~ "Chyba: %(errno)s %(strerror)s"
 
+#~ msgid "Problem using pynotify."
+#~ msgstr "Problém používania pynotify."
+
+#~ msgid "Invalid Downloads Today value.\n"
+#~ msgstr "Dnešná hodnota sťahovanie je invalidní.\n"
+
+#~ msgid "Resetting to midnight.\n"
+#~ msgstr "Resetovanie do polnoci.\n"
+
+#~ msgid "'Start of day' preference value is corrupted.\n"
+#~ msgstr "Hodnota nastavenia 'Začiatok dňa' je poškodená.\n"
+
 #~ msgid "Image has no metadata"
 #~ msgstr "Obrázok nemá metadáta."
 
 #~ msgid "_Photos"
 #~ msgstr "_Fotografie"
 
+#~ msgid "_Get Help Online..."
+#~ msgstr "_Nápoveda online..."
+
 #~ msgid "Error in Image Rename preferences"
 #~ msgstr "Chyba v nastavení premenovávanie obrázkov."
 
 #~ msgid "_Thumbnails"
 #~ msgstr "_Miniatúry"
 
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Prepáčte, v nastavení je chyba:\n"
+
+#~ msgid "Resetting to default values."
+#~ msgstr "Resetovanie na výchozí hodnoty."
+
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "Vyskytla sa chyba v nastavenie programu."
+
 #~ msgid "Error in Download Subfolder preferences"
 #~ msgstr "Chyba v nastavenie sťahovacie podzložky"
 
 #~ msgid "Select a folder in which to backup images"
 #~ msgstr "Vyberte zložku do ktorej má byť uložená záloha obrázkov"
 
+#~ msgid "_Report a Problem..."
+#~ msgstr "_Ohlásiť problém"
+
 #~ msgid "<b>Missing Backup Devices</b>"
 #~ msgstr "<b>Chýbajúce zálohovacie zariadenia</ b>"
 
@@ -2014,6 +1943,9 @@ msgstr "_Zobraziť"
 #~ msgid "<b>Image Devices</b>"
 #~ msgstr "<b>Obrázková zariadení</ b>"
 
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Automatizácia</span>"
+
 #~ msgid "<i>Example: /home/user/photos</i>"
 #~ msgstr "<i>Príklad: /home/user/photos</i>"
 
@@ -2023,15 +1955,37 @@ msgstr "_Zobraziť"
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Obrázková zariadenia</span>"
 
+#~ msgid "Automation"
+#~ msgstr "Automatizácia"
+
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Rename</span>\t"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Premenovanie obrázka</span>\t"
 
+#~ msgid "Backup location:"
+#~ msgstr "Umiestnenie zálohy:"
+
 #~ msgid "_Download "
 #~ msgstr "_Stiahnutie "
 
+#~ msgid "_Pause"
+#~ msgstr "_Pauza"
+
 #~ msgid "Preferences were changed."
 #~ msgstr "Nastavenie zmenené."
 
+#~ msgid "Using"
+#~ msgstr "Používanie"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Prosím skontrolujte nastavenia, reštartujte program a skúste to znova."
+
+#~ msgid "New day has started - resetting 'Downloads Today' sequence number"
+#~ msgstr "Nový deň začal - resetovanie 'Dnešná sťahovania' sekvenčné číslo"
+
 #~ msgid "Image has no thumbnail"
 #~ msgstr "Obrázok nemá náhľad"
 
@@ -2056,9 +2010,18 @@ msgstr "_Zobraziť"
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
+#~ msgid "Error Log"
+#~ msgstr "Správa o chybách"
+
 #~ msgid "Download Folder"
 #~ msgstr "Sťahovacie zložka"
 
+#~ msgid "Goodbye"
+#~ msgstr "Hezký den"
+
+#~ msgid "Preferences were modified."
+#~ msgstr "Nastavenie bolo upravené."
+
 #~ msgid "images skipped"
 #~ msgstr "obrázky preskočené"
 
@@ -2103,6 +2066,35 @@ msgstr "_Zobraziť"
 #~ msgid "Import your images efficiently and reliably"
 #~ msgstr "Importujte svoje obrázky efektívne a spoľahlive"
 
+#~ 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 Photo Downloader je otvorený softvér; môžete ho šíriť a / alebo "
+#~ "modifikovať za podmienok GNU General Public License publikovanej Free "
+#~ "Software Foundation; vo verzii 2, alebo (podľa vašich nárokov) v inej novšie "
+#~ "verzi.\n"
+#~ "\n"
+#~ "Rapid Photo Downloader je distribuovaný v nádeji že bude používaný, ale BEZ "
+#~ "AKEJKOĽVEK ZÁRUKY; neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI "
+#~ "alebo VHODNOSTI PRE KONKRÉTNY ÚČEL. Pozrite GNU General Public License pre "
+#~ "viac detailov.\n"
+#~ "\n"
+#~ "Mali by ste dostať kópiu GNU General Public Licence spolu s Rapid Photo "
+#~ "Downloader. Ak ju neobržíte napíšte na: Free Software Foundation, Inc, 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
 #~ msgid "Start downloading upon image device insertion"
 #~ msgstr "Štart sťahovanie po vložení obrázkového zariadenia"
 
@@ -2115,20 +2107,23 @@ msgstr "_Zobraziť"
 #~ msgid "Image filename could not be generated"
 #~ msgstr "Názov obrázku nemohol byť vygenerovaný"
 
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Zo zariadenie bolo odstráneno %i obrázkov"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Obrázok: %(source)s"
+#~ msgid "The device can now be safely removed"
+#~ msgstr "Zariadenie teraz nemôže byť bezpečne vymazané"
 
 #~ msgid "This device has no images to download from."
 #~ msgstr "Zariadenie nemá žiadne obrázky na stiahnutie."
 
+#, python-format
+#~ msgid "Download has started from %s"
+#~ msgstr "Sťahovanie z %s začalo"
+
 #~ msgid "Download copying error"
 #~ msgstr "Chyba kopírovanie sťahovanie"
 
+#, python-format
+#~ msgid "Download complete from %s"
+#~ msgstr "Sťahovanie z %s dokončené"
+
 #~ msgid ""
 #~ "The subfolder preferences entered are invalid and cannot be used.\n"
 #~ "They will be reset to their default values."
@@ -2144,6 +2139,9 @@ msgstr "_Zobraziť"
 #~ msgid "Thumbnail cannot be displayed"
 #~ msgstr "Náhľad nemôže byť zobrazený"
 
+#~ msgid "Starting downloads"
+#~ msgstr "Sťahovanie začína"
+
 #, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
@@ -2172,18 +2170,37 @@ msgstr "_Zobraziť"
 #~ "Destinácia: %(destination)s\n"
 #~ "Chyba: %(errorno)s %(strerror)s"
 
+#~ msgid "Job Code entered"
+#~ msgstr "Pracovný kód bol vložen"
+
+#~ msgid "Job Code not entered"
+#~ msgstr "Pracovný kód nebol vložen"
+
 #, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Prvý obrázek: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Druhý obrázek: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgid "Device %(device)s (%(path)s) ignored"
+#~ msgstr "Zariadenia %(device)s (%(path)s) bolo ignorované"
 
 #, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Obrázok: %(source)s\n"
-#~ "Chyba: %(errno)s %(strerror)s"
+#~ msgid "%s is already running"
+#~ msgstr "%s nie je pripravené na používanie"
+
+#, python-format
+#~ msgid "Device scan complete: no images found on %s"
+#~ msgstr "Prehľadávanie zariadenia kompletné: nenájdené žiadne obrázky na %s"
+
+#~ msgid "Backup device missing"
+#~ msgstr "Chýba záložné zariadenie"
+
+#~ msgid "No backup device was detected."
+#~ msgstr "Nebolo detekované žiadne záložné zariadenie."
+
+#, python-format
+#~ msgid "%(number)s of %(total)s images copied"
+#~ msgstr "%(number)s z %(total)s obrázkov skopírovaných"
+
+#, python-format
+#~ msgid "Unique identifier '%s' added"
+#~ msgstr "Unikátna značka '%s' pridaná"
+
+#~ msgid "Some preferences will be reset."
+#~ msgstr "Niektoré nastavenia budú resetované."
diff --git a/po/sr.po b/po/sr.po
index 2792c31..0508ae4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-21 01:12-0500\n"
-"PO-Revision-Date: 2011-04-24 19:59+0000\n"
+"POT-Creation-Date: 2011-09-08 06:50-0500\n"
+"PO-Revision-Date: 2011-09-12 01:00+0000\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-28 16:08+0000\n"
-"X-Generator: Launchpad (build 12915)\n"
+"X-Launchpad-Export-Date: 2011-09-19 19:06+0000\n"
+"X-Generator: Launchpad (build 13980)\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:11
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Брзи преносилац фотографија"
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Уређај"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Величина"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "Напредак преузимања"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s није демонтиран"
@@ -66,19 +66,19 @@ msgstr "%(device)s није демонтиран"
 #. 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:1154
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "претражујем уређај..."
 
-#: rapid/rapid.py:1969
+#: rapid/rapid.py:2077 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "Преузми"
 
-#: rapid/rapid.py:1972
+#: rapid/rapid.py:2080
 msgid "Pause"
 msgstr "Паузирај"
 
-#: rapid/rapid.py:2075
+#: rapid/rapid.py:2181
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -89,7 +89,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2078
+#: rapid/rapid.py:2184
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -98,136 +98,136 @@ msgstr ""
 "Следећа фасцикла за преузимање је неисправна:\n"
 "%s"
 
-#: rapid/rapid.py:2079
+#: rapid/rapid.py:2185
 msgid "Download cannot proceed"
 msgstr "Не могу да наставим преузимање"
 
-#: rapid/rapid.py:2360
+#: rapid/rapid.py:2490
 msgid "About 1 second remaining"
 msgstr "Преостала је 1 секунда"
 
-#: rapid/rapid.py:2362
+#: rapid/rapid.py:2492
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Преостало је %i секунди"
 
-#: rapid/rapid.py:2364
+#: rapid/rapid.py:2494
 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:2369
+#: rapid/rapid.py:2499
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Преостало је %(minutes)i:%(seconds)02i"
 
-#: rapid/rapid.py:2381 rapid/preferencesdialog.py:822 rapid/rpdfile.py:110
+#: rapid/rapid.py:2521 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "фотографије и видео"
 
-#: rapid/rapid.py:2383 rapid/rpdfile.py:112
+#: rapid/rapid.py:2523 rapid/rpdfile.py:112
 msgid "photos or videos"
 msgstr "фотографије или видео"
 
-#: rapid/rapid.py:2386 rapid/rapid.py:2929 rapid/rpdfile.py:115
+#: rapid/rapid.py:2526 rapid/rapid.py:3103 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "видео"
 
-#: rapid/rapid.py:2388 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:117
+#: rapid/rapid.py:2528 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
 #: rapid/rpdfile.py:270
 msgid "video"
 msgstr "видео"
 
-#: rapid/rapid.py:2391 rapid/rapid.py:2927 rapid/preferencesdialog.py:824
+#: rapid/rapid.py:2531 rapid/rapid.py:3101 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "фотографије"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2393 rapid/preferencesdialog.py:1372 rapid/rpdfile.py:122
+#: rapid/rapid.py:2533 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "фотографија"
 
-#: rapid/rapid.py:2420
+#: rapid/rapid.py:2560
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s преузето"
 
-#: rapid/rapid.py:2424
+#: rapid/rapid.py:2564
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s није преузето"
 
-#: rapid/rapid.py:2427 rapid/rapid.py:2479
+#: rapid/rapid.py:2567 rapid/rapid.py:2619
 msgid "warnings"
 msgstr "упозорења"
 
-#: rapid/rapid.py:2436
+#: rapid/rapid.py:2576
 msgid "All downloads complete"
 msgstr "Сва преузимања су завршена"
 
-#: rapid/rapid.py:2442 rapid/rapid.py:2451 rapid/rapid.py:2460
-#: rapid/rapid.py:2469 rapid/rapid.py:2477
+#: rapid/rapid.py:2582 rapid/rapid.py:2591 rapid/rapid.py:2600
+#: rapid/rapid.py:2609 rapid/rapid.py:2617
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2444 rapid/rapid.py:2462
+#: rapid/rapid.py:2584 rapid/rapid.py:2602
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s преузето"
 
-#: rapid/rapid.py:2453 rapid/rapid.py:2471
+#: rapid/rapid.py:2593 rapid/rapid.py:2611
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s није преузето"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2510
+#: rapid/rapid.py:2650
 #, 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:2517
+#: rapid/rapid.py:2657
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s од %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2897
+#: rapid/rapid.py:3071
 msgid "and"
 msgstr "и"
 
-#: rapid/rapid.py:2902
+#: rapid/rapid.py:3076
 msgid "Using backup devices"
 msgstr "Употреба резервних уређаја"
 
-#: rapid/rapid.py:2904
+#: rapid/rapid.py:3078
 msgid "Using backup device"
 msgstr "Употреба резервног уређаја"
 
-#: rapid/rapid.py:2906
+#: rapid/rapid.py:3080
 msgid "No backup devices detected"
 msgstr "Нису изабрани резервни уређаји"
 
-#: rapid/rapid.py:2933
+#: rapid/rapid.py:3107
 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:2945
+#: rapid/rapid.py:3119
 #, 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:2949
+#: rapid/rapid.py:3123
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -235,75 +235,87 @@ 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:2954
+#: rapid/rapid.py:3128
 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:2959
+#: rapid/rapid.py:3133
 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:2965
+#: rapid/rapid.py:3139
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s слободно"
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3147
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3150
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Правим резерву у %(path)s"
 
-#: rapid/rapid.py:2976
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3153
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3160
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. у %(backuppaths)s."
 
-#: rapid/rapid.py:3005
+#: rapid/rapid.py:3189
 msgid "Program preferences are invalid"
 msgstr "Подешавања програма су неисправна"
 
-#: rapid/rapid.py:3110 rapid/rpdfile.py:251
+#: rapid/rapid.py:3308 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Фотографија"
 
-#: rapid/rapid.py:3112 rapid/rpdfile.py:271
+#: rapid/rapid.py:3310 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Видео"
 
-#: rapid/rapid.py:3121
+#: rapid/rapid.py:3319
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Фасцикла за преузимање %(file_type)s датотека не постоји"
 
-#: rapid/rapid.py:3123 rapid/rapid.py:3137 rapid/rapid.py:3150
+#: rapid/rapid.py:3321 rapid/rapid.py:3335 rapid/rapid.py:3348
 #, python-format
 msgid "Folder: %s"
 msgstr "Фасцикла: %s"
 
-#: rapid/rapid.py:3135
+#: rapid/rapid.py:3333
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Фасцикла за преузимање %(file_type)s датотека је неисправна"
 
-#: rapid/rapid.py:3148
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Фасцикла за преузимање %(file_type)s датотека је неуписива"
 
-#: rapid/rapid.py:3226
+#: rapid/rapid.py:3424
 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:3273
+#: rapid/rapid.py:3471
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -312,42 +324,42 @@ msgstr ""
 "исписује податке о програму у командној линији док је покренут програм "
 "(подразумевано: %default)"
 
-#: rapid/rapid.py:3274
+#: rapid/rapid.py:3472
 msgid "display debugging information when run from the command line"
 msgstr ""
 "прикажи податке за тражење грешки у програму при покретању из командне линије"
 
-#: rapid/rapid.py:3275
+#: rapid/rapid.py:3473
 msgid "only output errors to the command line"
 msgstr "исписује грешке само у командној линији"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3277
+#: rapid/rapid.py:3475
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "исписује екстензије подржаних слика и видеа и напушта програма"
 
-#: rapid/rapid.py:3278
+#: rapid/rapid.py:3477
 msgid "reset all program settings and preferences and exit"
 msgstr "враћа све поставке на подразумевано и напушта програм"
 
-#: rapid/rapid.py:3291
+#: rapid/rapid.py:3490
 msgid "Photos:"
 msgstr "Фотографије:"
 
-#: rapid/rapid.py:3291
+#: rapid/rapid.py:3490
 msgid "Videos:"
 msgstr "Видео:"
 
-#: rapid/rapid.py:3296
+#: rapid/rapid.py:3495
 #, python-format
 msgid "and %s"
 msgstr "и %s"
 
-#: rapid/rapid.py:3304
+#: rapid/rapid.py:3503
 msgid "All settings and preferences have been reset"
 msgstr "Сва подешавања су враћена на подразумеване вредности"
 
-#: rapid/rapid.py:3313
+#: rapid/rapid.py:3521
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
@@ -357,16 +369,16 @@ msgstr ""
 "За преузимање видеа инсталирајте „hachoir metadata“ и „kaa metadata“ пакете "
 "за Питон."
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr "Грешка приликом образовања резервне копије"
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Не могу да направим циљни директоријум: %(directory)s\n"
 
-#: rapid/backupfile.py:143 rapid/backupfile.py:164 rapid/subfolderfile.py:194
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -375,13 +387,13 @@ msgstr ""
 "Извор: %(source)s\n"
 "Циљ: %(destination)s"
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Грешка: %(inst)s"
 
-#: rapid/copyfiles.py:143 rapid/subfolderfile.py:209
-#: rapid/subfolderfile.py:332 rapid/subfolderfile.py:350
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -405,350 +417,358 @@ msgstr "Да ли да преузимам фотографије или виде
 msgid "_Remember this choice"
 msgstr "_Запамти овај избор"
 
-#: rapid/downloadtracker.py:246
+#: rapid/downloadtracker.py:291
 msgid "MB/s"
 msgstr "MB/s"
 
-#: 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:570
 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 "ИСО"
 
 #. 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 "Данашња преузимања"
 
 #. 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 "Последње две цифре"
 
 #. 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 "Последње три цифре"
 
 #. 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 "Последње четири цифре"
 
 #. 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 "СС"
 
@@ -767,73 +787,104 @@ msgstr "Подешавања подфасцикле не треба да се з
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Подешавања подфасцикле не треба да садржи два %s један за другим"
 
-#: 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 Paths?"
+msgstr "Да уклоним све запамћене путање?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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:915
+#: 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:1078
 msgid "Job Code"
 msgstr "Код задатка"
 
-#: rapid/preferencesdialog.py:997
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr "Изаберите фасциклу за чување фотографија"
 
-#: rapid/preferencesdialog.py:1015
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr "Изаберите фасциклу за смештање преузетог видеа"
 
-#: rapid/preferencesdialog.py:1106
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Изаберите фасциклу која садржи %(file_types)s"
 
-#: rapid/preferencesdialog.py:1128
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Изаберите фасциклу за резервне копије %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Изаберите фасциклу за резерве фотографија"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+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:1214
+#: rapid/preferencesdialog.py:1457
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -841,7 +892,7 @@ msgstr ""
 "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање пуног имена. "
 "Искористите друге опције за преименовање.</i>"
 
-#: rapid/preferencesdialog.py:1265
+#: rapid/preferencesdialog.py:1508
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -850,13 +901,13 @@ msgstr ""
 "Искористите другу опцију за именовање фасцикли.</i>"
 
 #. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/preferencesdialog.py:1268
+#: rapid/preferencesdialog.py:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Пример: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1358
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -867,94 +918,118 @@ msgstr ""
 "коришћене.\n"
 "Враћам поставке на подразумеване вредности."
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Следећи изрази су неисправни и биће уклоњени уколико их не поправите:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Следећи израз је неисправан и биће уклоњен уколико га не поправите:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+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:1644
+#: rapid/preferencesdialog.py:1931
 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/preferencesdialog.py:1646
+#: rapid/preferencesdialog.py:1933
 msgid "externaldrive2"
 msgstr "СпољниУређај2"
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "Београд"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Софија"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Праг"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Зајечар"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Нови Сад"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Техеран"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr "Будва"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Париз"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Берлин"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Сиднеј"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Будимпешта"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Рим"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Москва"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Делфи"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Варшава"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Амазон"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Мадрид"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Истамбул"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:343
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
 msgid "subfolder"
 msgstr "подфасцикла"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:341
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
 msgid "filename"
 msgstr "име датотеке"
 
@@ -1010,11 +1085,9 @@ msgstr ""
 #: 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."
+"%(image1)s was taken 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
@@ -1211,7 +1284,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 ""
 "Нађене су фотографије са истим именом, које су сликане у различито време"
@@ -1248,24 +1321,24 @@ msgstr "%(number)s %(filetypes)s"
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: 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 "Извор: %(source)s"
 
-#: rapid/subfolderfile.py:339
+#: rapid/subfolderfile.py:358
 msgid "subfolder and filename"
 msgstr "подфасцикла и име датотеке"
 
-#: rapid/subfolderfile.py:377
+#: rapid/subfolderfile.py:396
 msgid "Failed to create download subfolder"
 msgstr "Не могу да направим подфасциклу за преузимање"
 
-#: rapid/subfolderfile.py:378
+#: rapid/subfolderfile.py:397
 #, python-format
 msgid "Path: %s"
 msgstr "Путања: %s"
@@ -1286,99 +1359,107 @@ msgstr "Изабери све фотографије"
 msgid "Check All Videos"
 msgstr "Изабери сав видео"
 
-#: rapid/glade3/rapid.ui.h:5
+#: rapid/glade3/rapid.ui.h:6
 msgid "Download / Pause"
 msgstr "Преузми / Паузирај"
 
-#: rapid/glade3/rapid.ui.h:6
+#: rapid/glade3/rapid.ui.h:7
 msgid "Get Help Online..."
 msgstr "Потражите помоћ на мрежи..."
 
-#: rapid/glade3/rapid.ui.h:7
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Помоћ"
+
+#: rapid/glade3/rapid.ui.h:9
 msgid "Make a Donation..."
 msgstr "Дајте донацију..."
 
-#: rapid/glade3/rapid.ui.h:8
+#: rapid/glade3/rapid.ui.h:10
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#: rapid/glade3/rapid.ui.h:9
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr "Поставке"
+
+#: rapid/glade3/rapid.ui.h:12
 msgid "Previous File"
 msgstr "Претходна датотека"
 
-#: rapid/glade3/rapid.ui.h:10
+#: rapid/glade3/rapid.ui.h:13
 msgid "Quit"
 msgstr "Изађи"
 
-#: rapid/glade3/rapid.ui.h:12
+#: rapid/glade3/rapid.ui.h:15
 msgid "Refresh"
 msgstr "Освежи"
 
-#: rapid/glade3/rapid.ui.h:13
+#: rapid/glade3/rapid.ui.h:16
 msgid "Report a Problem..."
 msgstr "Пријавите проблем..."
 
-#: rapid/glade3/rapid.ui.h:14
+#: rapid/glade3/rapid.ui.h:17
 msgid "Select All Wit_h Job Code"
 msgstr "Изабери све са _кодом задатка"
 
-#: rapid/glade3/rapid.ui.h:15
+#: rapid/glade3/rapid.ui.h:18
 msgid "Select All Without _Job Code"
 msgstr "Изабери све без к_ода задатка"
 
-#: rapid/glade3/rapid.ui.h:16
+#: rapid/glade3/rapid.ui.h:19
 msgid "Translate this Application..."
 msgstr "Преведите овај програм..."
 
-#: rapid/glade3/rapid.ui.h:17
+#: rapid/glade3/rapid.ui.h:20
 msgid "Uncheck All"
 msgstr "Поништи сав избор"
 
-#: rapid/glade3/rapid.ui.h:18
+#: rapid/glade3/rapid.ui.h:21
 msgid "_Check All"
 msgstr "И_забери све"
 
-#: rapid/glade3/rapid.ui.h:19
+#: rapid/glade3/rapid.ui.h:22
 msgid "_Clear Completed Downloads"
 msgstr "_Очисти завршена преузимања"
 
-#: rapid/glade3/rapid.ui.h:20
+#: rapid/glade3/rapid.ui.h:23
 msgid "_Download"
 msgstr "_Преузми"
 
-#: rapid/glade3/rapid.ui.h:21
+#: rapid/glade3/rapid.ui.h:24
 msgid "_Error Log"
 msgstr "Списак са _грешкама"
 
-#: rapid/glade3/rapid.ui.h:22
+#: rapid/glade3/rapid.ui.h:25
 msgid "_File"
 msgstr "_Датотека"
 
-#: rapid/glade3/rapid.ui.h:23
+#: rapid/glade3/rapid.ui.h:26
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: rapid/glade3/rapid.ui.h:24
+#: rapid/glade3/rapid.ui.h:27
 msgid "_Include in download"
 msgstr "_Укључи у преузето"
 
-#: rapid/glade3/rapid.ui.h:25
+#: rapid/glade3/rapid.ui.h:28
 msgid "_Make a Donation..."
 msgstr "_Новчани прилог пројекту"
 
-#: rapid/glade3/rapid.ui.h:26
+#: rapid/glade3/rapid.ui.h:29
 msgid "_Select"
 msgstr "_Изабери"
 
-#: rapid/glade3/rapid.ui.h:27
+#: rapid/glade3/rapid.ui.h:30
 msgid "_Translate this Application..."
 msgstr "Помоћ у _локализацији"
 
-#: rapid/glade3/rapid.ui.h:28
+#: rapid/glade3/rapid.ui.h:31
 msgid "_Uncheck All"
 msgstr "_Поништи сав избор"
 
-#: rapid/glade3/rapid.ui.h:29
+#: rapid/glade3/rapid.ui.h:32
 msgid "_View"
 msgstr "П_реглед"
 
@@ -1403,65 +1484,65 @@ 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/Спољни_Уређај/Фотографије</i>"
 
-#: rapid/glade3/prefs.ui.h:16
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Пример: /home/user/Фотографије</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>"
@@ -1522,14 +1603,10 @@ 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."
@@ -1537,7 +1614,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."
@@ -1545,14 +1622,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 "Уређаји"
@@ -1562,22 +1643,23 @@ 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>Преузимање директно са фото-апарата ради лоше, или чак уопште не ради. "
-"Пробајте да поставите апрат у ПТП режим, а ако то не помогне размислите о "
-"куповини читача картица.</i>"
+"<i>Директно преузимање са фото-апарата је још увек у развојној фази. Уколико "
+"приметите да је брзина преузимања мала, или да преузимање уопште не ради, "
+"поставите апарат у ПТП режим или купите читач картица.</i>"
 
 #: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
@@ -1604,80 +1686,109 @@ 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:58
+msgid "Ignored Paths"
+msgstr "Занемарене путање"
 
-#: rapid/glade3/prefs.ui.h:56
+#: 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
-msgid "Miscillaneous"
+#: 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 associated with devices 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 "
@@ -1686,7 +1797,14 @@ msgstr ""
 "Преузимање видео снимака није могуће. Уколико желите ову опцију инсталирајте "
 "<i>hachoir metadata</i> и <i>kaa metadata</i> пакете за Питон."
 
-#: rapid/glade3/prefs.ui.h:71
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of 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"
@@ -1700,14 +1818,14 @@ msgstr ""
 "сваког резервног уређаја морате направити фасцику са неким од ових "
 "назива.</i>"
 
-#: 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 ""
 "Одређује време у које ће вредност <i>данашњих преузимања</i> бити поништена."
 
-#: 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."
@@ -1715,43 +1833,51 @@ 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 "Усагласи називе RAW и JPEG слика"
 
-#: 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."
@@ -1759,7 +1885,7 @@ 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."
@@ -1767,7 +1893,7 @@ 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."
@@ -1775,7 +1901,7 @@ msgstr ""
 "Можете направити резервне кпије фотографија и видеа на више места при "
 "преузимању, нпр. на екстерним дисковима."
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Додај..."
 
@@ -1895,12 +2021,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ msgid "Invalid Downloads Today value.\n"
 #~ msgstr "Није исправна вредност за данашња преузимања.\n"
 
-#~ msgid ""
-#~ "Downloads today value not updated, as a download is currently occurring"
-#~ msgstr ""
-#~ "Вредност за данашња преузимања није ажурирана, јер је у току пренос "
-#~ "фотографија"
-
 #~ msgid "New day has started - resetting 'Downloads Today' sequence number"
 #~ msgstr "Почео је нови дан, поништавам број данашњих преузимања"
 
@@ -2000,25 +2120,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ msgid "Download complete from %s"
 #~ msgstr "Завршено је преузимање са %s"
 
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Не могу да уклоним фотографије са уређаја"
-
-#, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Слика: %(source)s\n"
-#~ "Грешка: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Слика: %(source)s"
-
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Обрисано је %i слика са уређаја"
-
 #, python-format
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "Преузето је %(number)s од %(total)s слика"
@@ -2217,15 +2318,15 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Уређаји са сликама</span>"
 
+#~ msgid "Backup location:"
+#~ msgstr "Место за резервну копију:"
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Сва права су задржана, Дејмон Линч (Damon Lynch) 2007-09"
 
 #~ msgid "Backup folder name:"
 #~ msgstr "Име фасцикле за резервну копију:"
 
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Обриши фотографије са изворног уређаја по преузимању"
-
 #~ msgid "_Thumbnails"
 #~ msgstr "_Умањени прикази"
 
@@ -2330,6 +2431,10 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ msgid "<b>Image Name Conflicts</b>"
 #~ msgstr "<b>Неподударање назива слика</b>"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Уколико искључите аутоматско налажење, изаберите место за резервну копију."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Напусти програм по успешном преузимању фотографија"
 
@@ -2346,6 +2451,14 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ 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 "Download copying error"
 #~ msgstr "Грешка у преузимању"
 
@@ -2373,9 +2486,6 @@ msgstr "Увезите ваше фотографије и видео брзо и
 #~ "Унета подешавања подфасцикли нису исправна.\n"
 #~ "Она ће бити враћена на подразумеване вредности."
 
-#~ msgid "Stored number value not updated, as a download is currently occurring"
-#~ msgstr "Вредност сачуваног броја није ажурирана, јер је у току преузимање"
-
 #~ msgid ""
 #~ "Subfolder name could not be properly generated. Check to ensure there is "
 #~ "sufficient image metadata."
@@ -2433,553 +2543,3 @@ msgstr "Увезите ваше фотографије и видео брзо и
 
 #~ msgid "<b>Image Rename</b>"
 #~ msgstr "<b>Преименовање фотографија</b>"
-
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr ""
-#~ "Фотографије имају исти назив датотека, али су  сликане у различито време:"
-
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Уређај са сликама: %s\n"
-
-#, python-format
-#~ msgid "Source: %s\n"
-#~ msgstr "Извор: %s\n"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Partially generated filename: %(newname)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Извор: %(source)s\n"
-#~ "Половични називи датотека: %(newname)s\n"
-#~ "Циљ: %(destination)s\n"
-#~ "Проблем: %(problem)s"
-
-#, python-format
-#~ msgid "Destination: %s"
-#~ msgstr "Циљ: %s"
-
-#, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Прва слика: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Друга слика: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#, python-format
-#~ msgid "Error: %(errno)s %(strerror)s"
-#~ msgstr "Грешка: %(errno)s %(strerror)s"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ msgstr ""
-#~ "Извор: %(source)s\n"
-#~ "Циљ: %(destination)s\n"
-
-#~ msgid ""
-#~ "Warning: desktop environment notification server is incorrectly configured."
-#~ msgstr "Упозорење: сервер за обавештавање није правино подешен."
-
-#~ msgid "Error:"
-#~ msgstr "Грешка:"
-
-#~ msgid "Could not create temporary download directory"
-#~ msgstr "Не могу да направим привремени директоријум за преузимање"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Не могу да упишем датотеке у фасциклу за преузимање. Проверите облашћења "
-#~ "фасцикле или измените поставке"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Ова путања за слике не постоји:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Решите овај проблем или измените поставке."
-
-#~ msgid "Problem with Download Folder"
-#~ msgstr "Проблем са фасциклом за фотографије"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Фасцикла за преузимање фотографија не постоји. Направите фасциклу или "
-#~ "иамените поставке"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Проблем са фасциклом за фотографије"
-
-#~ msgid "Copyright Damon Lynch 2007-10"
-#~ msgstr "Ава права су задржана, Damon Lynch 2007-10"
-
-#, python-format
-#~ msgid "0 of %(number)s %(filetypes)s"
-#~ msgstr "0 од %(number)s %(filetypes)s"
-
-#, python-format
-#~ msgid ""
-#~ "The %(filetype)s subfolder preferences had some unnecessary values removed."
-#~ msgstr ""
-#~ "Из поставке %(filetype)s подфасцикле су уклоњене неке непотребне вредности."
-
-#~ msgid "The following download path could not be created:\n"
-#~ msgstr "Не могу да образујем ову путању за преузимање:\n"
-
-#, python-format
-#~ msgid "%(path)s: "
-#~ msgstr "%(path)s: "
-
-#, python-format
-#~ msgid "Could not open %s(filetype)s"
-#~ msgstr "Не могу да отворим %s(filetype)s"
-
-#, python-format
-#~ msgid "The %s(filetype)s was not copied."
-#~ msgstr "Нису копиране %s(filetype)s датотеке."
-
-#, python-format
-#~ msgid "%(filetype)s filename could not be generated"
-#~ msgstr "Не могу да образујем назив за %(filetype)s датотеку"
-
-#, python-format
-#~ msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-#~ msgstr ""
-#~ "Претрага уређаја је завршена: није нађено %(filetypes)s на %(device)s"
-
-#, python-format
-#~ msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-#~ msgstr ""
-#~ "Претрага уређаја је завршена: нађено је %(number)s %(filetypes)s на "
-#~ "%(device)s"
-
-#, python-format
-#~ msgid "Could not open %(filetype)s"
-#~ msgstr "Не могу да отворим %(filetype)s"
-
-#, python-format
-#~ msgid ""
-#~ "First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Прва фотографија: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Друга фотографија: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times:"
-#~ msgstr "Фотографије са истим називом сликане у различито време:"
-
-#, python-format
-#~ msgid ""
-#~ "%(filetype)s filename could not be properly generated. Check to ensure there "
-#~ "is sufficient metadata."
-#~ msgstr ""
-#~ "Не могу да образујем исправан назив за %(filetype)s датотеку. Проверите да "
-#~ "ли постоје сви метаподаци."
-
-#, python-format
-#~ msgid "%(filetype)s has no metadata"
-#~ msgstr "%(filetype)s не садржи метаподатке"
-
-#, python-format
-#~ msgid "The %(file_type)s was not backed up."
-#~ msgstr "Није направљена резервна копија %(file_type)s."
-
-#, python-format
-#~ msgid "Backup %(file_type)s overwritten"
-#~ msgstr "Резервна копија %(file_type)s је преписана"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up to %(volume)s"
-#~ msgstr "Није направљена резервна копија %(file_type)s на %(volume)s"
-
-#, python-format
-#~ msgid "Backup of %(file_type)s already exists"
-#~ msgstr "Резервна копија %(file_type)s већ постоји"
-
-#, python-format
-#~ msgid ""
-#~ "Subfolder: %(subfolder)s\n"
-#~ "File: %(file)s\n"
-#~ "Problem: %(problem)s"
-#~ msgstr ""
-#~ "Подфасцикла: %(subfolder)s\n"
-#~ "Датотека: %(file)s\n"
-#~ "Проблем: %(problem)s"
-
-#, python-format
-#~ msgid ""
-#~ "Metadata is essential for generating subfolder and/or file names.\n"
-#~ "Source: %s"
-#~ msgstr ""
-#~ "Метаподаци су неопходни за образовање подфасцикли и/или имена датотека.\n"
-#~ "Извор: %s"
-
-#~ msgid ""
-#~ "Subfolder name could not be properly generated. Check to ensure there is "
-#~ "sufficient metadata."
-#~ msgstr ""
-#~ "Не могу да образујем исправна имена подфасцикли. Проверите да ли постоје "
-#~ "метаподаци."
-
-#~ msgid "No suitable backup volume was found"
-#~ msgstr "Није пројађен одговарајући диск за резервну копију"
-
-#, python-format
-#~ msgid "%(file_type)s could not be backed up"
-#~ msgstr "Не могу да направим резервну копију %(file_type)s"
-
-#, python-format
-#~ msgid "%(file_type)s not backed up"
-#~ msgstr "Није направљена резервна копија %(file_type)s"
-
-#, python-format
-#~ msgid "%(noFiles)s %(filetypes)s skipped"
-#~ msgstr "%(noFiles)s %(filetypes)s прескочено"
-
-#~ msgid "A backup location was not found"
-#~ msgstr "Није пронађена путања за резервне копије"
-
-#~ msgid "Could not delete photo or video from device"
-#~ msgstr "Не могу да обришем фотографије или видео са уређаја"
-
-#~ msgid "Video skipped"
-#~ msgstr "Видео је прескочен"
-
-#~ msgid "Video already exists"
-#~ msgstr "Видео већ постоји"
-
-#, python-format
-#~ msgid "Photo: %(source)s"
-#~ msgstr "Фотографија: %(source)s"
-
-#, python-format
-#~ msgid ""
-#~ "Photo: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Фотографија: %(source)s\n"
-#~ "Грешка: %(errno)s %(strerror)s"
-
-#~ msgid "Photo already exists"
-#~ msgstr "Фотографија већ постоји"
-
-#~ msgid "Photo skipped"
-#~ msgstr "Фотографија је прескочена"
-
-#, python-format
-#~ msgid "Deleted %(number)i %(filetypes)s from device"
-#~ msgstr "Обрисано је %(number)i %(filetypes)s са уређаја"
-
-#, python-format
-#~ msgid ""
-#~ "Sorry, this device location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Ова путања до уређаја не постоји:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Решите проблем са уређајем или измените поставке програма."
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-#~ msgstr "Фасцикла за преузете %(file_type)s постоји, али не дозвољава упис.\n"
-
-#, python-format
-#~ msgid "The %(file_type)s Download Folder does not exist.\n"
-#~ msgstr "Фасцикла за преузете %(file_type)s не постоји.\n"
-
-#, python-format
-#~ msgid "This device has no %(types_searched_for)s to download from."
-#~ msgstr "Овај уређај нема %(types_searched_for)s за преузимање."
-
-#~ msgid "Photo thumbnail could not be extracted"
-#~ msgstr "Не могу да извучем умањени приказ слике"
-
-#, python-format
-#~ msgid "Device: %s\n"
-#~ msgstr "Уређај: %s\n"
-
-#~ msgid "No backups can occur"
-#~ msgstr "Не могу да направим резервну копију"
-
-#, python-format
-#~ msgid "The path %s could not be created"
-#~ msgstr "Не могу да образујем путању %s"
-
-#~ msgid "Backup path does not exist"
-#~ msgstr "Не постоји путања за резервну копију"
-
-#~ msgid "No backup device was automatically detected"
-#~ msgstr "Није пронађен уређај за резервне копије"
-
-#~ msgid "Problem with Device Location Folder"
-#~ msgstr "Проблем са фасциклом уређаја"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "photos downloaded"
-#~ msgstr "преузете слике"
-
-#~ msgid "photos skipped"
-#~ msgstr "прескочене слике"
-
-#~ msgid "Problem with Download Folders"
-#~ msgstr "Преблем са фасциклом за преузете датотеке"
-
-#~ msgid ""
-#~ "Sorry, problems were encountered with your download folders. Please fix the "
-#~ "problems or modify the preferences.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Постоји неки проблем са фасциклом за преузете датотеке. Исправите проблем "
-#~ "или измените поставке програма.\n"
-#~ "\n"
-
-#, python-format
-#~ msgid "Failed to create default video download folder %(folder)s"
-#~ msgstr ""
-#~ "Не могу да направим подразумевану фасциклу за преузети видео %(folder)s"
-
-#, python-format
-#~ msgid "Creating photo download folder %(folder)s"
-#~ msgstr "Правим фасцикли за преузете слике %(folder)s"
-
-#, python-format
-#~ msgid "Creating video download folder %(folder)s"
-#~ msgstr "Правим фасцикли за преузети видео %(folder)s"
-
-#, python-format
-#~ msgid "Failed to create default photo download folder %(folder)s"
-#~ msgstr ""
-#~ "Не могу да направим подразумевану фасциклу за преузете слике %(folder)s"
-
-#, python-format
-#~ msgid "The %(filetype)s was not copied."
-#~ msgstr "%(filetype)s није прекопиран."
-
-#~ msgid "videos skipped"
-#~ msgstr "прескочен видео"
-
-#~ msgid "videos downloaded"
-#~ msgstr "преузет видео"
-
-#~ msgid "image or video number was specified but filename has no number"
-#~ msgstr "одређен је број слике или видеа, али име датотеке не садржи број"
-
-#, python-format
-#~ msgid "%s metadata is not present in video"
-#~ msgstr "Видео не садржи %s метаподатак"
-
-#, python-format
-#~ msgid "%s metadata is not present in photo"
-#~ msgstr "Слика не садржи %s метаподатак"
-
-#~ msgid "extension was specified but filename does not have an extension"
-#~ msgstr "екстензија је одређена, али име датотеке не садржи екстензију"
-
-#, python-format
-#~ msgid "%s metadata is not present"
-#~ msgstr "Не постоји %s метаподатак"
-
-#~ msgid ""
-#~ "Choose whether to skip downloading the file, or to add a unique indentifier."
-#~ msgstr "Да ли да прескочим датотеку или да додам јој јединствен број."
-
-#~ msgid ""
-#~ "Specify what to do when a photo or video of the same name has already been "
-#~ "downloaded or backed up."
-#~ msgstr ""
-#~ "Одређује радњу када постоји преузета или резервна фотографија и видео са "
-#~ "истим именом."
-
-#~ msgid "Exit program if download completes without any warnings or errors"
-#~ msgstr "Напусти програм иколико преузимање прође без грешака"
-
-#~ msgid ""
-#~ "Sorry, video downloading functionality disabled. To download videos, please "
-#~ "install the <i>kaa metadata</i> package for python."
-#~ msgstr ""
-#~ "Преузимање видеа није могуће. За преузимање видеа морате инсталирати Питонов "
-#~ "<i>kaa metadata</i> пакет."
-
-#~ msgid "Subsecond metadata not present in photo"
-#~ msgstr "Не постоје временски метаподаци о стотинкама"
-
-#, python-format
-#~ msgid ""
-#~ "Source: %(source)s\n"
-#~ "Destination: %(destination)s\n"
-#~ "%(problem)s"
-#~ msgstr ""
-#~ "Извор: %(source)s\n"
-#~ "Одредиште: %(destination)s\n"
-#~ "%(problem)s"
-
-#~ msgid "Downloading From Cameras"
-#~ msgstr "Преузимам са фото-апарата"
-
-#~ msgid "Downloading directly from a camera may work poorly or not at all"
-#~ msgstr ""
-#~ "Директно преузиумање са фото-апарата може да буде споро или да не ради"
-
-#~ msgid ""
-#~ "Downloading from a card reader always works and is generally much faster. It "
-#~ "is strongly recommended to use a card reader."
-#~ msgstr ""
-#~ "Преузимање са читача картица увек ради и много је брже. Препоручујемо да "
-#~ "користите читач картица."
-
-#~ msgid "_Show this message again"
-#~ msgstr "_Прикажи поново ову поруку"
-
-#, python-format
-#~ msgid "Attempting to download %s files"
-#~ msgstr "Покушавам да преузмем %s датотека"
-
-#~ msgid "Please check your system and try again."
-#~ msgstr "Проверите ваш систем и покушајте поново"
-
-#~ msgid "Path"
-#~ msgstr "Путања"
-
-#~ msgid "Date"
-#~ msgstr "Датум"
-
-#, python-format
-#~ msgid "%(filetype)s was not downloaded"
-#~ msgstr "%(filetype)s није преузет"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded successfully"
-#~ msgstr "%(filetype)s је успешно преузет"
-
-#~ msgid "File"
-#~ msgstr "Датотека"
-
-#~ msgid "Status"
-#~ msgstr "Стање"
-
-#~ msgid "Type"
-#~ msgstr "Тип"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded but there were problems backing up"
-#~ msgstr "%(filetype)s је преузет, сли постоје проблеми са резервном копијом"
-
-#, python-format
-#~ msgid "%(filetype)s was downloaded with warnings"
-#~ msgstr "%(filetype)s је преузет уз упозорења"
-
-#, python-format
-#~ msgid "%(filetype)s is ready to be downloaded"
-#~ msgstr "%(filetype)s је спреман за преузимање"
-
-#, python-format
-#~ msgid "%(filetype)s is about to be downloaded"
-#~ msgstr "%(filetype)s ће бити преузет"
-
-#~ msgid "Preview"
-#~ msgstr "Преглед"
-
-#, python-format
-#~ msgid "%(filetype)s was neither downloaded nor backed up"
-#~ msgstr "%(filetype)s није преузет нити сачуван у резервне копије"
-
-#~ msgid "Displaying warning about downloading directly from camera"
-#~ msgstr "Приказујем упозорење о преузимању са фото-апарата"
-
-#, python-format
-#~ msgid "%(filetype)s will be downloaded with warnings"
-#~ msgstr "%(filetype)s ће бити преузет уз упозорења"
-
-#~ msgid "Enter a new Job Code and press Enter, or select an existing Job Code"
-#~ msgstr "Упишите код задатка и притисните Enter, или изаберите постојећи код"
-
-#, python-format
-#~ msgid "%(filetype)s cannot be downloaded"
-#~ msgstr "%(filetype)s не може бити преузет"
-
-#~ msgid "Backup preferences were changed."
-#~ msgstr "Измењене су поставке за резервне копије."
-
-#~ msgid "Download device settings preferences were changed."
-#~ msgstr "Измењене су поставке уређаја за преузимање."
-
-#, python-format
-#~ msgid "Warning: backup device %(device)s is currently being downloaded from"
-#~ msgstr ""
-#~ "Упозорења: тренутно се преузимају слике са резервног уређаја %(device)s"
-
-#~ msgid "D_ownload Selected"
-#~ msgstr "_Преузми изабрано"
-
-#~ msgid "_Resume"
-#~ msgstr "_Настави"
-
-#~ msgid "Subfolder and filename preferences were changed."
-#~ msgstr "Измењене су поставке подфасцикли и имена датотека."
-
-#~ msgid "_Download All"
-#~ msgstr "Преузми _све"
-
-#~ msgid "Download folder preferences were changed."
-#~ msgstr "Измењене су поставке фасцикле за презуимање."
-
-#~ msgid "P_review Columns"
-#~ msgstr "Приказ _колона"
-
-#~ msgid "Preview _Folders"
-#~ msgstr "Приказ _фасцикли"
-
-#~ msgid "Select _All"
-#~ msgstr "Изабери _све"
-
-#~ msgid "_Filename"
-#~ msgstr "_Име датотеке"
-
-#~ msgid "_Device"
-#~ msgstr "У_ређај"
-
-#~ msgid "Select All Vi_deos"
-#~ msgstr "Изабери сав _видео"
-
-#~ msgid "Select All Pho_tos"
-#~ msgstr "Изабери све _фотографије"
-
-#~ msgid "Se_lect None"
-#~ msgstr "Изабери _ништа"
-
-#~ msgid "_Path"
-#~ msgstr "П_утања"
-
-#~ msgid "_Preview"
-#~ msgstr "_Преглед"
-
-#~ msgid "_Size"
-#~ msgstr "_Величина"
-
-#~ msgid "_Type"
-#~ msgstr "_Тип"
-
-#, python-format
-#~ msgid "%(free)s available"
-#~ msgstr "Доступно је %(free)s"
diff --git a/po/sv.po b/po/sv.po
index 61505a6..f337ce5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,1014 +7,315 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-27 22:33-0500\n"
-"PO-Revision-Date: 2010-06-11 20:12+0000\n"
-"Last-Translator: Ulf Urdén <ulf.urden@purplescout.com>\n"
+"POT-Creation-Date: 2011-09-19 14:04-0500\n"
+"PO-Revision-Date: 2011-09-26 13:08+0000\n"
+"Last-Translator: Ulf Urdén <ulf.urden@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-27 23:44+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:104 rapid/rapid.py:4447 rapid/glade3/rapid.glade.h:72
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:394
-msgid "New York"
-msgstr "New York"
-
-#: rapid/rapid.py:395
-msgid "Manila"
-msgstr "Manilla"
-
-#: rapid/rapid.py:395
-msgid "Prague"
-msgstr "Prag"
-
-#: rapid/rapid.py:395
-msgid "Helsinki"
-msgstr "Helsingfors"
-
-#: rapid/rapid.py:395
-msgid "Wellington"
-msgstr "Wellington"
-
-#: rapid/rapid.py:396
-msgid "Tehran"
-msgstr "Teheran"
-
-#: rapid/rapid.py:396
-msgid "Kampala"
-msgstr "Kampala"
-
-#: rapid/rapid.py:396
-msgid "Paris"
-msgstr "Paris"
-
-#: rapid/rapid.py:396
-msgid "Berlin"
-msgstr "Berlin"
-
-#: rapid/rapid.py:396
-msgid "Sydney"
-msgstr "Sydney"
-
-#: rapid/rapid.py:397
-msgid "Budapest"
-msgstr "Budapest"
-
-#: rapid/rapid.py:397
-msgid "Rome"
-msgstr "Rom"
-
-#: rapid/rapid.py:397
-msgid "Moscow"
-msgstr "Moskva"
-
-#: rapid/rapid.py:397
-msgid "Delhi"
-msgstr "Delhi"
-
-#: rapid/rapid.py:397
-msgid "Warsaw"
-msgstr "Warszawa"
-
-#: rapid/rapid.py:398
-msgid "Jakarta"
-msgstr "Djakarta"
-
-#: rapid/rapid.py:398
-msgid "Madrid"
-msgstr "Madrid"
-
-#: rapid/rapid.py:398
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: rapid/rapid.py:425
-msgid "Invalid Downloads Today value.\n"
-msgstr "Felaktigt värde för 'Antal överföringar idag'.\n"
-
-#: rapid/rapid.py:426
-msgid "Resetting value to zero.\n"
-msgstr "Nollställer värde.\n"
-
-#: rapid/rapid.py:465
-msgid "'Start of day' preference value is corrupted.\n"
-msgstr "Värdet på 'början på dagen' är korrupt\n"
-
-#: rapid/rapid.py:466
-msgid "Resetting to midnight.\n"
-msgstr "Nollställer till midnatt.\n"
-
-#: rapid/rapid.py:492
-msgid "Error in Photo Rename preferences"
-msgstr "Fel i inställningarna för bildnamnbyte"
-
-#: rapid/rapid.py:523 rapid/rapid.py:1567
-msgid "Sorry,these preferences contain an error:\n"
-msgstr "Följande inställningar innehåller fel:\n"
-
-#: rapid/rapid.py:534
-msgid "Resetting to default values."
-msgstr "Återställer till standardvärde."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:609 rapid/renamesubfolderprefs.py:196
-msgid "Job code"
-msgstr "Fototillfälle"
-
-#: rapid/rapid.py:677
-msgid "Error in Video Rename preferences"
-msgstr "Fel i inställningarna för filmnamnbyte"
-
-#: rapid/rapid.py:695
-msgid "Error in Photo Download Subfolders preferences"
-msgstr "Fel i inställningarna för bildöverföring"
-
-#: rapid/rapid.py:712
-msgid "Error in Video Download Subfolders preferences"
-msgstr "Fel i inställningarna för filmöverföring"
-
-#: rapid/rapid.py:745 rapid/rapid.py:1492
-msgid "photos and videos"
-msgstr "bilder och filmer"
-
-#: rapid/rapid.py:747 rapid/rapid.py:1502 rapid/rapid.py:1782
-msgid "photos"
-msgstr "bilder"
-
-#: rapid/rapid.py:880
-msgid "Select a folder to download photos to"
-msgstr "Välj en katalog att överföra bilder till"
-
-#: rapid/rapid.py:898
-msgid "Select a folder to download videos to"
-msgstr "Välj en katalog att överföra filmer till"
-
-#: rapid/rapid.py:980
-#, python-format
-msgid "Select a folder containing %(file_types)s"
-msgstr "Välj en katalog innehållande %(file_types)s"
-
-#: rapid/rapid.py:1002
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
-msgstr "Välj en katalog för att säkerhetskopiera %(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
-#: rapid/rapid.py:1095
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
-"name. Please use other renaming options.</i>"
-msgstr ""
-"<i><b>Varning:</b> Det saknas metadata för att namnge. Var god välj andra "
-"inställningar för namngivning.</i>"
-
-#: rapid/rapid.py:1129
-msgid ""
-"<i><b>Warning:</b> There is insufficient metadata to fully generate "
-"subfolders. Please use other subfolder naming options.</i>"
-msgstr ""
-"<i><b>Varning:</b> Det finns inte tillräckligt med metadata för att skapa "
-"underkataloger. Välj andra inställningar för att namnge underkataloger.</i>"
-
-#. Translators: you should not modify or leave out the %s. This is a code used by the programming language python to insert a value that thes user will see
-#: rapid/rapid.py:1133
+#: rapid/rapid.py:111
 #, python-format
-msgid "<i>Example: %s</i>"
-msgstr "<i>Exempel: %s</i>"
-
-#: rapid/rapid.py:1159
 msgid ""
-"Downloads today value not updated, as a download is currently occurring"
+"%(date)s\n"
+"%(time)s"
 msgstr ""
-"Antal nedladdningar idag uppdateras inte, eftersom en överföring pågår"
-
-#: rapid/rapid.py:1175
-msgid "Stored number value not updated, as a download is currently occurring"
-msgstr "Lagrat nummervärde uppdateras inte, eftersom en överföring pågår"
+"%(date)s\n"
+"%(time)s"
 
-#: rapid/rapid.py:1205
+#: rapid/rapid.py:113
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences had some unnecessary values removed."
-msgstr "Tog bort onödiga värden för underkatalog för %(filetype)s."
+msgid "%(date)s %(time)s"
+msgstr "%(date)s %(time)s"
 
-#. Preferences list is now empty
-#: rapid/rapid.py:1210
+#: rapid/rapid.py:116
 #, python-format
-msgid ""
-"The %(filetype)s subfolder preferences entered are invalid and cannot be "
-"used.\n"
-"They will be reset to their default values."
-msgstr ""
-"Underkatalog för %(filetype)s har felaktiga inställningar som inte kan "
-"användas.\n"
-"Återställer till standardvärden."
-
-#. check subfolder preferences for bad values
-#: rapid/rapid.py:1224 rapid/rapid.py:1504 rapid/rapid.py:2533
-msgid "photo"
-msgstr "bild"
+msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/rapid.py:1225 rapid/rapid.py:1499 rapid/rapid.py:2541
-msgid "video"
-msgstr "video"
-
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1468
-msgid "externaldrive1"
-msgstr "extern_enhet_1"
+#. Device refers to a thing like a camera, memory card in its reader,
+#. external hard drive, Portable Storage Device, etc.
+#: rapid/rapid.py:150
+msgid "Device"
+msgstr "Enhet"
 
-#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/rapid.py:1470
-msgid "externaldrive2"
-msgstr "extern_enhet_2"
+#. Size refers to the total size of images on the device, typically in
+#. MB or GB
+#: rapid/rapid.py:167
+msgid "Size"
+msgstr "Storlek"
 
-#: rapid/rapid.py:1494 rapid/rapid.py:1780
-msgid "photos or videos"
-msgstr "bilder eller filmer"
+#: rapid/rapid.py:170
+msgid "Download Progress"
+msgstr "Överföringsförlopp"
 
-#: rapid/rapid.py:1497
-msgid "videos"
-msgstr "video"
+#: rapid/rapid.py:316
+#, python-format
+msgid "%(device)s did not unmount"
+msgstr "%(device)s enheter avmonterades inte"
 
 #. 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 of y photos").
+#. (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:1556
+#: rapid/rapid.py:1178
 msgid "scanning..."
 msgstr "söker av..."
 
-#: rapid/rapid.py:1663
-msgid "The following download path could not be created:\n"
-msgstr "Följande överföringskatalog kunde inte skapas:\n"
-
-#: rapid/rapid.py:1664
-#, python-format
-msgid "%(path)s: "
-msgstr "%(path)s: "
-
-#: rapid/rapid.py:1665 rapid/rapid.py:1666 rapid/rapid.py:1681
-#: rapid/rapid.py:1682 rapid/rapid.py:2364 rapid/rapid.py:2367
-msgid "Download cannot proceed"
-msgstr "Kan inte fortsätta överföringen"
-
-#: rapid/rapid.py:1679 rapid/rapid.py:3381
-msgid "There is an error in the program preferences."
-msgstr "Det fanns ett fel i programinställningarna."
-
-#: rapid/rapid.py:1680
-msgid ""
-"\n"
-"Please check preferences, restart the program, and try again."
-msgstr ""
-"\n"
-"Var god kontrollera programinställningarna, starta om programmet, och försök "
-"igen."
-
-#. 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:1791
-#, python-format
-msgid "0 of %(number)s %(filetypes)s"
-msgstr "0 av %(number)s %(filetypes)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:1803
-#, python-format
-msgid "Device scan complete: found %(number)s %(filetypes)s on %(device)s"
-msgstr "Enhetssökning klar: hittade %(number)s %(filetypes)s på %(device)s"
-
-#: rapid/rapid.py:1810
-#, python-format
-msgid "Device scan complete: no %(filetypes)s found on %(device)s"
-msgstr "Enhetssökning klar: inga %(filetypes)s hittades på %(device)s"
-
-#: rapid/rapid.py:1844
-#, python-format
-msgid "%(filetype)s filename could not be generated"
-msgstr "%(filetype)s filnamn kunde inte skapas"
-
-#. '%(source)s' and '%(problem)s' are two more examples of text that should not be modified or left out
-#: rapid/rapid.py:1846
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Problem: %(problem)s"
-msgstr ""
-"Källa: %(source)s\n"
-"Problem: %(problem)s"
+#: rapid/rapid.py:2086 rapid/glade3/rapid.ui.h:5
+msgid "Download"
+msgstr "Hämta"
 
-#: rapid/rapid.py:1850
-#, python-format
-msgid ""
-"%(filetype)s filename could not be properly generated. Check to ensure there "
-"is sufficient metadata."
-msgstr ""
-"%(filetype)s filnamn kunde inte skapas. Kontrollera att det finns "
-"tillräckligt med metadata."
+#: rapid/rapid.py:2089
+msgid "Pause"
+msgstr "Pausa"
 
-#: rapid/rapid.py:1851
+#: rapid/rapid.py:2190
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Partially generated filename: %(newname)s\n"
-"Destination: %(destination)s\n"
-"Problem: %(problem)s"
+"These download folders are invalid:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 msgstr ""
-"Källa: %(source)s\n"
-"Delvis genererat filnamn: %(newname)s\n"
-"Mål: %(destination)s\n"
-"Problem: %(problem)s"
+"Följande mappar är ogiltiga:\n"
+"%(folder1)s\n"
+"%(folder2)s"
 
-#: rapid/rapid.py:1859 rapid/rapid.py:1864 rapid/rapid.py:1883
-#: rapid/rapid.py:2207
+#: rapid/rapid.py:2193
 #, python-format
 msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s"
+"This download folder is invalid:\n"
+"%s"
 msgstr ""
-"Källa: %(source)s\n"
-"Destination: %(destination)s"
-
-#: rapid/rapid.py:1861
-#, python-format
-msgid "Unique identifier '%s' added"
-msgstr "Lade till unik indentifierare \"%s\""
+"Denna mapp är ogiltig:\n"
+"%s"
 
-#: rapid/rapid.py:1869 rapid/rapid.py:2270
-#, python-format
-msgid "Source: %(source)s"
-msgstr "Källa: %(source)s"
-
-#: rapid/rapid.py:1877 rapid/rapid.py:1882
-msgid "Download copying error"
-msgstr "Överföringsfel"
-
-#: rapid/rapid.py:1878
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errorno)s %(strerror)s"
-msgstr ""
-"Källa: %(source)s\n"
-"Mål: %(destination)s\n"
-"Fel: %(errorno)s %(strerror)s"
-
-#: rapid/rapid.py:1880 rapid/rapid.py:1885
-#, python-format
-msgid "The %(filetype)s was not copied."
-msgstr "%(filetype)s överfördes inte."
-
-#: rapid/rapid.py:1889
-msgid ""
-"Photos detected with the same filenames, but taken at different times:"
-msgstr "Bilder med samma namn, men tagna vid ett annat tillfälle:"
-
-#: rapid/rapid.py:1890
-#, python-format
-msgid ""
-"First photo: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Second photo: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-msgstr ""
-"Första bilden: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-"Andra bilden: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-
-#: rapid/rapid.py:1914 rapid/rapid.py:1927
-#, python-format
-msgid "Could not open %(filetype)s"
-msgstr "Kunde inte öppna %(filetype)s"
-
-#: rapid/rapid.py:1915 rapid/rapid.py:1928
-#, python-format
-msgid "Source: %s"
-msgstr "Källa: %s"
-
-#: rapid/rapid.py:1950
-#, python-format
-msgid "%(filetype)s has no metadata"
-msgstr "%(filetype)s saknar metadata"
-
-#: rapid/rapid.py:1951
-#, python-format
-msgid ""
-"Metadata is essential for generating subfolder and/or file names.\n"
-"Source: %s"
-msgstr ""
-"Metadata behövs för att namnge underkataloger och filnamn.\n"
-"Källa: %s"
-
-#: rapid/rapid.py:1962
-msgid ""
-"Subfolder name could not be properly generated. Check to ensure there is "
-"sufficient metadata."
-msgstr ""
-"Underkataloger kunde inte skapas. Kontrollera att det finns tillräckligt med "
-"metadata."
-
-#: rapid/rapid.py:1963
-#, python-format
-msgid ""
-"Subfolder: %(subfolder)s\n"
-"File: %(file)s\n"
-"Problem: %(problem)s"
-msgstr ""
-"Underkatalog: %(subfolder)s\n"
-"Fil: %(file)s\n"
-"Problem: %(problem)s"
-
-#. A new day, according the user's preferences of what time a day begins, has started
-#: rapid/rapid.py:2147
-msgid "New day has started - resetting 'Downloads Today' sequence number"
-msgstr "Ny dag påbörjad - nollställer dagens överföringar"
-
-#: rapid/rapid.py:2206
-#, python-format
-msgid "Backup of %(file_type)s already exists"
-msgstr "Säkerhetskopia av %(file_type)s finns redan"
-
-#: rapid/rapid.py:2210
-#, python-format
-msgid "Backup %(file_type)s overwritten"
-msgstr "Säkerhetskopia av %(file_type)s skrevs över"
-
-#: rapid/rapid.py:2215
-#, python-format
-msgid "%(file_type)s not backed up to %(volume)s"
-msgstr "%(file_type)s är inte säkerhetskopierad till %(volume)s"
-
-#: rapid/rapid.py:2217
-#, python-format
-msgid "%(file_type)s not backed up"
-msgstr "%(file_type)s är inte säkerhetskopierad(e)"
+#: rapid/rapid.py:2194
+msgid "Download cannot proceed"
+msgstr "Kan inte fortsätta överföringen"
 
-#: rapid/rapid.py:2243 rapid/rapid.py:2260
-msgid "Backing up error"
-msgstr "Fel vid säkerhetskopiering"
+#: rapid/rapid.py:2503
+msgid "About 1 second remaining"
+msgstr "Cirka en sekund återstår"
 
-#: rapid/rapid.py:2244
+#: rapid/rapid.py:2505
 #, python-format
-msgid "Destination directory could not be created: %(directory)s\n"
-msgstr "Målplatsen kunde inte skapas: %(directory)s\n"
+msgid "About %i seconds remaining"
+msgstr "Cirka %i sekunder återstår"
 
-#: rapid/rapid.py:2246
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-msgstr ""
-"Källa: %(source)s\n"
-"Mål: %(destination)s\n"
+#: rapid/rapid.py:2507
+msgid "About 1 minute remaining"
+msgstr "Cirka en minut återstår"
 
-#: rapid/rapid.py:2248
+#. 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:2512
 #, python-format
-msgid "Error: %(errno)s %(strerror)s"
-msgstr "Fel: %(errno)s %(strerror)s"
+msgid "About %(minutes)i:%(seconds)02i minutes remaining"
+msgstr "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
 
-#: rapid/rapid.py:2249 rapid/rapid.py:2263
-#, python-format
-msgid "The %(file_type)s was not backed up."
-msgstr "%(file_type)s blev inte säkerhetskopierad(e)."
+#: rapid/rapid.py:2534 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
+msgid "photos and videos"
+msgstr "bilder och filmer"
 
-#: rapid/rapid.py:2261
-#, python-format
-msgid ""
-"Source: %(source)s\n"
-"Destination: %(destination)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
-"Källa: %(source)s\n"
-"Mål: %(destination)s\n"
-"Fel: %(errno)s %(strerror)s"
+#: rapid/rapid.py:2536 rapid/rpdfile.py:112
+msgid "photos or videos"
+msgstr "bilder eller filmer"
 
-#: rapid/rapid.py:2269
-#, python-format
-msgid "%(file_type)s could not be backed up"
-msgstr "%(file_type)s kunde inte säkerhetskopieras"
+#: rapid/rapid.py:2539 rapid/rapid.py:3116 rapid/rpdfile.py:115
+msgid "videos"
+msgstr "video"
 
-#: rapid/rapid.py:2272
-msgid "No suitable backup volume was found"
-msgstr "Ingen lämplig enhet för säkerhetskopiering hittades"
+#: rapid/rapid.py:2541 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:117
+#: rapid/rpdfile.py:270
+msgid "video"
+msgstr "video"
 
-#: rapid/rapid.py:2274
-msgid "A backup location was not found"
-msgstr "Ingen lämplig plats för säkerhetskopiering hittades"
+#: rapid/rapid.py:2544 rapid/rapid.py:3114 rapid/preferencesdialog.py:893
+#: rapid/rpdfile.py:120
+msgid "photos"
+msgstr "bilder"
 
-#. 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:2288
-msgid "The device can now be safely removed"
-msgstr "Enheten kan nu avlägsnas säkert"
+#. check subfolder preferences for bad values
+#: rapid/rapid.py:2546 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
+#: rapid/rpdfile.py:250
+msgid "photo"
+msgstr "bild"
 
-#: rapid/rapid.py:2294
+#: rapid/rapid.py:2573
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s överfördes"
 
-#: rapid/rapid.py:2297
+#: rapid/rapid.py:2577
 #, python-format
-msgid "%(noFiles)s %(filetypes)s skipped"
-msgstr "%(noFiles)s %(filetypes)s skippades"
+msgid "%(noFiles)s %(filetypes)s failed to download"
+msgstr "%(noFiles)s %(filetypes)s gick inte att hämta"
 
-#: rapid/rapid.py:2303 rapid/rapid.py:4027
+#: rapid/rapid.py:2580 rapid/rapid.py:2632
 msgid "warnings"
 msgstr "varningar"
 
-#: rapid/rapid.py:2305 rapid/rapid.py:4029
-msgid "errors"
-msgstr "fel"
-
-#: rapid/rapid.py:2331 rapid/rapid.py:2823 rapid/rapid.py:2838
-msgid "Photo thumbnail could not be extracted"
-msgstr "Kunde inte hitta miniatyr av bilden"
-
-#: rapid/rapid.py:2358
-#, python-format
-msgid "Source: %s\n"
-msgstr "Källa: %s\n"
-
-#: rapid/rapid.py:2360
-#, python-format
-msgid "Device: %s\n"
-msgstr "Enhet: %s\n"
+#: rapid/rapid.py:2589
+msgid "All downloads complete"
+msgstr "Alla överföringar klara"
 
-#: rapid/rapid.py:2361
+#: rapid/rapid.py:2595 rapid/rapid.py:2604 rapid/rapid.py:2613
+#: rapid/rapid.py:2622 rapid/rapid.py:2630
 #, python-format
-msgid "Destination: %s"
-msgstr "Mål: %s"
-
-#: rapid/rapid.py:2362 rapid/rapid.py:2365
-msgid "Could not create temporary download directory"
-msgstr "Kunde inte skapa temporär överföringskatalog"
-
-#: rapid/rapid.py:2365
-msgid "Error:"
-msgstr "Fel:"
+msgid "%(number)s %(numberdownloaded)s"
+msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2382
+#: rapid/rapid.py:2597 rapid/rapid.py:2615
 #, python-format
-msgid "This device has no %(types_searched_for)s to download from."
-msgstr "Denna enhet saknar %(types_searched_for)s att överföra."
+msgid "%(filetype)s downloaded"
+msgstr "%(filetype)s hämtade"
 
-#: rapid/rapid.py:2417
+#: rapid/rapid.py:2606 rapid/rapid.py:2624
 #, python-format
-msgid "Download has started from %s"
-msgstr "Överföringen startade vid %s"
+msgid "%(filetype)s failed to download"
+msgstr "%(filetype)s gick inte att hämta"
 
-#: rapid/rapid.py:2434
-msgid "Backup path does not exist"
-msgstr "Sökväg för säkerhetskopiering finns inte"
-
-#: rapid/rapid.py:2435
+#. e.g.: 3 of 205 photos and videos (202 remaining)
+#: rapid/rapid.py:2663
 #, python-format
-msgid "The path %s could not be created"
-msgstr "Sökvägen %s kunde inte skapas"
-
-#: rapid/rapid.py:2436 rapid/rapid.py:2444
-msgid "No backups can occur"
-msgstr "Inga säkerhetskopior kan genomföras"
-
-#: rapid/rapid.py:2442
-msgid "Backup device missing"
-msgstr "Enhet för säkerhetskopiering saknas"
-
-#: rapid/rapid.py:2443
-msgid "No backup device was automatically detected"
-msgstr "Inga enheter för säkerhetskopiering hittades"
-
-#: rapid/rapid.py:2534 rapid/rapid.py:3343 rapid/rapid.py:3345
-msgid "Photo"
-msgstr "Bild"
+msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
+msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s återstår)"
 
-#: rapid/rapid.py:2535
-msgid "Photo skipped"
-msgstr "Hoppade över bild"
-
-#: rapid/rapid.py:2536
-msgid "Photo already exists"
-msgstr "Bild finns redan"
-
-#: rapid/rapid.py:2542 rapid/rapid.py:3343
-msgid "Video"
-msgstr "Film"
-
-#: rapid/rapid.py:2543
-msgid "Video skipped"
-msgstr "Hoppade över film"
-
-#: rapid/rapid.py:2544
-msgid "Video already exists"
-msgstr "Filmen finns redan"
-
-#: rapid/rapid.py:2592
+#. e.g.: 205 of 205 photos and videos
+#: rapid/rapid.py:2670
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:2607 rapid/rapid.py:2611
-msgid "Could not delete photo or video from device"
-msgstr "Kunde inte ta bort bild eller film från enheten"
-
-#: rapid/rapid.py:2608
-#, python-format
-msgid ""
-"Photo: %(source)s\n"
-"Error: %(errno)s %(strerror)s"
-msgstr ""
-"Bild: %(source)s\n"
-"Fel: %(errno)s %(strerror)s"
-
-#: rapid/rapid.py:2612
-#, python-format
-msgid "Photo: %(source)s"
-msgstr "Bild: %(source)s"
-
-#: rapid/rapid.py:2614
-#, python-format
-msgid "Deleted %(number)i %(filetypes)s from device"
-msgstr "Raderade %(number)i %(filetypes)s från enhet"
-
-#: rapid/rapid.py:2624
-#, python-format
-msgid "Download complete from %s"
-msgstr "Överföring från %s är klart"
-
-#. Device refers to a thing like a camera, memory card in its reader, external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:2700
-msgid "Device"
-msgstr "Enhet"
-
-#. Size refers to the total size of images on the device, typically in MB or GB
-#: rapid/rapid.py:2705
-msgid "Size"
-msgstr "Storlek"
-
-#: rapid/rapid.py:2708
-msgid "Download Progress"
-msgstr "Överföringsförlopp"
-
-#: rapid/rapid.py:2824 rapid/rapid.py:2839
-msgid "It may be corrupted"
-msgstr "Den kan vara korrupt"
-
-#: rapid/rapid.py:2869
-msgid "Device Detected"
-msgstr "Enhet hittad"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2878
-msgid ""
-"Should this device or partition be used to download photos or videos from?"
-msgstr "Skall denna enhet användas för bild- eller filmöverföring?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2897
-msgid "_Remember this choice"
-msgstr "_Kom ihåg mitt val"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2934
-#, python-format
-msgid "%s selected for downloading from"
-msgstr "%s bilder valda för överföring från"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2937
-msgid "This device or partition will always be used to download from"
-msgstr "Bilder kommer alltid att överföras från denna enhet"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2940
-#, python-format
-msgid "%s rejected as a download device"
-msgstr "%s nekades som överföringsenhet"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/rapid.py:2943
-msgid "This device or partition will never be used to download from"
-msgstr "Bilder kommer aldrig att överföras från denna enhet"
-
-#: rapid/rapid.py:2950
-msgid "Remove all Job Codes?"
-msgstr "Ta bort alla fototillfällen?"
-
-#: rapid/rapid.py:2967
-msgid "Should all Job Codes be removed?"
-msgstr "Vill du ta bort alla fototillfällen?"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:2995
-msgid "Enter a Job Code"
-msgstr "Ange fototillfälle"
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3013
-msgid "Enter a new job code, or select a previous one."
-msgstr "Ange ett nytt fototillfälle, eller välj ett tidigare."
-
-#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/rapid.py:3016
-msgid "Enter a new job code."
-msgstr "Ange ett nytt fototillfälle."
-
-#: rapid/rapid.py:3021
-msgid "Job Code:"
-msgstr "Fototillfälle:"
-
-#: rapid/rapid.py:3068
-msgid "Job Code entered"
-msgstr "Ett fototillfälle angavs"
-
-#: rapid/rapid.py:3070
-msgid "Job Code not entered"
-msgstr "Inget fototillfälle angivet"
-
-#: rapid/rapid.py:3330
-#, python-format
-msgid ""
-"Sorry, this device location does not exist:\n"
-"%(path)s\n"
-"\n"
-"Please resolve the problem, or modify your preferences."
-msgstr ""
-"Beklagar, enheten finns inte:\n"
-"%(path)s\n"
-"\n"
-"Åtgärda felet, eller ändra i inställningarna."
-
-#: rapid/rapid.py:3334
-msgid "Problem with Device Location Folder"
-msgstr "Problem med enhetssökväg"
-
-#: rapid/rapid.py:3350
-#, python-format
-msgid "The %(file_type)s Download Folder does not exist.\n"
-msgstr "Överföringskatalogen %(file_type)s finns inte.\n"
-
-#: rapid/rapid.py:3359
-#, python-format
-msgid "The %(file_type)s Download Folder exists but cannot be written to.\n"
-msgstr ""
-"Överföringskatalogen %(file_type)s finns, men går inte att skriva till.\n"
-
-#: rapid/rapid.py:3364
-msgid ""
-"Sorry, problems were encountered with your download folders. Please fix the "
-"problems or modify the preferences.\n"
-"\n"
-msgstr ""
-"Beklagar, det uppstod problem med överföringskatalogen. Åtgärda felet, eller "
-"ändra i inställningarna.\n"
-"\n"
-
-#: rapid/rapid.py:3367
-msgid "Problem with Download Folder"
-msgstr "Fel med bildöverföringskatalogen"
-
-#: rapid/rapid.py:3369
-msgid "Problem with Download Folders"
-msgstr "Problem med överföringskataloger"
-
-#: rapid/rapid.py:3382
-msgid "Some preferences will be reset."
-msgstr "Några inställningar kommer att återställas"
-
-#: rapid/rapid.py:3416
-#, python-format
-msgid "Prompting whether to use %s"
-msgstr "Frågar om %s ska användas"
-
-#: rapid/rapid.py:3444
-msgid "Prompting for Job Code"
-msgstr "Frågar om fototillfälle"
-
-#: rapid/rapid.py:3448
-msgid "Already prompting for Job Code, do not prompt again"
-msgstr "Visar redan fråga om fototillfälle, fråga inte igen"
-
-#: rapid/rapid.py:3463
-msgid "Starting downloads that have been waiting for a Job Code"
-msgstr "Påbörjar överföringar som har väntat på fototillfälle"
-
-#: rapid/rapid.py:3467
-msgid "Starting downloads"
-msgstr "Påbörjar överföring"
-
-#: rapid/rapid.py:3482
-#, python-format
-msgid "Creating photo download folder %(folder)s"
-msgstr "Skapar bildöverföringskatalog för %(folder)s"
-
-#: rapid/rapid.py:3487
-#, python-format
-msgid "Failed to create default photo download folder %(folder)s"
-msgstr "Misslyckades med att skapa bildöverföringskatalog för %(folder)s"
-
-#: rapid/rapid.py:3491
-#, python-format
-msgid "Creating video download folder %(folder)s"
-msgstr "Skapar filmöverföringskatalog för %(folder)s"
-
-#: rapid/rapid.py:3496
-#, python-format
-msgid "Failed to create default video download folder %(folder)s"
-msgstr "Misslyckades med att skapa filmöverföringskatalog för %(folder)s"
-
-#: rapid/rapid.py:3521
-msgid ""
-"A newer version of this program was previously run on this computer.\n"
-"\n"
-msgstr ""
-"En nyare version av det här programmet har startats.\n"
-"\n"
-
-#: rapid/rapid.py:3523
-msgid ""
-"Program preferences appear to be valid, but please check them to ensure "
-"correct operation."
-msgstr ""
-"Inställningarna ser korrekta ut, men kontrollera dem för att vara säker."
-
-#: rapid/rapid.py:3525
-msgid "Sorry, some preferences are invalid and will be reset."
-msgstr ""
-"Beklagar, några av inställningarna innehåller fel och kommer att återställas."
-
-#: rapid/rapid.py:3526
-msgid "Warning:"
-msgstr "Varning:"
-
-#: rapid/rapid.py:3531
-msgid ""
-"This version of the program is newer than the previously run version. "
-"Checking preferences."
-msgstr ""
-"Programmet är av en nyare version än tidigare, kontrollerar inställningar."
-
-#: rapid/rapid.py:3538
-msgid "Preferences were modified."
-msgstr "Inställningarna har ändrats."
-
-#: rapid/rapid.py:3539
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Your preferences have been updated.\n"
-"\n"
-"Please check them to ensure correct operation."
-msgstr ""
-"Denna versionen av programmet använder andra inställningar än äldre "
-"versioner. Inställningarna har därför uppdaterats."
-
-#: rapid/rapid.py:3543
-msgid "No preferences needed to be changed."
-msgstr "Inga inställningar behöver ändras."
-
-#: rapid/rapid.py:3545
-msgid ""
-"This version of the program uses different preferences than the old version. "
-"Some of your previous preferences were invalid, and could not be updated. "
-"They will be reset."
-msgstr ""
-"Denna versionen av programmet använder andra inställningar än äldre "
-"versioner. Några av inställningarna var felaktiga och kunde inte uppdateras. "
-"De kommer därför att återställas."
-
-#: rapid/rapid.py:3555
-msgid "Problem using pynotify."
-msgstr "Ett problem uppstod vid användning av pynotify."
-
-#: rapid/rapid.py:3571
-msgid "Failed to receive pynotify server capabilities."
-msgstr "Kunde inte ta emot serveregenskaper från pynotify."
-
-#: rapid/rapid.py:3580
-msgid ""
-"Warning: desktop environment notification server is incorrectly configured."
-msgstr "Varning: notifieringssystemets server är felaktigt konfigurerad"
-
-#: rapid/rapid.py:3626
+#: rapid/rapid.py:3084
 msgid "and"
 msgstr "och"
 
-#: rapid/rapid.py:3631
+#: rapid/rapid.py:3089
 msgid "Using backup devices"
 msgstr "Använder enheter för säkerhetskopiering"
 
-#: rapid/rapid.py:3633
+#: rapid/rapid.py:3091
 msgid "Using backup device"
 msgstr "Använder enhet för säkerhetskopiering"
 
-#: rapid/rapid.py:3635
+#: rapid/rapid.py:3093
 msgid "No backup devices detected"
 msgstr "Inga enheter för säkerhetskopiering hittades"
 
-#: rapid/rapid.py:3674 rapid/rapid.py:3831
+#: rapid/rapid.py:3120
+msgid "Free space:"
+msgstr "Ledigt utrymme:"
+
+#. (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:3132
 #, python-format
-msgid "Device %(device)s (%(path)s) ignored"
-msgstr "Enhete %(device)s (%(path)s) ignorerades"
+msgid "(%(file_type)s)"
+msgstr "(%(file_type)s)"
 
-#: rapid/rapid.py:3790
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#: rapid/rapid.py:3136
 #, python-format
-msgid "Detected %(device)s with path %(path)s"
-msgstr "Hittade %(device)s med sökvägen %(path)s"
+msgid "%(free)s %(file_type)s"
+msgstr "%(free)s %(file_type)s"
 
-#: rapid/rapid.py:3794
-msgid "Automatically start download is true"
-msgstr "Automatisk överföring är aktiverad"
+#. 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:3141
+msgid "; "
+msgstr "; "
 
-#: rapid/rapid.py:3796
-msgid "Automatically start download is false"
-msgstr "Automatisk överföring är avaktiverad"
+#. 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:3146
+msgid "."
+msgstr "."
 
-#: rapid/rapid.py:3849
-msgid "Using manually specified path"
-msgstr "Använder manuell sökväg"
+#. Freespace available on the filesystem for downloading to
+#. Displayed in status bar message on main window
+#. e.g. 14.7GB available
+#: rapid/rapid.py:3152
+#, python-format
+msgid "%(free)s free"
+msgstr "%(free)s tillgängligt"
+
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3160
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr "Säkerhetskopierar bilder och filmer till %(path)s"
 
-#: rapid/rapid.py:3857
+#. user manually specified backup location
+#: rapid/rapid.py:3163
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Säkerhetskopierar till %(path)s"
 
-#: rapid/rapid.py:3968 rapid/rapid.py:4017
-msgid "All downloads complete"
-msgstr "Alla överföringar klara"
-
-#: rapid/rapid.py:3982
-msgid "MB/s"
-msgstr "MB/s"
-
-#: rapid/rapid.py:3992
-msgid "About 1 second remaining"
-msgstr "Cirka en sekund återstår"
-
-#: rapid/rapid.py:3994
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3166
 #, python-format
-msgid "About %i seconds remaining"
-msgstr "Cirka %i sekunder återstår"
-
-#: rapid/rapid.py:3996
-msgid "About 1 minute remaining"
-msgstr "Cirka en minut återstår"
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr "Säkerhetskopierar bolder till %(path)s och videor till %(path2)s"
 
-#. 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:4001
+#: rapid/rapid.py:3173
 #, python-format
-msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
+msgid "%(freespace)s. %(backuppaths)s."
+msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:4019
-msgid "photos downloaded"
-msgstr "bilder överförda"
+#: rapid/rapid.py:3202
+msgid "Program preferences are invalid"
+msgstr "Programinställningarna är ogiltiga"
 
-#: rapid/rapid.py:4021
-msgid "photos skipped"
-msgstr "bilder hoppades över"
+#: rapid/rapid.py:3321 rapid/rpdfile.py:251
+msgid "Photo"
+msgstr "Bild"
 
-#: rapid/rapid.py:4023
-msgid "videos downloaded"
-msgstr "filmer överförda"
+#: rapid/rapid.py:3323 rapid/rpdfile.py:271
+msgid "Video"
+msgstr "Film"
 
-#: rapid/rapid.py:4025
-msgid "videos skipped"
-msgstr "filmer hoppades över"
+#: rapid/rapid.py:3332
+#, python-format
+msgid "%(file_type)s download folder does not exist"
+msgstr "%(file_type)s nedladdningsmapp saknas"
 
-#. This text will be displayed to the user on the Download / Pause button.
-#. Please note the space at the end of the label - it is needed to meet the Gnome Human Interface Guidelines
-#: rapid/rapid.py:4125
-msgid "_Download "
-msgstr "_Överför "
+#: rapid/rapid.py:3334 rapid/rapid.py:3348 rapid/rapid.py:3361
+#, python-format
+msgid "Folder: %s"
+msgstr "Mapp: %s"
 
-#. This text will be displayed to the user on the Download / Pause button.
-#: rapid/rapid.py:4135
-msgid "_Pause"
-msgstr "_Paus"
+#: rapid/rapid.py:3346
+#, python-format
+msgid "%(file_type)s download folder is invalid"
+msgstr "%(file_type)s nedladdningsmapp är ogiltig"
 
-#: rapid/rapid.py:4209
-msgid "Preferences were changed."
-msgstr "Inställningar ändrades"
+#: rapid/rapid.py:3359
+#, python-format
+msgid "%(file_type)s download folder is not writable"
+msgstr "%(file_type)s nedladdningsmapp är inte skrivbar"
 
-#: rapid/rapid.py:4407
-msgid "Goodbye"
-msgstr "Farväl"
+#: rapid/rapid.py:3437
+msgid "Thumbnails"
+msgstr "Miniatyrer"
 
 #. 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:4418
+#: rapid/rapid.py:3484
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -1023,615 +324,1293 @@ msgstr ""
 "visa programinformation på kommandoraden när programmet körs (standardvärde: "
 "%default)"
 
-#: rapid/rapid.py:4419
+#: rapid/rapid.py:3485
+msgid "display debugging information when run from the command line"
+msgstr "visa debuginformation när programmet körs från kommandorad"
+
+#: rapid/rapid.py:3486
 msgid "only output errors to the command line"
 msgstr "Visa fel endast på kommandoraden"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:4421
+#: rapid/rapid.py:3488
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr "lista filändelser som programmet stödjer och avsluta"
 
-#: rapid/rapid.py:4422
+#: rapid/rapid.py:3490
 msgid "reset all program settings and preferences and exit"
 msgstr "nollställ alla inställningar och avsluta"
 
-#: rapid/rapid.py:4431
+#: rapid/rapid.py:3503
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:4431
+#: rapid/rapid.py:3503
 msgid "Videos:"
 msgstr "Filmer:"
 
-#: rapid/rapid.py:4436
+#: rapid/rapid.py:3508
 #, python-format
 msgid "and %s"
 msgstr "och %s"
 
-#: rapid/rapid.py:4444
+#: rapid/rapid.py:3516
 msgid "All settings and preferences have been reset"
 msgstr "Alla inställningar har nollställts"
 
-#. Which volume management code is being used (GIO or GnomeVFS)
-#: rapid/rapid.py:4448 rapid/rapid.py:4449 rapid/rapid.py:4451
-#: rapid/rapid.py:4456 rapid/rapid.py:4460
-msgid "Using"
-msgstr "Använder"
+#: rapid/rapid.py:3534
+msgid ""
+"Video downloading functionality disabled.\n"
+"To download videos, please install the hachoir metadata and kaa metadata "
+"packages for python."
+msgstr ""
+"Nedladdning av video är inaktiverat.\n"
+"För att kunna ladda ned videos, var vänlig att installera Python-paketen "
+"hachoir och kaa."
+
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
+msgid "Backing up error"
+msgstr "Fel vid säkerhetskopiering"
+
+#: rapid/backupfile.py:144
+#, python-format
+msgid "Destination directory could not be created: %(directory)s\n"
+msgstr "Målplatsen kunde inte skapas: %(directory)s\n"
+
+#: rapid/backupfile.py:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#, python-format
+msgid ""
+"Source: %(source)s\n"
+"Destination: %(destination)s"
+msgstr ""
+"Källa: %(source)s\n"
+"Destination: %(destination)s"
 
-#: rapid/rapid.py:4453
-msgid "\n"
-msgstr "\n"
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#, python-format
+msgid "Error: %(inst)s"
+msgstr "Fel: %(inst)s"
 
-#. this application is already running
-#: rapid/rapid.py:4477
+#: rapid/copyfiles.py:143 rapid/subfolderfile.py:211
+#: rapid/subfolderfile.py:351 rapid/subfolderfile.py:369
 #, python-format
-msgid "%s is already running"
-msgstr "%s körs redan"
+msgid ""
+"%(problem)s\n"
+"File: %(file)s"
+msgstr ""
+"%(problem)s\n"
+"Fil: %(file)s"
+
+#: rapid/device.py:79
+msgid "Device Detected"
+msgstr "Enhet hittad"
+
+#. 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 "Skall denna enhet användas för bild- eller filmöverföring?"
 
-#: rapid/renamesubfolderprefs.py:190
+#. 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 "_Kom ihåg mitt val"
+
+#: rapid/downloadtracker.py:298
+msgid "MB/s"
+msgstr "MB/s"
+
+#: rapid/generatenameconfig.py:145
 msgid "Date time"
 msgstr "Datumtid"
 
-#: rapid/renamesubfolderprefs.py:191
+#: rapid/generatenameconfig.py:146
 msgid "Text"
 msgstr "Text"
 
-#: rapid/renamesubfolderprefs.py:192
+#: rapid/generatenameconfig.py:147
 msgid "Filename"
 msgstr "Filnamn"
 
-#: rapid/renamesubfolderprefs.py:193
+#: rapid/generatenameconfig.py:148
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/renamesubfolderprefs.py:194
+#: rapid/generatenameconfig.py:149
 msgid "Sequences"
 msgstr "Sekvenser"
 
-#: rapid/renamesubfolderprefs.py:197
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/generatenameconfig.py:151 rapid/preferencesdialog.py:570
+msgid "Job code"
+msgstr "Fototillfälle"
+
+#: rapid/generatenameconfig.py:152
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/renamesubfolderprefs.py:198
+#: rapid/generatenameconfig.py:153
 msgid "Video date"
 msgstr "Filmdatum"
 
-#: rapid/renamesubfolderprefs.py:199
+#: rapid/generatenameconfig.py:154
 msgid "Today"
 msgstr "Idag"
 
-#: rapid/renamesubfolderprefs.py:200
+#: rapid/generatenameconfig.py:155
 msgid "Yesterday"
 msgstr "Igår"
 
+#. 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 "Nedladdningstid"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:202
+#: rapid/generatenameconfig.py:159
 msgid "Name + extension"
 msgstr "Namn + filändelse"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:204
+#: rapid/generatenameconfig.py:161
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:206
+#: rapid/generatenameconfig.py:163
 msgid "Extension"
 msgstr "Filändelse"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:208
+#: rapid/generatenameconfig.py:165
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: rapid/renamesubfolderprefs.py:209
+#: rapid/generatenameconfig.py:166
 msgid "Video number"
 msgstr "Filmnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:211
+#: rapid/generatenameconfig.py:168
 msgid "Aperture"
 msgstr "Bländare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:213
+#: 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/renamesubfolderprefs.py:215
+#: rapid/generatenameconfig.py:172
 msgid "Exposure time"
 msgstr "Bländartid"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:217
+#: rapid/generatenameconfig.py:174
 msgid "Focal length"
 msgstr "Brännvidd"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:219
+#: rapid/generatenameconfig.py:176
 msgid "Camera make"
 msgstr "Kameratillverkare"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:221
+#: 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/renamesubfolderprefs.py:223
+#: rapid/generatenameconfig.py:180
 msgid "Short camera model"
 msgstr "Förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:225
+#: rapid/generatenameconfig.py:182
 msgid "Hyphenated short camera model"
 msgstr "Utökad förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:227
+#: 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/renamesubfolderprefs.py:229
+#: rapid/generatenameconfig.py:186
 msgid "Shutter count"
 msgstr "Antal exponeringar"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/renamesubfolderprefs.py:231
+#: rapid/generatenameconfig.py:188
 msgid "Owner name"
 msgstr "Ägarens namn"
 
-#: rapid/renamesubfolderprefs.py:232
+#: rapid/generatenameconfig.py:189
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/renamesubfolderprefs.py:233
+#: rapid/generatenameconfig.py:190
 msgid "Width"
 msgstr "Bredd"
 
-#: rapid/renamesubfolderprefs.py:234
+#: rapid/generatenameconfig.py:191
 msgid "Height"
 msgstr "Höjd"
 
-#: rapid/renamesubfolderprefs.py:235
+#: rapid/generatenameconfig.py:192
 msgid "Length"
 msgstr "Längd"
 
-#: rapid/renamesubfolderprefs.py:236
+#: rapid/generatenameconfig.py:193
 msgid "Frames Per Second"
 msgstr "Bildrutor per sekund"
 
+#: rapid/generatenameconfig.py:194
+msgid "Artist"
+msgstr "Artist"
+
+#: rapid/generatenameconfig.py:195
+msgid "Copyright"
+msgstr "Upphovsrätt"
+
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:238
+#: rapid/generatenameconfig.py:197
 msgid "Downloads today"
 msgstr "Överföringar idag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:240
+#: rapid/generatenameconfig.py:199
 msgid "Session number"
 msgstr "Sessionsnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:242
+#: rapid/generatenameconfig.py:201
 msgid "Subfolder number"
 msgstr "Nummer på underkatalog"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/renamesubfolderprefs.py:244
+#: rapid/generatenameconfig.py:203
 msgid "Stored number"
 msgstr "Tidigare sekvensnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/renamesubfolderprefs.py:246
+#: rapid/generatenameconfig.py:205
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:248
+#: rapid/generatenameconfig.py:207
 msgid "All digits"
 msgstr "Alla siffror"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:250
+#: rapid/generatenameconfig.py:209
 msgid "Last digit"
 msgstr "Senaste siffra"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:252
+#: rapid/generatenameconfig.py:211
 msgid "Last 2 digits"
 msgstr "Senaste två siffrorna"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:254
+#: rapid/generatenameconfig.py:213
 msgid "Last 3 digits"
 msgstr "Senaste tre siffrorna"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/renamesubfolderprefs.py:256
+#: rapid/generatenameconfig.py:215
 msgid "Last 4 digits"
 msgstr "Senaste fyra siffrorna"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:258
+#: rapid/generatenameconfig.py:217
 msgid "Original Case"
 msgstr "Använd ursprungligt skiftläge"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:260
+#: rapid/generatenameconfig.py:219
 msgid "UPPERCASE"
 msgstr "VERSALER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/renamesubfolderprefs.py:262
+#: rapid/generatenameconfig.py:221
 msgid "lowercase"
 msgstr "gemener"
 
-#: rapid/renamesubfolderprefs.py:263
+#: rapid/generatenameconfig.py:222
 msgid "One digit"
 msgstr "En siffra"
 
-#: rapid/renamesubfolderprefs.py:264
+#: rapid/generatenameconfig.py:223
 msgid "Two digits"
 msgstr "Två siffror"
 
-#: rapid/renamesubfolderprefs.py:265
+#: rapid/generatenameconfig.py:224
 msgid "Three digits"
 msgstr "Tre siffror"
 
-#: rapid/renamesubfolderprefs.py:266
+#: rapid/generatenameconfig.py:225
 msgid "Four digits"
 msgstr "Fyra siffror"
 
-#: rapid/renamesubfolderprefs.py:267
+#: rapid/generatenameconfig.py:226
 msgid "Five digits"
 msgstr "Fem siffror"
 
-#: rapid/renamesubfolderprefs.py:268
+#: rapid/generatenameconfig.py:227
 msgid "Six digits"
 msgstr "Sex siffror"
 
-#: rapid/renamesubfolderprefs.py:269
+#: rapid/generatenameconfig.py:228
 msgid "Seven digits"
 msgstr "Sju siffror"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:271
+#: rapid/generatenameconfig.py:230
 msgid "Subseconds"
 msgstr "Sekunder"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:273
+#: rapid/generatenameconfig.py:232
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:275
+#: rapid/generatenameconfig.py:234
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:277
+#: rapid/generatenameconfig.py:236
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:279
+#: rapid/generatenameconfig.py:238
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:281
+#: rapid/generatenameconfig.py:240
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:283
+#: rapid/generatenameconfig.py:242
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:285
+#: 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/renamesubfolderprefs.py:287
+#: rapid/generatenameconfig.py:246
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:289
+#: rapid/generatenameconfig.py:248
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:291
+#: 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/renamesubfolderprefs.py:293
+#: 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/renamesubfolderprefs.py:295
+#: 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/renamesubfolderprefs.py:297
+#: 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/renamesubfolderprefs.py:299
+#: 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/renamesubfolderprefs.py:301
+#: 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/renamesubfolderprefs.py:303
+#: 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/renamesubfolderprefs.py:305
+#: 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/renamesubfolderprefs.py:307
+#: 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/renamesubfolderprefs.py:309
+#: rapid/generatenameconfig.py:268
 msgid "MM (minutes)"
 msgstr "MM (minuter)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/renamesubfolderprefs.py:311
+#: rapid/generatenameconfig.py:270
 msgid "SS"
 msgstr "SS"
 
-#: rapid/renamesubfolderprefs.py:794
+#: rapid/preferencesdialog.py:370
+#, python-format
+msgid "Subfolder preferences should not start with a %s"
+msgstr "Inställningen för underkataloger skall inte börja med %s"
+
+#: rapid/preferencesdialog.py:372
+#, python-format
+msgid "Subfolder preferences should not end with a %s"
+msgstr "Inställning för underkatalog skall inte börja med %s"
+
+#: rapid/preferencesdialog.py:376
+#, python-format
+msgid "Subfolder preferences should not contain two %s one after the other"
+msgstr "Inställning för underkatalog skall inte innehålla två %s i rad"
+
+#: rapid/preferencesdialog.py:431 rapid/preferencesdialog.py:693
+msgid "Remove all Job Codes?"
+msgstr "Ta bort alla fototillfällen?"
+
+#: rapid/preferencesdialog.py:432 rapid/preferencesdialog.py:710
+msgid "Should all Job Codes be removed?"
+msgstr "Vill du ta bort alla fototillfällen?"
+
+#: rapid/preferencesdialog.py:438
+msgid "Remove all Remembered Paths?"
+msgstr "Ta bort alla sparade sökvägar?"
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths be removed?"
+msgstr "Ska alla sparade sökvägar tas bort?"
+
+#: rapid/preferencesdialog.py:445
+msgid "Remove all Ignored Paths?"
+msgstr "Ta bort alla ignorerade sökvägar?"
+
+#: rapid/preferencesdialog.py:446
+msgid "Should all ignored paths be removed?"
+msgstr "Ska alla ignorerade sökvägar tas bort?"
+
+#: rapid/preferencesdialog.py:457
+msgid "Error in Photo Rename preferences"
+msgstr "Fel i inställningarna för bildnamnbyte"
+
+#: rapid/preferencesdialog.py:638
+msgid "Error in Video Rename preferences"
+msgstr "Fel i inställningarna för filmnamnbyte"
+
+#: rapid/preferencesdialog.py:659
+msgid "Error in Photo Download Subfolders preferences"
+msgstr "Fel i inställningarna för bildöverföring"
+
+#: rapid/preferencesdialog.py:676
+msgid "Error in Video Download Subfolders preferences"
+msgstr "Fel i inställningarna för filmöverföring"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:735
+msgid "Enter a Job Code"
+msgstr "Ange fototillfälle"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:751
+msgid "Enter a new Job Code, or select a previous one"
+msgstr "Skriv ett nytt jobbnummer, eller välj ett föregående"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
+#: rapid/preferencesdialog.py:754
+msgid "Enter a new Job Code"
+msgstr "Ange nytt jobbnamn"
+
+#: rapid/preferencesdialog.py:759
+msgid "Job Code:"
+msgstr "Fototillfälle:"
+
+#: rapid/preferencesdialog.py:815
+msgid "Enter a Path to Ignore"
+msgstr "Ange sökväg att ignorera"
+
+#: rapid/preferencesdialog.py:827
+msgid "Specify a path that will never be scanned for photos or videos"
+msgstr ""
+"Ange en sökväg som aldrig kommer att avsökas efter bilder eller videor"
+
+#: rapid/preferencesdialog.py:832
+msgid "Path:"
+msgstr "Sökväg:"
+
+#: rapid/preferencesdialog.py:1078
+msgid "Job Code"
+msgstr "Jobbnamn"
+
+#: rapid/preferencesdialog.py:1160
+msgid "Select a folder to download photos to"
+msgstr "Välj en katalog att överföra bilder till"
+
+#: rapid/preferencesdialog.py:1178
+msgid "Select a folder to download videos to"
+msgstr "Välj en katalog att överföra filmer till"
+
+#: rapid/preferencesdialog.py:1323
 #, python-format
+msgid "Select a folder containing %(file_types)s"
+msgstr "Välj en katalog innehållande %(file_types)s"
+
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr "Välj en plats för att säkerhetskopiera bilder"
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
+msgstr "Välj en plats för att säkerhetskopiera videor"
+
+#. 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:1457
+msgid ""
+"<i><b>Warning:</b> There is insufficient metadata to fully generate the "
+"name. Please use other renaming options.</i>"
+msgstr ""
+"<i><b>Varning:</b> Det saknas metadata för att namnge. Var god välj andra "
+"inställningar för namngivning.</i>"
+
+#: rapid/preferencesdialog.py:1508
 msgid ""
-"Preference key '%(key)s' is invalid.\n"
-"Expected one of %(value)s"
+"<i><b>Warning:</b> There is insufficient metadata to fully generate "
+"subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"Inställningen '%(key)s' är ogiltig.\n"
-"Förväntat värde är något av %(value)s"
+"<i><b>Varning:</b> Det finns inte tillräckligt med metadata för att skapa "
+"underkataloger. Välj andra inställningar för att namnge underkataloger.</i>"
 
-#: rapid/renamesubfolderprefs.py:801
+#. 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:1511
 #, python-format
-msgid "Preference value '%(value)s' is invalid"
-msgstr "Inställningen '%(value)s' är ogiltig"
+msgid "<i>Example: %s</i>"
+msgstr "<i>Exempel: %s</i>"
 
-#: rapid/renamesubfolderprefs.py:805
-msgid "These preferences are not well formed:"
-msgstr "Följande inställningar är ogiltiga:"
+#. Preferences list is now empty
+#: rapid/preferencesdialog.py:1601
+#, python-format
+msgid ""
+"The %(filetype)s subfolder preferences entered are invalid and cannot be "
+"used.\n"
+"They will be reset to their default values."
+msgstr ""
+"Underkatalog för %(filetype)s har felaktiga inställningar som inte kan "
+"användas.\n"
+"Återställer till standardvärden."
 
-#: rapid/renamesubfolderprefs.py:934
-msgid "Subsecond metadata not present in photo"
-msgstr "Metadata med subsekunder saknas i bilden"
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+"Följande reguljära uttryck är ogiltiga, och kommer att tas bort om du inte "
+"ändrar dem:\n"
+" %s"
 
-#: rapid/renamesubfolderprefs.py:941
+#: rapid/preferencesdialog.py:1748
 #, python-format
-msgid "%s metadata is not present"
-msgstr "%s metadata saknas"
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+"Detta reguljära uttryck är ogiltigt, och kommer att tas bort om du inte "
+"ändrar det:\n"
+" %s"
+
+#: rapid/preferencesdialog.py:1749
+msgid "Invalid regular expression"
+msgstr "Ogiltigt reguljärt uttryck"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1931
+msgid "externaldrive1"
+msgstr "extern_enhet_1"
+
+#. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
+#: rapid/preferencesdialog.py:1933
+msgid "externaldrive2"
+msgstr "extern_enhet_2"
+
+#: rapid/prefsrapid.py:126
+msgid "New York"
+msgstr "New York"
+
+#: rapid/prefsrapid.py:127
+msgid "Manila"
+msgstr "Manilla"
+
+#: rapid/prefsrapid.py:127
+msgid "Prague"
+msgstr "Prag"
+
+#: rapid/prefsrapid.py:127
+msgid "Helsinki"
+msgstr "Helsingfors"
+
+#: rapid/prefsrapid.py:127
+msgid "Wellington"
+msgstr "Wellington"
+
+#: rapid/prefsrapid.py:128
+msgid "Tehran"
+msgstr "Teheran"
+
+#: rapid/prefsrapid.py:128
+msgid "Kampala"
+msgstr "Kampala"
+
+#: rapid/prefsrapid.py:128
+msgid "Paris"
+msgstr "Paris"
+
+#: rapid/prefsrapid.py:128
+msgid "Berlin"
+msgstr "Berlin"
+
+#: rapid/prefsrapid.py:128
+msgid "Sydney"
+msgstr "Sydney"
+
+#: rapid/prefsrapid.py:129
+msgid "Budapest"
+msgstr "Budapest"
+
+#: rapid/prefsrapid.py:129
+msgid "Rome"
+msgstr "Rom"
+
+#: rapid/prefsrapid.py:129
+msgid "Moscow"
+msgstr "Moskva"
+
+#: rapid/prefsrapid.py:129
+msgid "Delhi"
+msgstr "Delhi"
+
+#: rapid/prefsrapid.py:129
+msgid "Warsaw"
+msgstr "Warszawa"
 
-#: rapid/renamesubfolderprefs.py:960 rapid/renamesubfolderprefs.py:968
-#: rapid/renamesubfolderprefs.py:977
+#: rapid/prefsrapid.py:130
+msgid "Jakarta"
+msgstr "Djakarta"
+
+#: rapid/prefsrapid.py:130
+msgid "Madrid"
+msgstr "Madrid"
+
+#: rapid/prefsrapid.py:130
+msgid "Stockholm"
+msgstr "Stockholm"
+
+#. components
+#: rapid/problemnotification.py:26 rapid/subfolderfile.py:362
+msgid "subfolder"
+msgstr "Underkatalog"
+
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:360
+msgid "filename"
+msgstr "Filnamn"
+
+#: rapid/problemnotification.py:80
 #, python-format
-msgid "Error in date time component. Value %s appears invalid"
-msgstr "Fel i komponenten för datumtid. Värdet %s verkar ogiltigt"
+msgid "Date time value %s appears invalid."
+msgstr "Datum/tid-värde %s verkar ogiltigt."
 
-#: rapid/renamesubfolderprefs.py:1004
-msgid "extension was specified but filename does not have an extension"
-msgstr "filändelse angavs men filnamnet har ingen ändelse"
+#: rapid/problemnotification.py:81
+msgid "Filename does not have an extension."
+msgstr "Filnamnet saknar filändelse."
 
-#: rapid/renamesubfolderprefs.py:1008
-msgid "image or video number was specified but filename has no number"
-msgstr "bild eller filmnummer angavs men filnamnet har inget nummer"
+#. 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 "Filnamnet saknar sekvensnummer."
 
-#: rapid/renamesubfolderprefs.py:1081
+#: rapid/problemnotification.py:84
 #, python-format
-msgid "%s metadata is not present in photo"
-msgstr "%s saknas i bilden"
+msgid "Error generating component %s."
+msgstr "Ett fel uppstod när nummer %s skulle skapas."
 
-#: rapid/renamesubfolderprefs.py:1194
+#. a generic problem
+#: rapid/problemnotification.py:86
 #, python-format
-msgid "error generating name with component %s"
-msgstr "ett fel uppstod med komponenten %s"
+msgid "%(filetype)s metadata cannot be read"
+msgstr "Metadata i %(filetype)s kan inte läsas."
 
-#: rapid/renamesubfolderprefs.py:1450
+#: rapid/problemnotification.py:88
 #, python-format
-msgid "%s metadata is not present in video"
-msgstr "%s saknas i filmen"
+msgid "%(filetype)s %(area)s could not be generated"
+msgstr "%(filetype)s %(area)s kunde inte skapas."
 
-#: rapid/renamesubfolderprefs.py:1546
+#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
 #, python-format
-msgid "Subfolder preferences should not start with a %s"
-msgstr "Inställningen för underkataloger skall inte börja med %s"
+msgid "An error occurred when copying the %(filetype)s"
+msgstr "Ett fel uppstod när %(filetype)s skulle kopieras"
 
-#: rapid/renamesubfolderprefs.py:1548
+#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
 #, python-format
-msgid "Subfolder preferences should not end with a %s"
-msgstr "Inställning för underkatalog skall inte börja med %s"
+msgid "%(filetype)s already exists"
+msgstr "%(filetype)s finns redan"
 
-#: rapid/renamesubfolderprefs.py:1552
+#: rapid/problemnotification.py:97
 #, python-format
-msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Inställning för underkatalog skall inte innehålla två %s i rad"
+msgid ""
+"%(filetype)s could not be backed up because no suitable backup locations "
+"were found."
+msgstr ""
+"%(filetype)s kunde inte säkerhetskopieras, eftersom ingen plats för "
+"säkerhetskopior hittades."
+
+#: rapid/problemnotification.py:102
+#, python-format
+msgid ""
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
+msgstr ""
+"%(image1)s togs den %(image1_date)s kl %(image1_time)s, och %(image2)s den "
+"%(image2_date)s kl %(image2_time)s."
+
+#: rapid/problemnotification.py:103
+#, python-format
+msgid "%(filetype)s was already downloaded"
+msgstr "%(filetype)s är redan nedladdad"
+
+#: 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 ""
+"Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s. Den "
+"har fått '%(identifier)s' som unik identifierare."
+
+#: rapid/problemnotification.py:108
+#, python-format
+msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
+msgstr ""
+"Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s."
+
+#: rapid/problemnotification.py:109
+#, python-format
+msgid "There is no data with which to name the %(filetype)s."
+msgstr "Det saknas data för att namnge %(filetype)s."
+
+#: rapid/problemnotification.py:111
+#, python-format
+msgid "Error: %(errorno)s %(strerror)s"
+msgstr "Fel: %(errorno)s %(strerror)s"
+
+#: rapid/problemnotification.py:201
+msgid "The metadata might be corrupt."
+msgstr "Metadatan kan vara korrupt."
+
+#: rapid/problemnotification.py:204
+msgid ""
+"The filename, extension and Exif information indicate it has already been "
+"downloaded."
+msgstr "Filnamnet, filändelsen och Exif-informationen har redan överförts."
+
+#: rapid/problemnotification.py:223
+#, python-format
+msgid " It was backed up to %(volume)s"
+msgstr " Den har säkerhetskopierats till %(volume)s"
+
+#: rapid/problemnotification.py:225
+msgid " It was backed up to these devices: "
+msgstr " Den har säkerhetskopierats till följande enheter: "
+
+#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
+#: rapid/problemnotification.py:300
+#, python-format
+msgid "%s, "
+msgstr "%s, "
+
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
+#, python-format
+msgid "%(volumes)s and %(final_volume)s."
+msgstr "%(volumes)s och %(final_volume)s."
+
+#: rapid/problemnotification.py:240
+#, python-format
+msgid ""
+"Photos detected with the same filenames, but taken at different times: "
+"%(details)s"
+msgstr ""
+"Hittade bilder med samma filnamn, fast tagna vid olika tillfällen: "
+"%(details)s"
+
+#: rapid/problemnotification.py:257
+#, python-format
+msgid "An error occurred when backing up on %(volume)s: %(inst)s."
+msgstr ""
+"Ett fel uppstod när säkerhetskopia skulle tas till %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:259
+#, python-format
+msgid "An error occurred when backing up on %(volume)s."
+msgstr "Ett fel uppstod när säkerhetskopia skulle tas till %(volume)s."
+
+#: rapid/problemnotification.py:261
+msgid "Errors occurred when backing up on the following backup devices: "
+msgstr ""
+"Ett fel uppstod när säkerhetskopia skulle tas till följande enheter: "
+
+#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#, python-format
+msgid "%(volume)s (%(inst)s), "
+msgstr "%(volume)s (%(inst)s), "
+
+#: rapid/problemnotification.py:267
+#, python-format
+msgid "%(volume)s, "
+msgstr "%(volume)s, "
+
+#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#, python-format
+msgid "%(volumes)s and %(volume)s (%(inst)s)."
+msgstr "%(volumes)s och %(volume)s (%(inst)s)."
+
+#: rapid/problemnotification.py:276
+#, python-format
+msgid "%(volumes)s and %(volume)s."
+msgstr "%(volumes)s och %(volume)s."
+
+#: rapid/problemnotification.py:284
+#, python-format
+msgid "Backup already exists on %(volume)s."
+msgstr "Säkerhetskopia finns redan på %(volume)s."
+
+#: rapid/problemnotification.py:286
+msgid "Backups already exist in these locations: "
+msgstr "Säkerhetskopia finns redan i: "
+
+#: rapid/problemnotification.py:296
+#, python-format
+msgid "Backup overwritten on %(volume)s."
+msgstr "Säkerhetskopia skrevs över på %(volume)s."
+
+#: rapid/problemnotification.py:298
+msgid "Backups overwritten on these devices: "
+msgstr "Säkerhetskopia skrevs över i: "
+
+#: rapid/problemnotification.py:309
+#, python-format
+msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
+msgstr "Ett fel uppstod när kataloger skulle skapas på %(volume)s: %(inst)s."
+
+#: rapid/problemnotification.py:311
+msgid ""
+"Errors occurred when creating directories on the following backup devices: "
+msgstr "Ett fel uppstod när kataloger skulle skapas på följande enheter: "
+
+#: rapid/problemnotification.py:322
+#, python-format
+msgid "%(previousproblem)s Additionally, %(newproblem)s"
+msgstr "%(previousproblem)s Mer problem därtill, %(newproblem)s"
+
+#: rapid/problemnotification.py:330
+#, python-format
+msgid " Furthermore, there were %(problems)s."
+msgstr " Problem hittades %(problems)s."
+
+#: rapid/problemnotification.py:332
+#, python-format
+msgid " Furthermore, there was a %(problem)s."
+msgstr " Ett problem hittades %(problem)s."
+
+#: rapid/problemnotification.py:341
+#, python-format
+msgid "The %(type)s metadata is missing."
+msgstr "%(type)s metadata saknas."
+
+#: rapid/problemnotification.py:343
+msgid "The following metadata is missing: "
+msgstr "Följande metadata saknas: "
+
+#: rapid/problemnotification.py:346
+#, python-format
+msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+msgstr ""
+"%(missing_metadata_elements)s oct %(final_missing_metadata_element)s."
+
+#: rapid/problemnotification.py:363
+msgid "Problems in subfolder and filename generation"
+msgstr "Problem med skapande av undermappar och filnamn"
+
+#: rapid/problemnotification.py:365
+msgid "Problem in subfolder and filename generation"
+msgstr "Problem med skapande av undermappar och filnamn"
+
+#: rapid/problemnotification.py:368
+#, python-format
+msgid "Problems in %s generation"
+msgstr "Problem med skapande av %s"
+
+#: rapid/problemnotification.py:370
+#, python-format
+msgid "Problem in %s generation"
+msgstr "Problem med skapande av %s"
+
+#: rapid/problemnotification.py:379
+#, python-format
+msgid "%(filetype)s already exists, but it was backed up"
+msgstr "%(filetype)s finns redan, men säkerhetskopierades"
+
+#: rapid/problemnotification.py:381
+#, python-format
+msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+msgstr ""
+"Ett fel uppstod vid kopiering av %(filetype)s, men säkerhetskopierades"
+
+#: rapid/problemnotification.py:401
+msgid "Multiple problems were encountered"
+msgstr "Flera fel hittades"
+
+#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+msgid "Photos detected with the same filenames, but taken at different times"
+msgstr "Bilder med samma filnamn hittades, fast tagna vid olika tillfällen"
+
+#: rapid/problemnotification.py:409
+msgid "there were errors backing up"
+msgstr "det uppstod fel vid säkerhetskopiering"
+
+#: rapid/problemnotification.py:410
+msgid "There were errors backing up"
+msgstr "Det uppstod fel vid säkerhetskopiering"
+
+#: rapid/problemnotification.py:412
+msgid "there was an error backing up"
+msgstr "det uppstod ett fel vid säkerhetskopiering"
+
+#: rapid/problemnotification.py:413
+msgid "There was an error backing up"
+msgstr "Det uppstod ett fel vid säkerhetskopiering"
+
+#. e.g.
+#: rapid/problemnotification.py:416
+#, python-format
+msgid "%(previousproblem)s, and %(backinguperror)s"
+msgstr "%(previousproblem)s, och %(backinguperror)s"
+
+#: rapid/rpdfile.py:136
+#, python-format
+msgid "%(number)s %(filetypes)s"
+msgstr "%(number)s %(filetypes)s"
+
+#: rapid/subfolderfile.py:79
+#, python-format
+msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+
+#: rapid/subfolderfile.py:299
+msgid "Photo has already been downloaded"
+msgstr "Bilden har redan överförts"
+
+#: rapid/subfolderfile.py:300
+#, python-format
+msgid "Source: %(source)s"
+msgstr "Källa: %(source)s"
+
+#: rapid/subfolderfile.py:358
+msgid "subfolder and filename"
+msgstr "undermapp och filnamn"
+
+#: rapid/subfolderfile.py:396
+msgid "Failed to create download subfolder"
+msgstr "Misslyckades med att skapa mapp för nedladdning"
+
+#: rapid/subfolderfile.py:397
+#, python-format
+msgid "Path: %s"
+msgstr "Sökväg: %s"
+
+#: rapid/glade3/rapid.ui.h:1
+msgid "About..."
+msgstr "Om..."
+
+#: rapid/glade3/rapid.ui.h:2
+msgid "Check All"
+msgstr "Markera alla"
+
+#: rapid/glade3/rapid.ui.h:3
+msgid "Check All Photos"
+msgstr "Markera alla bilder"
+
+#: rapid/glade3/rapid.ui.h:4
+msgid "Check All Videos"
+msgstr "Markera alla videor"
+
+#: rapid/glade3/rapid.ui.h:6
+msgid "Download / Pause"
+msgstr "Överföring / Paus"
 
-#: rapid/glade3/rapid.glade.h:1
+#: rapid/glade3/rapid.ui.h:7
+msgid "Get Help Online..."
+msgstr "Få hjälp på internet..."
+
+#: rapid/glade3/rapid.ui.h:8
+msgid "Help"
+msgstr "Hjälp"
+
+#: rapid/glade3/rapid.ui.h:9
+msgid "Make a Donation..."
+msgstr "Donera..."
+
+#: rapid/glade3/rapid.ui.h:10
+msgid "Next File"
+msgstr "Nästa fil"
+
+#: rapid/glade3/rapid.ui.h:11
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: rapid/glade3/rapid.ui.h:12
+msgid "Previous File"
+msgstr "Föregående fil"
+
+#: rapid/glade3/rapid.ui.h:13
+msgid "Quit"
+msgstr "Avsluta"
+
+#: rapid/glade3/rapid.ui.h:15
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: rapid/glade3/rapid.ui.h:16
+msgid "Report a Problem..."
+msgstr "Rapportera problem..."
+
+#: rapid/glade3/rapid.ui.h:17
+msgid "Select All Wit_h Job Code"
+msgstr "Markera alla vid ett fototillf_älle"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "Select All Without _Job Code"
+msgstr "Markera alla som sakna_r fototillfälle"
+
+#: rapid/glade3/rapid.ui.h:19
+msgid "Translate this Application..."
+msgstr "Översätt detta program..."
+
+#: rapid/glade3/rapid.ui.h:20
+msgid "Uncheck All"
+msgstr "Avmarkera alla"
+
+#: rapid/glade3/rapid.ui.h:21
+msgid "_Check All"
+msgstr "_Markera allt"
+
+#: rapid/glade3/rapid.ui.h:22
+msgid "_Clear Completed Downloads"
+msgstr "_Töm slutförda överföringar"
+
+#: rapid/glade3/rapid.ui.h:23
+msgid "_Download"
+msgstr "_Överför"
+
+#: rapid/glade3/rapid.ui.h:24
+msgid "_Error Log"
+msgstr "_Fellogg"
+
+#: rapid/glade3/rapid.ui.h:25
+msgid "_File"
+msgstr "_Arkiv"
+
+#: rapid/glade3/rapid.ui.h:26
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: rapid/glade3/rapid.ui.h:27
+msgid "_Include in download"
+msgstr "_Ta med i överföring"
+
+#: rapid/glade3/rapid.ui.h:28
+msgid "_Make a Donation..."
+msgstr "_Donera..."
+
+#: rapid/glade3/rapid.ui.h:29
+msgid "_Select"
+msgstr "_Markera"
+
+#: rapid/glade3/rapid.ui.h:30
+msgid "_Translate this Application..."
+msgstr "_Översätt programmet..."
+
+#: rapid/glade3/rapid.ui.h:31
+msgid "_Uncheck All"
+msgstr "_Avmarkera allt"
+
+#: rapid/glade3/rapid.ui.h:32
+msgid "_View"
+msgstr "_Visa"
+
+#: 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 " hh:mm"
 
-#: 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 "<b>Säkerhetskopia</b"
+msgstr "<b>Säkerhetskopia</b>"
 
-#: rapid/glade3/rapid.glade.h:6
+#: rapid/glade3/prefs.ui.h:5
 msgid "<b>Compatibility with Other Operating Systems</b>"
 msgstr "<b>Kompatibilitet med andra operativsystem</b>"
 
-#: rapid/glade3/rapid.glade.h:7
-msgid "<b>Devices</b>"
-msgstr "<b>Enheter</b>"
-
-#: rapid/glade3/rapid.glade.h:8
+#: rapid/glade3/prefs.ui.h:6
 msgid "<b>Download Folder</b>"
 msgstr "<b>Överföringskatalog</b>"
 
-#: rapid/glade3/rapid.glade.h:9
+#: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Subfolders</b>"
 msgstr "<b>Underkataloger till överföring</b>"
 
-#: rapid/glade3/rapid.glade.h:10
+#: rapid/glade3/prefs.ui.h:8
 msgid "<b>Example</b>"
 msgstr "<b>Exempel</b>"
 
-#: rapid/glade3/rapid.glade.h:11
+#: rapid/glade3/prefs.ui.h:9
 msgid "<b>Job Codes</b>"
 msgstr "<b>Fototillfällen</b>"
 
-#: rapid/glade3/rapid.glade.h:12
-msgid "<b>Missing Backup Devices</b>"
-msgstr "<b>Saknade enheter för säkerhetskopiering</b>"
-
-#: rapid/glade3/rapid.glade.h:13
+#: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Bildnamngivning</b>"
 
-#: rapid/glade3/rapid.glade.h:14
+#: rapid/glade3/prefs.ui.h:11
 msgid "<b>Photo and Video Name Conflicts</b>"
 msgstr "<b>Bild- och filmnamnkonflikter</b>"
 
-#: rapid/glade3/rapid.glade.h:15
+#: rapid/glade3/prefs.ui.h:12
 msgid "<b>Program Automation</b>"
 msgstr "<b>Automatisering av programmet</b>"
 
-#: rapid/glade3/rapid.glade.h:16
+#: rapid/glade3/prefs.ui.h:13
 msgid "<b>Sequence Numbers</b>"
 msgstr "<b>Sekvensnummer</b>"
 
-#: rapid/glade3/rapid.glade.h:17
+#: rapid/glade3/prefs.ui.h:14
 msgid "<i>/media/externaldrive/Photos</i>"
 msgstr "<i>/media/extern_enhet/Photos</i>"
 
-#: rapid/glade3/rapid.glade.h:18
+#: rapid/glade3/prefs.ui.h:15
 msgid "<i>Example: /home/user/Pictures</i>"
 msgstr "<i>Exempel: /home/user/Bilder</i>"
 
-#: rapid/glade3/rapid.glade.h:19
+#: rapid/glade3/prefs.ui.h:16
 msgid "<i>Example:</i>"
 msgstr "<i>Exempel:</i>"
 
-#: rapid/glade3/rapid.glade.h:20
+#: rapid/glade3/prefs.ui.h:17
 msgid "<i>New:</i>"
 msgstr "<i>Ny:</i>"
 
-#: rapid/glade3/rapid.glade.h:21
+#: rapid/glade3/prefs.ui.h:18
 msgid "<i>Original:</i>"
 msgstr "<i>Original:</i>"
 
-#: rapid/glade3/rapid.glade.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Automatisering</span>"
-
-#: rapid/glade3/rapid.glade.h:23
+#: rapid/glade3/prefs.ui.h:19
 msgid "<span weight=\"bold\" size=\"x-large\">Backup</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Säkerhetskopiering</span>\t"
 
-#: rapid/glade3/rapid.glade.h:24
+#: rapid/glade3/prefs.ui.h:20
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Enhetsinställningar</span>"
+
+#: rapid/glade3/prefs.ui.h:21
 msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Enheter</span>"
 
-#: rapid/glade3/rapid.glade.h:25
+#: rapid/glade3/prefs.ui.h:22
 msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Felhantering</span>"
 
-#: rapid/glade3/rapid.glade.h:26
+#: rapid/glade3/prefs.ui.h:23
 msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Fototillfällen</span>"
 
-#: rapid/glade3/rapid.glade.h:27
+#: rapid/glade3/prefs.ui.h:24
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Diverse</span>"
+
+#: rapid/glade3/prefs.ui.h:25
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Bildöverföringskataloger</span>"
 
-#: rapid/glade3/rapid.glade.h:28
+#: rapid/glade3/prefs.ui.h:26
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Bildnamngivning</span>\t"
 
-#: rapid/glade3/rapid.glade.h:29
+#: rapid/glade3/prefs.ui.h:27
 msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Alternativ för namnbyte</span>"
 
-#: rapid/glade3/rapid.glade.h:30
+#: rapid/glade3/prefs.ui.h:28
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Filmöverföringsmappar</span>"
 
-#: rapid/glade3/rapid.glade.h:31
+#: rapid/glade3/prefs.ui.h:29
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 msgstr "<span weight=\"bold\" size=\"x-large\">Filmnamngivning</span>\t"
 
-#: rapid/glade3/rapid.glade.h:32
+#: rapid/glade3/prefs.ui.h:30
 msgid "Add unique identifier"
 msgstr "Lägg till unik identifierare"
 
-#: rapid/glade3/rapid.glade.h:33
+#: rapid/glade3/prefs.ui.h:31
 msgid "Automatically detect Portable Storage Devices"
 msgstr "Hitta bärbara lagringsenheter automatiskt"
 
-#: rapid/glade3/rapid.glade.h:34
+#: rapid/glade3/prefs.ui.h:32
 msgid "Automatically detect backup devices"
 msgstr "Hitta enheter för säkerhetskopiering automatiskt"
 
-#: rapid/glade3/rapid.glade.h:35
+#: rapid/glade3/prefs.ui.h:33
 msgid "Automatically detect devices"
 msgstr "Hitta enheter automatiskt"
 
-#: rapid/glade3/rapid.glade.h:36
-msgid "Automation"
-msgstr "Automatisering"
-
-#: rapid/glade3/rapid.glade.h:37
+#: rapid/glade3/prefs.ui.h:34
 msgid "Backup"
 msgstr "Säkerhetskopiering"
 
-#: rapid/glade3/rapid.glade.h:38
-msgid "Backup location:"
-msgstr "Plats för säkerhetskopior:"
-
-#: rapid/glade3/rapid.glade.h:39
+#: rapid/glade3/prefs.ui.h:35
 msgid "Backup photos and videos when downloading"
 msgstr "Säkerhetskopiera bilder och filmer vid överföring"
 
-#: rapid/glade3/rapid.glade.h:40
+#: 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."
@@ -1639,7 +1618,7 @@ msgstr ""
 "Ange en katalog för överföring. Underkataloger kommer att skapas automatiskt "
 "enligt strukturen nedan."
 
-#: rapid/glade3/rapid.glade.h:41
+#: 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."
@@ -1647,195 +1626,190 @@ msgstr ""
 "Välj katalog för överföring. Underkataloger kommer att skapas automatiskt "
 "enligt inställningarna nedan."
 
-#: rapid/glade3/rapid.glade.h:42
-msgid ""
-"Choose whether to skip downloading the file, or to add a unique indentifier."
-msgstr "Välj om filen ska hoppas över, eller döpas om med ett unikt namn."
-
-#: rapid/glade3/rapid.glade.h:43
-msgid "Copyright Damon Lynch 2007-10"
-msgstr "Copyright Damon Lynch 2007-10"
-
-#: rapid/glade3/rapid.glade.h:44
+#: rapid/glade3/prefs.ui.h:38
 msgid "Day start:"
 msgstr "Början på dagen:"
 
-#: rapid/glade3/rapid.glade.h:45
+#: rapid/glade3/prefs.ui.h:39
 msgid "Delete photos and videos from device upon download completion"
 msgstr "Radera bilder och filmer från enheten när överföring är klar"
 
-#: rapid/glade3/rapid.glade.h:46
+#: rapid/glade3/prefs.ui.h:40
+msgid "Device Options"
+msgstr "Enhetsinställningar"
+
+#: rapid/glade3/prefs.ui.h:41
 msgid "Devices"
 msgstr "Enheter"
 
-#: rapid/glade3/rapid.glade.h:47
+#: 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 ""
-"Enheter kan du överföra bilder och filmer ifrån. Till exempel kameror, "
-"minneskort eller bärbara hårddiskar.\n"
+"Du kan överföra bilder och videor från kameror, minneskort eller externa "
+"enheter som t.ex hårddiskar.\n"
 "\n"
-"Du kan överföra bilder från flera enheter samtidigt, eller ange en plats på "
-"din hårddisk.\n"
+"Du kan överföra från flera enheter samtidigt, eller ange en plats på din "
+"hårddisk.\n"
 "\n"
-"<i>Om det fungerar dåligt eller inte alls att överföra bilder från din "
-"kamera, försök sätta den i PTP-läge. Om det inte är möjligt, överväg att "
-"skaffa en minneskortläsare.</i>"
-
-#: rapid/glade3/rapid.glade.h:52
-msgid "Download / Pause"
-msgstr "Överföring / Paus"
+"<i>Överföring direkt från kameror är en experimentell funktion. Om det "
+"fungerar dåligt eller inte alls, prova att aktivera PTP läge på din kamera. "
+"Om det ändå inte fungerar måste du använda en kortläsare.</i>"
 
-#: rapid/glade3/rapid.glade.h:53
+#: rapid/glade3/prefs.ui.h:47
 msgid "Download folder:"
 msgstr "Katalog för överföring:"
 
-#: rapid/glade3/rapid.glade.h:54
+#: rapid/glade3/prefs.ui.h:48
 msgid "Downloads today:"
 msgstr "Antal överföringar idag:"
 
-#: rapid/glade3/rapid.glade.h:55
+#: rapid/glade3/prefs.ui.h:49
 msgid "Error Handling"
 msgstr "Felhantering"
 
-#: rapid/glade3/rapid.glade.h:56
-msgid "Error Log"
-msgstr "Fellogg"
+#: rapid/glade3/prefs.ui.h:50
+msgid "Exit program even if download had warnings or errors"
+msgstr "Avsluta programmet även om fel eller varningar uppstod"
 
-#: rapid/glade3/rapid.glade.h:57
-msgid "Exit program if download completes without any warnings or errors"
-msgstr "Avsluta programmet om överföring sker utan fel"
+#: rapid/glade3/prefs.ui.h:51
+msgid "Exit program when download completes"
+msgstr "Avsluta programmet när överföring är klar"
 
-#: rapid/glade3/rapid.glade.h:58
-msgid "If you disable automatic detection, choose the exact backup location."
+#: rapid/glade3/prefs.ui.h:52
+msgid "Generate thumbnails (slower)"
+msgstr "Skapa miniatyrer (långsammare)"
+
+#: rapid/glade3/prefs.ui.h:53
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Om du avaktiverar automatisk sökning av enheter för säkerhetkopiering, ange "
-"istället en plats."
+"Om du inaktiverar automatisk sökning, ange exakt plats för säkerhetskopior."
 
-#: rapid/glade3/rapid.glade.h:59
+#: 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 ""
-"Om du avaktiverar automatisk sökning efter enheter, välj platsen där bilder "
-"och filmer finns."
+"Om du inaktiverar automatisk sökning, ange exakt plats för bilder och videor."
 
-#: rapid/glade3/rapid.glade.h:60
+#: 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 ""
-"Om du avaktiverar automatisk sökning av bärbara lagringsenheter, ange "
-"istället en plats."
-
-#: rapid/glade3/rapid.glade.h:61
-msgid "Ignore"
-msgstr "Ignorera"
+"Om du aktiverar sökning av externa enheter så kommer hela enheten att "
+"avsökas. På stora enheter kan det ta en stund.\n"
+"\n"
+"När denna inställning är påslagen och en potentiell enhet hittas, så kommer "
+"du att frågas om den ska avsökas eller ej."
 
-#: rapid/glade3/rapid.glade.h:62
-msgid "Import your photos and videos efficiently and reliably"
-msgstr "Överför dina bilder och filmer snabbt och enkelt"
+#: rapid/glade3/prefs.ui.h:58
+msgid "Ignored Paths"
+msgstr "Ignorerade sökvägar"
 
-#: rapid/glade3/rapid.glade.h:63
+#: rapid/glade3/prefs.ui.h:59
 msgid "Job Codes"
 msgstr "Fototillfällen"
 
-#: rapid/glade3/rapid.glade.h:64
+#: rapid/glade3/prefs.ui.h:60
 msgid "Location:"
 msgstr "Plats:"
 
-#: rapid/glade3/rapid.glade.h:65
+#: rapid/glade3/prefs.ui.h:61
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: rapid/glade3/prefs.ui.h:62
 msgid "Overwrite"
 msgstr "Ersätt"
 
-#: rapid/glade3/rapid.glade.h:66
+#: rapid/glade3/prefs.ui.h:63
+msgid "Performance"
+msgstr "Prestanda"
+
+#: rapid/glade3/prefs.ui.h:64
 msgid "Photo Folders"
 msgstr "Bildkataloger"
 
-#: rapid/glade3/rapid.glade.h:67
+#: rapid/glade3/prefs.ui.h:65
 msgid "Photo Rename"
 msgstr "Bildnamngivning"
 
-#: rapid/glade3/rapid.glade.h:68
+#: rapid/glade3/prefs.ui.h:66
 msgid "Photo backup folder name:"
 msgstr "Plats för säkerhetskopiering av bilder:"
 
-#: rapid/glade3/rapid.glade.h:69
+#: rapid/glade3/prefs.ui.h:67
+msgid "Photo backup location:"
+msgstr "Plats för säkerhetskopiering av bilder:"
+
+#: rapid/glade3/prefs.ui.h:68
 msgid "Preferences: Rapid Photo Downloader"
 msgstr "Inställningar: Rapid Photo Downloader"
 
-#: rapid/glade3/rapid.glade.h:71
+#: rapid/glade3/prefs.ui.h:70
 msgid "R_emove All"
 msgstr "_Ta bort alla"
 
-#: rapid/glade3/rapid.glade.h:73
+#: rapid/glade3/prefs.ui.h:72
+msgid "Re_move All"
+msgstr "Ta bo_rt alla"
+
+#: rapid/glade3/prefs.ui.h:73
+msgid "Remembered Paths"
+msgstr "Sparade sökvägar"
+
+#: rapid/glade3/prefs.ui.h:74
 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."
+"Remembered paths are those associated with devices that you have chosen to "
+"always scan or ignore when automatic detection of Portable Storage Devices "
+"is enabled."
 msgstr ""
-"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."
+"Sparade sökvägar är sådana som förknippas med enheter där du har valt att "
+"alltid avsöka eller ignorera, när automatisk avsökning är påslaget."
 
-#: rapid/glade3/rapid.glade.h:78
+#: rapid/glade3/prefs.ui.h:75
 msgid "Rename Options"
 msgstr "Inställningar för namnbyte"
 
-#: rapid/glade3/rapid.glade.h:79
-msgid "Report a warning"
-msgstr "Rapportera en varning"
-
-#: rapid/glade3/rapid.glade.h:80
-msgid "Report an error"
-msgstr "Rapportera ett fel"
-
-#: rapid/glade3/rapid.glade.h:81
+#: rapid/glade3/prefs.ui.h:76
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: rapid/glade3/rapid.glade.h:82
+#: rapid/glade3/prefs.ui.h:77
 msgid "Skip download"
 msgstr "Hoppa över överföring"
 
-#: rapid/glade3/rapid.glade.h:83
+#: 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 ""
-"Beklagar, överföring av filmer är avaktiverat. För att överföra filmer måste "
-"du installera <i>kaa metadata</i> paketet för Python."
+"Nedladdning av video är inaktiverat. För att kunna ladda ned videos, var "
+"vänlig att installera Python-paketen <i>hachoir</i> och <i>kaa</i>."
+
+#: rapid/glade3/prefs.ui.h:79
+msgid ""
+"Specify the ending portion of any paths you want ignored when scanning "
+"devices for photos or videos. Any path ending with the values below will not "
+"be scanned."
+msgstr "Ange namnändelse på sökvägar som du inte vill att de ska avsökas."
 
-#: rapid/glade3/rapid.glade.h:84
+#: rapid/glade3/prefs.ui.h:80
 msgid ""
 "Specify the folder in which backups are stored on the device.  \n"
 "\n"
@@ -1849,7 +1823,7 @@ msgstr ""
 "till säkerhetskopior. För varje enhet du vill använda till säkerhetskopior "
 "kan du skapa en mapp med ett av dessa namn.</i>"
 
-#: rapid/glade3/rapid.glade.h:87
+#: 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."
@@ -1857,21 +1831,7 @@ msgstr ""
 "Ange tiden i 24-timmarsformat då <i>Antal överföringar idag</i> ska "
 "nollställas."
 
-#: rapid/glade3/rapid.glade.h:88
-msgid ""
-"Specify what to do when a photo or video of the same name has already been "
-"downloaded or backed up."
-msgstr ""
-"Ange vad som ska ske när en bild eller film med samma namn redan har "
-"överförts till enheten."
-
-#: rapid/glade3/rapid.glade.h:89
-msgid "Specify what to do when there are no backup devices."
-msgstr ""
-"Ange vad som ska hända när det inte finns några enheter för "
-"säkerhetskopiering."
-
-#: rapid/glade3/rapid.glade.h:90
+#: 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."
@@ -1879,43 +1839,59 @@ msgstr ""
 "Ange om specialtecken som inte stöds av operativsystemet ska tas bort från "
 "filnamn."
 
-#: rapid/glade3/rapid.glade.h:91
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr "Börja överföring vid programstart"
 
-#: rapid/glade3/rapid.glade.h:92
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr "Påbörja överföring när enhet sätts i"
 
-#: rapid/glade3/rapid.glade.h:93
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr "Lagrat nummer:"
 
-#: rapid/glade3/rapid.glade.h:94
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr "Avlägsna inkompatibla tecken"
 
-#: rapid/glade3/rapid.glade.h:95
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr "Synkronisera RAW och JPEG-sekvensnummer"
 
-#: rapid/glade3/rapid.glade.h:96
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr "Mata ut och avmontera enheter när överföring är klar"
 
-#: rapid/glade3/rapid.glade.h:97
+#: rapid/glade3/prefs.ui.h:91
+msgid "Use _python-style regular expressions"
+msgstr "Använd Python-kompatibla reguljära uttryck"
+
+#: rapid/glade3/prefs.ui.h:92
 msgid "Video Folders"
 msgstr "Filmkataloger"
 
-#: rapid/glade3/rapid.glade.h:98
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr "Filmnamngivning"
 
-#: rapid/glade3/rapid.glade.h:99
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr "Katalog för säkerhetskopiering av film:"
 
-#: rapid/glade3/rapid.glade.h:100
+#: rapid/glade3/prefs.ui.h:95
+msgid "Video backup location:"
+msgstr "Plats för säkerhetskopiering av videor:"
+
+#: 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 ""
+"När en bild eller video med samma namn redan har överförts, välj om den ska "
+"skippas eller tilldelas ett unikt nummer."
+
+#: 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."
@@ -1923,7 +1899,7 @@ msgstr ""
 "Ange om filer som redan finns på enheten för säkerhetskopiering skall "
 "skrivas över, eller inte säkerhetskopieras."
 
-#: rapid/glade3/rapid.glade.h:101
+#: 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."
@@ -1931,53 +1907,29 @@ msgstr ""
 "Du kan säkerhetskopiera dina bilder och filmer till flera mål när de "
 "överförs, till exempel externa hårddiskar."
 
-#: rapid/glade3/rapid.glade.h:102
+#: rapid/glade3/prefs.ui.h:99
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: rapid/glade3/rapid.glade.h:103
-msgid "_Clear Completed Downloads"
-msgstr "_Töm slutförda överföringar"
-
-#: rapid/glade3/rapid.glade.h:104
-msgid "_Error Log"
-msgstr "_Fellogg"
-
-#: rapid/glade3/rapid.glade.h:105
-msgid "_Get Help Online..."
-msgstr "_Få hjälp online"
-
-#: rapid/glade3/rapid.glade.h:106
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: rapid/glade3/rapid.glade.h:107
-msgid "_Make a Donation..."
-msgstr "_Donera..."
-
-#: rapid/glade3/rapid.glade.h:108
-msgid "_Photos"
-msgstr "_Bilder"
-
-#: rapid/glade3/rapid.glade.h:109
-msgid "_Report a Problem..."
-msgstr "_Rapportera ett fel..."
-
-#: rapid/glade3/rapid.glade.h:110
-msgid "_Thumbnails"
-msgstr "_Miniatyrbilder"
+#: rapid/glade3/about.ui.h:1
+msgid "Import your photos and videos efficiently and reliably"
+msgstr "Överför dina bilder och filmer snabbt och enkelt"
 
-#: rapid/glade3/rapid.glade.h:111
-msgid "_Translate this Application..."
-msgstr "_Översätt programmet..."
+#~ msgid "Resetting value to zero.\n"
+#~ msgstr "Nollställer värde.\n"
 
-#: rapid/glade3/rapid.glade.h:112
-msgid "_View"
-msgstr "_Visa"
+#~ msgid "Resetting to midnight.\n"
+#~ msgstr "Nollställer till midnatt.\n"
 
 #~ msgid "Error in Image Rename preferences"
 #~ msgstr "Fel i inställningarna för bildnamnbyte"
 
+#~ msgid "Sorry,these preferences contain an error:\n"
+#~ msgstr "Följande inställningar innehåller fel:\n"
+
+#~ msgid "Resetting to default values."
+#~ msgstr "Återställer till standardvärde."
+
 #~ msgid "Error in Download Subfolder preferences"
 #~ msgstr "Fel i inställningar för överföring till underkataloger"
 
@@ -1998,6 +1950,17 @@ msgstr "_Visa"
 #~ "Inställningarna för underkataloger har ogiltiga värden.\n"
 #~ " Använder standardvärden."
 
+#~ msgid "There is an error in the program preferences."
+#~ msgstr "Det fanns ett fel i programinställningarna."
+
+#~ msgid ""
+#~ "\n"
+#~ "Please check preferences, restart the program, and try again."
+#~ msgstr ""
+#~ "\n"
+#~ "Var god kontrollera programinställningarna, starta om programmet, och försök "
+#~ "igen."
+
 #, python-format
 #~ msgid "0 of %s images copied"
 #~ msgstr "0 av %s bilder överförda"
@@ -2010,6 +1973,14 @@ msgstr "_Visa"
 #~ msgid "Image filename could not be generated"
 #~ msgstr "Kunde inte skapa ett filnamn för bild"
 
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Problem: %(problem)s"
+#~ msgstr ""
+#~ "Källa: %(source)s\n"
+#~ "Problem: %(problem)s"
+
 #~ msgid ""
 #~ "Image filename could not be properly generated. Check to ensure there is "
 #~ "sufficient image metadata."
@@ -2030,6 +2001,10 @@ msgstr "_Visa"
 #~ msgid "Could not open image"
 #~ msgstr "Kunde inte öppna bild"
 
+#, python-format
+#~ msgid "Source: %s"
+#~ msgstr "Källa: %s"
+
 #~ msgid "Image has no metadata"
 #~ msgstr "Bilden innehåller ingen metadata"
 
@@ -2058,12 +2033,35 @@ msgstr "_Visa"
 #~ "Bild: %(image)s\n"
 #~ "Problem: %(problem)s"
 
+#, python-format
+#~ msgid "Unique identifier '%s' added"
+#~ msgstr "Lade till unik indentifierare \"%s\""
+
+#~ msgid "New day has started - resetting 'Downloads Today' sequence number"
+#~ msgstr "Ny dag påbörjad - nollställer dagens överföringar"
+
+#~ msgid "Download copying error"
+#~ msgstr "Överföringsfel"
+
+#, python-format
+#~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Error: %(errorno)s %(strerror)s"
+#~ msgstr ""
+#~ "Källa: %(source)s\n"
+#~ "Mål: %(destination)s\n"
+#~ "Fel: %(errorno)s %(strerror)s"
+
 #~ msgid "The image was not copied."
 #~ msgstr "Bilden överfördes inte."
 
 #~ msgid "Backup image already exists"
 #~ msgstr "Bilden är redan säkerhetskopierad"
 
+#~ msgid "      "
+#~ msgstr "      "
+
 #~ msgid "Copyright Damon Lynch 2007-09"
 #~ msgstr "Copyright Damon Lynch 2007-09"
 
@@ -2088,6 +2086,16 @@ msgstr "_Visa"
 
 #, python-format
 #~ msgid ""
+#~ "Source: %(source)s\n"
+#~ "Destination: %(destination)s\n"
+#~ "Error: %(errno)s %(strerror)s"
+#~ msgstr ""
+#~ "Källa: %(source)s\n"
+#~ "Mål: %(destination)s\n"
+#~ "Fel: %(errno)s %(strerror)s"
+
+#, python-format
+#~ msgid ""
 #~ "Destination directory could not be created\n"
 #~ "%(directory)s\n"
 #~ "Error: %(errno)s %(strerror)s"
@@ -2096,6 +2104,9 @@ msgstr "_Visa"
 #~ "%(directory)s\n"
 #~ "Fel: %(errno)s %(strerror)s"
 
+#~ msgid "The device can now be safely removed"
+#~ msgstr "Enheten kan nu avlägsnas säkert"
+
 #, python-format
 #~ msgid "%s images downloaded"
 #~ msgstr "%s bilder överförda"
@@ -2103,6 +2114,12 @@ msgstr "_Visa"
 #~ msgid "Image overwritten"
 #~ msgstr "Skrev över bild"
 
+#~ msgid "errors"
+#~ msgstr "fel"
+
+#~ msgid "Backup device missing"
+#~ msgstr "Enhet för säkerhetskopiering saknas"
+
 #~ msgid "No backup device was detected."
 #~ msgstr "Ingen enhet för säkerhetskopiering hittades"
 
@@ -2112,6 +2129,10 @@ msgstr "_Visa"
 #~ msgid "Image has no thumbnail"
 #~ msgstr "Bilden saknar miniatyr"
 
+#, python-format
+#~ msgid "Download has started from %s"
+#~ msgstr "Överföringen startade vid %s"
+
 #~ msgid "Image already exists"
 #~ msgstr "Bilden finns redan"
 
@@ -2121,19 +2142,120 @@ msgstr "_Visa"
 #~ msgid "Thumbnail cannot be displayed"
 #~ msgstr "Kunde inte skapa miniatyr"
 
+#~ msgid "It may be corrupted"
+#~ msgstr "Den kan vara korrupt"
+
 #, python-format
 #~ msgid "%(number)s of %(total)s images copied"
 #~ msgstr "%(number)s av %(total)s bilder överförda"
 
+#, python-format
+#~ msgid "Download complete from %s"
+#~ msgstr "Överföring från %s är klart"
+
+#~ msgid "Warning:"
+#~ msgstr "Varning:"
+
+#~ msgid "Sorry, some preferences are invalid and will be reset."
+#~ msgstr ""
+#~ "Beklagar, några av inställningarna innehåller fel och kommer att återställas."
+
+#~ msgid ""
+#~ "Program preferences appear to be valid, but please check them to ensure "
+#~ "correct operation."
+#~ msgstr ""
+#~ "Inställningarna ser korrekta ut, men kontrollera dem för att vara säker."
+
+#~ msgid ""
+#~ "A newer version of this program was previously run on this computer.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "En nyare version av det här programmet har startats.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "This version of the program is newer than the previously run version. "
+#~ "Checking preferences."
+#~ msgstr ""
+#~ "Programmet är av en nyare version än tidigare, kontrollerar inställningar."
+
+#~ msgid "Some preferences will be reset."
+#~ msgstr "Några inställningar kommer att återställas"
+
+#~ msgid "Starting downloads"
+#~ msgstr "Påbörjar överföring"
+
+#~ msgid "No preferences needed to be changed."
+#~ msgstr "Inga inställningar behöver ändras."
+
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Your preferences have been updated.\n"
+#~ "\n"
+#~ "Please check them to ensure correct operation."
+#~ msgstr ""
+#~ "Denna versionen av programmet använder andra inställningar än äldre "
+#~ "versioner. Inställningarna har därför uppdaterats."
+
+#~ msgid "Preferences were modified."
+#~ msgstr "Inställningarna har ändrats."
+
+#~ msgid "Problem using pynotify."
+#~ msgstr "Ett problem uppstod vid användning av pynotify."
+
+#~ msgid ""
+#~ "This version of the program uses different preferences than the old version. "
+#~ "Some of your previous preferences were invalid, and could not be updated. "
+#~ "They will be reset."
+#~ msgstr ""
+#~ "Denna versionen av programmet använder andra inställningar än äldre "
+#~ "versioner. Några av inställningarna var felaktiga och kunde inte uppdateras. "
+#~ "De kommer därför att återställas."
+
+#~ msgid "Failed to receive pynotify server capabilities."
+#~ msgstr "Kunde inte ta emot serveregenskaper från pynotify."
+
+#~ msgid "Using manually specified path"
+#~ msgstr "Använder manuell sökväg"
+
+#, python-format
+#~ msgid "Detected %(device)s with path %(path)s"
+#~ msgstr "Hittade %(device)s med sökvägen %(path)s"
+
+#~ msgid "Automatically start download is false"
+#~ msgstr "Automatisk överföring är avaktiverad"
+
+#~ msgid "Automatically start download is true"
+#~ msgstr "Automatisk överföring är aktiverad"
+
 #~ msgid "images skipped"
 #~ msgstr "bilder skippade"
 
+#~ msgid "_Download "
+#~ msgstr "_Överför "
+
 #~ msgid "images downloaded"
 #~ msgstr "bilder överförda"
 
+#~ msgid "_Pause"
+#~ msgstr "_Paus"
+
+#~ msgid "Preferences were changed."
+#~ msgstr "Inställningar ändrades"
+
 #~ msgid "list image file extensions the program recognizes and exit"
 #~ msgstr "visa filändelser för bildformat som programmet hanterar och avsluta"
 
+#~ msgid "Goodbye"
+#~ msgstr "Farväl"
+
+#, python-format
+#~ msgid "%s is already running"
+#~ msgstr "%s körs redan"
+
+#~ msgid "Using"
+#~ msgstr "Använder"
+
 #~ msgid "Subsecond metadata not present in image"
 #~ msgstr "Metadata för sekunder finns inte i bilden"
 
@@ -2141,15 +2263,41 @@ msgstr "_Visa"
 #~ msgid "%s metadata is not present in image"
 #~ msgstr "%s metadata finns inte i bilden"
 
+#, python-format
+#~ msgid "Error in date time component. Value %s appears invalid"
+#~ msgstr "Fel i komponenten för datumtid. Värdet %s verkar ogiltigt"
+
 #~ msgid "extension was specified but image name has no extension"
 #~ msgstr "filändelse angavs men bilden saknar filändelse"
 
 #~ msgid "image number was specified but image filename has no number"
 #~ msgstr "Bildnummer angavs men filnamnet saknar nummer"
 
+#, python-format
+#~ msgid "error generating name with component %s"
+#~ msgstr "ett fel uppstod med komponenten %s"
+
+#~ msgid "These preferences are not well formed:"
+#~ msgstr "Följande inställningar är ogiltiga:"
+
+#, python-format
+#~ msgid "Preference value '%(value)s' is invalid"
+#~ msgstr "Inställningen '%(value)s' är ogiltig"
+
+#, python-format
+#~ msgid ""
+#~ "Preference key '%(key)s' is invalid.\n"
+#~ "Expected one of %(value)s"
+#~ msgstr ""
+#~ "Inställningen '%(key)s' är ogiltig.\n"
+#~ "Förväntat värde är något av %(value)s"
+
 #~ msgid "<b>Image Rename</b>"
 #~ msgstr "<b>Namnbyte av bilder</b>"
 
+#~ msgid "<b>Missing Backup Devices</b>"
+#~ msgstr "<b>Saknade enheter för säkerhetskopiering</b>"
+
 #~ msgid "<i>Example: /home/user/photos</i>"
 #~ msgstr "<i>Exempel: /home/user/photos</i>"
 
@@ -2159,6 +2307,9 @@ msgstr "_Visa"
 #~ msgid "<b>Image Devices</b>"
 #~ msgstr "<b>Bildenheter</b>"
 
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Automation</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Automatisering</span>"
+
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Image Devices</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Bildenheter</span>"
 
@@ -2171,6 +2322,12 @@ msgstr "_Visa"
 #~ msgid "Backup photos when downloading"
 #~ msgstr "Säkerhetskopiera bilder vid överföring"
 
+#~ msgid "Automation"
+#~ msgstr "Automatisering"
+
+#~ msgid "Backup location:"
+#~ msgstr "Plats för säkerhetskopior:"
+
 #~ msgid "Backup folder name:"
 #~ msgstr "Katalog för säkerhetskopiering:"
 
@@ -2189,20 +2346,74 @@ msgstr "_Visa"
 #~ msgid "Image location:"
 #~ msgstr "Bildplats:"
 
+#~ 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 ""
+#~ "Om du avaktiverar automatisk sökning av bärbara lagringsenheter, ange "
+#~ "istället en plats."
+
 #~ msgid "Image Devices"
 #~ msgstr "Bildenheter"
 
+#~ msgid "If you disable automatic detection, choose the exact backup location."
+#~ msgstr ""
+#~ "Om du avaktiverar automatisk sökning av enheter för säkerhetkopiering, ange "
+#~ "istället en plats."
+
 #~ msgid "Exit program after completion of successful download"
 #~ msgstr "Avsluta programmet efter lyckad överföring"
 
+#~ msgid "Ignore"
+#~ msgstr "Ignorera"
+
 #~ msgid ""
 #~ "If you disable automatic detection, choose the exact location of the images."
 #~ msgstr ""
 #~ "Om du avaktiverar automatisk sökning av bildenheter, ange istället en plats."
 
+#~ msgid "Error Log"
+#~ msgstr "Fellogg"
+
+#~ msgid "Report a warning"
+#~ msgstr "Rapportera en varning"
+
+#~ 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 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."
+
 #~ msgid "Import your images efficiently and reliably"
 #~ msgstr "Överför dina bilder snabbt och säkert"
 
+#~ msgid "Report an error"
+#~ msgstr "Rapportera ett fel"
+
 #~ msgid "Unmount (\"eject\") image device upon download completion"
 #~ msgstr "Mata ut enhet när överföring är klar"
 
@@ -2222,6 +2433,11 @@ msgstr "_Visa"
 #~ msgid "Start downloading upon image device insertion"
 #~ msgstr "Börja överföring vid inkoppling av enhet"
 
+#~ msgid "Specify what to do when there are no backup devices."
+#~ msgstr ""
+#~ "Ange vad som ska hända när det inte finns några enheter för "
+#~ "säkerhetskopiering."
+
 #~ msgid ""
 #~ "Specify whether image and folder names should have any characters removed "
 #~ "that are not allowed by other operating systems."
@@ -2229,6 +2445,12 @@ msgstr "_Visa"
 #~ "Ange om tecken i fil- eller katalognamn som inte stöds av andra "
 #~ "operativsystem ska avlägsnas."
 
+#~ msgid "_Report a Problem..."
+#~ msgstr "_Rapportera ett fel..."
+
+#~ msgid "_Photos"
+#~ msgstr "_Bilder"
+
 #~ msgid ""
 #~ "When backing up, choose whether to overwrite an image on the backup device "
 #~ "that has the same name, or skip backing it up."
@@ -2243,9 +2465,30 @@ msgstr "_Visa"
 #~ "Du kan säkerhetskopiera bilder till flera platser när de överförs, t.ex. "
 #~ "externa hårddiskar."
 
+#~ msgid "_Get Help Online..."
+#~ msgstr "_Få hjälp online"
+
+#~ msgid "_Thumbnails"
+#~ msgstr "_Miniatyrbilder"
+
+#~ msgid "Invalid Downloads Today value.\n"
+#~ msgstr "Felaktigt värde för 'Antal överföringar idag'.\n"
+
+#~ msgid "'Start of day' preference value is corrupted.\n"
+#~ msgstr "Värdet på 'början på dagen' är korrupt\n"
+
 #~ msgid "Image Rename"
 #~ msgstr "Namnbyte"
 
+#~ msgid "Starting downloads that have been waiting for a Job Code"
+#~ msgstr "Påbörjar överföringar som har väntat på fototillfälle"
+
+#~ msgid "Job Code entered"
+#~ msgstr "Ett fototillfälle angavs"
+
+#~ msgid "Prompting for Job Code"
+#~ msgstr "Frågar om fototillfälle"
+
 #, python-format
 #~ msgid "Device scan complete: no images found on %s"
 #~ msgstr "Avsökning av enhet klar: hittade inga bilder på enheten %s"
@@ -2277,69 +2520,36 @@ msgstr "_Visa"
 #~ msgid "Should this device or partition be used to download images from?"
 #~ msgstr "Vill du överföra bilder från den här enheten eller partitionen?"
 
+#~ msgid "Job Code not entered"
+#~ msgstr "Inget fototillfälle angivet"
+
 #, python-format
-#~ msgid "Image: %(source)s"
-#~ msgstr "Bild: %(source)s"
+#~ msgid "%s selected for downloading from"
+#~ msgstr "%s bilder valda för överföring från"
 
-#~ msgid "Could not delete image from image device"
-#~ msgstr "Kunde inte radera bilder från bildenhet"
+#~ msgid "This device or partition will always be used to download from"
+#~ msgstr "Bilder kommer alltid att överföras från denna enhet"
 
 #, python-format
-#~ msgid ""
-#~ "Image: %(source)s\n"
-#~ "Error: %(errno)s %(strerror)s"
-#~ msgstr ""
-#~ "Bild: %(source)s\n"
-#~ "Fel: %(errno)s %(strerror)s"
+#~ msgid "%s rejected as a download device"
+#~ msgstr "%s nekades som överföringsenhet"
 
-#, python-format
-#~ msgid "Deleted %i images from image device"
-#~ msgstr "Raderade %i bilder från bildenhet"
+#~ msgid "This device or partition will never be used to download from"
+#~ msgstr "Bilder kommer aldrig att överföras från denna enhet"
 
-#~ msgid "Delete images from image device upon download completion"
-#~ msgstr "Radera bilder från bildenhet när bildöverföring är färdig"
+#~ msgid "Enter a new job code, or select a previous one."
+#~ msgstr "Ange ett nytt fototillfälle, eller välj ett tidigare."
 
-#~ msgid ""
-#~ "Images detected with the same filenames, but taken at different times:"
-#~ msgstr "Hittade bilder med samma filnamn, men tagna vid olika tillfällen:"
+#~ msgid "Enter a new job code."
+#~ msgstr "Ange ett nytt fototillfälle."
 
 #, python-format
-#~ msgid ""
-#~ "First image: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Second image: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
-#~ msgstr ""
-#~ "Första bilden: %(image1)s %(image1_date_time)s:%(image1_subseconds)s\n"
-#~ "Andra bilden: %(image2)s %(image2_date_time)s:%(image2_subseconds)s"
+#~ msgid "Prompting whether to use %s"
+#~ msgstr "Frågar om %s ska användas"
 
-#, python-format
-#~ msgid "Image device: %s\n"
-#~ msgstr "Bildenhet: %s\n"
+#~ msgid "Already prompting for Job Code, do not prompt again"
+#~ msgstr "Visar redan fråga om fototillfälle, fråga inte igen"
 
 #, python-format
-#~ msgid ""
-#~ "Sorry, this image location does not exist:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Please resolve the problem, or modify your preferences."
-#~ msgstr ""
-#~ "Beklagar, men bildplatsen finns inte:\n"
-#~ "%(path)s\n"
-#~ "\n"
-#~ "Var vänlig lös problemet, eller ändra inställningarna."
-
-#~ msgid ""
-#~ "Sorry, the Download Folder exists but cannot be written to. Please check the "
-#~ "folder's permissions, or modify your preferences"
-#~ msgstr ""
-#~ "Beklagar, men det går inte att skriva till överföringskatalogen. Ändra "
-#~ "katalogens rättigheter eller inställningarna"
-
-#~ msgid ""
-#~ "Sorry, the Download Folder does not exist. Please create the folder, or "
-#~ "modify your preferences"
-#~ msgstr ""
-#~ "Beklagar, men överföringskatalogen finns inte. Skapa katalogen, eller ändra "
-#~ "inställningarna"
-
-#~ msgid "Problem with Image Location Folder"
-#~ msgstr "Problem med bildkatalogen"
+#~ msgid "Device %(device)s (%(path)s) ignored"
+#~ msgstr "Enhete %(device)s (%(path)s) ignorerades"
diff --git a/po/tr.po b/po/tr.po
index 637e3ab..db66864 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,55 +7,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"POT-Creation-Date: 2011-09-08 06:50-0500\n"
+"PO-Revision-Date: 2011-08-24 15:52+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\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: 2011-08-03 08:43+0000\n"
-"X-Generator: Launchpad (build 13573)\n"
+"X-Launchpad-Export-Date: 2011-09-19 19:06+0000\n"
+"X-Generator: Launchpad (build 13980)\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
+#: rapid/rapid.py:106 rapid/glade3/rapid.ui.h:14
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:110
+#: rapid/rapid.py:111
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:113
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:116
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
-#: rapid/rapid.py:149
+#: rapid/rapid.py:150
 msgid "Device"
 msgstr "Aygıt"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:166
+#: rapid/rapid.py:167
 msgid "Size"
 msgstr "Boyut"
 
-#: rapid/rapid.py:169
+#: rapid/rapid.py:170
 msgid "Download Progress"
 msgstr "İndirme Süreci"
 
-#: rapid/rapid.py:315
+#: rapid/rapid.py:316
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -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:1178
 msgid "scanning..."
 msgstr "taranıyor..."
 
-#: rapid/rapid.py:1989 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2077 rapid/glade3/rapid.ui.h:5
 msgid "Download"
 msgstr "İndir"
 
-#: rapid/rapid.py:1992
+#: rapid/rapid.py:2080
 msgid "Pause"
 msgstr "Duraklat"
 
-#: rapid/rapid.py:2093
+#: rapid/rapid.py:2181
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -84,7 +84,7 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2096
+#: rapid/rapid.py:2184
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -93,136 +93,136 @@ msgstr ""
 "Bu indirme klasörü geçersiz:\n"
 "%s"
 
-#: rapid/rapid.py:2097
+#: rapid/rapid.py:2185
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2386
+#: rapid/rapid.py:2490
 msgid "About 1 second remaining"
 msgstr "Yaklaşık 1 saniye kaldı"
 
-#: rapid/rapid.py:2388
+#: rapid/rapid.py:2492
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Yaklaşık %i saniye kaldı"
 
-#: rapid/rapid.py:2390
+#: rapid/rapid.py:2494
 msgid "About 1 minute remaining"
 msgstr "Yaklaşık 1 dakika kaldı"
 
 #. 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
+#: rapid/rapid.py:2499
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Yaklaşık %(minutes)i:%(seconds)02i dakika kaldı"
 
-#: rapid/rapid.py:2417 rapid/preferencesdialog.py:823 rapid/rpdfile.py:110
+#: rapid/rapid.py:2521 rapid/preferencesdialog.py:891 rapid/rpdfile.py:110
 msgid "photos and videos"
 msgstr "fotoğraflar ve videolar"
 
-#: rapid/rapid.py:2419 rapid/rpdfile.py:112
+#: rapid/rapid.py:2523 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
+#: rapid/rapid.py:2526 rapid/rapid.py:3103 rapid/rpdfile.py:115
 msgid "videos"
 msgstr "videolar"
 
-#: rapid/rapid.py:2424 rapid/preferencesdialog.py:1374 rapid/rpdfile.py:117
+#: rapid/rapid.py:2528 rapid/preferencesdialog.py:1616 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/rapid.py:2531 rapid/rapid.py:3101 rapid/preferencesdialog.py:893
 #: rapid/rpdfile.py:120
 msgid "photos"
 msgstr "fotoğraflar"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2429 rapid/preferencesdialog.py:1373 rapid/rpdfile.py:122
+#: rapid/rapid.py:2533 rapid/preferencesdialog.py:1615 rapid/rpdfile.py:122
 #: rapid/rpdfile.py:250
 msgid "photo"
 msgstr "fotoğraf"
 
-#: rapid/rapid.py:2456
+#: rapid/rapid.py:2560
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2460
+#: rapid/rapid.py:2564
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2463 rapid/rapid.py:2515
+#: rapid/rapid.py:2567 rapid/rapid.py:2619
 msgid "warnings"
 msgstr "uyarılar"
 
-#: rapid/rapid.py:2472
+#: rapid/rapid.py:2576
 msgid "All downloads complete"
 msgstr "Bütün yüklemeler tamamlandı"
 
-#: rapid/rapid.py:2478 rapid/rapid.py:2487 rapid/rapid.py:2496
-#: rapid/rapid.py:2505 rapid/rapid.py:2513
+#: rapid/rapid.py:2582 rapid/rapid.py:2591 rapid/rapid.py:2600
+#: rapid/rapid.py:2609 rapid/rapid.py:2617
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2480 rapid/rapid.py:2498
+#: rapid/rapid.py:2584 rapid/rapid.py:2602
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2489 rapid/rapid.py:2507
+#: rapid/rapid.py:2593 rapid/rapid.py:2611
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2546
+#: rapid/rapid.py:2650
 #, 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:2553
+#: rapid/rapid.py:2657
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:2935
+#: rapid/rapid.py:3071
 msgid "and"
 msgstr "ve"
 
-#: rapid/rapid.py:2940
+#: rapid/rapid.py:3076
 msgid "Using backup devices"
 msgstr "Yedekleme ünitelerini kullanma"
 
-#: rapid/rapid.py:2942
+#: rapid/rapid.py:3078
 msgid "Using backup device"
 msgstr "Yedekleme ünitesi kullanma"
 
-#: rapid/rapid.py:2944
+#: rapid/rapid.py:3080
 msgid "No backup devices detected"
 msgstr "Yedekleme ünitesi bulunamadı"
 
-#: rapid/rapid.py:2971
+#: rapid/rapid.py:3107
 msgid "Free space:"
 msgstr "Boş alan:"
 
 #. (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
+#: rapid/rapid.py:3119
 #, 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:2987
+#: rapid/rapid.py:3123
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -230,75 +230,87 @@ 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:2992
+#: rapid/rapid.py:3128
 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
+#: rapid/rapid.py:3133
 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
+#: rapid/rapid.py:3139
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
+#. user manually specified the same location for photos and video backups
+#: rapid/rapid.py:3147
+#, python-format
+msgid "Backing up photos and videos to %(path)s"
+msgstr ""
+
 #. user manually specified backup location
-#: rapid/rapid.py:3009
+#: rapid/rapid.py:3150
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
-#: rapid/rapid.py:3014
+#. user manually specified different locations for photo and video backups
+#: rapid/rapid.py:3153
+#, python-format
+msgid "Backing up photos to %(path)s and videos to %(path2)s"
+msgstr ""
+
+#: rapid/rapid.py:3160
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3043
+#: rapid/rapid.py:3189
 msgid "Program preferences are invalid"
 msgstr "Uygulama tercihleri geçersiz"
 
-#: rapid/rapid.py:3148 rapid/rpdfile.py:251
+#: rapid/rapid.py:3308 rapid/rpdfile.py:251
 msgid "Photo"
 msgstr "Fotoğraf"
 
-#: rapid/rapid.py:3150 rapid/rpdfile.py:271
+#: rapid/rapid.py:3310 rapid/rpdfile.py:271
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3159
+#: rapid/rapid.py:3319
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3161 rapid/rapid.py:3175 rapid/rapid.py:3188
+#: rapid/rapid.py:3321 rapid/rapid.py:3335 rapid/rapid.py:3348
 #, python-format
 msgid "Folder: %s"
 msgstr "Klasör: %s"
 
-#: rapid/rapid.py:3173
+#: rapid/rapid.py:3333
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3186
+#: rapid/rapid.py:3346
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3264
+#: rapid/rapid.py:3424
 msgid "Thumbnails"
 msgstr "Küçük resimler"
 
 #. 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
+#: rapid/rapid.py:3471
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -307,70 +319,70 @@ msgstr ""
 "Uygulama bilgilerini, uygulama çalışırken komut satırında göster(öntanımlı: "
 "%default)"
 
-#: rapid/rapid.py:3312
+#: rapid/rapid.py:3472
 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:3313
+#: rapid/rapid.py:3473
 msgid "only output errors to the command line"
 msgstr "sadece hataqları komut satırında göster"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3315
+#: rapid/rapid.py:3475
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3316
+#: rapid/rapid.py:3477
 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:3329
+#: rapid/rapid.py:3490
 msgid "Photos:"
 msgstr "Fotoğraflar:"
 
-#: rapid/rapid.py:3329
+#: rapid/rapid.py:3490
 msgid "Videos:"
 msgstr "Videolar:"
 
-#: rapid/rapid.py:3334
+#: rapid/rapid.py:3495
 #, python-format
 msgid "and %s"
 msgstr "ve %s"
 
-#: rapid/rapid.py:3342
+#: rapid/rapid.py:3503
 msgid "All settings and preferences have been reset"
 msgstr "Bütün uygulama ayarları ve tercihleri sıfırlandı"
 
-#: rapid/rapid.py:3351
+#: rapid/rapid.py:3521
 msgid ""
 "Video downloading functionality disabled.\n"
 "To download videos, please install the hachoir metadata and kaa metadata "
 "packages for python."
 msgstr ""
 
-#: rapid/backupfile.py:139 rapid/backupfile.py:162
+#: rapid/backupfile.py:142 rapid/backupfile.py:165
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:141
+#: rapid/backupfile.py:144
 #, python-format
 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:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:146 rapid/backupfile.py:166
+#: rapid/backupfile.py:149 rapid/backupfile.py:169
 #, python-format
 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"
@@ -392,7 +404,7 @@ msgstr ""
 msgid "_Remember this choice"
 msgstr ""
 
-#: rapid/downloadtracker.py:268
+#: rapid/downloadtracker.py:291
 msgid "MB/s"
 msgstr ""
 
@@ -417,7 +429,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 ""
 
@@ -762,92 +774,123 @@ 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 Paths?"
+msgstr ""
+
+#: rapid/preferencesdialog.py:439
+msgid "Should all remembered paths 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:1078
 msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:998
+#: rapid/preferencesdialog.py:1160
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1016
+#: rapid/preferencesdialog.py:1178
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1107
+#: rapid/preferencesdialog.py:1323
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1129
-#, python-format
-msgid "Select a folder in which to backup %(file_types)s"
+#: rapid/preferencesdialog.py:1349
+msgid "Select a folder in which to backup photos"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1362
+msgid "Select a folder in which to backup videos"
 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:1457
 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:1508
 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:1511
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1359
+#: rapid/preferencesdialog.py:1601
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -855,94 +898,114 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
+#: rapid/preferencesdialog.py:1746
+#, python-format
+msgid ""
+"The following regular expressions are invalid, and will be removed unless "
+"you correct them:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1748
+#, python-format
+msgid ""
+"This regular expression is invalid, and will be removed unless you correct "
+"it:\n"
+" %s"
+msgstr ""
+
+#: rapid/preferencesdialog.py:1749
+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:1931
 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:1933
 msgid "externaldrive2"
 msgstr ""
 
-#: rapid/prefsrapid.py:122
+#: rapid/prefsrapid.py:126
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Prague"
 msgstr "Prag"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:123
+#: rapid/prefsrapid.py:127
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Tehran"
 msgstr "Tahran"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Kampala"
 msgstr ""
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:124
+#: rapid/prefsrapid.py:128
 msgid "Sydney"
 msgstr "Sidney"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Budapest"
 msgstr "Budapeşte"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Moscow"
 msgstr "Moskova"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:125
+#: rapid/prefsrapid.py:129
 msgid "Warsaw"
 msgstr "Varşova"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:130
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. 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 ""
 
@@ -996,8 +1059,8 @@ msgstr ""
 #: 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."
+"%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
+"on %(image2_date)s at %(image2_time)s."
 msgstr ""
 
 #: rapid/problemnotification.py:103
@@ -1188,7 +1251,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 ""
 
@@ -1224,24 +1287,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 ""
@@ -1593,7 +1656,7 @@ msgid ""
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:58
-msgid "Ignored Paths\t"
+msgid "Ignored Paths"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:59
@@ -1645,13 +1708,14 @@ msgid "Re_move All"
 msgstr ""
 
 #: rapid/glade3/prefs.ui.h:73
-msgid "Remembered Devices"
+msgid "Remembered Paths"
 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."
+"Remembered paths are those associated with devices 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
@@ -1675,6 +1739,13 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:79
 msgid ""
+"Specify the ending portion of 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"
 "<i>Note: this will also be used to determine whether or not the device is "
@@ -1682,90 +1753,87 @@ msgid ""
 "a folder in it with one of these names.</i>"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:82
+#: 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:83
+#: 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:84
+#: rapid/glade3/prefs.ui.h:85
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:86
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:87
 msgid "Stored number:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:87
+#: rapid/glade3/prefs.ui.h:88
 msgid "Strip incompatible characters"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:88
+#: rapid/glade3/prefs.ui.h:89
 msgid "Synchronize RAW + JPEG sequence numbers"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:89
+#: rapid/glade3/prefs.ui.h:90
 msgid "Unmount (\"eject\") device upon download completion"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:90
+#: 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:91
+#: rapid/glade3/prefs.ui.h:93
 msgid "Video Rename"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:92
+#: rapid/glade3/prefs.ui.h:94
 msgid "Video backup folder name:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:93
+#: rapid/glade3/prefs.ui.h:95
 msgid "Video backup location:"
 msgstr ""
 
-#: rapid/glade3/prefs.ui.h:94
+#: 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:95
+#: 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:96
+#: 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:97
+#: rapid/glade3/prefs.ui.h:99
 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 ""
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
 #~ msgid "      "
 #~ msgstr "      "
diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index 06cdcf8..35cd727 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,27 +1,53 @@
 Version 0.4.2
 -------------
 
-2011-08-xx
+2011-10-01
 
-Added feature in Prefences window to remove any paths that have previously
+Added feature in Preferences 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. 
+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.
+You can now specify paths never to scan for photos or videos. By default, any 
+path ending in .Trash or .thumbnails is ignored.  Advanced users can specify
+paths to never scan using python-style regular expressions.
 
-Fixed bug #774488: added manual backup path for videos, in addition to photos.
+Fixed bug #774488: added manual backup path for videos, in addition to photos -
+
+You can now manually specify a path specifically in which to backup videos. This
+can be the same as or different than the path in which to backup photos.
+
+Fixed bug #838722: wrong file types may be backed up to external devices - 
+
+Fixed a bug when auto detection of backup devices is enabled, files of the wrong
+type might be backed up. For instance, if the backup device is only meant to 
+store videos, and the download contains photos, photos would incorrectly be
+backed up to the device in addition to videos.
+
+Fixed bug #815727: Backup errors and warnings incorrectly displayed in log 
+window -
+
+Fixed a bug that occurred when backing up errors are encountered, the log window
+did not display them correctly, although they were correctly outputted to the 
+terminal window. This only occurred when more than one backup device was being
+used during a download.
+
+Fixed bug #859242: Crash when displaying a preview of file without an extracted
+thumbnail.
+
+Fixed bug #810559: Crash when generating thumbnail images
 
 Fixed bug #789995: crash when --reset-settings option is given on the command 
 line.
 
-Fixed bug #795446: small error in translation template.
+Fixed bugs #795446 and #844714: small errors in translation template.
+
+Fixed a bug in the Swedish translation. 
 
-Updated Brazilian, Dutch, Français, German, Japanese, Polish, Russian, Spanish 
-and Turkish translations.
+Added Danish translation, by Torben Gundtofte-Bruun. Updated Brazilian, Czech,
+Dutch, French, German, Hungarian, Italian, Japanese, Norwegian, Polish, Russian, 
+Serbian, Slovak, Spanish, Swedish and Turkish translations.
 
 
 Version 0.4.1
@@ -32,7 +58,7 @@ Version 0.4.1
 Added exif Artist and Copyright metadata options to file and subfolder name
 generation.
 
-Fixed bug #774476: thumbnails occassionally not sorted by file modification
+Fixed bug #774476: thumbnails occasionally not sorted by file modification
 time.
 
 Fixed bug #784399: job code not prompted for after preference change.
@@ -52,7 +78,7 @@ Version 0.4.0
 
 2011-04-28
 
-Features added since Release Candiate 1:
+Features added since Release Candidate 1:
 
 * Allow multiple selection of files to check or uncheck for downloading.
 * Automation feature to delete downloaded files from a device.
@@ -200,7 +226,7 @@ download. It also performs the actual downloads quicker. It will use
 multiple CPU cores if they are available. 
 
 Rapid Photo Downloader now requires version 0.3.0 or newer of pyexiv2. It also
-requries Python Imaging (PIL) to run. It will only run on recent Linux
+requires Python Imaging (PIL) to run. It will only run on recent Linux
 distributions such as Ubuntu 10.04 or newer. It has been tested on Ubuntu 10.04,
 10.10 and 11.04, as well as Fedora 14. (There is currently an unusual bug 
 adjusting some preferences when running Ubuntu 11.04. See bug #739021).
@@ -236,7 +262,7 @@ Version 0.3.5
 
 2011-03-23
 
-The primrary purpose of this release is update translations and fix bug #714039,
+The primary purpose of this release is update translations and fix bug #714039,
 where under certain circumstances the program could crash while downloading 
 files. 
 
@@ -291,7 +317,7 @@ is that the video creation date is now correctly read (the creation time read by
 kaa metadata was sometimes wrong by a few hours). Kaa-metadata is still used to
 extract some the codec, fourcc and frames per second (FPS) metadata.
 
-Fixed bug #640722: Added preliminary support for Samusung SRW files. Current
+Fixed bug #640722: Added preliminary support for Samsung SRW files. Current
 versions of Exiv2 and pyexiv2 can read some but not all metadata from this new
 RAW format. If you try to use metadata that cannot be extracted, Rapid Photo 
 Downloader will issue a warning.
@@ -317,7 +343,7 @@ Version 0.3.2
 Added Norwegian Nynorsk translation. Updated Chinese, Finnish, Hungarian, Dutch, 
 Occitan (post 1500), Polish, Brazilian Portuguese, and Russian translations.
 
-Fixed crash on startup when checking for freespace, and the download folder does
+Fixed crash on startup when checking for free space, and the download folder does
 not exist.
 
 
@@ -330,7 +356,7 @@ The main window now works more effectively on tiny screens, such as those found
 on netbooks. If the screen height is less than or equal to 650 pixels, elements
 in the preview pane are removed, and the spacing is tightened.
 
-The amount of free space available on the filesystem where photos are to be
+The amount of free space available on the file-system where photos are to be
 downloaded is now displayed in the status bar. (Note this is only the case on
 moderately up-to-date Linux distributions that use GVFS, such as Ubuntu 8.10 or
 higher).
@@ -431,7 +457,7 @@ Don't stop a file being downloaded if a valid subfolder or filename can be
 generated using a Job Code.
 
 Bug fix: don't automatically exit if there were errors or warnings and a 
-download was occuring from more than one device.
+download was occurring from more than one device.
 
 Auto start now works correctly again.
 
@@ -560,7 +586,7 @@ system has, it must either be running pyexiv2 >= 0.2.0, or have exiv2 installed.
 
 Fixed bug #483222: sometimes images could not be downloaded to NTFS partitions.
 This fix was a welcome side effect of using GIO to copy images, instead of 
-relying on the python standard libary.
+relying on the python standard library.
 
 Error message headings in the Error Log are now displayed in a red font.
 
@@ -594,7 +620,7 @@ dialog window.
 Fixed bug #510484: Crashes when fails to create temporary download directory.
 
 Fixed bug #510516: Program now checks to see if the download folder exists and
-is writeable. If automatic detection of image devices is not enabled, it checks
+is writable. If automatic detection of image devices is not enabled, it checks
 to see if the image location path exists.
 
 Updated Czech, Dutch, Finnish, French, German, Hungarian, Italian, Polish, 
@@ -617,7 +643,7 @@ example, if 200 RAW images and 200 matching JPEG images are downloaded, the
 value of Downloads today will be incremented by 200, and not 400. The same goes 
 for the rest of the sequence values, including the Stored number sequence 
 number. Images are detected by comparing filename, as well as the exif value for
-the date and time the image was created (including subseconds when the camera 
+the date and time the image was created (including sub seconds when the camera 
 records this value). This option will take effect regardless of whether the RAW 
 and JPEG images are stored on different memory cards or the same memory card. 
 Furthermore, if they are stored on separate memory cards, you can download from 
@@ -773,7 +799,7 @@ to the documentation found online at the program's website. This documentation
 is now complete.
 
 The Preferences Dialog Window is now navigated using a list control, as it was
-in early versions of the program. This change was necesseary because with some
+in early versions of the program. This change was necessary because with some
 translations, the dialog window was becoming too wide with the normal tab 
 layout. Usability of the preferences dialog is improved: it will now resize 
 itself based on its content.
@@ -928,7 +954,7 @@ more helpful information is printed to the console output.
 Bug fix: better handle automated shortening Canon names like 'Canon 5D Mark II'.
 It is now shortened to '5DMkII' instead of merely '5D'.
 
-Bug fix: reenable example of image renaming and subfolder name generation by
+Bug fix: re-enable example of image renaming and subfolder name generation by
 using first image from the first available download device. This was
 inadvertently disabled in an earlier beta.
 
@@ -1001,7 +1027,7 @@ Version 0.0.8 beta 2
 
 2009-03-25
 
-First Ububtu package.
+First Ubuntu package.
 
 Rename tarball package to suit package name.
 
@@ -1046,7 +1072,7 @@ robust.
 Remove list control from preferences, reverting to normal tabbed preferences, 
 as the window was becoming too wide.
 
-Show notifcations via libnotify.
+Show notifications via libnotify.
 
 Error and warning icons can now be clicked on to open log window.
 
diff --git a/rapid/backupfile.py b/rapid/backupfile.py
index 6b6d11d..40039bc 100644
--- a/rapid/backupfile.py
+++ b/rapid/backupfile.py
@@ -31,6 +31,9 @@ import rpdfile
 import problemnotification as pn
 import config
 
+PHOTO_BACKUP = 1
+VIDEO_BACKUP = 2
+PHOTO_VIDEO_BACKUP = 3
 
 from gettext import gettext as _
 
@@ -149,7 +152,7 @@ class BackupFiles(multiprocessing.Process):
                 if backup_duplicate_overwrite:
                     flags = gio.FILE_COPY_OVERWRITE
                 else:
-                    flags = gio.FILE_COPY_NONE            
+                    flags = gio.FILE_COPY_NONE
                     
                 try:
                     source.copy(dest, self.progress_callback, flags, 
diff --git a/rapid/device.py b/rapid/device.py
index dcfdf94..423acdd 100644
--- a/rapid/device.py
+++ b/rapid/device.py
@@ -156,21 +156,5 @@ def is_DCIM_device(path):
     test_path = os.path.join(path, "DCIM")
     return utilities.is_directory(test_path)
     
-def is_backup_media(path, identifiers, writeable=True):
-    """  Test to see if path is used as a backup medium for storing photos or videos
-    
-    Identifiers is expected to be a list of folder names to check to see
-    if the path is a backup path. Only one of them needs to be present
-    for the path to be considered a backup medium.
-    
-    If writeable is True, the directory must be writeable by the user """
-    suitable = False
-    
-    for identifier in identifiers:
-        if os.path.isdir(os.path.join(path, identifier)):
-            if writeable:
-                suitable = os.access(os.path.join(path, identifier), os.W_OK)
-            else:
-                suitable = True
-    return suitable
+
 
diff --git a/rapid/downloadtracker.py b/rapid/downloadtracker.py
index 824a812..df48754 100644
--- a/rapid/downloadtracker.py
+++ b/rapid/downloadtracker.py
@@ -40,10 +40,16 @@ class DownloadTracker:
     def _refresh_values(self):
         """ these values are reset when a download is completed"""
         self.size_of_download_in_bytes_by_scan_pid = dict()
+        self.total_bytes_backed_up_by_scan_pid = dict()
+        self.size_of_photo_backup_in_bytes_by_scan_pid = dict()
+        self.size_of_video_backup_in_bytes_by_scan_pid = dict()
         self.raw_size_of_download_in_bytes_by_scan_pid = dict()
         self.total_bytes_copied_by_scan_pid = dict()
-        self.total_bytes_backed_up_by_scan_pid = dict()
+        self.total_bytes_video_backed_up_by_scan_pid = dict()
         self.no_files_in_download_by_scan_pid = dict()
+        self.no_photos_in_download_by_scan_pid = dict()
+        self.no_videos_in_download_by_scan_pid = dict()
+        
         
         # 'Download count' tracks the index of the file being downloaded
         # into the list of files that need to be downloaded -- much like
@@ -66,11 +72,30 @@ class DownloadTracker:
         self.backups_performed_by_unique_id = dict()
         self.auto_delete = dict()
         
-    def set_no_backup_devices(self, no_backup_devices):
-        self.no_backup_devices = no_backup_devices
+    def set_no_backup_devices(self, no_photo_backup_devices, no_video_backup_devices):
+        self.no_photo_backup_devices = no_photo_backup_devices
+        self.no_video_backup_devices = no_video_backup_devices
+        self.no_backup_devices = no_photo_backup_devices + no_video_backup_devices
+        
+    def get_no_backup_devices(self):
+        """
+        Returns how many devices are being used to backup files of each type
+        Return value is an integer tuple: photo and video
+        """
+        return (self.no_photo_backup_devices, self.no_video_backup_devices)
         
-    def init_stats(self, scan_pid, bytes, no_files):
+    def init_stats(self, scan_pid, photo_size_in_bytes, video_size_in_bytes, no_photos_to_download, no_videos_to_download):
+        no_files = no_photos_to_download + no_videos_to_download
         self.no_files_in_download_by_scan_pid[scan_pid] = no_files
+        self.no_photos_in_download_by_scan_pid[scan_pid] = no_photos_to_download
+        self.no_videos_in_download_by_scan_pid[scan_pid] = no_videos_to_download
+        self.size_of_photo_backup_in_bytes_by_scan_pid[scan_pid] = photo_size_in_bytes * self.no_photo_backup_devices
+        self.size_of_video_backup_in_bytes_by_scan_pid[scan_pid] = video_size_in_bytes * self.no_video_backup_devices
+        bytes = photo_size_in_bytes + video_size_in_bytes
+        # rename_chunk is used to account for the time it takes to rename a file
+        # it is arbitrarily set to 10% of the time it takes to copy it
+        # this makes a difference to the user when they're downloading from a 
+        # a high speed source
         self.rename_chunk[scan_pid] = bytes / 10 / no_files
         self.size_of_download_in_bytes_by_scan_pid[scan_pid] = bytes + self.rename_chunk[scan_pid] * no_files
         self.raw_size_of_download_in_bytes_by_scan_pid[scan_pid] = bytes
@@ -86,7 +111,6 @@ class DownloadTracker:
     def get_no_files_in_download(self, scan_pid):
         return self.no_files_in_download_by_scan_pid[scan_pid]
         
-        
     def get_no_files_downloaded(self, scan_pid, file_type):
         if file_type == FILE_TYPE_PHOTO:
             return self.photos_downloaded.get(scan_pid, 0)
@@ -119,9 +143,12 @@ class DownloadTracker:
         self.backups_performed_by_unique_id[unique_id] = \
                     self.backups_performed_by_unique_id.get(unique_id, 0) + 1
         
-    def all_files_backed_up(self, unique_id):
+    def all_files_backed_up(self, unique_id, file_type):
         if unique_id in self.backups_performed_by_unique_id:
-            return self.backups_performed_by_unique_id[unique_id] == self.no_backup_devices
+            if file_type == FILE_TYPE_PHOTO:
+                return self.backups_performed_by_unique_id[unique_id] == self.no_photo_backup_devices
+            else:
+                return self.backups_performed_by_unique_id[unique_id] == self.no_video_backup_devices
         else:
             logger.critical("Unexpected unique_id in self.backups_performed_by_unique_id")
             return True
@@ -155,14 +182,17 @@ class DownloadTracker:
         has been completed 
         """
         
-        # three components: copy (download), rename, and backup
+        # when calculating the percentage, there are three components: 
+        # copy (download), rename ('rename_chunk'), and backup
         percent_complete = (((float(
                   self.total_bytes_copied_by_scan_pid[scan_pid]) 
                 + self.rename_chunk[scan_pid] * self.files_downloaded[scan_pid])
                 + self.total_bytes_backed_up_by_scan_pid[scan_pid])
                 / (self.size_of_download_in_bytes_by_scan_pid[scan_pid] + 
-                   self.raw_size_of_download_in_bytes_by_scan_pid[scan_pid] * 
-                   self.no_backup_devices)) * 100
+                   self.size_of_photo_backup_in_bytes_by_scan_pid[scan_pid] +
+                   self.size_of_video_backup_in_bytes_by_scan_pid[scan_pid]
+                   )) * 100
+        
         return percent_complete
         
     def get_overall_percent_complete(self):
diff --git a/rapid/glade3/about.ui b/rapid/glade3/about.ui
index ef8a65b..3e59698 100644
--- a/rapid/glade3/about.ui
+++ b/rapid/glade3/about.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkAboutDialog" id="about">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -22,9 +21,13 @@ You should have received a copy of the GNU General Public License along with Rap
 Lőrincz András &lt;level.andrasnak@gmail.com&gt;
 Michel Ange &lt;michelange@wanadoo.fr&gt;
 Alain J. Baudrez &lt;a.baudrez@gmail.com&gt;
+Kevin Brubeck Unhammer &lt;unhammer@fsfe.org&gt;
 Bert &lt;crinbert@yahoo.com&gt;
 Martin Dahl Moe
+Marco de Freitas &lt;marcodefreitas@gmail.com&gt;
 Martin Egger &lt;martin.egger@gmx.net&gt;
+Emanuele Grande &lt;caccolangrifata@gmail.com&gt;
+Torben Gundtofte-Bruun &lt;torben@g-b.dk&gt;
 Miroslav Matejaš &lt;silverspace@ubuntu-hr.org&gt;
 Nicolás M. Zahlut &lt;nzahlut@live.com&gt;
 Erik M
@@ -49,12 +52,12 @@ Aron Xu &lt;happyaron.xu@gmail.com&gt;
     <property name="logo">rapid-photo-downloader.svg</property>
     <property name="wrap_license">True</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
diff --git a/rapid/glade3/about.ui.h b/rapid/glade3/about.ui.h
deleted file mode 100644
index 7c721a5..0000000
--- a/rapid/glade3/about.ui.h
+++ /dev/null
@@ -1 +0,0 @@
-char *s = N_("Import your photos and videos efficiently and reliably");
diff --git a/rapid/glade3/prefs.ui b/rapid/glade3/prefs.ui
index d5ff1e0..0a13978 100644
--- a/rapid/glade3/prefs.ui
+++ b/rapid/glade3/prefs.ui
@@ -2309,7 +2309,7 @@ When this option is enabled, and a potential device is detected, you will be pro
                                 <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="label" translatable="yes">Remembered paths are those associated with devices 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>
@@ -2454,7 +2454,7 @@ When this option is enabled, and a potential device is detected, you will be pro
                                 <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="label" translatable="yes">Specify the ending portion of 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>
@@ -2957,7 +2957,7 @@ When this option is enabled, and a potential device is detected, you will be pro
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="video_backup_location_label">
+                                  <object class="GtkLabel" id="backup_video_location_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
diff --git a/rapid/glade3/prefs.ui.h b/rapid/glade3/prefs.ui.h
deleted file mode 100644
index ef85be3..0000000
--- a/rapid/glade3/prefs.ui.h
+++ /dev/null
@@ -1,99 +0,0 @@
-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
deleted file mode 100644
index 7d5efa3..0000000
--- a/rapid/glade3/rapid.ui.h
+++ /dev/null
@@ -1,32 +0,0 @@
-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 ea66c8d..1509630 100644
--- a/rapid/preferencesdialog.py
+++ b/rapid/preferencesdialog.py
@@ -435,8 +435,8 @@ class RemoveAllJobCodeDialog(QuestionDialog):
 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?'),
+                                _('Remove all Remembered Paths?'),
+                                _('Should all remembered paths be removed?'),
                                 post_choice_callback)
     
 class RemoveAllIgnoredPathsDialog(QuestionDialog):
@@ -972,6 +972,10 @@ class PreferencesDialog():
         self.prefs.backup_location = widget.get_current_folder()
         self.update_backup_example()
         
+    def on_backup_video_folder_filechooser_button_selection_changed(self, widget):
+        self.prefs.backup_video_location = widget.get_current_folder()
+        self.update_backup_example()
+        
     def on_device_location_filechooser_button_selection_changed(self, widget):
         self.prefs.device_location = widget.get_current_folder()
         
@@ -1337,8 +1341,12 @@ class PreferencesDialog():
         
 
     def _setup_backup_tab(self):
+        """
+        Setup and configure backup tab 
+        """
+        #Manual backup location for photos file chooser
         self.backup_folder_filechooser_button = gtk.FileChooserButton(
-                            _("Select a folder in which to backup %(file_types)s") % {'file_types':self.file_types})
+                            _("Select a folder in which to backup photos"))
         self.backup_folder_filechooser_button.set_current_folder(
                             self.prefs.backup_location)
         self.backup_folder_filechooser_button.set_action(
@@ -1348,6 +1356,20 @@ class PreferencesDialog():
         self.backup_table.attach(self.backup_folder_filechooser_button,
                             3, 4, 8, 9, yoptions = gtk.SHRINK)
         self.backup_folder_filechooser_button.show()
+        
+        #Manual backup location for videos file chooser
+        self.backup_video_folder_filechooser_button = gtk.FileChooserButton(
+                            _("Select a folder in which to backup videos"))
+        self.backup_video_folder_filechooser_button.set_current_folder(
+                            self.prefs.backup_video_location)
+        self.backup_video_folder_filechooser_button.set_action(
+                            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
+        self.backup_video_folder_filechooser_button.connect("selection-changed", 
+                    self.on_backup_video_folder_filechooser_button_selection_changed)
+        self.backup_table.attach(self.backup_video_folder_filechooser_button,
+                            3, 4, 9, 10, yoptions = gtk.SHRINK)
+        self.backup_video_folder_filechooser_button.show()
+
         self.backup_identifier_entry.set_text(self.prefs.backup_identifier)
         self.video_backup_identifier_entry.set_text(self.prefs.video_backup_identifier)
         
@@ -1361,6 +1383,14 @@ class PreferencesDialog():
         self._backup_controls2 = [self.backup_location_label,
                                 self.backup_folder_filechooser_button,
                                 self.backup_location_explanation_label]
+                                
+        if metadatavideo.DOWNLOAD_VIDEO:
+            self._backup_controls2 += [self.backup_video_folder_filechooser_button,
+                                self.backup_video_location_label]
+        else:
+            self.backup_video_folder_filechooser_button.set_sensitive(False)
+            self.backup_video_location_label.set_sensitive(False)
+            
         self._backup_controls = self._backup_controls0 + self._backup_controls1 + \
                                 self._backup_controls2
                                 
diff --git a/rapid/prefsrapid.py b/rapid/prefsrapid.py
index 6fa5f74..080e6f9 100644
--- a/rapid/prefsrapid.py
+++ b/rapid/prefsrapid.py
@@ -101,6 +101,7 @@ class RapidPreferences(prefs.Preferences):
         "video_backup_identifier": prefs.Value(prefs.STRING, 
                                         get_default_backup_video_identifier()),
         "backup_location": prefs.Value(prefs.STRING, os.path.expanduser('~')),
+        "backup_video_location": prefs.Value(prefs.STRING, os.path.expanduser('~')),
         "strip_characters": prefs.Value(prefs.BOOL, True),
         "auto_download_at_startup": prefs.Value(prefs.BOOL, False),
         "auto_download_upon_device_insertion": prefs.Value(prefs.BOOL, False),
diff --git a/rapid/problemnotification.py b/rapid/problemnotification.py
index 6238847..95e31a4 100755
--- a/rapid/problemnotification.py
+++ b/rapid/problemnotification.py
@@ -99,7 +99,7 @@ problem_definitions = {
     BACKUP_DIRECTORY_CREATION:      (BACKUP_PROBLEM,         "%s", True),
     NO_DOWNLOAD_WAS_BACKED_UP:      (BACKUP_OK,              "%s", True),
     
-    SAME_FILE_DIFFERENT_EXIF:       (DIFFERENT_EXIF,        _("%(image1)s was taken at on %(image1_date)s at %(image1_time)s, and %(image2)s on %(image2_date)s at %(image2_time)s."), False),
+    SAME_FILE_DIFFERENT_EXIF:       (DIFFERENT_EXIF,        _("%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s on %(image2_date)s at %(image2_time)s."), False),
     FILE_ALREADY_DOWNLOADED:        (FILE_ALREADY_DOWN_CAT, _('%(filetype)s was already downloaded'), False),
 }
 
diff --git a/rapid/rapid.py b/rapid/rapid.py
index 237c843..db5bdc6 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -68,6 +68,7 @@ import scan as scan_process
 import copyfiles
 import subfolderfile
 import backupfile
+from backupfile import PHOTO_BACKUP, VIDEO_BACKUP, PHOTO_VIDEO_BACKUP
 
 import errorlog
 
@@ -890,9 +891,10 @@ class ThumbnailDisplay(gtk.IconView):
     def generate_thumbnails(self, scan_pid):
         """Initiate thumbnail generation for files scanned in one process
         """
-        rpd_files = [self.rpd_files[unique_id] for unique_id in self.process_index[scan_pid]]
-        thumbnail_pid = self.thumbnail_manager.add_task((scan_pid, rpd_files))
-        self.generating_thumbnails[scan_pid] = thumbnail_pid
+        if scan_pid in self.process_index:
+            rpd_files = [self.rpd_files[unique_id] for unique_id in self.process_index[scan_pid]]
+            thumbnail_pid = self.thumbnail_manager.add_task((scan_pid, rpd_files))
+            self.generating_thumbnails[scan_pid] = thumbnail_pid
     
     def _set_thumbnail(self, unique_id, icon):
         treerowref = self.treerow_index[unique_id]
@@ -991,7 +993,7 @@ class ThumbnailDisplay(gtk.IconView):
             self.rapid_app.update_preview_image(unique_id, preview_image)
             
             # user can turn off option for thumbnail generation after a scan
-            if unique_id not in self.thumbnails:
+            if unique_id not in self.thumbnails and preview_small is not None:
                 self._set_thumbnail(unique_id, preview_small.get_image())
                 
     
@@ -1229,6 +1231,7 @@ class BackupFilesManager(TaskManager):
                        terminate_queue, run_event):
         path = task[0]
         name = task[1]
+        backup_type = task[2]
         backup_files = backupfile.BackupFiles(path, name, self.batch_size, 
                                         task_process_conn, terminate_queue, 
                                         run_event)
@@ -1236,22 +1239,36 @@ class BackupFilesManager(TaskManager):
         self._processes.append((backup_files, terminate_queue, run_event, 
                                 task_results_conn))
         
-        self.backup_devices_by_path[path] = (task_results_conn, backup_files.pid)
+        self.backup_devices_by_path[path] = (task_results_conn, backup_files.pid,
+                                            backup_type)
         
         return backup_files.pid
         
     def backup_file(self, move_succeeded, rpd_file, path_suffix, 
                                                 backup_duplicate_overwrite):
+
+        if rpd_file.file_type == rpdfile.FILE_TYPE_PHOTO:
+            logger.debug("Backing up photo %s", rpd_file.download_name)
+        else:
+            logger.debug("Backing up video %s", rpd_file.download_name)
+
         for path in self.backup_devices_by_path:
-            task_results_conn = self.backup_devices_by_path[path][0]
-            task_results_conn.send((move_succeeded, rpd_file, path_suffix, 
+            backup_type = self.backup_devices_by_path[path][2]
+            if ((backup_type == PHOTO_VIDEO_BACKUP) or 
+                    (rpd_file.file_type == rpdfile.FILE_TYPE_PHOTO and backup_type == PHOTO_BACKUP) or
+                    (rpd_file.file_type == rpdfile.FILE_TYPE_VIDEO and backup_type == VIDEO_BACKUP)):
+                logger.debug("Backing up to %s", path)
+                task_results_conn = self.backup_devices_by_path[path][0]
+                task_results_conn.send((move_succeeded, rpd_file, path_suffix, 
                                     backup_duplicate_overwrite))
+            else:
+                logger.debug("Not backing up to %s", path)
             
-    def add_device(self, path, name):
+    def add_device(self, path, name, backup_type):
         """
         Convenience function to setup adding a backup device
         """
-        return self.add_task((path, name))
+        return self.add_task((path, name, backup_type))
     
     def remove_device(self, path):
         pid = self.backup_devices_by_path[path][1]
@@ -1643,10 +1660,10 @@ class RapidApp(dbus.service.Object):
     
     
     def _backup_device_name(self, path):
-        if self.backup_devices[path] is None:
+        if self.backup_devices[path][0] is None:
             name = path
         else:
-            name = self.backup_devices[path].get_name()
+            name = self.backup_devices[path][0].get_name()
         return name
         
     def start_device_scan(self, device):
@@ -1699,9 +1716,9 @@ class RapidApp(dbus.service.Object):
                             logger.info("%s ignored", mount.get_name())
                         else:
                             logger.info("Detected %s", mount.get_name())
-                            is_backup_mount = self.check_if_backup_mount(path)
+                            is_backup_mount, backup_file_type = self.check_if_backup_mount(path)
                             if is_backup_mount:
-                                self.backup_devices[path] = mount
+                                self.backup_devices[path] = (mount, backup_file_type)
                             elif (self.prefs.device_autodetection and 
                                  (dv.is_DCIM_device(path) or 
                                   self.search_for_PSD())):
@@ -1723,14 +1740,8 @@ class RapidApp(dbus.service.Object):
 
         if self.prefs.backup_images:
             if not self.prefs.backup_device_autodetection:
-                # user manually specified backup location
-                # will backup to this path, but don't need any volume info 
-                # associated with it
-                self.backup_devices[self.prefs.backup_location] = None
-                
-            for path in self.backup_devices:
-                name = self._backup_device_name(path)
-                self.backup_manager.add_device(path, name)
+                self._setup_manual_backup()
+            self._add_backup_devices()
                 
         self.update_no_backup_devices()
         
@@ -1760,6 +1771,38 @@ class RapidApp(dbus.service.Object):
         if not mounts:
             self.set_download_action_sensitivity()
         
+    def _setup_manual_backup(self):
+        """
+        Setup backup devices that the user has manually specified.
+        Depending on the folder the user has chosen, the paths for photo and
+        video backup will either be the same or they will differ.
+        """
+        # user manually specified backup locations
+        # will backup to these paths, but don't need any volume info 
+        # associated with them        
+        self.backup_devices[self.prefs.backup_location] = (None, PHOTO_BACKUP)
+        if DOWNLOAD_VIDEO:
+            if self.prefs.backup_location <> self.prefs.backup_video_location:
+                self.backup_devices[self.prefs.backup_video_location] = (None, VIDEO_BACKUP)
+                logger.info("Backing up photos to %s", self.prefs.backup_location)
+                logger.info("Backing up videos to %s", self.prefs.backup_video_location)
+            else:
+                # videos and photos are being backed up to the same location
+                self.backup_devices[self.prefs.backup_location] = (None, PHOTO_VIDEO_BACKUP)
+                logger.info("Backing up photos and videos to %s", self.prefs.backup_location)
+        else:
+            logger.info("Backing up photos to %s", self.prefs.backup_location)
+            
+    def _add_backup_devices(self):
+        """
+        Add each backup devices / path to backup manager
+        """
+        for path in self.backup_devices:
+            name = self._backup_device_name(path)
+            backup_type = self.backup_devices[path][1]
+            self.backup_manager.add_device(path, name, backup_type)
+        
+        
     def get_use_device(self, device):  
         """ Prompt user whether or not to download from this device """
         
@@ -1797,26 +1840,67 @@ class RapidApp(dbus.service.Object):
         """
         return self.prefs.device_autodetection_psd and self.prefs.device_autodetection
 
-    def check_if_backup_mount(self,  path):
+    def check_if_backup_mount(self, path):
         """
-        Checks to see if backups are enabled and path represents a valid backup location
+        Checks to see if backups are enabled and path represents a valid backup 
+        location. It must be writeable.
         
         Checks against user preferences.
+        
+        Returns a tuple:
+        (True, <backup-type> (one of PHOTO_VIDEO_BACKUP, PHOTO_BACKUP, or VIDEO_BACKUP)) or
+        (False, None) 
         """
-        identifiers = [self.prefs.backup_identifier]
-        if DOWNLOAD_VIDEO:
-            identifiers.append(self.prefs.video_backup_identifier)
         if self.prefs.backup_images:
             if self.prefs.backup_device_autodetection:
-                if dv.is_backup_media(path, identifiers):
-                    return True
+                # Determine if the auto-detected backup device is 
+                # to be used to backup only photos, or videos, or both.
+                # Use the presence of a corresponding directory to 
+                # determine this.
+                # The directory must be writable.
+                photo_path = os.path.join(path, self.prefs.backup_identifier)
+                p_backup = os.path.isdir(photo_path) and os.access(photo_path, os.W_OK)
+                if DOWNLOAD_VIDEO:
+                    video_path = os.path.join(path, self.prefs.video_backup_identifier)
+                    v_backup = os.path.isdir(video_path) and os.access(video_path, os.W_OK)
+                else:
+                    v_backup = False
+                if p_backup and v_backup:
+                    logger.info("Photos and videos will be backed up to %s", path)
+                    return (True, PHOTO_VIDEO_BACKUP)
+                elif p_backup:
+                    logger.info("Photos will be backed up to %s", path)
+                    return (True, PHOTO_BACKUP)
+                elif v_backup:
+                    logger.info("Videos will be backed up to %s", path)
+                    return (True, VIDEO_BACKUP)
             elif path == self.prefs.backup_location:
+                # user manually specified the path    
+                if os.access(self.prefs.backup_location, os.W_OK):
+                    return (True, PHOTO_BACKUP)
+            elif path == self.prefs.backup_video_location:
                 # user manually specified the path
-                return True
-        return False        
+                if os.access(self.prefs.backup_video_location, os.W_OK):
+                    return (True, VIDEO_BACKUP)
+        return (False, None)
 
     def update_no_backup_devices(self):
-        self.download_tracker.set_no_backup_devices(len(self.backup_devices))
+        self.no_photo_backup_devices = 0
+        self.no_video_backup_devices = 0
+        for path, value in self.backup_devices.iteritems():
+            backup_type = value[1]
+            if backup_type == PHOTO_BACKUP:
+                self.no_photo_backup_devices += 1
+            elif backup_type == VIDEO_BACKUP:
+                self.no_video_backup_devices += 1
+            else:
+                #both videos and photos are backed up to this device / path
+                self.no_photo_backup_devices += 1
+                self.no_video_backup_devices += 1
+        logger.info("# photo backup devices: %s; # video backup devices: %s", 
+                    self.no_photo_backup_devices, self.no_video_backup_devices)
+        self.download_tracker.set_no_backup_devices(self.no_photo_backup_devices, 
+                                                    self.no_video_backup_devices)
 
     def refresh_backup_media(self):
         """
@@ -1832,22 +1916,19 @@ class RapidApp(dbus.service.Object):
         self.backup_devices = {}
         if self.prefs.backup_images:
             if not self.prefs.backup_device_autodetection:
-                # user manually specified backup location
-                # will backup to this path, but don't need any volume info associated with it
-                self.backup_devices[self.prefs.backup_location] = None
+                self._setup_manual_backup()
             else:
                 for mount in self.vmonitor.get_mounts():
                     if not mount.is_shadowed():
                         path = mount.get_root().get_path()
                         if path:
-                            if self.check_if_backup_mount(path):
+                            is_backup_mount, backup_file_type = self.check_if_backup_mount(path)
+                            if is_backup_mount:
                                 # is a backup volume
                                 if path not in self.backup_devices:
-                                    self.backup_devices[path] = mount
+                                    self.backup_devices[path] = (mount, backup_file_type)
             
-            for path in self.backup_devices:
-                name = self._backup_device_name(path)
-                self.backup_manager.add_device(path, name)
+            self._add_backup_devices()
 
         self.update_no_backup_devices()
         self.display_free_space()
@@ -1880,13 +1961,13 @@ class RapidApp(dbus.service.Object):
                 logger.info("Device %(device)s (%(path)s) ignored" % {
                             'device': mount.get_name(), 'path': path})
             else:
-                is_backup_mount = self.check_if_backup_mount(path)
+                is_backup_mount, backup_file_type = self.check_if_backup_mount(path)
                             
                 if is_backup_mount:
                     if path not in self.backup_devices:
                         self.backup_devices[path] = mount
                         name = self._backup_device_name(path)
-                        self.backup_manager.add_device(path, name)
+                        self.backup_manager.add_device(path, name, backup_file_type)
                         self.update_no_backup_devices()
                         self.display_free_space()
 
@@ -2158,25 +2239,40 @@ class RapidApp(dbus.service.Object):
         """
         Initiate downloading and renaming of files
         """
-        
         # Check which file types will be downloaded for this particular process
-        if self.files_of_type_present(files, rpdfile.FILE_TYPE_PHOTO):
+        no_photos_to_download = self.files_of_type_present(files, 
+                                                    rpdfile.FILE_TYPE_PHOTO, 
+                                                    return_file_count=True)
+        if no_photos_to_download:
             photo_download_folder = self.prefs.download_folder
         else:
             photo_download_folder = None
             
-        if self.files_of_type_present(files, rpdfile.FILE_TYPE_VIDEO):
-            video_download_folder = self.prefs.video_download_folder
+        if DOWNLOAD_VIDEO:
+            no_videos_to_download = self.files_of_type_present(files, 
+                                        rpdfile.FILE_TYPE_VIDEO,
+                                        return_file_count=True)
+            if no_videos_to_download:
+                video_download_folder = self.prefs.video_download_folder
+            else:
+                video_download_folder = None
         else:
             video_download_folder = None
+            no_videos_to_download = 0
         
-        download_size = self.size_files_to_be_downloaded(files)
+        photo_download_size, video_download_size = self.size_files_to_be_downloaded(files)
         self.download_tracker.init_stats(scan_pid=scan_pid, 
-                                bytes=download_size,
-                                no_files=len(files))
+                                photo_size_in_bytes=photo_download_size, 
+                                video_size_in_bytes=video_download_size,
+                                no_photos_to_download=no_photos_to_download,
+                                no_videos_to_download=no_videos_to_download)
+        
+        
+        download_size = photo_download_size + video_download_size
         
         if self.prefs.backup_images:
-            download_size = download_size * (len(self.backup_devices) + 1)
+            download_size = download_size + ((self.no_photo_backup_devices * photo_download_size) +
+                                             (self.no_video_backup_devices * video_download_size))
             
         self.time_remaining.set(scan_pid, download_size)
         self.time_check.set_download_mark()
@@ -2276,10 +2372,6 @@ class RapidApp(dbus.service.Object):
         if rpd_file.status == config.STATUS_DOWNLOADED_WITH_WARNING:
             self.log_error(config.WARNING, rpd_file.error_title, 
                            rpd_file.error_msg, rpd_file.error_extra_detail)
-            self.error_title = ''
-            self.error_msg = ''
-            self.error_extra_detail = ''
-                           
                            
         if self.prefs.backup_images and len(self.backup_devices):
             if self.prefs.backup_device_autodetection:
@@ -2296,8 +2388,20 @@ class RapidApp(dbus.service.Object):
         else:
             self.file_download_finished(move_succeeded, rpd_file)
      
-     
+    
+    def multiple_backup_devices(self, file_type):
+        """Returns true if more than one backup device is being used for that
+        file type
+        """
+        return ((file_type == rpdfile.FILE_TYPE_PHOTO and 
+                 self.no_photo_backup_devices > 1) or
+                (file_type == rpdfile.FILE_TYPE_VIDEO and 
+                 self.no_video_backup_devices > 1))
+                                 
     def backup_results(self, source, condition):
+        """
+        Handle results sent from backup processes
+        """
         connection = self.backup_manager.get_pipe(source)
         conn_type, msg_data = connection.recv()
         if conn_type == rpdmp.CONN_PARTIAL:
@@ -2315,8 +2419,20 @@ class RapidApp(dbus.service.Object):
                 
             elif msg_type == rpdmp.MSG_FILE:
                 backup_succeeded, rpd_file = data
+                
+                # Only show an error message if there is more than one device
+                # backing up files of this type - if that is the case,
+                # do not want to reply on showing an error message in the 
+                # function file_download_finished, as it is only called once,
+                # when all files have been backed up
+                if not backup_succeeded and self.multiple_backup_devices(rpd_file.file_type):
+                    self.log_error(config.SERIOUS_ERROR, 
+                        rpd_file.error_title, 
+                        rpd_file.error_msg, rpd_file.error_extra_detail)
+                
                 self.download_tracker.file_backed_up(rpd_file.unique_id)
-                if self.download_tracker.all_files_backed_up(rpd_file.unique_id):
+                if self.download_tracker.all_files_backed_up(rpd_file.unique_id,
+                                                             rpd_file.file_type):
                     self.file_download_finished(backup_succeeded, rpd_file)
             return True
         else:
@@ -2324,10 +2440,13 @@ class RapidApp(dbus.service.Object):
 
     
     def file_download_finished(self, succeeded, rpd_file):
+        """
+        Called when a file has been downloaded i.e. copied, renamed, and backed up
+        """
         scan_pid = rpd_file.scan_pid
         unique_id = rpd_file.unique_id
         # Update error log window if neccessary
-        if not succeeded:
+        if not succeeded and not self.multiple_backup_devices(rpd_file.file_type):
             self.log_error(config.SERIOUS_ERROR, rpd_file.error_title, 
                            rpd_file.error_msg, rpd_file.error_extra_detail)
         elif self.prefs.auto_delete:
@@ -2340,7 +2459,7 @@ class RapidApp(dbus.service.Object):
                                                         rpd_file.file_type,
                                                         rpd_file.status)
                                                         
-        completed, files_remaining = self._update_file_download_device_progress(scan_pid, unique_id)
+        completed, files_remaining = self._update_file_download_device_progress(scan_pid, unique_id, rpd_file.file_type)
         
         if self.download_is_occurring():
             self.update_time_remaining()
@@ -2538,7 +2657,7 @@ class RapidApp(dbus.service.Object):
             self.display_summary_notification = False # don't show it again unless needed
       
         
-    def _update_file_download_device_progress(self, scan_pid, unique_id):
+    def _update_file_download_device_progress(self, scan_pid, unique_id, file_type):
         """
         Increments the progress bar for an individual device
         
@@ -2552,7 +2671,7 @@ class RapidApp(dbus.service.Object):
         file_types = self.download_tracker.get_file_types_present(scan_pid)
         completed = files_downloaded == files_to_download
         if completed and (self.prefs.backup_images and len(self.backup_devices)):
-            completed = self.download_tracker.all_files_backed_up(unique_id)
+            completed = self.download_tracker.all_files_backed_up(unique_id, file_type)
         
         if completed:
             files_remaining = self.thumbnails.get_no_files_remaining(scan_pid)
@@ -2649,6 +2768,11 @@ class RapidApp(dbus.service.Object):
         # related values in the preferences dialog window
         self.refresh_downloads_today = False
         
+        # these values are used to track the number of backup devices / 
+        # locations for each file type
+        self.no_photo_backup_devices = 0
+        self.no_video_backup_devices = 0
+        
         self.downloads_today_tracker = self.prefs.get_downloads_today_tracker()
         
         downloads_today = self.downloads_today_tracker.get_and_maybe_reset_downloads_today()
@@ -2669,6 +2793,7 @@ class RapidApp(dbus.service.Object):
         self.uses_session_sequece_no_value = Value(c_bool, self.prefs.any_pref_uses_session_sequece_no())
         self.uses_sequence_letter_value = Value(c_bool, self.prefs.any_pref_uses_sequence_letter_value())
         
+        self.check_prefs_upgrade(__version__)
         self.prefs.program_version = __version__
         
     def _check_for_sequence_value_use(self):
@@ -2676,6 +2801,33 @@ class RapidApp(dbus.service.Object):
         self.uses_session_sequece_no_value.value = self.prefs.any_pref_uses_session_sequece_no()
         self.uses_sequence_letter_value.value = self.prefs.any_pref_uses_sequence_letter_value()    
     
+    def check_prefs_upgrade(self, running_version):
+        """
+        Checks if the running version of the program is different from the 
+        version recorded in the preferences.
+        
+        If the version is different, the preferences are checked to see
+        whether they should be upgraded or not.
+        """
+        previous_version = self.prefs.program_version
+        if len(previous_version) > 0:
+            # the program has been run previously for this user
+        
+            pv = utilities.pythonify_version(previous_version)
+            rv = utilities.pythonify_version(running_version)
+        
+            if pv <> rv:
+                # 0.4.1 and below had only one manual backup location
+                # 0.4.2 introduced a distinct video back up location that can be manually set
+                # Therefore must duplicate the previous photo & video manual backup location into the 
+                # new video field, unless it has already been changed already.
+                
+                if pv < utilities.pythonify_version('0.4.2'):
+                    if self.prefs.backup_video_location == os.path.expanduser('~'):
+                        self.prefs.backup_video_location = self.prefs.backup_location
+                        logger.info("Migrated manual backup location preference to videos: %s", 
+                                    self.prefs.backup_video_location)
+    
     def on_preference_changed(self, key, value):
         """
         Called when user changes the program's preferences
@@ -2691,7 +2843,9 @@ class RapidApp(dbus.service.Object):
             if not self.preferences_dialog_displayed:
                 self.post_preference_change()
                 
-        elif key in ['backup_images', 'backup_device_autodetection', 'backup_location', 'backup_identifier', 'video_backup_identifier']:
+        elif key in ['backup_images', 'backup_device_autodetection', 
+                     'backup_location', 'backup_video_location', 
+                     'backup_identifier', 'video_backup_identifier']:
             self.rerun_setup_available_backup_media = True
             if not self.preferences_dialog_displayed:
                 self.post_preference_change()
@@ -2954,7 +3108,7 @@ class RapidApp(dbus.service.Object):
                 elif i == (v - 1) :
                     prefix = " " + _("and")  + " "
             i += 1
-            message = "%s%s'%s'" % (message,  prefix, self.backup_devices[b].get_name())
+            message = "%s%s'%s'" % (message,  prefix, self.backup_devices[b][0].get_name())
         
         if v > 1:
             message = _("Using backup devices") + " %s" % message
@@ -3025,8 +3179,18 @@ class RapidApp(dbus.service.Object):
             
         if self.prefs.backup_images: 
             if not self.prefs.backup_device_autodetection:
-                # user manually specified backup location
-                msg2 = _('Backing up to %(path)s') % {'path':self.prefs.backup_location}
+                if self.prefs.backup_location == self.prefs.backup_video_location:
+                    if DOWNLOAD_VIDEO:
+                        # user manually specified the same location for photos and video backups
+                        msg2 = _('Backing up photos and videos to %(path)s') % {'path':self.prefs.backup_location}
+                    else:
+                        # user manually specified backup location
+                        msg2 = _('Backing up to %(path)s') % {'path':self.prefs.backup_location}
+                else:
+                    # user manually specified different locations for photo and video backups
+                    msg2 = _('Backing up photos to %(path)s and videos to %(path2)s') % {
+                             'path':self.prefs.backup_location,
+                             'path2': self.prefs.backup_video_location}
             else:
                 msg2 = self.display_backup_mounts() 
                 
@@ -3070,25 +3234,39 @@ class RapidApp(dbus.service.Object):
     # Utility functions
     # # #
 
-    def files_of_type_present(self, files, file_type):
+    def files_of_type_present(self, files, file_type, return_file_count=False):
         """
         Returns true if there is at least one instance of the file_type
         in the list of files to be copied
+        
+        If return_file_count is True, then the number of files of that type
+        will be counted and returned instead of True or False
         """
+        i = 0
         for rpd_file in files:
             if rpd_file.file_type == file_type:
-                return True
-        return False
-        
+                if return_file_count:
+                    i += 1
+                else:
+                    return True
+        if not return_file_count:
+            return False
+        else:
+            return i
+                
     def size_files_to_be_downloaded(self, files):
         """
-        Returns the total size of the files to be downloaded in bytes
+        Returns the total sizes of the photos and videos to be downloaded in bytes
         """
-        size = 0
-        for i in range(len(files)):
-            size += files[i].size
+        photo_size = 0
+        video_size = 0
+        for rpd_file in files:
+            if rpd_file.file_type == rpdfile.FILE_TYPE_PHOTO:
+                photo_size += rpd_file.size
+            else:
+                video_size += rpd_file.size
 
-        return size
+        return (photo_size, video_size)
                                               
     def check_download_folder_validity(self, files_by_scan_pid):
         """
diff --git a/rapid/subfolderfile.py b/rapid/subfolderfile.py
index 4b6cca1..a80bc84 100644
--- a/rapid/subfolderfile.py
+++ b/rapid/subfolderfile.py
@@ -317,9 +317,9 @@ class SubfolderFile(multiprocessing.Process):
                             a = rpd_file.metadata.aperture()
                             if a == '0.0':
                                 fl = rpd_file.metadata["Exif.Photo.FocalLength"].value
-                                logger.info("Samyang lens - adjusting focal length and aperture... ")
+                                logger.info("Adjusting focal length and aperture for %s", rpd_file.full_file_name)
                                 #~ try:
-                                rpd_file.metadata["Exif.Photo.FocalLength"] = fractions.Fraction(14,1)
+                                rpd_file.metadata["Exif.Photo.FocalLength"] = fractions.Fraction(self.focal_length,1)
                                 rpd_file.metadata["Exif.Photo.FNumber"] = fractions.Fraction(8,1)
                                     #~ rpd_file.metadata.write(preserve_timestamps=True)
                                 #~ logger.info("...wrote new value")
diff --git a/rapid/thumbnail.py b/rapid/thumbnail.py
index 7a41e54..c987018 100644
--- a/rapid/thumbnail.py
+++ b/rapid/thumbnail.py
@@ -319,7 +319,7 @@ class GetPreviewImage(multiprocessing.Process):
         
     def get_stock_image(self, file_type):
         """
-        Get stock image for file type scaled to the current size of the 
+        Get stock image for file type scaled to the current size of the screen
         """
         if file_type == rpdfile.FILE_TYPE_PHOTO:
             if self.stock_photo_thumbnail_image is None:
@@ -337,7 +337,6 @@ class GetPreviewImage(multiprocessing.Process):
             if full_size_preview is None:
                 full_size_preview = self.get_stock_image(file_type)
             self.results_pipe.send((unique_id, full_size_preview, reduced_size_preview))
-            
 
 
 class GenerateThumbnails(multiprocessing.Process):