Merge tag 'upstream/0.4.5'

Upstream version 0.4.5
author: Julien Valroff <julien@kirya.net> 2012-06-26 20:47:28 +0200
committer: Julien Valroff <julien@kirya.net> 2012-06-26 20:47:28 +0200
commit: 70572245101637651d6e88fc323171205d6a7306 (patch)
tree: ef64c3789f70ff4b93a186beb766c94cba1cac7f
parent: 78bd370ebdbd4b69e25edb5825628d5b00865699 (diff)
parent: 2a794565f77005a753930023e41c7b696eaed6ac (diff)
15 files changed, 2194 insertions, 1840 deletions
diff --git a/PKG-INFO b/PKG-INFO
index 9d7179c..c77e051 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rapid-photo-downloader
-Version: 0.4.4
+Version: 0.4.5
 Summary: Rapid Photo Downloader for Linux
 Home-page: http://www.damonlynch.net/rapid
 Author: Damon Lynch
diff --git a/doc/rapid-photo-downloader.pod b/doc/rapid-photo-downloader.pod
index 9d88802..43a97f9 100644
--- a/doc/rapid-photo-downloader.pod
+++ b/doc/rapid-photo-downloader.pod
@@ -12,6 +12,9 @@ Options:
   -v, --verbose
   -q, --quiet
   -e, --extensions
+  --focal-length=FOCAL_LENGTH
+  -a, --auto-detect
+  -l PATH, --device-location=PATH
   --reset-settings
   
 =head1 DESCRIPTION
@@ -49,6 +52,20 @@ Only display output errors and warnings to the command line as the program runs.
 
 Displays image file extensions the program recognizes and exits.
 
+=item B<--focal-length=FOCAL_LENGTH>
+
+If an aperture value of 0.0 is encountered, the focal length metadata will be set to the 
+number passed, and its aperture metadata to f/8.
+
+=item B<-a, --auto-detect>
+
+Automatically detect devices from which to download, overwriting existing program preferences.
+
+=item B<-l PATH, --device-location=PATH>
+
+Manually specify the PATH of the device from which to download, overwriting existing program 
+preferences.
+
 =item B<--reset-settings>
 
 Resets all program settings and preferences to their default values and exits.
diff --git a/po/de.po b/po/de.po
index cd9047a..a7a8f87 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: 2012-01-30 14:43-0600\n"
-"PO-Revision-Date: 2012-01-13 15:36+0000\n"
-"Last-Translator: Dennis Baudys <Unknown>\n"
+"POT-Creation-Date: 2012-06-17 03:05-0500\n"
+"PO-Revision-Date: 2012-06-07 14:17+0000\n"
+"Last-Translator: Uwe Dulz <uwe.dulz@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-14 01:40+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 14:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:109 rapid/rapid.py:1753 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:116
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:122
 #, 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:154
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Laufwerk"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:172
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Grösse"
 
-#: rapid/rapid.py:175
+#: rapid/rapid.py:178
 msgid "Download Progress"
-msgstr "Fortschritt im Download"
+msgstr "Fortschritt beim Herunterladen"
 
-#: rapid/rapid.py:321
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s konnte nicht entfernt werden"
@@ -66,22 +66,22 @@ 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:1188
+#: rapid/rapid.py:1217
 msgid "scanning..."
 msgstr "Laufwerk wird durchsucht …"
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr "Stammverzeichnis des Dateisystems"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Herunterladen von %(location)s."
 
-#: rapid/rapid.py:1756
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +89,15 @@ msgstr ""
 "Wollen Sie wirklich von hier herunterladen? Auf manchen Systemen kann das "
 "Scannen dieses Ortes sehr lange dauern."
 
-#: rapid/rapid.py:2178
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Herunterladen"
 
-#: rapid/rapid.py:2181
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Anhalten"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2289
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,176 @@ msgstr ""
 "Dieses Download-Verzeichnis ist ungültig:\n"
 "%s"
 
-#: rapid/rapid.py:2290
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr "Der Download kann nicht weitergeführt werden"
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Etwa 1 Sekunde verbleibend"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Etwa %i Sekunden verbleibend"
 
-#: rapid/rapid.py:2661
+#: rapid/rapid.py:2704
 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:2666
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
-#: rapid/rapid.py:2688 rapid/rpdfile.py:115
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "BIlder und Filme"
 
-#: rapid/rapid.py:2690 rapid/rpdfile.py:117
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "Bilder oder Filme"
 
-#: rapid/rapid.py:2693 rapid/rapid.py:3506 rapid/rpdfile.py:120
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "Filme"
 
-#: rapid/rapid.py:2695 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:122
-#: rapid/rpdfile.py:271
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "Film"
 
-#: rapid/rapid.py:2698 rapid/rapid.py:3504 rapid/rpdfile.py:125
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "Bilder"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2700 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:127
-#: rapid/rpdfile.py:252
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#: rapid/rapid.py:2731
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s konnten nicht heruntergeladen werden"
 
-#: rapid/rapid.py:2734 rapid/rapid.py:2786
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "Warnungen"
 
-#: rapid/rapid.py:2743
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Alle Downloads sind abgeschlossen"
 
-#: rapid/rapid.py:2749 rapid/rapid.py:2758 rapid/rapid.py:2767
-#: rapid/rapid.py:2776 rapid/rapid.py:2784
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2751 rapid/rapid.py:2769
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s heruntergeladen"
 
-#: rapid/rapid.py:2760 rapid/rapid.py:2778
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, 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:2817
+#: rapid/rapid.py:2860
 #, 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:2824
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s von %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr "von"
 
-#: rapid/rapid.py:3178
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Auto-Erkennung"
 
-#: rapid/rapid.py:3182 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Wählen Sie einen Ordner welcher %(file_types)s enthält"
 
-#: rapid/rapid.py:3223
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Kopieren"
 
-#: rapid/rapid.py:3236
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Verschieben"
 
-#: rapid/rapid.py:3258
+#: rapid/rapid.py:3310
 msgid "To"
 msgstr "An"
 
-#: rapid/rapid.py:3265 rapid/rapid.py:3901
+#: rapid/rapid.py:3317 rapid/rapid.py:3985
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3268 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr "Wählen Sie ein Verzeichnis für den Download der Bilder"
 
-#: rapid/rapid.py:3280 rapid/rapid.py:3901
+#: rapid/rapid.py:3332 rapid/rapid.py:3985
 msgid "Videos:"
 msgstr "Filme:"
 
-#: rapid/rapid.py:3282 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr "Wählen Sie einen Ordner für den Download von Filmen"
 
-#: rapid/rapid.py:3474
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "und"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr "Die Sicherungslaufwerke werden verwendet"
 
-#: rapid/rapid.py:3481
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr "Das Sicherungslaufwerk wird verwendet"
 
-#: rapid/rapid.py:3483
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungslaufwerke gefunden"
 
-#: rapid/rapid.py:3510
+#: rapid/rapid.py:3562
 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:3522
+#: rapid/rapid.py:3574
 #, 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:3526
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,89 +294,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:3531
+#: rapid/rapid.py:3583
 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:3536
+#: rapid/rapid.py:3588
 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:3542
+#: rapid/rapid.py:3594
 #, 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:3550
+#: rapid/rapid.py:3602
 #, 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:3553
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sicherungskopieren in %(path)s erstellen"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3556
+#: rapid/rapid.py:3608
 #, 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:3563
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3592
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr "Die Benutzervoreinstellungen sind ungültig"
 
-#: rapid/rapid.py:3711 rapid/rpdfile.py:253
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Bild"
 
-#: rapid/rapid.py:3713 rapid/rpdfile.py:272
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3722
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s Download-Verzeichnis existiert nicht"
 
-#: rapid/rapid.py:3724 rapid/rapid.py:3738 rapid/rapid.py:3751
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr "Verzeichnis: %s"
 
-#: rapid/rapid.py:3736
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s Download-Verzeichnis ist ungültig"
 
-#: rapid/rapid.py:3749
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s Download-Verzeichnis ist schreibgeschützt"
 
-#: rapid/rapid.py:3835
+#: rapid/rapid.py:3894
 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:3882
+#: rapid/rapid.py:3948
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -385,45 +385,63 @@ msgstr ""
 "Zeige die Programminformationen an, wenn das Programm aus der Kommandozeile "
 "aufgerufen wurde  (Voreinstellung: %default)"
 
-#: rapid/rapid.py:3883
+#: rapid/rapid.py:3949
 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:3884
+#: rapid/rapid.py:3950
 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:3886
+#: rapid/rapid.py:3952
 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:3888
+#: rapid/rapid.py:3954
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3955
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3956
 msgid "reset all program settings and preferences and exit"
 msgstr "Alle Einstellungen auf Standardwerte zurücksetzten und beenden"
 
-#: rapid/rapid.py:3906
+#: rapid/rapid.py:3969
+msgid ""
+"Error: specify device auto-detection or manually specifiy a device's path "
+"from which to download, but do not do both."
+msgstr ""
+
+#: rapid/rapid.py:3990
 #, python-format
 msgid "and %s"
 msgstr "und %s"
 
-#: rapid/rapid.py:3914
+#: rapid/rapid.py:3998
 msgid "All settings and preferences have been reset"
 msgstr "Alle Einstellungen wurden zurückgesetzt"
 
-#: rapid/backupfile.py:156 rapid/backupfile.py:179
+#: rapid/backupfile.py:157 rapid/backupfile.py:180
 msgid "Backing up error"
 msgstr "Fehler beim Erstellen der Sicherungskopie"
 
-#: rapid/backupfile.py:158
+#: rapid/backupfile.py:159
 #, 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:160 rapid/backupfile.py:181 rapid/subfolderfile.py:198
+#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -432,13 +450,13 @@ msgstr ""
 "Quelle: %(source)s\n"
 "Ziel: %(destination)s"
 
-#: rapid/backupfile.py:163 rapid/backupfile.py:183
+#: rapid/backupfile.py:164 rapid/backupfile.py:184
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Fehler: %(inst)s"
 
-#: rapid/copyfiles.py:162 rapid/subfolderfile.py:213
-#: rapid/subfolderfile.py:346 rapid/subfolderfile.py:364
+#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
+#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -447,12 +465,12 @@ msgstr ""
 "%(problem)s\n"
 "Datei: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Laufwerk gefunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
@@ -460,488 +478,498 @@ msgstr ""
 "Filmen verwendet werden?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:107
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Auswahl merken"
 
-#: rapid/downloadtracker.py:298
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
-msgstr "Datum Zeit"
+msgstr "Datum Uhrzeit"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Text"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Dateiname"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sequenzen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Film Datum"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Heute"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Download-Zeit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Name + Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Name"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Erweiterung"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Film Nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Blende"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:175
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "ISO-Wert"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:177
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:179
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Brennweite"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:181
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Kamerahersteller"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:183
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:185
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Kameramodell (kurz)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Kameramodell (kurz, Bindestriche)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Seriennummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Anzahl der Auslösungen"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Dateinummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "nur Ordner"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Ordner und Datei"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Name des Eigentümers"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Breite"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Höhe"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Länge"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Bilder pro Sekunde"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Autor"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Copyright"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Downloads heute"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Sitzungsnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr "Nummer des Unterverzeichnisses"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Gespeicherte Nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Vorlaufender Buchstabe"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Alle Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Letzte Ziffer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Letzte 2 Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Letzte 3 Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Letze 4 Ziffern"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:229
 msgid "Original Case"
 msgstr "Ursprüngliche Schreibweise"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "GROSSBUCHSTABEN"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "kleinschreibung"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Eine Ziffer"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Zwei Ziffern"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Drei Ziffern"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Vier Ziffern"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Fünf Ziffern"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Sechs Ziffern"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Sieben Ziffern"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Hundertstelsekunden"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "JJJJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:245
+#: rapid/generatenameconfig.py:246
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:247
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "JJMMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:249
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "JJ-MM-TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:251
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MMTTJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:253
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MMTTJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:255
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "MMTT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:257
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "TTMMJJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:259
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "TTMMJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:261
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:263
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:265
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:267
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:269
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr "Monat (ausgeschrieben)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:272
+msgid "Month (abbreviated)"
+msgstr "Monat (abgekürzt)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:271
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:273
+#: rapid/generatenameconfig.py:278
 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:275
+#: rapid/generatenameconfig.py:280
 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:277
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:279
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr "MM (Minuten)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:281
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Die Unterverzeichnisvoreinstellungen sollten nicht mit %s beginnen"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Die Unterverzeichnisvoreinstellungen sollten nicht mit %s enden"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Die Unterverzeichnisvoreinstellungen sollten nicht zwei %s nacheinander "
 "enthalten"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Alle Auftragsbezeichnungen löschen?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Sollen alle Auftragsbezeichnungen gelöscht werden?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Alle gespeicherten Pfade löschen?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Sollen alle gespeicherten Pfade gelöscht werden?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Alle ignorierten Pfade löschen?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Sollen alle ignorierten Pfade gelöscht werden?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Fehler in den Vorgaben zur Umbennennung von Bildern"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Fehler in den Vorgaben zur Umbennennung von Filmen"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Fehler in den Vorgaben für Bilder-Downloadunterordner"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 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:739
+#: rapid/preferencesdialog.py:742
 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:755
+#: rapid/preferencesdialog.py:758
 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:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Geben Sie eine neue Auftragsbezeichung ein"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Auftragsbezeichnung:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Geben Sie einen Pfad ein, welcher ignoriert werden sollen"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 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:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Pfad:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1082
 msgid "Job Code"
 msgstr "Auftragsbezeichnung"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1353
 msgid "Select a folder in which to backup photos"
 msgstr ""
 "Wählen Sie den Order in welchem die Sicherkeitskopien der Bilder abgelegt "
 "werden"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1366
 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:1458
+#: rapid/preferencesdialog.py:1461
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -949,7 +977,7 @@ msgstr ""
 "<i><b>Warnung:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1512
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -959,13 +987,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:1512
+#: rapid/preferencesdialog.py:1515
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Beispiel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1605
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -976,7 +1004,7 @@ msgstr ""
 "und können nicht verwendet werden.\n"
 "Sie werden auf die Standardwerte zurückgesetzt."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1750
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -987,7 +1015,7 @@ msgstr ""
 "Sie sie nicht korrigieren:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1752
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -998,142 +1026,142 @@ msgstr ""
 "ihn nicht korrigieren:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1753
 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:1931
+#: rapid/preferencesdialog.py:1934
 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:1933
+#: rapid/preferencesdialog.py:1936
 msgid "externaldrive2"
 msgstr "ExternesLaufwerk2"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr "Prag"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Rom"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moskau"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Warschau"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
 msgid "subfolder"
 msgstr "Unterordner"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:355
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
 msgid "filename"
 msgstr "Dateiname"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:81
 #, python-format
 msgid "Date time value %s appears invalid."
-msgstr "Die Werte für Datum und Zeit %s scheinen ungültig zu sein."
+msgstr "Die Werte für Datum und Uhrzeit %s scheinen ungültig zu sein."
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:82
 msgid "Filename does not have an extension."
 msgstr "Der Dateinamen enthält keinen Dateitypen."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:84
 msgid "Filename does not have a number component."
 msgstr "Der Dateinamen enthält keine Zahlen."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Error generating component %s."
 msgstr "Fehler beim Erstellen von %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:87
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s Metadaten können nicht gelesen werden"
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s können nicht erstellt werden"
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Beim Kopieren von %(filetype)s ist ein Fehler aufgetreten"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s existiert bereits"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:98
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1142,7 +1170,7 @@ msgstr ""
 "Von %(filetype)s konnte keine Sicherungskopie erstellt werden, da kein "
 "entsprechenden Verzeichnis gefunden wurde."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:103
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1151,12 +1179,12 @@ msgstr ""
 "%(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
+#: rapid/problemnotification.py:104
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s wurde bereits heruntergeladen"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:108
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1165,29 +1193,29 @@ msgstr ""
 "Die existierende Datei %(filetype)s wurde zuletzt am %(date)s um %(time)s "
 "modifiziert. Eine eindeutige Kennung '%(identifier)s' wurde angefügt."
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:109
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 "Die existierende Datei %(filetype)s wurde zuletzt am %(date)s um %(time)s "
 "modifiziert."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:110
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 "Es existieren keine Daten um den Dateinamen zu erstellen %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:112
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Fehler: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:202
 msgid "The metadata might be corrupt."
 msgstr "Die Metadaten scheinen korrupt zu sein."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:205
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1195,28 +1223,28 @@ msgstr ""
 "Dateiname, Erweiterung und EXIF-Informationen zeigen an, dass das Bild schon "
 "heruntergeladen wurde."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:224
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Es wurde auf %(volume)s gesichert"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:226
 msgid " It was backed up to these devices: "
 msgstr " Es wurde auf diese Laufwerke gesichert: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
+#: rapid/problemnotification.py:302
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s und %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:241
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1225,195 +1253,200 @@ msgstr ""
 "Bilder mit identischen Dateinamen aber unterschiedlichen Aufnahmezeiten "
 "gefunden: %(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:258
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 "Ein Fehler trat auf beim beim Erstellen der Sicherungskopien auf Laufwerk "
 "%(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:260
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 "Ein Fehler trat auf beim beim Erstellen der Sicherungskopien auf Laufwerk "
 "%(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:262
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 "Fehler traten auf beim beim Erstellen der Sicherungskopien auf die folgenden "
 "Laufwerke: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:268
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s und %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:277
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s und %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:285
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Sicherungskopie existiert bereits auf %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:287
 msgid "Backups already exist in these locations: "
 msgstr "Sicherungskopien existieren bereits auf den folgenden Laufwerken: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:297
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sicherungskopie überschrieben auf %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:299
 msgid "Backups overwritten on these devices: "
 msgstr "Sicherungskopien überschrieben auf den folgenden Laufwerken: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:310
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "Fehler beim Erstellen der Verzeichnisse auf %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:312
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Fehler beim Erstellen der Verzeichnisse auf den folgenden "
 "Sicherungslaufwerken: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:323
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s zusätzlich, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:331
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Zustätzlich sind folgende Probleme aufgetreten %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:333
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Zustätzlich ist folgendes Problem aufgetreten %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:342
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Die %(type)s Metadaten fehlen."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:344
 msgid "The following metadata is missing: "
 msgstr "Die folgenden Metadaten fehlen: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 "%(missing_metadata_elements)s und %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:364
 msgid "Problems in subfolder and filename generation"
 msgstr "Probleme bei der Erstllung der Order und Dateinamen"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:366
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem bei der Erstllung der Order und Dateinamen"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:369
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Probleme bei der Erstllung von %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem bei der Erstllung von %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:380
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s existiert bereits, wurde aber gesichert"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:382
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "Beim kopieren von %(filetype)s, ist ein Fehler aufgetreten, es wurde aber "
 "gesichert"
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:402
 msgid "Multiple problems were encountered"
 msgstr "Mehrere Probleme sind aufgetreten"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:232
+#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 "Bilder mit gleichem Dateinamen aber unterschiedlichen Aufnahmezeiten gefunden"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:410
 msgid "there were errors backing up"
 msgstr "beim Erstellen der Sicherungskopieren sind Fehler aufgetreten"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:411
 msgid "There were errors backing up"
 msgstr "Beim Erstellen der Sicherungskopieren sind Fehler aufgetreten"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:413
 msgid "there was an error backing up"
 msgstr "beim Erstellen der Sicherungskopieren ist ein Fehler aufgetreten"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:414
 msgid "There was an error backing up"
 msgstr "Beim Erstellen der Sicherungskopieren ist ein Fehler aufgetreten"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:417
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, und %(backinguperror)s"
 
-#: rapid/rpdfile.py:141
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:300
+#: rapid/subfolderfile.py:301
 msgid "Photo has already been downloaded"
 msgstr "Das Bild wurde bereits heruntergeladen"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:302
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Quelle: %(source)s"
 
-#: rapid/subfolderfile.py:353
+#: rapid/subfolderfile.py:354
 msgid "subfolder and filename"
 msgstr "Unterordner und Dateiname"
 
-#: rapid/subfolderfile.py:392
+#: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
 msgstr "Der Download-Unterordner konnte nicht erstellt werden"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:394
 #, python-format
 msgid "Path: %s"
 msgstr "Pfad: %s"
@@ -1598,7 +1631,7 @@ msgid ""
 "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 "sequence number should be reset."
 msgstr ""
-"Geben Sie die Zeit im 24-Stunden Format an, wann die Sequenznummer in "
+"Geben Sie die Uhrzeit im 24-Stunden Format an, wann die Sequenznummer in "
 "<i>Downloads heute</i> zurückgesetzt werden soll."
 
 #: rapid/glade3/prefs.ui.h:25
diff --git a/po/et.po b/po/et.po
index 7181d3d..4dc0989 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,55 +7,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-01-30 14:43-0600\n"
-"PO-Revision-Date: 2012-04-18 09:26+0000\n"
-"Last-Translator: Tauno Erik <Unknown>\n"
+"POT-Creation-Date: 2012-06-17 03:05-0500\n"
+"PO-Revision-Date: 2012-06-20 18:05+0000\n"
+"Last-Translator: tabbernuk <boamaod@gmail.com>\n"
 "Language-Team: Estonian <et@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: 2012-05-14 01:41+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 14:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:109 rapid/rapid.py:1753 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid foto allalaadija"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:116
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:122
 #, 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:154
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Seade"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:172
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Maht"
 
-#: rapid/rapid.py:175
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr "Allalaadimise edenemine"
 
-#: rapid/rapid.py:321
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -64,36 +64,36 @@ 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:1188
+#: rapid/rapid.py:1217
 msgid "scanning..."
 msgstr "otsimine..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr ""
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:1756
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
 msgstr ""
 
-#: rapid/rapid.py:2178
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Laadi arvutisse"
 
-#: rapid/rapid.py:2181
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Peata"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -101,183 +101,183 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2289
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2290
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Umbes 1 sekund jäänud veel"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2661
+#: rapid/rapid.py:2704
 msgid "About 1 minute remaining"
-msgstr "Umbes 1 minutd jäänud veel"
+msgstr "Umbes 1 minut on veel jäänud"
 
 #. 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:2666
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2688 rapid/rpdfile.py:115
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "fotod ja videod"
 
-#: rapid/rapid.py:2690 rapid/rpdfile.py:117
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "fotod või videod"
 
-#: rapid/rapid.py:2693 rapid/rapid.py:3506 rapid/rpdfile.py:120
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "videod"
 
-#: rapid/rapid.py:2695 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:122
-#: rapid/rpdfile.py:271
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2698 rapid/rapid.py:3504 rapid/rpdfile.py:125
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "fotod"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2700 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:127
-#: rapid/rpdfile.py:252
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2731
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2734 rapid/rapid.py:2786
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "hoiatused"
 
-#: rapid/rapid.py:2743
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Kõik allalaadimised lõpetatud"
 
-#: rapid/rapid.py:2749 rapid/rapid.py:2758 rapid/rapid.py:2767
-#: rapid/rapid.py:2776 rapid/rapid.py:2784
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2751 rapid/rapid.py:2769
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2760 rapid/rapid.py:2778
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2817
+#: rapid/rapid.py:2860
 #, 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:2824
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:3178
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Automaattuvastus"
 
-#: rapid/rapid.py:3182 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:3223
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: rapid/rapid.py:3236
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Liiguta"
 
-#: rapid/rapid.py:3258
+#: rapid/rapid.py:3310
 msgid "To"
 msgstr "Sihtkoht"
 
-#: rapid/rapid.py:3265 rapid/rapid.py:3901
+#: rapid/rapid.py:3317 rapid/rapid.py:3985
 msgid "Photos:"
 msgstr "Fotod:"
 
-#: rapid/rapid.py:3268 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:3280 rapid/rapid.py:3901
+#: rapid/rapid.py:3332 rapid/rapid.py:3985
 msgid "Videos:"
 msgstr "Videod:"
 
-#: rapid/rapid.py:3282 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:3474
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "ja"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3481
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3483
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3510
+#: rapid/rapid.py:3562
 msgid "Free space:"
 msgstr "Vaba ruum:"
 
 #. (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:3522
+#: rapid/rapid.py:3574
 #, 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:3526
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -285,652 +285,680 @@ 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:3531
+#: rapid/rapid.py:3583
 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:3536
+#: rapid/rapid.py:3588
 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:3542
+#: rapid/rapid.py:3594
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3550
+#: rapid/rapid.py:3602
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:3553
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3556
+#: rapid/rapid.py:3608
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:3563
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3592
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3711 rapid/rpdfile.py:253
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3713 rapid/rpdfile.py:272
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3722
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3724 rapid/rapid.py:3738 rapid/rapid.py:3751
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3736
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3749
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3835
+#: rapid/rapid.py:3894
 msgid "Thumbnails"
 msgstr "Pisipildid"
 
 #. 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:3882
+#: rapid/rapid.py:3948
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3883
+#: rapid/rapid.py:3949
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3884
+#: rapid/rapid.py:3950
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3886
+#: rapid/rapid.py:3952
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3888
+#: rapid/rapid.py:3954
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3955
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3956
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:3906
+#: rapid/rapid.py:3969
+msgid ""
+"Error: specify device auto-detection or manually specifiy a device's path "
+"from which to download, but do not do both."
+msgstr ""
+
+#: rapid/rapid.py:3990
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:3914
+#: rapid/rapid.py:3998
 msgid "All settings and preferences have been reset"
 msgstr ""
 
-#: rapid/backupfile.py:156 rapid/backupfile.py:179
+#: rapid/backupfile.py:157 rapid/backupfile.py:180
 msgid "Backing up error"
 msgstr ""
 
-#: rapid/backupfile.py:158
+#: rapid/backupfile.py:159
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr ""
 
-#: rapid/backupfile.py:160 rapid/backupfile.py:181 rapid/subfolderfile.py:198
+#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
 #, python-format
 msgid ""
 "Source: %(source)s\n"
 "Destination: %(destination)s"
 msgstr ""
 
-#: rapid/backupfile.py:163 rapid/backupfile.py:183
+#: rapid/backupfile.py:164 rapid/backupfile.py:184
 #, python-format
 msgid "Error: %(inst)s"
 msgstr ""
 
-#: rapid/copyfiles.py:162 rapid/subfolderfile.py:213
-#: rapid/subfolderfile.py:346 rapid/subfolderfile.py:364
+#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
+#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
 #, python-format
 msgid ""
 "%(problem)s\n"
 "File: %(file)s"
 msgstr ""
 
-#: rapid/device.py:79
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Seade tuvastatud"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 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/device.py:107
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Mäleta seda valikut"
 
-#: rapid/downloadtracker.py:298
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr ""
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr ""
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr ""
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Faili nimi"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metaandmed"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr ""
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Pildi kuupäev"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Video kuupäev"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Täna"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 msgid "Yesterday"
 msgstr "Eile"
 
 #. Translators: Download time is the time and date that the download started (when the user clicked the Download button)
-#: rapid/generatenameconfig.py:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Allalaadimise aeg"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Nimi+laiend"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Nimi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Laiend"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Pildi number"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Video number"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Ava"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:175
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:177
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Säritusaeg"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:179
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Fookuskaugus"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:181
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:183
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Kaamera mudel"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:185
+#: rapid/generatenameconfig.py:186
 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:187
+#: rapid/generatenameconfig.py:188
 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:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Seerianumber"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Faili number"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Ainult kataloog"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Kataloog ja fail"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Omaniku nimi"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr ""
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Laius"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Kõrgus"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Kestvus"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr ""
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr ""
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 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:224
+#: rapid/generatenameconfig.py:225
 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:226
+#: rapid/generatenameconfig.py:227
 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:228
+#: rapid/generatenameconfig.py:229
 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:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr ""
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr ""
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr ""
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:245
+#: rapid/generatenameconfig.py:246
 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:247
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:249
+#: rapid/generatenameconfig.py:250
 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:251
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:253
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:255
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:257
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:259
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:261
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:263
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:265
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:267
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:269
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:272
+msgid "Month (abbreviated)"
+msgstr ""
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:271
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:273
+#: rapid/generatenameconfig.py:278
 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:275
+#: rapid/generatenameconfig.py:280
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:277
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:279
+#: rapid/generatenameconfig.py:284
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:281
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr ""
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr ""
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr ""
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 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:739
+#: rapid/preferencesdialog.py:742
 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:755
+#: rapid/preferencesdialog.py:758
 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:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1082
 msgid "Job Code"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1353
 msgid "Select a folder in which to backup photos"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1366
 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:1458
+#: rapid/preferencesdialog.py:1461
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1512
 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:1512
+#: rapid/preferencesdialog.py:1515
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr ""
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1605
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -938,7 +966,7 @@ msgid ""
 "They will be reset to their default values."
 msgstr ""
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1750
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -946,7 +974,7 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1752
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -954,397 +982,402 @@ msgid ""
 " %s"
 msgstr ""
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1753
 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:1931
+#: rapid/preferencesdialog.py:1934
 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:1933
+#: rapid/preferencesdialog.py:1936
 msgid "externaldrive2"
 msgstr ""
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr ""
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr ""
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr ""
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr ""
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr ""
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr ""
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr ""
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
 msgid "subfolder"
 msgstr ""
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:355
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
 msgid "filename"
 msgstr ""
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:81
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr ""
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:82
 msgid "Filename does not have an extension."
 msgstr ""
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:84
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Error generating component %s."
 msgstr ""
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:87
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr ""
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr ""
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr ""
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr ""
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:98
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 msgstr ""
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:103
 #, 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
+#: rapid/problemnotification.py:104
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr ""
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:108
 #, 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
+#: rapid/problemnotification.py:109
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:110
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr ""
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:112
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr ""
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:202
 msgid "The metadata might be corrupt."
 msgstr ""
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:205
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:224
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr ""
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:226
 msgid " It was backed up to these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
 #, python-format
 msgid "%s, "
 msgstr ""
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
+#: rapid/problemnotification.py:302
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:241
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:258
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:260
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:262
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr ""
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:268
 #, python-format
 msgid "%(volume)s, "
 msgstr ""
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr ""
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:277
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:285
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:287
 msgid "Backups already exist in these locations: "
 msgstr ""
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:297
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr ""
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:299
 msgid "Backups overwritten on these devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:310
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr ""
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:312
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:323
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr ""
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:331
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr ""
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:333
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr ""
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:342
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:344
 msgid "The following metadata is missing: "
 msgstr ""
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr ""
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:364
 msgid "Problems in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:366
 msgid "Problem in subfolder and filename generation"
 msgstr ""
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:369
 #, python-format
 msgid "Problems in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "Problem in %s generation"
 msgstr ""
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:380
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:382
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:402
 msgid "Multiple problems were encountered"
 msgstr ""
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:232
+#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
 msgid "Photos detected with the same filenames, but taken at different times"
 msgstr ""
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:410
 msgid "there were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:411
 msgid "There were errors backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:413
 msgid "there was an error backing up"
 msgstr ""
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:414
 msgid "There was an error backing up"
 msgstr ""
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:417
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#: rapid/rpdfile.py:141
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:300
+#: rapid/subfolderfile.py:301
 msgid "Photo has already been downloaded"
 msgstr ""
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:302
 #, python-format
 msgid "Source: %(source)s"
 msgstr ""
 
-#: rapid/subfolderfile.py:353
+#: rapid/subfolderfile.py:354
 msgid "subfolder and filename"
 msgstr ""
 
-#: rapid/subfolderfile.py:392
+#: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
 msgstr ""
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:394
 #, python-format
 msgid "Path: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index e7bfb41..b760975 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-11-20 13:25-0600\n"
-"PO-Revision-Date: 2011-11-21 16:59+0000\n"
+"POT-Creation-Date: 2012-06-23 04:00-0500\n"
+"PO-Revision-Date: 2012-06-22 15:28+0000\n"
 "Last-Translator: Marco Solari <marcosolari@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-28 07:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-06-25 00:48+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:107 rapid/rapid.py:1699 rapid/glade3/rapid.ui.h:14
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:112
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:122
 #, 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:152
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Dispositivo"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:170
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Dimensione"
 
-#: rapid/rapid.py:173
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr "Avanzamento del download"
 
-#: rapid/rapid.py:319
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s non si è smontato correttamente"
@@ -66,22 +66,22 @@ msgstr "%(device)s non si è smontato correttamente"
 #. 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:1186
+#: rapid/rapid.py:1216
 msgid "scanning..."
 msgstr "scansione in corso..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1697
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr "l'origine del file system"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1701
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Si scarica da %(location)s."
 
-#: rapid/rapid.py:1702
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +89,15 @@ msgstr ""
 "Si vuole davvero scaricare da qui? Su alcuni sistemi esaminare questa "
 "posizione può richiedere un tempo molto lungo"
 
-#: rapid/rapid.py:2124 rapid/glade3/rapid.ui.h:5
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:2127
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Sospendi"
 
-#: rapid/rapid.py:2228
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2231
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,176 @@ msgstr ""
 "Questa cartelle per il download non è valida:\n"
 "%s"
 
-#: rapid/rapid.py:2232
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr "Il download non può procedere"
 
-#: rapid/rapid.py:2559
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Circa 1 secondo rimanente"
 
-#: rapid/rapid.py:2561
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Circa %i secondi rimanenti"
 
-#: rapid/rapid.py:2563
+#: rapid/rapid.py:2704
 msgid "About 1 minute remaining"
 msgstr "Manca circa 1 minuto"
 
 #. Translators: in the text '%(minutes)i:%(seconds)02i', only the : should be translated, if needed.
 #. '%(minutes)i' and '%(seconds)02i' should not be modified or left out. They are used to format and display the amount
 #. of time the download has remainging, e.g. 'About 5:36 minutes remaining'
-#: rapid/rapid.py:2568
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Circa %(minutes)i:%(seconds)02i minuti rimanenti"
 
-#: rapid/rapid.py:2590 rapid/rpdfile.py:113
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "foto e video"
 
-#: rapid/rapid.py:2592 rapid/rpdfile.py:115
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "foto o video"
 
-#: rapid/rapid.py:2595 rapid/rapid.py:3408 rapid/rpdfile.py:118
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "video"
 
-#: rapid/rapid.py:2597 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:120
-#: rapid/rpdfile.py:254
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2600 rapid/rapid.py:3406 rapid/rpdfile.py:123
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "foto"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2602 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:125
-#: rapid/rpdfile.py:234
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "photo"
 
-#: rapid/rapid.py:2629
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s scaricati"
 
-#: rapid/rapid.py:2633
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Impossibile scaricare %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2636 rapid/rapid.py:2688
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "avvertenze"
 
-#: rapid/rapid.py:2645
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Tutti i download completati"
 
-#: rapid/rapid.py:2651 rapid/rapid.py:2660 rapid/rapid.py:2669
-#: rapid/rapid.py:2678 rapid/rapid.py:2686
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2653 rapid/rapid.py:2671
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s scaricati"
 
-#: rapid/rapid.py:2662 rapid/rapid.py:2680
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, 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:2719
+#: rapid/rapid.py:2860
 #, 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:2726
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s di %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3072
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr "Da"
 
-#: rapid/rapid.py:3080
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Rileva automaticamente"
 
-#: rapid/rapid.py:3084 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selezionare una cartella contenente %(file_types)s"
 
-#: rapid/rapid.py:3125
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Copia"
 
-#: rapid/rapid.py:3138
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Sposta"
 
-#: rapid/rapid.py:3160
+#: rapid/rapid.py:3310
 msgid "To"
 msgstr "A"
 
-#: rapid/rapid.py:3167 rapid/rapid.py:3796
+#: rapid/rapid.py:3317 rapid/rapid.py:3986
 msgid "Photos:"
 msgstr "Foto:"
 
-#: rapid/rapid.py:3170 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr "Selezionare una cartella in cui scaricare le foto"
 
-#: rapid/rapid.py:3182 rapid/rapid.py:3796
+#: rapid/rapid.py:3332 rapid/rapid.py:3986
 msgid "Videos:"
 msgstr "Video:"
 
-#: rapid/rapid.py:3184 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr "Selezionare una cartella in cui scaricare i video"
 
-#: rapid/rapid.py:3376
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "e"
 
-#: rapid/rapid.py:3381
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr "Si utilizzano dispositivi di backup"
 
-#: rapid/rapid.py:3383
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr "Si utilizza un dispositivo di backup"
 
-#: rapid/rapid.py:3385
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr "Non è stato rilevato nessun dispositivo di backup"
 
-#: rapid/rapid.py:3412
+#: rapid/rapid.py:3562
 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:3424
+#: rapid/rapid.py:3574
 #, 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:3428
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +294,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:3433
+#: rapid/rapid.py:3583
 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:3438
+#: rapid/rapid.py:3588
 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:3444
+#: rapid/rapid.py:3594
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s liberi"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3452
+#: rapid/rapid.py:3602
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Si salvano fotografie e video in %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3455
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Backup su %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3458
+#: rapid/rapid.py:3608
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Si salvano le fotografie in %(path)s ed i video in %(path2)s"
 
-#: rapid/rapid.py:3465
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3494
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr "Le preferenze del programma non sono valide"
 
-#: rapid/rapid.py:3613 rapid/rpdfile.py:235
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3615 rapid/rpdfile.py:255
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3624
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "la cartella di download %(file_type)s non esiste"
 
-#: rapid/rapid.py:3626 rapid/rapid.py:3640 rapid/rapid.py:3653
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr "Cartella: %s"
 
-#: rapid/rapid.py:3638
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "la cartella di download %(file_type)s non è valida"
 
-#: rapid/rapid.py:3651
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "la cartella di download %(file_type)s non è scrivibile"
 
-#: rapid/rapid.py:3729
+#: rapid/rapid.py:3894
 msgid "Thumbnails"
 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:3777
+#: rapid/rapid.py:3949
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,44 +383,66 @@ msgstr ""
 "visualizza informazioni sul programma sulla riga comando quando il programma "
 "è in esecuzione (default: %default)"
 
-#: rapid/rapid.py:3778
+#: rapid/rapid.py:3950
 msgid "display debugging information when run from the command line"
 msgstr "visualizza informazioni di debug quando eseguito dalla riga comando"
 
-#: rapid/rapid.py:3779
+#: rapid/rapid.py:3951
 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:3781
+#: rapid/rapid.py:3953
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "elenca le estensioni delle foto e dei video riconosciute dal programma ed "
 "esce"
 
-#: rapid/rapid.py:3783
+#: rapid/rapid.py:3955
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+"rileva automaticamente i dispositivi da cui scaricare, sovrascrivendo le "
+"preferenze di programma esistenti"
+
+#: rapid/rapid.py:3956
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+"specifica manualmente il PATH del dispositivo da cui scaricare, "
+"sovrascrivendo le preferenze di programma esistenti"
+
+#: rapid/rapid.py:3957
 msgid "reset all program settings and preferences and exit"
 msgstr "resetta tutte le impostazioni e preferenze del programma ed esce"
 
-#: rapid/rapid.py:3801
+#: rapid/rapid.py:3970
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+
+#: rapid/rapid.py:3991
 #, python-format
 msgid "and %s"
 msgstr "e %s"
 
-#: rapid/rapid.py:3809
+#: rapid/rapid.py:3999
 msgid "All settings and preferences have been reset"
 msgstr "Tutte le impostazioni e preferenze sono state resettate"
 
-#: rapid/backupfile.py:142 rapid/backupfile.py:165
+#: rapid/backupfile.py:157 rapid/backupfile.py:180
 msgid "Backing up error"
 msgstr "Errore durante il backup"
 
-#: rapid/backupfile.py:144
+#: rapid/backupfile.py:159
 #, 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:146 rapid/backupfile.py:167 rapid/subfolderfile.py:196
+#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -429,13 +451,13 @@ msgstr ""
 "Origine: %(source)s\n"
 "Destinazione: %(destination)s"
 
-#: rapid/backupfile.py:149 rapid/backupfile.py:169
+#: rapid/backupfile.py:164 rapid/backupfile.py:184
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Errore: %(inst)s"
 
-#: rapid/copyfiles.py:159 rapid/subfolderfile.py:211
-#: rapid/subfolderfile.py:352 rapid/subfolderfile.py:370
+#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
+#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -444,12 +466,12 @@ msgstr ""
 "%(problem)s\n"
 "File: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Dispositivo rilevato"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
@@ -457,483 +479,493 @@ msgstr ""
 "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
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Ricorda questa scelta"
 
-#: rapid/downloadtracker.py:298
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "Data e ora"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Testo"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Nome file"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadati"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Ordinamenti"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Codice lavoro"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Data dell'immagine"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Data del video"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "Oggi"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 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:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Tempo del download"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 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:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Estensione"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Numero immagine"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Numero video"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:175
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:177
+#: rapid/generatenameconfig.py:178
 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:179
+#: rapid/generatenameconfig.py:180
 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:181
+#: rapid/generatenameconfig.py:182
 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:183
+#: rapid/generatenameconfig.py:184
 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:185
+#: rapid/generatenameconfig.py:186
 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:187
+#: rapid/generatenameconfig.py:188
 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:189
+#: rapid/generatenameconfig.py:190
 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:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Contatore dell'otturatore"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Numero file"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Solo la cartella"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Cartella e file"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Nome del proprietario"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Codec"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Larghezza"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Altezza"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Lunghezza"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Fotogrammi per secondo"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Artista"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Diritti d'autore"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Download oggi"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 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:212
+#: rapid/generatenameconfig.py:213
 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:214
+#: rapid/generatenameconfig.py:215
 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:216
+#: rapid/generatenameconfig.py:217
 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:218
+#: rapid/generatenameconfig.py:219
 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:220
+#: rapid/generatenameconfig.py:221
 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:222
+#: rapid/generatenameconfig.py:223
 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:224
+#: rapid/generatenameconfig.py:225
 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:226
+#: rapid/generatenameconfig.py:227
 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:228
+#: rapid/generatenameconfig.py:229
 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:230
+#: rapid/generatenameconfig.py:231
 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:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "minuscolo"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Una cifra"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "Due cifre"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Quattro cifre"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Cinque cifre"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Sei cifre"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 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:241
+#: rapid/generatenameconfig.py:242
 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:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:245
+#: rapid/generatenameconfig.py:246
 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:247
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:249
+#: rapid/generatenameconfig.py:250
 msgid "YY-MM-DD"
 msgstr "AA-MM-DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:251
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:253
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:255
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:257
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:259
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:261
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:263
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:265
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:267
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:269
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr "Mese"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:272
+msgid "Month (abbreviated)"
+msgstr "Mese"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:271
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:273
+#: rapid/generatenameconfig.py:278
 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:275
+#: rapid/generatenameconfig.py:280
 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:277
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:279
+#: rapid/generatenameconfig.py:284
 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:281
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero iniziare con un %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Le preferenze sottocartella non dovrebbero terminare con un %s"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 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:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Elimina tutti i Codici Lavoro?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Occorre rimuovere tutti i Codici Lavoro?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Elimina tutti i Percorsi Memorizzati?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Occorre rimuovere tutti i percorsi memorizzati?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Si rimuovono tutti i percorsi ignorati?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Occorre rimuovere tutti i percorsi ignorati?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Errore nelle preferenze di Rinomina Foto"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Errore nelle preferenze di Rinomina Video"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Errore nelle preferenze di Scarica Sottocartelle Foto"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 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:739
+#: rapid/preferencesdialog.py:742
 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:755
+#: rapid/preferencesdialog.py:758
 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:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Inserire un nuovo Codice Lavoro"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Codice Lavoro:"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr "Inserire un persorco da ignorare"
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Specificare un percorso che non sarà mai esaminato per cercare fotografie e "
 "video"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Percorso:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1082
 msgid "Job Code"
 msgstr "Codice Lavoro"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1353
 msgid "Select a folder in which to backup photos"
 msgstr "Selezioanre un percorso in cui salvare le fotografie"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1366
 msgid "Select a folder in which to backup videos"
 msgstr "Selezioanre un percorso in cui salvare i video"
 
 #. 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:1458
+#: rapid/preferencesdialog.py:1461
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -942,7 +974,7 @@ msgstr ""
 "completamente il nome. Si prega di utilizzare altre opzioni per la "
 "rinomina.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1512
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -952,13 +984,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:1512
+#: rapid/preferencesdialog.py:1515
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Esempio: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1605
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -969,7 +1001,7 @@ msgstr ""
 "non possono essere utilizzate.\n"
 "Saranno reimpostate ai loro valori di default."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1750
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -980,7 +1012,7 @@ msgstr ""
 "meno che non vengano corrette:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1752
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -991,142 +1023,142 @@ msgstr ""
 "venga corretta:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1753
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
 #. Translators: this value is used as an example device when automatic backup device detection is enabled. You should translate this.
-#: rapid/preferencesdialog.py:1931
+#: rapid/preferencesdialog.py:1934
 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:1933
+#: rapid/preferencesdialog.py:1936
 msgid "externaldrive2"
 msgstr "driveesterno1"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr "Praga"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Parigi"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr "Berlino"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sidney"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Mosca"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Varsavia"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Giacarta"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Stoccolma"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:363
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
 msgid "subfolder"
 msgstr "sottocartella"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:361
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
 msgid "filename"
 msgstr "nome del file"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:81
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Il valore del tempo %s sembra essere non valido"
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:82
 msgid "Filename does not have an extension."
 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
+#: rapid/problemnotification.py:84
 msgid "Filename does not have a number component."
 msgstr "Il nome del file non ha una componente numerica."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Error generating component %s."
 msgstr "Errore nel generare la componente %s."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:87
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "i metadati %(filetype)s non sono leggibili"
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s non può essere generato"
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "Si è verificato un errore durante la copia di %(filetype)s"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s esiste già"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:98
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1135,7 +1167,7 @@ msgstr ""
 "Non si può effettuare il backup di %(filetype)s in quanto non è stata "
 "travata nessuna posizione adatta."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:103
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1144,12 +1176,12 @@ msgstr ""
 "%(image1)s è stata scattata il %(image1_date)s alle %(image1_time)s, e "
 "%(image2)s il %(image2_date)s alle %(image2_time)s."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:104
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s è stato già scaricato"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:108
 #, python-format
 msgid ""
 "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
@@ -1158,26 +1190,26 @@ msgstr ""
 "La data di ultima modifica dei %(filetype)s esistenti è %(date)s alle "
 "%(time)s. E' stato aggiunto l'identificatoe univoco '%(identifier)s'."
 
-#: rapid/problemnotification.py:108
+#: rapid/problemnotification.py:109
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr "Il %(filetype)s è stato modificato il %(date)s alle %(time)s."
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:110
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
 msgstr "Non ci sono dati con cui nominare i %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:112
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Errore: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:202
 msgid "The metadata might be corrupt."
 msgstr "I metadata potrebbero essere corrotti."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:205
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
@@ -1185,28 +1217,28 @@ msgstr ""
 "Il nome del file, l'estensione e le informazioni Exif indicano che è già "
 "stato scaricato."
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:224
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " È stato effettuato il backup su %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:226
 msgid " It was backed up to these devices: "
 msgstr " È stato effettuato il backup su questi di dispositivi: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
+#: rapid/problemnotification.py:302
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s e %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:241
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
@@ -1215,497 +1247,465 @@ msgstr ""
 "Sono state rilevato foto con lo stesso nome del file, ma scattate in ore "
 "differenti: %(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:258
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "Si è verificato un errore salvando su %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:260
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "Si è verificato un errore salvando su %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:262
 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
+#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:268
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s e %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:277
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s e %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:285
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Il backup esiste già su %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:287
 msgid "Backups already exist in these locations: "
 msgstr "Il backup esiste già in queste posizioni: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:297
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Salvataggio sovrascritto su %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:299
 msgid "Backups overwritten on these devices: "
 msgstr "Salvataggi sovrascritti su questi dispositivi: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:310
 #, 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
+#: rapid/problemnotification.py:312
 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
+#: rapid/problemnotification.py:323
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s Inoltre, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:331
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Inoltre, si è verificato %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:333
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Inoltre, si è verificato un %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:342
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Il %(type)s metadata è mancante."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:344
 msgid "The following metadata is missing: "
 msgstr "I seguenti metadata sono mancanti: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:347
 #, python-format
 msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 msgstr "%(missing_metadata_elements)s e %(final_missing_metadata_element)s."
 
-#: rapid/problemnotification.py:363
+#: rapid/problemnotification.py:364
 msgid "Problems in subfolder and filename generation"
 msgstr "Problemi nella generazione della sottocartella e del nome del file"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:366
 msgid "Problem in subfolder and filename generation"
 msgstr "Problema nella generazione della sottocartella e del nome del file"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:369
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemi nella generazione %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problema nella generazione %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:380
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s esiste già, ma si è effettuato il backup"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:382
 #, 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
+#: rapid/problemnotification.py:402
 msgid "Multiple problems were encountered"
 msgstr "Si sono verificati molteplici errori"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:230
+#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
 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 "
 "orari diversi"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:410
 msgid "there were errors backing up"
 msgstr "si sono verificati errori salvando"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:411
 msgid "There were errors backing up"
 msgstr "Si sono verificati errori salvando"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:413
 msgid "there was an error backing up"
 msgstr "si è verificato un errore salvando"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:414
 msgid "There was an error backing up"
 msgstr "Si è verificato un errore salvando"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:417
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, e %(backinguperror)s"
 
-#: rapid/rpdfile.py:139
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+"scansione in corso (trovate %(photos)s fotografie e %(videos)s video)..."
+
+#: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:300
+#: rapid/subfolderfile.py:301
 msgid "Photo has already been downloaded"
 msgstr "La fotografia è stata già scaricata"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:302
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Origine: %(source)s"
 
-#: rapid/subfolderfile.py:359
+#: rapid/subfolderfile.py:354
 msgid "subfolder and filename"
 msgstr "sottocartella e nome del file"
 
-#: rapid/subfolderfile.py:397
+#: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
 msgstr ""
 "Si è verificato un errore nella creazione della sottocartella di download"
 
-#: rapid/subfolderfile.py:398
+#: rapid/subfolderfile.py:394
 #, python-format
 msgid "Path: %s"
 msgstr "Percorso: %s"
 
-#: rapid/glade3/rapid.ui.h:1
-msgid "About..."
-msgstr "Informazioni su..."
-
 #: rapid/glade3/rapid.ui.h:2
-msgid "Check All"
-msgstr "Seleziona tutto"
+msgid "_File"
+msgstr "_File"
 
 #: rapid/glade3/rapid.ui.h:3
-msgid "Check All Photos"
-msgstr "Seleziona tutte le foto"
+msgid "Download / Pause"
+msgstr "Download / Sospendi"
 
 #: rapid/glade3/rapid.ui.h:4
-msgid "Check All Videos"
-msgstr "Seleziona tutti i video"
+msgid "_Select"
+msgstr "_Seleziona"
+
+#: rapid/glade3/rapid.ui.h:5
+msgid "Select All Without _Job Code"
+msgstr "Seleziona Tutto _Senza il Codice _Lavoro"
 
 #: rapid/glade3/rapid.ui.h:6
-msgid "Download / Pause"
-msgstr "Download / Sospendi"
+msgid "Select All Wit_h Job Code"
+msgstr "Seleziona Tutto _Con il Codice Lavoro"
 
 #: rapid/glade3/rapid.ui.h:7
-msgid "Get Help Online..."
-msgstr "Ottieni aiuto anline..."
+msgid "_View"
+msgstr "_Visualizza"
 
 #: rapid/glade3/rapid.ui.h:8
-msgid "Help"
-msgstr "Guida"
+msgid "_Error Log"
+msgstr "_Registro errori"
 
 #: rapid/glade3/rapid.ui.h:9
-msgid "Make a Donation..."
-msgstr "Effettua una donazione..."
+msgid "_Clear Completed Downloads"
+msgstr "_Svotare i Downloads Completati"
 
 #: rapid/glade3/rapid.ui.h:10
-msgid "Next File"
-msgstr "File successivo"
-
-#: rapid/glade3/rapid.ui.h:11
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: rapid/glade3/rapid.ui.h:12
 msgid "Previous File"
 msgstr "File precedente"
 
-#: rapid/glade3/rapid.ui.h:13
-msgid "Quit"
-msgstr "Esci"
-
-#: rapid/glade3/rapid.ui.h:15
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: rapid/glade3/rapid.ui.h:16
-msgid "Report a Problem..."
-msgstr "Segnala un problema..."
-
-#: rapid/glade3/rapid.ui.h:17
-msgid "Select All Wit_h Job Code"
-msgstr "Seleziona Tutto _Con il Codice Lavoro"
-
-#: rapid/glade3/rapid.ui.h:18
-msgid "Select All Without _Job Code"
-msgstr "Seleziona Tutto _Senza il Codice _Lavoro"
-
-#: rapid/glade3/rapid.ui.h:19
-msgid "Translate this Application..."
-msgstr "Traduci questa applicazione..."
-
-#: rapid/glade3/rapid.ui.h:20
-msgid "Uncheck All"
-msgstr "Deseleziona tutto"
-
-#: rapid/glade3/rapid.ui.h:21
-msgid "_Check All"
-msgstr "Seleziona _tutto"
-
-#: rapid/glade3/rapid.ui.h:22
-msgid "_Clear Completed Downloads"
-msgstr "_Svotare i Downloads Completati"
-
-#: rapid/glade3/rapid.ui.h:23
-msgid "_Download"
-msgstr "_Download"
-
-#: rapid/glade3/rapid.ui.h:24
-msgid "_Error Log"
-msgstr "_Registro errori"
-
-#: rapid/glade3/rapid.ui.h:25
-msgid "_File"
-msgstr "_File"
+#: rapid/glade3/rapid.ui.h:11
+msgid "Next File"
+msgstr "File successivo"
 
-#: rapid/glade3/rapid.ui.h:26
+#: rapid/glade3/rapid.ui.h:12
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: rapid/glade3/rapid.ui.h:27
-msgid "_Include in download"
-msgstr "_Includi nel download"
-
-#: rapid/glade3/rapid.ui.h:28
+#: rapid/glade3/rapid.ui.h:13
 msgid "_Make a Donation..."
 msgstr "_Fai una donazione..."
 
-#: rapid/glade3/rapid.ui.h:29
-msgid "_Select"
-msgstr "_Seleziona"
-
-#: rapid/glade3/rapid.ui.h:30
+#: rapid/glade3/rapid.ui.h:14
 msgid "_Translate this Application..."
 msgstr "_Traduci questa Applicazione..."
 
-#: rapid/glade3/rapid.ui.h:31
+#: rapid/glade3/rapid.ui.h:15
+msgid "_Check All"
+msgstr "Seleziona _tutto"
+
+#: rapid/glade3/rapid.ui.h:16
 msgid "_Uncheck All"
 msgstr "_Deseleziona Tutti"
 
-#: rapid/glade3/rapid.ui.h:32
-msgid "_View"
-msgstr "_Visualizza"
+#: rapid/glade3/rapid.ui.h:17
+msgid "_Include in download"
+msgstr "_Includi nel download"
+
+#: rapid/glade3/rapid.ui.h:18
+msgid "_Download"
+msgstr "_Download"
 
 #: rapid/glade3/prefs.ui.h:1
-msgid " "
-msgstr " "
+msgid "Preferences: Rapid Photo Downloader"
+msgstr "Preferenze: Rapid Photo Downloader"
 
 #: rapid/glade3/prefs.ui.h:2
-msgid " hh:mm"
-msgstr " hh:mm"
+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>"
 
 #: rapid/glade3/prefs.ui.h:3
-msgid ":"
-msgstr ":"
+msgid "<i>Example: /home/user/Pictures</i>"
+msgstr "<i>Esempio: /home/user/Immagini</i>"
 
 #: rapid/glade3/prefs.ui.h:4
-msgid "<b>Backup</b>"
-msgstr "<b>Backup</b>"
+msgid "<b>Download Subfolders</b>"
+msgstr "<b>Sottocartella di download</b>"
 
 #: rapid/glade3/prefs.ui.h:5
-msgid "<b>Compatibility with Other Operating Systems</b>"
-msgstr "<b>Compatibilità con altri sistemi operativi</b>"
+msgid "Download folder:"
+msgstr "Cartella di download:"
 
 #: rapid/glade3/prefs.ui.h:6
-msgid "<b>Download Folder</b>"
-msgstr "<b>Cartella di download</b>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded photos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Scelta della cartella di download. Sottocartelle per le fotografie scaricate "
+"saranno create automaticamente in questa cartella utilizzando la struttura "
+"specificata sotto."
 
 #: rapid/glade3/prefs.ui.h:7
-msgid "<b>Download Subfolders</b>"
-msgstr "<b>Sottocartella di download</b>"
+msgid "<b>Download Folder</b>"
+msgstr "<b>Cartella di download</b>"
 
 #: rapid/glade3/prefs.ui.h:8
-msgid "<b>Example</b>"
-msgstr "<b>Esempio</b>"
+msgid "Photo Folders"
+msgstr "Cartelle delle foto"
 
 #: rapid/glade3/prefs.ui.h:9
-msgid "<b>Job Codes</b>"
-msgstr "<b>Codici Lavoro</b>"
+msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina foto</span>\t"
 
 #: rapid/glade3/prefs.ui.h:10
 msgid "<b>Photo Rename</b>"
 msgstr "<b>Rinomina foto</b>"
 
 #: rapid/glade3/prefs.ui.h:11
-msgid "<b>Photo and Video Name Conflicts</b>"
-msgstr "<b>Nomi di foto e video in conflitto</b>"
+msgid " "
+msgstr " "
 
 #: rapid/glade3/prefs.ui.h:12
-msgid "<b>Program Automation</b>"
-msgstr "<b>Automazione programma</b>"
+msgid "<i>New:</i>"
+msgstr "<i>Nuovo:</i>"
 
 #: rapid/glade3/prefs.ui.h:13
-msgid "<b>Sequence Numbers</b>"
-msgstr "<b>Numeri di sequenza</b>"
+msgid "<i>Original:</i>"
+msgstr "<i>Originale:</i>"
 
 #: rapid/glade3/prefs.ui.h:14
-msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/externaldrive/Photos</i>"
+msgid "<b>Example</b>"
+msgstr "<b>Esempio</b>"
 
 #: rapid/glade3/prefs.ui.h:15
-msgid "<i>Example: /home/user/Pictures</i>"
-msgstr "<i>Esempio: /home/user/Immagini</i>"
+msgid "Photo Rename"
+msgstr "Rinomina foto"
 
 #: rapid/glade3/prefs.ui.h:16
-msgid "<i>Example:</i>"
-msgstr "<i>Esempio:</i>"
+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>"
 
 #: rapid/glade3/prefs.ui.h:17
-msgid "<i>New:</i>"
-msgstr "<i>Nuovo:</i>"
+msgid ""
+"Sorry, video downloading functionality disabled. To download videos, please "
+"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+"for python, or <i>exiftool</i>."
+msgstr ""
+"Spiacenti, la funzionalità dello scarico dei video è disabilitata. Per "
+"scaricare i video, si prega di installare i pacchetti python  <i>hachoir "
+"metadata</i> e <i>kaa metadata</i>, oppure <i>exiftool</i>."
 
 #: rapid/glade3/prefs.ui.h:18
-msgid "<i>Original:</i>"
-msgstr "<i>Originale:</i>"
+msgid ""
+"Choose the download folder. Subfolders for the downloaded videos will be "
+"automatically created in this folder using the structure specified below."
+msgstr ""
+"Scegliere la cartella per il download. Le sottocartelle per i video "
+"scaricati saranno create automaticamente in questa cartella utilizzando la "
+"struttura specificata sotto."
 
 #: 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"
+msgid "Video Folders"
+msgstr "Cartelle video"
 
 #: rapid/glade3/prefs.ui.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni Dispositivo</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
+msgstr "<span weight=\"bold\" size=\"x-large\">Rinomina video</span>\t"
 
 #: rapid/glade3/prefs.ui.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi</span>"
+msgid "Video Rename"
+msgstr "Rinomina video"
 
 #: rapid/glade3/prefs.ui.h:22
-msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Gestione degli errori</span>"
+msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni di rinomina</span>"
 
 #: rapid/glade3/prefs.ui.h:23
-msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Codici Lavoro</span>"
+msgid "<b>Sequence Numbers</b>"
+msgstr "<b>Numeri di sequenza</b>"
 
 #: rapid/glade3/prefs.ui.h:24
-msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Varie</span>"
+msgid ""
+"Specify the time in 24 hour format at which the <i>Downloads today</i> "
+"sequence number should be reset."
+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: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>"
+msgid "Day start:"
+msgstr "Giorno iniziale:"
 
 #: 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"
+msgid "Downloads today:"
+msgstr "Downloads oggi:"
 
 #: 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>"
+msgid "Stored number:"
+msgstr "Numero memorizzato:"
 
 #: 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>"
+msgid ":"
+msgstr ":"
 
 #: 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"
+msgid " hh:mm"
+msgstr " hh:mm"
 
 #: rapid/glade3/prefs.ui.h:30
-msgid "Add unique identifier"
-msgstr "Aggiunta di un identificatore univoco"
+msgid "Synchronize RAW + JPEG sequence numbers"
+msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
 
 #: rapid/glade3/prefs.ui.h:31
-msgid "Automatically detect Portable Storage Devices"
-msgstr "Rileva automaticamente i dispositivi di memorizzazione portatile"
+msgid "<b>Compatibility with Other Operating Systems</b>"
+msgstr "<b>Compatibilità con altri sistemi operativi</b>"
 
 #: rapid/glade3/prefs.ui.h:32
-msgid "Automatically detect backup devices"
-msgstr "Rileva automaticamente i dispositivi di backup"
+msgid ""
+"Specify whether photo, video and folder names should have any characters "
+"removed that are not allowed by other operating systems."
+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:33
-msgid "Automatically detect devices"
-msgstr "Rileva i dispositivi automaticamente"
+msgid "Strip incompatible characters"
+msgstr "Elimina caratteri incompatibili"
 
 #: rapid/glade3/prefs.ui.h:34
-msgid "Automatically rotate JPEG images"
-msgstr "Ruota automaticamente le immagini JPEG"
+msgid "Rename Options"
+msgstr "Opzioni di rinomina"
 
 #: rapid/glade3/prefs.ui.h:35
-msgid "Backup"
-msgstr "Backup"
+msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Codici Lavoro</span>"
 
 #: rapid/glade3/prefs.ui.h:36
-msgid "Backup photos and videos when downloading"
-msgstr "Effettua il backup delle foto e dei video durante il download"
+msgid "<b>Job Codes</b>"
+msgstr "<b>Codici Lavoro</b>"
 
 #: rapid/glade3/prefs.ui.h:37
-msgid ""
-"Choose the download folder. Subfolders for the downloaded photos will be "
-"automatically created in this folder using the structure specified below."
-msgstr ""
-"Scelta della cartella di download. Sottocartelle per le fotografie scaricate "
-"saranno create automaticamente in questa cartella utilizzando la struttura "
-"specificata sotto."
-
-#: rapid/glade3/prefs.ui.h:38
-msgid ""
-"Choose the download folder. Subfolders for the downloaded videos will be "
-"automatically created in this folder using the structure specified below."
-msgstr ""
-"Scegliere la cartella per il download. Le sottocartelle per i video "
-"scaricati saranno create automaticamente in questa cartella utilizzando la "
-"struttura specificata sotto."
+msgid "_Add..."
+msgstr "_Aggiungere..."
 
 #: rapid/glade3/prefs.ui.h:39
-msgid "Day start:"
-msgstr "Giorno iniziale:"
+msgid "R_emove All"
+msgstr "R_imuovi Tutto"
 
 #: rapid/glade3/prefs.ui.h:40
-msgid "Device Options"
-msgstr "Opzioni Dispositivo"
+msgid "Job Codes"
+msgstr "Codici Lavoro"
 
 #: rapid/glade3/prefs.ui.h:41
+msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Dispositivi</span>"
+
+#: rapid/glade3/prefs.ui.h:42
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: rapid/glade3/prefs.ui.h:42
+#: rapid/glade3/prefs.ui.h:43
 msgid ""
 "Devices are from where to download photos and videos, such as cameras, "
 "memory cards or Portable Storage Devices.\n"
@@ -1731,38 +1731,33 @@ msgstr ""
 " Se ciò non fosse possibile, occorre utilizzare un lettore di schede di "
 "memoria.</i>"
 
-#: rapid/glade3/prefs.ui.h:47
-msgid "Download folder:"
-msgstr "Cartella di download:"
-
 #: rapid/glade3/prefs.ui.h:48
-msgid "Downloads today:"
-msgstr "Downloads oggi:"
+msgid "Automatically detect Portable Storage Devices"
+msgstr "Rileva automaticamente i dispositivi di memorizzazione portatile"
 
 #: rapid/glade3/prefs.ui.h:49
-msgid "Error Handling"
-msgstr "Gestione degli errori"
+msgid "Automatically detect devices"
+msgstr "Rileva i dispositivi automaticamente"
 
 #: rapid/glade3/prefs.ui.h:50
-msgid "Exit program even if download had warnings or errors"
+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 ""
-"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 "Esce dal programma quando il download è completo"
-
-#: rapid/glade3/prefs.ui.h:52
-msgid "Generate thumbnails (slower)"
-msgstr "Generazione delle miniature (lento)"
+"Se abiliti la rilevazione automatica dei Dispositivi di Memorizzazione "
+"Portatile (PSD), sarà analizzato tutto il dispositivo. Su grossi dispositivi "
+"ciò potrebbe richiedere un po' di tempo.\n"
+"\n"
+"Quando questa opzione è abilitata, ed un dispositivo potenziale  viene "
+"rilevato, ti verrà richiesto di determinare se questo dovrà essere "
+"analizzato o meno."
 
 #: rapid/glade3/prefs.ui.h:53
-msgid ""
-"If you disable automatic detection, choose the exact backup locations."
-msgstr ""
-"Se si disabilita la rilevazione automatica, scegliere le posizioni esatte "
-"del salvataggio."
+msgid "Location:"
+msgstr "Posizione:"
 
 #: rapid/glade3/prefs.ui.h:54
 msgid ""
@@ -1773,194 +1768,185 @@ msgstr ""
 "delle fotografie e dei video."
 
 #: rapid/glade3/prefs.ui.h:55
+msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni Dispositivo</span>"
+
+#: rapid/glade3/prefs.ui.h:56
+msgid "Remembered Paths"
+msgstr "Percorsi Memorizzati"
+
+#: rapid/glade3/prefs.ui.h:57
 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."
+"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 ""
-"Se abiliti la rilevazione automatica dei Dispositivi di Memorizzazione "
-"Portatile (PSD), sarà analizzato tutto il dispositivo. Su grossi dispositivi "
-"ciò potrebbe richiedere un po' di tempo.\n"
-"\n"
-"Quando questa opzione è abilitata, ed un dispositivo potenziale  viene "
-"rilevato, ti verrà richiesto di determinare se questo dovrà essere "
-"analizzato o meno."
+"I percorsi memorizzati sono quelli associati con i dispositivi che hai "
+"scelto di analizzare sempre oppure di ignorare quando la rilevazione "
+"automatica dei Dispositivi di Memorizzazione Portatile (PSD) è abilitata."
 
 #: rapid/glade3/prefs.ui.h:58
 msgid "Ignored Paths"
 msgstr "Percorsi Ignorati"
 
 #: rapid/glade3/prefs.ui.h:59
-msgid "Job Codes"
-msgstr "Codici Lavoro"
-
-#: rapid/glade3/prefs.ui.h:60
-msgid "Location:"
-msgstr "Posizione:"
+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 ""
+"Specifica la porzione finale dei percorsi che vuoi ignorare quando si "
+"analizzano i dispositivi per le fotografie o i video. Qualsiasi percorso che "
+"termini con i valori di seguito non sarà analizzato."
 
 #: rapid/glade3/prefs.ui.h:61
-msgid "Miscellaneous"
-msgstr "Varie"
+msgid "Re_move All"
+msgstr "Ri_muovi Tutto"
 
 #: rapid/glade3/prefs.ui.h:62
-msgid "Overwrite"
-msgstr "Sovrascrivi"
+msgid "Use _python-style regular expressions"
+msgstr "Utilizza espressioni regolari _python-style"
 
 #: rapid/glade3/prefs.ui.h:63
-msgid "Performance"
-msgstr "Prestazioni"
+msgid "Device Options"
+msgstr "Opzioni Dispositivo"
 
 #: rapid/glade3/prefs.ui.h:64
-msgid "Photo Folders"
-msgstr "Cartelle delle foto"
+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:65
-msgid "Photo Rename"
-msgstr "Rinomina foto"
+msgid "<b>Backup</b>"
+msgstr "<b>Backup</b>"
 
 #: rapid/glade3/prefs.ui.h:66
-msgid "Photo backup folder name:"
-msgstr "Nome della cartella del backup delle foto:"
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr ""
+"Se si disabilita la rilevazione automatica, scegliere le posizioni esatte "
+"del salvataggio."
 
 #: rapid/glade3/prefs.ui.h:67
-msgid "Photo backup location:"
-msgstr "Posizione del salvataggio delle fotografie"
+msgid "Automatically detect backup devices"
+msgstr "Rileva automaticamente i dispositivi di backup"
 
 #: rapid/glade3/prefs.ui.h:68
-msgid "Preferences: Rapid Photo Downloader"
-msgstr "Preferenze: Rapid Photo Downloader"
+msgid ""
+"You can have your photos and videos backed up to multiple locations as they "
+"are downloaded, e.g. external hard drives."
+msgstr ""
+"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:70
-msgid "R_emove All"
-msgstr "R_imuovi Tutto"
+#: rapid/glade3/prefs.ui.h:69
+msgid "Backup photos and videos when downloading"
+msgstr "Effettua il backup delle foto e dei video durante il download"
 
-#: rapid/glade3/prefs.ui.h:72
-msgid "Re_move All"
-msgstr "Ri_muovi Tutto"
+#: rapid/glade3/prefs.ui.h:70
+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 ""
+"Specificare la cartella in cui memorizzare i backup sul dispositivo.  \n"
+"\n"
+"<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:73
-msgid "Remembered Paths"
-msgstr "Percorsi Memorizzati"
+msgid "Photo backup location:"
+msgstr "Posizione del salvataggio delle fotografie"
 
 #: 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 ""
-"I percorsi memorizzati sono quelli associati con i dispositivi che hai "
-"scelto di analizzare sempre oppure di ignorare quando la rilevazione "
-"automatica dei Dispositivi di Memorizzazione Portatile (PSD) è abilitata."
+msgid "Photo backup folder name:"
+msgstr "Nome della cartella del backup delle foto:"
 
 #: rapid/glade3/prefs.ui.h:75
-msgid "Rename Options"
-msgstr "Opzioni di rinomina"
+msgid "<i>Example:</i>"
+msgstr "<i>Esempio:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
-msgid "Skip"
-msgstr "Salta"
+msgid "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/externaldrive/Photos</i>"
 
 #: rapid/glade3/prefs.ui.h:77
-msgid "Skip download"
-msgstr "Salta il download"
+msgid "Video backup folder name:"
+msgstr "Nome della cartella di backup dei video:"
 
 #: rapid/glade3/prefs.ui.h:78
-msgid ""
-"Sorry, video downloading functionality disabled. To download videos, please "
-"install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
-"for python, or <i>exiftool</i>."
-msgstr ""
-"Spiacenti, la funzionalità dello scarico dei video è disabilitata. Per "
-"scaricare i video, si prega di installare i pacchetti python  <i>hachoir "
-"metadata</i> e <i>kaa metadata</i>, oppure <i>exiftool</i>."
+msgid "Video backup location:"
+msgstr "Posizione del salvataggio dei video"
 
 #: 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 ""
-"Specifica la porzione finale dei percorsi che vuoi ignorare quando si "
-"analizzano i dispositivi per le fotografie o i video. Qualsiasi percorso che "
-"termini con i valori di seguito non sarà analizzato."
+msgid "Backup"
+msgstr "Backup"
 
 #: 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 ""
-"Specificare la cartella in cui memorizzare i backup sul dispositivo.  \n"
-"\n"
-"<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>"
+msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Varie</span>"
 
-#: 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 ""
-"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:81
+msgid "<b>Program Automation</b>"
+msgstr "<b>Automazione programma</b>"
 
-#: 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 ""
-"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:82
+msgid "Unmount (\"eject\") device upon download completion"
+msgstr "Smonta (\"espelli\") il dispositivo al completamento del download"
 
-#: rapid/glade3/prefs.ui.h:85
+#: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
 msgstr "Inizia il download all'avvio del programma"
 
-#: rapid/glade3/prefs.ui.h:86
+#: rapid/glade3/prefs.ui.h:84
 msgid "Start downloading upon device insertion"
 msgstr "Inizia il download quando il dispositivo viene inserito"
 
+#: rapid/glade3/prefs.ui.h:85
+msgid "Exit program when download completes"
+msgstr "Esce dal programma quando il download è completo"
+
+#: rapid/glade3/prefs.ui.h:86
+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:87
-msgid "Stored number:"
-msgstr "Numero memorizzato:"
+msgid "Automatically rotate JPEG images"
+msgstr "Ruota automaticamente le immagini JPEG"
 
 #: rapid/glade3/prefs.ui.h:88
-msgid "Strip incompatible characters"
-msgstr "Elimina caratteri incompatibili"
+msgid "Performance"
+msgstr "Prestazioni"
 
 #: rapid/glade3/prefs.ui.h:89
-msgid "Synchronize RAW + JPEG sequence numbers"
-msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
+msgid "Generate thumbnails (slower)"
+msgstr "Generazione delle miniature (lento)"
 
 #: rapid/glade3/prefs.ui.h:90
-msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Smonta (\"espelli\") il dispositivo al completamento del download"
+msgid "Miscellaneous"
+msgstr "Varie"
 
 #: rapid/glade3/prefs.ui.h:91
-msgid "Use _python-style regular expressions"
-msgstr "Utilizza espressioni regolari _python-style"
+msgid "<span weight=\"bold\" size=\"x-large\">Error Handling</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Gestione degli errori</span>"
 
 #: rapid/glade3/prefs.ui.h:92
-msgid "Video Folders"
-msgstr "Cartelle video"
+msgid "<b>Photo and Video Name Conflicts</b>"
+msgstr "<b>Nomi di foto e video in conflitto</b>"
 
 #: rapid/glade3/prefs.ui.h:93
-msgid "Video Rename"
-msgstr "Rinomina video"
+msgid "Add unique identifier"
+msgstr "Aggiunta di un identificatore univoco"
 
 #: rapid/glade3/prefs.ui.h:94
-msgid "Video backup folder name:"
-msgstr "Nome della cartella di backup dei video:"
+msgid "Skip download"
+msgstr "Salta il download"
 
 #: rapid/glade3/prefs.ui.h:95
-msgid "Video backup location:"
-msgstr "Posizione del salvataggio dei video"
-
-#: 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."
@@ -1968,7 +1954,7 @@ msgstr ""
 "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:97
+#: rapid/glade3/prefs.ui.h:96
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up."
@@ -1976,17 +1962,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:97
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
 #: 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 ""
-"Durante il download è possibile effettuare il backup delle foto e dei video "
-"in posizioni multiple, come ad esempio su dischi esterni."
+msgid "Skip"
+msgstr "Salta"
 
 #: rapid/glade3/prefs.ui.h:99
-msgid "_Add..."
-msgstr "_Aggiungere..."
+msgid "Error Handling"
+msgstr "Gestione degli errori"
 
 #: rapid/glade3/about.ui.h:1
 msgid "Import your photos and videos efficiently and reliably"
diff --git a/po/nb.po b/po/nb.po
index f1806a8..4e7774d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-01-30 14:43-0600\n"
-"PO-Revision-Date: 2012-02-20 22:14+0000\n"
+"POT-Creation-Date: 2012-06-17 03:05-0500\n"
+"PO-Revision-Date: 2012-06-17 10:05+0000\n"
 "Last-Translator: Erik M <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2012-05-14 01:41+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 14:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:109 rapid/rapid.py:1753 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:114
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:116
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:119
+#: rapid/rapid.py:122
 #, 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:154
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Enhet"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:172
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Størrelse"
 
-#: rapid/rapid.py:175
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr "Status for nedlasting"
 
-#: rapid/rapid.py:321
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s ble ikke utløst"
@@ -66,22 +66,22 @@ msgstr "%(device)s ble ikke utløst"
 #. 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:1188
+#: rapid/rapid.py:1217
 msgid "scanning..."
 msgstr "søker..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr "rotmappen til filsystemet"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1755
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Laster ned fra %(location)s."
 
-#: rapid/rapid.py:1756
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +89,15 @@ msgstr ""
 "Vil du virkelig laste ned fra denne posisjonen ? På noen system kan det ta "
 "lang tid å søke igjennom filene."
 
-#: rapid/rapid.py:2178
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Last ned"
 
-#: rapid/rapid.py:2181
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Pause"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2289
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,176 +117,176 @@ msgstr ""
 "Denne mappen for nedlasting er ugyldig:\n"
 "%s"
 
-#: rapid/rapid.py:2290
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr "Kan ikke fortsette nedlasting"
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Rundt 1 sekund igjen"
 
-#: rapid/rapid.py:2659
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Omtrent %i sekunder igjen"
 
-#: rapid/rapid.py:2661
+#: rapid/rapid.py:2704
 msgid "About 1 minute remaining"
 msgstr "Rundt 1 minutt igjen"
 
 #. 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:2666
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Omtrent %(minutes)i minutter og %(seconds)02i sekunder igjen"
 
-#: rapid/rapid.py:2688 rapid/rpdfile.py:115
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "bilder og videoer"
 
-#: rapid/rapid.py:2690 rapid/rpdfile.py:117
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "bilder eller video"
 
-#: rapid/rapid.py:2693 rapid/rapid.py:3506 rapid/rpdfile.py:120
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "videoklipp"
 
-#: rapid/rapid.py:2695 rapid/preferencesdialog.py:1617 rapid/rpdfile.py:122
-#: rapid/rpdfile.py:271
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2698 rapid/rapid.py:3504 rapid/rpdfile.py:125
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "bilder"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2700 rapid/preferencesdialog.py:1616 rapid/rpdfile.py:127
-#: rapid/rpdfile.py:252
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "bilde"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s nedlastet"
 
-#: rapid/rapid.py:2731
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikke a laste ned %(noFiles)s %(filetypes)s"
 
-#: rapid/rapid.py:2734 rapid/rapid.py:2786
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "advarsler"
 
-#: rapid/rapid.py:2743
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Ferdig med nedlasting"
 
-#: rapid/rapid.py:2749 rapid/rapid.py:2758 rapid/rapid.py:2767
-#: rapid/rapid.py:2776 rapid/rapid.py:2784
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2751 rapid/rapid.py:2769
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lastet ned"
 
-#: rapid/rapid.py:2760 rapid/rapid.py:2778
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Klarte ikke å laste ned %(filetype)s"
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2817
+#: rapid/rapid.py:2860
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s igjen)"
 
 #. e.g.: 205 of 205 photos and videos
-#: rapid/rapid.py:2824
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s av %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3170
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr "Fra"
 
-#: rapid/rapid.py:3178
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Oppdag automatisk"
 
-#: rapid/rapid.py:3182 rapid/preferencesdialog.py:1324
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Velg katalog med %(file_types)r"
 
-#: rapid/rapid.py:3223
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Kopier"
 
-#: rapid/rapid.py:3236
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Flytt"
 
-#: rapid/rapid.py:3258
+#: rapid/rapid.py:3310
 msgid "To"
 msgstr "Til"
 
-#: rapid/rapid.py:3265 rapid/rapid.py:3901
+#: rapid/rapid.py:3317 rapid/rapid.py:3985
 msgid "Photos:"
 msgstr "Bilder:"
 
-#: rapid/rapid.py:3268 rapid/preferencesdialog.py:1161
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr "Velg katalog for å laste inn bilder"
 
-#: rapid/rapid.py:3280 rapid/rapid.py:3901
+#: rapid/rapid.py:3332 rapid/rapid.py:3985
 msgid "Videos:"
 msgstr "Videoer:"
 
-#: rapid/rapid.py:3282 rapid/preferencesdialog.py:1179
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr "Velg katalog for å laste inn video"
 
-#: rapid/rapid.py:3474
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "og"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr "Bruker sikkerhetskopierings enheter"
 
-#: rapid/rapid.py:3481
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr "Bruker sikkerhetskopierings enhet"
 
-#: rapid/rapid.py:3483
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr "Fant ingen enheter for sikkerhetskopiering"
 
-#: rapid/rapid.py:3510
+#: rapid/rapid.py:3562
 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:3522
+#: rapid/rapid.py:3574
 #, 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:3526
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -294,87 +294,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:3531
+#: rapid/rapid.py:3583
 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:3536
+#: rapid/rapid.py:3588
 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:3542
+#: rapid/rapid.py:3594
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s tilgjengelig"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3550
+#: rapid/rapid.py:3602
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr "Sikkerhetskopierer bilder og video til %(path)s"
 
 #. user manually specified backup location
-#: rapid/rapid.py:3553
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Sikkerhetskopierer til %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3556
+#: rapid/rapid.py:3608
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr "Sikkerhetskopierer bilder til %(path)s og video til %(path2)s"
 
-#: rapid/rapid.py:3563
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3592
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingene er ugyldige"
 
-#: rapid/rapid.py:3711 rapid/rpdfile.py:253
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Bilde"
 
-#: rapid/rapid.py:3713 rapid/rpdfile.py:272
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3722
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "Nedlastningsmappe til %(file_type)s finnes ikke"
 
-#: rapid/rapid.py:3724 rapid/rapid.py:3738 rapid/rapid.py:3751
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr "Mappe: %s"
 
-#: rapid/rapid.py:3736
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "Nedlastingsmappe til %(file_type)s er ugyldig"
 
-#: rapid/rapid.py:3749
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "Nedlastingsmappen til %(file_type)s er ikke skrivbar"
 
-#: rapid/rapid.py:3835
+#: rapid/rapid.py:3894
 msgid "Thumbnails"
 msgstr "Miniatyrbilder"
 
 #. 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:3882
+#: rapid/rapid.py:3948
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -383,43 +383,61 @@ msgstr ""
 "vis programinformasjon på kommandolinjen når programmet kjører (standard: "
 "%default)"
 
-#: rapid/rapid.py:3883
+#: rapid/rapid.py:3949
 msgid "display debugging information when run from the command line"
 msgstr "vis feilrettingsinformasjon ved kjøring fra kommandolinje"
 
-#: rapid/rapid.py:3884
+#: rapid/rapid.py:3950
 msgid "only output errors to the command line"
 msgstr "vis bare feil på kommandolinjen"
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3886
+#: rapid/rapid.py:3952
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 "vis hvilke bilde- og videofiltyper programmet gjenkjenner, og avslutt"
 
-#: rapid/rapid.py:3888
+#: rapid/rapid.py:3954
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3955
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3956
 msgid "reset all program settings and preferences and exit"
 msgstr "nullstill alle programinnstillinger og avslutt"
 
-#: rapid/rapid.py:3906
+#: rapid/rapid.py:3969
+msgid ""
+"Error: specify device auto-detection or manually specifiy a device's path "
+"from which to download, but do not do both."
+msgstr ""
+
+#: rapid/rapid.py:3990
 #, python-format
 msgid "and %s"
 msgstr "og %s"
 
-#: rapid/rapid.py:3914
+#: rapid/rapid.py:3998
 msgid "All settings and preferences have been reset"
 msgstr "Alle innstillingene er nullstillte"
 
-#: rapid/backupfile.py:156 rapid/backupfile.py:179
+#: rapid/backupfile.py:157 rapid/backupfile.py:180
 msgid "Backing up error"
 msgstr "Feil ved sikkerhetskopiering"
 
-#: rapid/backupfile.py:158
+#: rapid/backupfile.py:159
 #, python-format
 msgid "Destination directory could not be created: %(directory)s\n"
 msgstr "Klarte ikke å opprette målmappen %(directory)s\n"
 
-#: rapid/backupfile.py:160 rapid/backupfile.py:181 rapid/subfolderfile.py:198
+#: rapid/backupfile.py:161 rapid/backupfile.py:182 rapid/subfolderfile.py:199
 #, python-format
 msgid ""
 "Source: %(source)s\n"
@@ -428,13 +446,13 @@ msgstr ""
 "Kilde: %(source)s\n"
 "Mål: %(destination)s"
 
-#: rapid/backupfile.py:163 rapid/backupfile.py:183
+#: rapid/backupfile.py:164 rapid/backupfile.py:184
 #, python-format
 msgid "Error: %(inst)s"
 msgstr "Feil: %(inst)s"
 
-#: rapid/copyfiles.py:162 rapid/subfolderfile.py:213
-#: rapid/subfolderfile.py:346 rapid/subfolderfile.py:364
+#: rapid/copyfiles.py:163 rapid/subfolderfile.py:214
+#: rapid/subfolderfile.py:347 rapid/subfolderfile.py:365
 #, python-format
 msgid ""
 "%(problem)s\n"
@@ -443,12 +461,12 @@ msgstr ""
 "%(problem)s\n"
 "Fil: %(file)s"
 
-#: rapid/device.py:79
+#: rapid/device.py:80
 msgid "Device Detected"
 msgstr "Enhet funnet"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:88
+#: rapid/device.py:89
 msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
@@ -456,480 +474,490 @@ msgstr ""
 "videoer fra?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
-#: rapid/device.py:107
+#: rapid/device.py:108
 msgid "_Remember this choice"
 msgstr "_Husk dette valget"
 
-#: rapid/downloadtracker.py:298
+#: rapid/downloadtracker.py:299
 msgid "MB/s"
 msgstr "MB/s"
 
-#: rapid/generatenameconfig.py:150
+#: rapid/generatenameconfig.py:151
 msgid "Date time"
 msgstr "Dato tid"
 
-#: rapid/generatenameconfig.py:151
+#: rapid/generatenameconfig.py:152
 msgid "Text"
 msgstr "Tekst"
 
-#: rapid/generatenameconfig.py:152
+#: rapid/generatenameconfig.py:153
 msgid "Filename"
 msgstr "Filnavn"
 
-#: rapid/generatenameconfig.py:153
+#: rapid/generatenameconfig.py:154
 msgid "Metadata"
 msgstr "Metadata"
 
-#: rapid/generatenameconfig.py:154
+#: rapid/generatenameconfig.py:155
 msgid "Sequences"
 msgstr "Sekvenser"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/generatenameconfig.py:156 rapid/preferencesdialog.py:574
+#: rapid/generatenameconfig.py:157 rapid/preferencesdialog.py:577
 msgid "Job code"
 msgstr "Jobbnavn"
 
-#: rapid/generatenameconfig.py:157
+#: rapid/generatenameconfig.py:158
 msgid "Image date"
 msgstr "Bilde dato"
 
-#: rapid/generatenameconfig.py:158
+#: rapid/generatenameconfig.py:159
 msgid "Video date"
 msgstr "Video dato"
 
-#: rapid/generatenameconfig.py:159
+#: rapid/generatenameconfig.py:160
 msgid "Today"
 msgstr "I dag"
 
-#: rapid/generatenameconfig.py:160
+#: rapid/generatenameconfig.py:161
 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:162
+#: rapid/generatenameconfig.py:163
 msgid "Download time"
 msgstr "Nedlastings dato"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:164
+#: rapid/generatenameconfig.py:165
 msgid "Name + extension"
 msgstr "Navn + filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:166
+#: rapid/generatenameconfig.py:167
 msgid "Name"
 msgstr "Filnavn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:168
+#: rapid/generatenameconfig.py:169
 msgid "Extension"
 msgstr "Filtype"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:170
+#: rapid/generatenameconfig.py:171
 msgid "Image number"
 msgstr "Bilde nummer"
 
-#: rapid/generatenameconfig.py:171
+#: rapid/generatenameconfig.py:172
 msgid "Video number"
 msgstr "Video nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:173
+#: rapid/generatenameconfig.py:174
 msgid "Aperture"
 msgstr "Blender"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:175
+#: rapid/generatenameconfig.py:176
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:177
+#: rapid/generatenameconfig.py:178
 msgid "Exposure time"
 msgstr "Eksponeringstid"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:179
+#: rapid/generatenameconfig.py:180
 msgid "Focal length"
 msgstr "Brennvidde"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:181
+#: rapid/generatenameconfig.py:182
 msgid "Camera make"
 msgstr "Kamera produsent"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:183
+#: rapid/generatenameconfig.py:184
 msgid "Camera model"
 msgstr "Kamera modell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:185
+#: rapid/generatenameconfig.py:186
 msgid "Short camera model"
 msgstr "Forkortet kamera modell"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:187
+#: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
 msgstr "Forkortet kamera modell med prefiks"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:189
+#: rapid/generatenameconfig.py:190
 msgid "Serial number"
 msgstr "Serie nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:191
+#: rapid/generatenameconfig.py:192
 msgid "Shutter count"
 msgstr "Eksponerings teller"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: rapid/generatenameconfig.py:193
+#: rapid/generatenameconfig.py:194
 msgid "File number"
 msgstr "Fil nummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:195
+#: rapid/generatenameconfig.py:196
 msgid "Folder only"
 msgstr "Bare mappe"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: rapid/generatenameconfig.py:197
+#: rapid/generatenameconfig.py:198
 msgid "Folder and file"
 msgstr "Mappe og fil"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: rapid/generatenameconfig.py:199
+#: rapid/generatenameconfig.py:200
 msgid "Owner name"
 msgstr "Eier navn"
 
-#: rapid/generatenameconfig.py:200
+#: rapid/generatenameconfig.py:201
 msgid "Codec"
 msgstr "Kodek"
 
-#: rapid/generatenameconfig.py:201
+#: rapid/generatenameconfig.py:202
 msgid "Width"
 msgstr "Bredde"
 
-#: rapid/generatenameconfig.py:202
+#: rapid/generatenameconfig.py:203
 msgid "Height"
 msgstr "Høyde"
 
-#: rapid/generatenameconfig.py:203
+#: rapid/generatenameconfig.py:204
 msgid "Length"
 msgstr "Lengde"
 
-#: rapid/generatenameconfig.py:204
+#: rapid/generatenameconfig.py:205
 msgid "Frames Per Second"
 msgstr "Bilder i sekundet"
 
-#: rapid/generatenameconfig.py:205
+#: rapid/generatenameconfig.py:206
 msgid "Artist"
 msgstr "Kunstner"
 
-#: rapid/generatenameconfig.py:206
+#: rapid/generatenameconfig.py:207
 msgid "Copyright"
 msgstr "Opphavsrettighet"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:208
+#: rapid/generatenameconfig.py:209
 msgid "Downloads today"
 msgstr "Nedlastet i dag"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:210
+#: rapid/generatenameconfig.py:211
 msgid "Session number"
 msgstr "Økt nummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: rapid/generatenameconfig.py:212
+#: rapid/generatenameconfig.py:213
 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:214
+#: rapid/generatenameconfig.py:215
 msgid "Stored number"
 msgstr "Antall lagrede"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: rapid/generatenameconfig.py:216
+#: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:218
+#: rapid/generatenameconfig.py:219
 msgid "All digits"
 msgstr "Alle tall"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:220
+#: rapid/generatenameconfig.py:221
 msgid "Last digit"
 msgstr "Siste tall"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:222
+#: rapid/generatenameconfig.py:223
 msgid "Last 2 digits"
 msgstr "Siste 2 tall"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:224
+#: rapid/generatenameconfig.py:225
 msgid "Last 3 digits"
 msgstr "Siste 3 tall"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: rapid/generatenameconfig.py:226
+#: rapid/generatenameconfig.py:227
 msgid "Last 4 digits"
 msgstr "Siste 4 tall"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:228
+#: rapid/generatenameconfig.py:229
 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:230
+#: rapid/generatenameconfig.py:231
 msgid "UPPERCASE"
 msgstr "STORE BOKSTAVER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your language features capitalization
-#: rapid/generatenameconfig.py:232
+#: rapid/generatenameconfig.py:233
 msgid "lowercase"
 msgstr "små bokstaver"
 
-#: rapid/generatenameconfig.py:233
+#: rapid/generatenameconfig.py:234
 msgid "One digit"
 msgstr "Ett tall"
 
-#: rapid/generatenameconfig.py:234
+#: rapid/generatenameconfig.py:235
 msgid "Two digits"
 msgstr "To tall"
 
-#: rapid/generatenameconfig.py:235
+#: rapid/generatenameconfig.py:236
 msgid "Three digits"
 msgstr "Tre tall"
 
-#: rapid/generatenameconfig.py:236
+#: rapid/generatenameconfig.py:237
 msgid "Four digits"
 msgstr "Fire tall"
 
-#: rapid/generatenameconfig.py:237
+#: rapid/generatenameconfig.py:238
 msgid "Five digits"
 msgstr "Fem Tall"
 
-#: rapid/generatenameconfig.py:238
+#: rapid/generatenameconfig.py:239
 msgid "Six digits"
 msgstr "Seks tall"
 
-#: rapid/generatenameconfig.py:239
+#: rapid/generatenameconfig.py:240
 msgid "Seven digits"
 msgstr "Syv tall"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:241
+#: rapid/generatenameconfig.py:242
 msgid "Subseconds"
 msgstr "Delsekund"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:243
+#: rapid/generatenameconfig.py:244
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:245
+#: rapid/generatenameconfig.py:246
 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:247
+#: rapid/generatenameconfig.py:248
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:249
+#: rapid/generatenameconfig.py:250
 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:251
+#: rapid/generatenameconfig.py:252
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:253
+#: rapid/generatenameconfig.py:254
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:255
+#: rapid/generatenameconfig.py:256
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:257
+#: rapid/generatenameconfig.py:258
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:259
+#: rapid/generatenameconfig.py:260
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:261
+#: rapid/generatenameconfig.py:262
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:263
+#: rapid/generatenameconfig.py:264
 msgid "YY"
 msgstr "YY"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:265
+#: rapid/generatenameconfig.py:266
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:267
+#: rapid/generatenameconfig.py:268
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:269
+#: rapid/generatenameconfig.py:270
+msgid "Month (full)"
+msgstr "Måned (full)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:272
+msgid "Month (abbreviated)"
+msgstr "Måned (kort)"
+
+#. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
+#: rapid/generatenameconfig.py:274
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:271
+#: rapid/generatenameconfig.py:276
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:273
+#: rapid/generatenameconfig.py:278
 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:275
+#: rapid/generatenameconfig.py:280
 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:277
+#: rapid/generatenameconfig.py:282
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: rapid/generatenameconfig.py:279
+#: rapid/generatenameconfig.py:284
 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:281
+#: rapid/generatenameconfig.py:286
 msgid "SS"
 msgstr "SS"
 
-#: rapid/preferencesdialog.py:371
+#: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Egenskaper for undermappen kan ikke begynne med %s"
 
-#: rapid/preferencesdialog.py:373
+#: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Egenskapene for undermappen kan ikke slutte med %s"
 
-#: rapid/preferencesdialog.py:377
+#: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Egenskaper for undermappen skal ikke ha to %s etter hverandre"
 
-#: rapid/preferencesdialog.py:436 rapid/preferencesdialog.py:697
+#: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
 msgstr "Fjern alle jobb koder?"
 
-#: rapid/preferencesdialog.py:437 rapid/preferencesdialog.py:714
+#: rapid/preferencesdialog.py:440 rapid/preferencesdialog.py:717
 msgid "Should all Job Codes be removed?"
 msgstr "Skal alle jobb koder fjernes?"
 
-#: rapid/preferencesdialog.py:443
+#: rapid/preferencesdialog.py:446
 msgid "Remove all Remembered Paths?"
 msgstr "Fjern alle huskede stier?"
 
-#: rapid/preferencesdialog.py:444
+#: rapid/preferencesdialog.py:447
 msgid "Should all remembered paths be removed?"
 msgstr "Skal alle huskede stier fjernes?"
 
-#: rapid/preferencesdialog.py:450
+#: rapid/preferencesdialog.py:453
 msgid "Remove all Ignored Paths?"
 msgstr "Fjern alle undertrykte filbaner?"
 
-#: rapid/preferencesdialog.py:451
+#: rapid/preferencesdialog.py:454
 msgid "Should all ignored paths be removed?"
 msgstr "Skal alle undertrykte stier fjernes?"
 
-#: rapid/preferencesdialog.py:462
+#: rapid/preferencesdialog.py:465
 msgid "Error in Photo Rename preferences"
 msgstr "Feil i innstillingene til nytt bildenavn"
 
-#: rapid/preferencesdialog.py:642
+#: rapid/preferencesdialog.py:645
 msgid "Error in Video Rename preferences"
 msgstr "Feil i innstillingene til nytt videonavn"
 
-#: rapid/preferencesdialog.py:663
+#: rapid/preferencesdialog.py:666
 msgid "Error in Photo Download Subfolders preferences"
 msgstr "Feil i innstillingene til undermappene for bildenedlasting"
 
-#: rapid/preferencesdialog.py:680
+#: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
 msgstr "Feil i innstillingene til undermappene for videonedlasting"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:739
+#: rapid/preferencesdialog.py:742
 msgid "Enter a Job Code"
 msgstr "Skriv inn ett jobbnavn"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:755
+#: rapid/preferencesdialog.py:758
 msgid "Enter a new Job Code, or select a previous one"
 msgstr "Skriv inn ett jobbnavn, eller velg ett tidligere ett"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: rapid/preferencesdialog.py:758
+#: rapid/preferencesdialog.py:761
 msgid "Enter a new Job Code"
 msgstr "Skriv inn ett nytt jobbnavn"
 
-#: rapid/preferencesdialog.py:763
+#: rapid/preferencesdialog.py:766
 msgid "Job Code:"
 msgstr "Jobbnavn"
 
-#: rapid/preferencesdialog.py:819
+#: rapid/preferencesdialog.py:822
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: rapid/preferencesdialog.py:831
+#: rapid/preferencesdialog.py:834
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Oppgi en filsti som det ikke vil letes etter bilder eller video"
 
-#: rapid/preferencesdialog.py:836
+#: rapid/preferencesdialog.py:839
 msgid "Path:"
 msgstr "Filbane:"
 
-#: rapid/preferencesdialog.py:1079
+#: rapid/preferencesdialog.py:1082
 msgid "Job Code"
 msgstr "Jobbnavn"
 
-#: rapid/preferencesdialog.py:1350
+#: rapid/preferencesdialog.py:1353
 msgid "Select a folder in which to backup photos"
 msgstr "Velg en mappe for sikkerhetskopiering av bilder"
 
-#: rapid/preferencesdialog.py:1363
+#: rapid/preferencesdialog.py:1366
 msgid "Select a folder in which to backup videos"
 msgstr "Velg en mappe for sikkerhetskopiering av video"
 
 #. 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:1458
+#: rapid/preferencesdialog.py:1461
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 "name. Please use other renaming options.</i>"
@@ -937,7 +965,7 @@ msgstr ""
 "<i><b>Advarsel:</b> Det er ikke nok metadata til å generere navnet fullt ut. "
 "Bruk andre alternativer for omdøping av navn.</i>"
 
-#: rapid/preferencesdialog.py:1509
+#: rapid/preferencesdialog.py:1512
 msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
@@ -946,13 +974,13 @@ msgstr ""
 "Bruk andre alternativer for omdøping av 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:1512
+#: rapid/preferencesdialog.py:1515
 #, python-format
 msgid "<i>Example: %s</i>"
 msgstr "<i>Eksempel: %s</i>"
 
 #. Preferences list is now empty
-#: rapid/preferencesdialog.py:1602
+#: rapid/preferencesdialog.py:1605
 #, python-format
 msgid ""
 "The %(filetype)s subfolder preferences entered are invalid and cannot be "
@@ -962,7 +990,7 @@ msgstr ""
 "Innstillingene til %(filetype)s undermappe er ugyldige og kan ikke brukes.\n"
 "De vil bli satt tilbake til standard verdier."
 
-#: rapid/preferencesdialog.py:1747
+#: rapid/preferencesdialog.py:1750
 #, python-format
 msgid ""
 "The following regular expressions are invalid, and will be removed unless "
@@ -973,7 +1001,7 @@ msgstr ""
 "endrer dem:\n"
 "%s"
 
-#: rapid/preferencesdialog.py:1749
+#: rapid/preferencesdialog.py:1752
 #, python-format
 msgid ""
 "This regular expression is invalid, and will be removed unless you correct "
@@ -984,142 +1012,142 @@ msgstr ""
 "det:\n"
 " %s"
 
-#: rapid/preferencesdialog.py:1750
+#: rapid/preferencesdialog.py:1753
 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
+#: rapid/preferencesdialog.py:1934
 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
+#: rapid/preferencesdialog.py:1936
 msgid "externaldrive2"
 msgstr "eksterndisk2"
 
-#: rapid/prefsrapid.py:126
+#: rapid/prefsrapid.py:127
 msgid "New York"
 msgstr "New York"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Manila"
 msgstr "Manila"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Prague"
 msgstr "Praha"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: rapid/prefsrapid.py:127
+#: rapid/prefsrapid.py:128
 msgid "Wellington"
 msgstr "Wellington"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Tehran"
 msgstr "Teheran"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Kampala"
 msgstr "Kampala"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Paris"
 msgstr "Paris"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Berlin"
 msgstr "Berlin"
 
-#: rapid/prefsrapid.py:128
+#: rapid/prefsrapid.py:129
 msgid "Sydney"
 msgstr "Sydney"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Budapest"
 msgstr "Budapest"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Rome"
 msgstr "Roma"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Moscow"
 msgstr "Moskva"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Delhi"
 msgstr "Delhi"
 
-#: rapid/prefsrapid.py:129
+#: rapid/prefsrapid.py:130
 msgid "Warsaw"
 msgstr "Warszawa"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Madrid"
 msgstr "Madrid"
 
-#: rapid/prefsrapid.py:130
+#: rapid/prefsrapid.py:131
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. components
-#: rapid/problemnotification.py:26 rapid/subfolderfile.py:357
+#: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
 msgid "subfolder"
 msgstr "undermappe"
 
-#: rapid/problemnotification.py:27 rapid/subfolderfile.py:355
+#: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
 msgid "filename"
 msgstr "filnavn"
 
-#: rapid/problemnotification.py:80
+#: rapid/problemnotification.py:81
 #, python-format
 msgid "Date time value %s appears invalid."
 msgstr "Dato tidsverdien %s fremstår som ugyldig."
 
-#: rapid/problemnotification.py:81
+#: rapid/problemnotification.py:82
 msgid "Filename does not have an extension."
 msgstr "Filnavnet mangler filending."
 
 #. a number component is something like the 8346 in IMG_8346.JPG
-#: rapid/problemnotification.py:83
+#: rapid/problemnotification.py:84
 msgid "Filename does not have a number component."
 msgstr "Filnavnet mangler nummerdelen."
 
-#: rapid/problemnotification.py:84
+#: rapid/problemnotification.py:85
 #, python-format
 msgid "Error generating component %s."
 msgstr "Feil ved oppretting av %s-komponenten."
 
 #. a generic problem
-#: rapid/problemnotification.py:86
+#: rapid/problemnotification.py:87
 #, python-format
 msgid "%(filetype)s metadata cannot be read"
 msgstr "%(filetype)s metadata kan ikke leses"
 
-#: rapid/problemnotification.py:88
+#: rapid/problemnotification.py:89
 #, python-format
 msgid "%(filetype)s %(area)s could not be generated"
 msgstr "%(filetype)s %(area)s kunne ikke opprettes"
 
-#: rapid/problemnotification.py:90 rapid/problemnotification.py:91
+#: rapid/problemnotification.py:91 rapid/problemnotification.py:92
 #, python-format
 msgid "An error occurred when copying the %(filetype)s"
 msgstr "En feil oppstod ved kopiering av %(filetype)s"
 
-#: rapid/problemnotification.py:93 rapid/problemnotification.py:94
+#: rapid/problemnotification.py:94 rapid/problemnotification.py:95
 #, python-format
 msgid "%(filetype)s already exists"
 msgstr "%(filetype)s finnes allerede"
 
-#: rapid/problemnotification.py:97
+#: rapid/problemnotification.py:98
 #, python-format
 msgid ""
 "%(filetype)s could not be backed up because no suitable backup locations "
@@ -1128,7 +1156,7 @@ msgstr ""
 "%(filetype)s could not be backed up because no suitable backup locations "
 "were found."
 
-#: rapid/problemnotification.py:102
+#: rapid/problemnotification.py:103
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -1137,253 +1165,258 @@ msgstr ""
 "%(image1)s ble tatt den %(image1_date)s klokken %(image1_time)s, og "
 "%(image2)s den %(image2_date)s klokken %(image2_time)s."
 
-#: rapid/problemnotification.py:103
+#: rapid/problemnotification.py:104
 #, python-format
 msgid "%(filetype)s was already downloaded"
 msgstr "%(filetype)s er allerede lastet ned"
 
-#: rapid/problemnotification.py:107
+#: rapid/problemnotification.py:108
 #, 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
+#: rapid/problemnotification.py:109
 #, python-format
 msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 msgstr ""
 
-#: rapid/problemnotification.py:109
+#: rapid/problemnotification.py:110
 #, python-format
 msgid "There is no data with which to name the %(filetype)s."
-msgstr ""
+msgstr "Mangler data for å navngi %(filetype)s."
 
-#: rapid/problemnotification.py:111
+#: rapid/problemnotification.py:112
 #, python-format
 msgid "Error: %(errorno)s %(strerror)s"
 msgstr "Feil: %(errorno)s %(strerror)s"
 
-#: rapid/problemnotification.py:201
+#: rapid/problemnotification.py:202
 msgid "The metadata might be corrupt."
 msgstr "Metadataen kan være korrupt."
 
-#: rapid/problemnotification.py:204
+#: rapid/problemnotification.py:205
 msgid ""
 "The filename, extension and Exif information indicate it has already been "
 "downloaded."
 msgstr ""
 
-#: rapid/problemnotification.py:223
+#: rapid/problemnotification.py:224
 #, python-format
 msgid " It was backed up to %(volume)s"
 msgstr " Det ble sikkerhetskopiert til %(volume)s"
 
-#: rapid/problemnotification.py:225
+#: rapid/problemnotification.py:226
 msgid " It was backed up to these devices: "
 msgstr " Det ble sikkerhetskopiert til disse enhetene: "
 
-#: rapid/problemnotification.py:227 rapid/problemnotification.py:288
-#: rapid/problemnotification.py:300
+#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
+#: rapid/problemnotification.py:301
 #, python-format
 msgid "%s, "
 msgstr "%s, "
 
-#: rapid/problemnotification.py:228 rapid/problemnotification.py:289
-#: rapid/problemnotification.py:301
+#: rapid/problemnotification.py:229 rapid/problemnotification.py:290
+#: rapid/problemnotification.py:302
 #, python-format
 msgid "%(volumes)s and %(final_volume)s."
 msgstr "%(volumes)s og %(final_volume)s."
 
-#: rapid/problemnotification.py:240
+#: rapid/problemnotification.py:241
 #, python-format
 msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
-"Fant bilder med samme filnavn, men tatt ved forskjellige tidspunkt: "
+"Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt: "
 "%(details)s"
 
-#: rapid/problemnotification.py:257
+#: rapid/problemnotification.py:258
 #, python-format
 msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 msgstr "En feil oppstod ved sikkerhetskopiering til %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:259
+#: rapid/problemnotification.py:260
 #, python-format
 msgid "An error occurred when backing up on %(volume)s."
 msgstr "En feil oppstod ved sikkerhetskopiering til %(volume)s."
 
-#: rapid/problemnotification.py:261
+#: rapid/problemnotification.py:262
 msgid "Errors occurred when backing up on the following backup devices: "
 msgstr "Flere feil oppstod ved sikkerhetskopiering til følgende enheter: "
 
-#: rapid/problemnotification.py:265 rapid/problemnotification.py:313
+#: rapid/problemnotification.py:266 rapid/problemnotification.py:314
 #, python-format
 msgid "%(volume)s (%(inst)s), "
 msgstr "%(volume)s (%(inst)s), "
 
-#: rapid/problemnotification.py:267
+#: rapid/problemnotification.py:268
 #, python-format
 msgid "%(volume)s, "
 msgstr "%(volume)s, "
 
-#: rapid/problemnotification.py:271 rapid/problemnotification.py:315
+#: rapid/problemnotification.py:272 rapid/problemnotification.py:316
 #, python-format
 msgid "%(volumes)s and %(volume)s (%(inst)s)."
 msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
-#: rapid/problemnotification.py:276
+#: rapid/problemnotification.py:277
 #, python-format
 msgid "%(volumes)s and %(volume)s."
 msgstr "%(volumes)s og %(volume)s."
 
-#: rapid/problemnotification.py:284
+#: rapid/problemnotification.py:285
 #, python-format
 msgid "Backup already exists on %(volume)s."
 msgstr "Sikkerhetskopi finnes allerede på %(volume)s."
 
-#: rapid/problemnotification.py:286
+#: rapid/problemnotification.py:287
 msgid "Backups already exist in these locations: "
 msgstr "Sikkerhetskopier finnes allerede i disse plasseringene: "
 
-#: rapid/problemnotification.py:296
+#: rapid/problemnotification.py:297
 #, python-format
 msgid "Backup overwritten on %(volume)s."
 msgstr "Sikkerhetskopi overskrevet på %(volume)s."
 
-#: rapid/problemnotification.py:298
+#: rapid/problemnotification.py:299
 msgid "Backups overwritten on these devices: "
 msgstr "Sikkerhetskopier overskrevet på  disse enhetene: "
 
-#: rapid/problemnotification.py:309
+#: rapid/problemnotification.py:310
 #, python-format
 msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 msgstr "En feil oppstod ved oppretting av mapper på %(volume)s: %(inst)s."
 
-#: rapid/problemnotification.py:311
+#: rapid/problemnotification.py:312
 msgid ""
 "Errors occurred when creating directories on the following backup devices: "
 msgstr ""
 "Flere feil oppstod ved oppretting av mapper på følgende enheter for "
 "sikkerhetskopi: "
 
-#: rapid/problemnotification.py:322
+#: rapid/problemnotification.py:323
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
 msgstr "%(previousproblem)s i tillegg, %(newproblem)s"
 
-#: rapid/problemnotification.py:330
+#: rapid/problemnotification.py:331
 #, python-format
 msgid " Furthermore, there were %(problems)s."
 msgstr " Dessuten, var det %(problems)s."
 
-#: rapid/problemnotification.py:332
+#: rapid/problemnotification.py:333
 #, python-format
 msgid " Furthermore, there was a %(problem)s."
 msgstr " Dessuten, var det ett %(problem)s."
 
-#: rapid/problemnotification.py:341
+#: rapid/problemnotification.py:342
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s metadata mangler."
 
-#: rapid/problemnotification.py:343
+#: rapid/problemnotification.py:344
 msgid "The following metadata is missing: "
 msgstr "Følgende metadata mangler: "
 
-#: rapid/problemnotification.py:346
+#: rapid/problemnotification.py:347
 #, 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
+#: rapid/problemnotification.py:364
 msgid "Problems in subfolder and filename generation"
 msgstr "Flere problemer ved oppretting av undermapper og filnavn"
 
-#: rapid/problemnotification.py:365
+#: rapid/problemnotification.py:366
 msgid "Problem in subfolder and filename generation"
 msgstr "Problem ved oppretting av undermappe og filnavn"
 
-#: rapid/problemnotification.py:368
+#: rapid/problemnotification.py:369
 #, python-format
 msgid "Problems in %s generation"
 msgstr "Problemer ved oppretting av %s"
 
-#: rapid/problemnotification.py:370
+#: rapid/problemnotification.py:371
 #, python-format
 msgid "Problem in %s generation"
 msgstr "Problem ved oppretting av %s"
 
-#: rapid/problemnotification.py:379
+#: rapid/problemnotification.py:380
 #, python-format
 msgid "%(filetype)s already exists, but it was backed up"
 msgstr "%(filetype)s finnes allerede, men den ble sikkerhetskopiert"
 
-#: rapid/problemnotification.py:381
+#: rapid/problemnotification.py:382
 #, python-format
 msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 msgstr ""
 "En feil oppstod ved kopiering av %(filetype)s, men den ble sikkerhetskopiert"
 
-#: rapid/problemnotification.py:401
+#: rapid/problemnotification.py:402
 msgid "Multiple problems were encountered"
 msgstr "Flere feil oppstod"
 
-#: rapid/problemnotification.py:403 rapid/subfolderfile.py:232
+#: rapid/problemnotification.py:404 rapid/subfolderfile.py:233
 msgid "Photos detected with the same filenames, but taken at different times"
-msgstr "Bilder funnet med like navn, men tatt til forskjellig tid"
+msgstr "Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt"
 
-#: rapid/problemnotification.py:409
+#: rapid/problemnotification.py:410
 msgid "there were errors backing up"
 msgstr "det oppstod flere feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:410
+#: rapid/problemnotification.py:411
 msgid "There were errors backing up"
 msgstr "Det oppstod flere feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:412
+#: rapid/problemnotification.py:413
 msgid "there was an error backing up"
 msgstr "det oppstod en feil ved sikkerhetskopieringen"
 
-#: rapid/problemnotification.py:413
+#: rapid/problemnotification.py:414
 msgid "There was an error backing up"
 msgstr "Det oppstod en feil under sikkerhetskopieringen"
 
 #. e.g.
-#: rapid/problemnotification.py:416
+#: rapid/problemnotification.py:417
 #, python-format
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, og %(backinguperror)s"
 
-#: rapid/rpdfile.py:141
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: rapid/subfolderfile.py:79
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
+#: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#: rapid/subfolderfile.py:300
+#: rapid/subfolderfile.py:301
 msgid "Photo has already been downloaded"
 msgstr "Bildet er allerede lastet ned"
 
-#: rapid/subfolderfile.py:301
+#: rapid/subfolderfile.py:302
 #, python-format
 msgid "Source: %(source)s"
 msgstr "Kilde: %(source)s"
 
-#: rapid/subfolderfile.py:353
+#: rapid/subfolderfile.py:354
 msgid "subfolder and filename"
 msgstr "undermappe og filnavn"
 
-#: rapid/subfolderfile.py:392
+#: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
 msgstr "Klarte ikke å opprette undermappe for nedlasting"
 
-#: rapid/subfolderfile.py:393
+#: rapid/subfolderfile.py:394
 #, python-format
 msgid "Path: %s"
 msgstr "Filbane: %s"
@@ -1481,6 +1514,9 @@ msgid ""
 "Choose the download folder. Subfolders for the downloaded photos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
+"Velg en mappe for nedlasting. Undermapper for bildene vil automatisk bli "
+"opprettet i denne mappen etter de valg du har gjort for "
+"nedlastingsundermapper."
 
 #: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
@@ -1537,6 +1573,9 @@ msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
+"Velg en mappe for nedlasting. Undermapper for videoene vil automatisk bli "
+"opprettet i denne mappen etter de valg du har gjort for "
+"nedlastingsundermapper."
 
 #: rapid/glade3/prefs.ui.h:19
 msgid "Video Folders"
@@ -1733,7 +1772,7 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:67
 msgid "Automatically detect backup devices"
-msgstr ""
+msgstr "Oppdag enheter for sikkerhetskopiering automatisk"
 
 #: rapid/glade3/prefs.ui.h:68
 msgid ""
@@ -1784,7 +1823,7 @@ msgstr "Sikkerhetskopi"
 
 #: rapid/glade3/prefs.ui.h:80
 msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Forskjellig</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Diverse</span>"
 
 #: rapid/glade3/prefs.ui.h:81
 msgid "<b>Program Automation</b>"
@@ -1808,7 +1847,7 @@ msgstr "Avslutt programmet når nedlastingen er ferdig"
 
 #: rapid/glade3/prefs.ui.h:86
 msgid "Exit program even if download had warnings or errors"
-msgstr ""
+msgstr "Avslutt programmet selv om nedlastingen hadde feil eller advarsler"
 
 #: rapid/glade3/prefs.ui.h:87
 msgid "Automatically rotate JPEG images"
diff --git a/po/nl.po b/po/nl.po
index 71fdbac..213645c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,23 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-05-13 22:31-0500\n"
-"PO-Revision-Date: 2012-05-23 09:49+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-23 04:00-0500\n"
+"PO-Revision-Date: 2012-06-24 09:07+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: 2012-05-29 18:44+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-06-25 00:48+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+"Language: nl\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:110 rapid/rapid.py:1749 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +32,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:120
+#: rapid/rapid.py:122
 #, 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:155
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Apparaat"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:173
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Grootte"
 
-#: rapid/rapid.py:176
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr "Downloadvoortgang"
 
-#: rapid/rapid.py:322
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "%(device)s werd niet ontkoppeld"
@@ -66,22 +67,22 @@ 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:1189
+#: rapid/rapid.py:1216
 msgid "scanning..."
 msgstr "Aan het scannen..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1747
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr "de 'root' van het bestandssysteem"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Aan het downloaden van %(location)s."
 
-#: rapid/rapid.py:1752
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +90,15 @@ msgstr ""
 "Wenst u werkelijk vanaf hier te downloaden? Het doorlopen van deze plaats "
 "kan op bepaalde systemen heel lang duren."
 
-#: rapid/rapid.py:2174
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Download"
 
-#: rapid/rapid.py:2177
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Pauze"
 
-#: rapid/rapid.py:2282
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +109,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2285
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,177 +118,177 @@ msgstr ""
 "Deze downloadmap is ongeldig:\n"
 "%s"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr "Download kan niet plaatsgrijpen"
 
-#: rapid/rapid.py:2653
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Ongeveer 1 seconde te gaan"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Ongeveer %i seconden te gaan"
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2704
 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:2662
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
-#: rapid/rapid.py:2684 rapid/rpdfile.py:116
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "foto's en video's"
 
-#: rapid/rapid.py:2686 rapid/rpdfile.py:118
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "foto's of video's"
 
-#: rapid/rapid.py:2689 rapid/rapid.py:3502 rapid/rpdfile.py:121
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "video's"
 
-#: rapid/rapid.py:2691 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:123
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "video"
 
-#: rapid/rapid.py:2694 rapid/rapid.py:3500 rapid/rpdfile.py:126
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "foto's"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2696 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:128
-#: rapid/rpdfile.py:253
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "foto"
 
-#: rapid/rapid.py:2723
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kon niet gedownload worden"
 
-#: rapid/rapid.py:2730 rapid/rapid.py:2782
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "verwittigingen"
 
-#: rapid/rapid.py:2739
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Alle downloads zijn afgelopen"
 
-#: rapid/rapid.py:2745 rapid/rapid.py:2754 rapid/rapid.py:2763
-#: rapid/rapid.py:2772 rapid/rapid.py:2780
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2747 rapid/rapid.py:2765
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s gedownload"
 
-#: rapid/rapid.py:2756 rapid/rapid.py:2774
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, 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:2813
+#: rapid/rapid.py:2860
 #, 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:2820
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s van %(total)s %(filetypes)s"
 
-#: rapid/rapid.py:3166
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr "Van"
 
-#: rapid/rapid.py:3174
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Automatisch detecteren"
 
-#: rapid/rapid.py:3178 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Selecteer een map die %(file_types)s bevat"
 
-#: rapid/rapid.py:3219
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: rapid/rapid.py:3232
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: rapid/rapid.py:3254
+#: rapid/rapid.py:3310
 msgid "To"
-msgstr "Aan"
+msgstr "Naar"
 
-#: rapid/rapid.py:3261 rapid/rapid.py:3897
+#: rapid/rapid.py:3317 rapid/rapid.py:3986
 msgid "Photos:"
 msgstr "Foto's:"
 
-#: rapid/rapid.py:3264 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr "Duid een map aan om de foto's naar toe te downloaden"
 
-#: rapid/rapid.py:3276 rapid/rapid.py:3897
+#: rapid/rapid.py:3332 rapid/rapid.py:3986
 msgid "Videos:"
 msgstr "Video's:"
 
-#: rapid/rapid.py:3278 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
-msgstr "Selecteer een folder om de video's naar toe te downloaden"
+msgstr "Selecteer een map om de video's naar toe te downloaden"
 
-#: rapid/rapid.py:3470
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "en"
 
-#: rapid/rapid.py:3475
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr "Backup apparaten aan het gebruiken"
 
-#: rapid/rapid.py:3477
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr "Backup apparaat aan het gebruiken"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr "Geen backup apparaat gedetecteerd"
 
-#: rapid/rapid.py:3506
+#: rapid/rapid.py:3562
 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:3518
+#: rapid/rapid.py:3574
 #, 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:3522
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +296,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:3527
+#: rapid/rapid.py:3583
 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:3532
+#: rapid/rapid.py:3588
 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:3538
+#: rapid/rapid.py:3594
 #, python-format
 msgid "%(free)s free"
 msgstr "%(free)s vrij"
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3546
+#: rapid/rapid.py:3602
 #, 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:3549
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Backuppen naar %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3552
+#: rapid/rapid.py:3608
 #, 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:3559
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3588
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr "Programma voorkeuren zijn ongeldig"
 
-#: rapid/rapid.py:3707 rapid/rpdfile.py:254
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Foto"
 
-#: rapid/rapid.py:3709 rapid/rpdfile.py:273
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Video"
 
-#: rapid/rapid.py:3718
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "%(file_type)s downloadmap bestaat niet"
 
-#: rapid/rapid.py:3720 rapid/rapid.py:3734 rapid/rapid.py:3747
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr "Map: %s"
 
-#: rapid/rapid.py:3732
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "%(file_type)s downloadmap is ongeldig"
 
-#: rapid/rapid.py:3745
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "%(file_type)s downloadmap is niet beschrijfbaar"
 
-#: rapid/rapid.py:3831
+#: rapid/rapid.py:3894
 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:3878
+#: rapid/rapid.py:3949
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,33 +385,57 @@ msgstr ""
 "vertoon programma informatie op de commando lijn wanneer het programma "
 "draait (standaard: %default)"
 
-#: rapid/rapid.py:3879
+#: rapid/rapid.py:3950
 msgid "display debugging information when run from the command line"
-msgstr "vertoon debug informatie wanneer uitgevoerd vanop de commando prompt"
+msgstr "vertoon debug informatie wanneer uitgevoerd vanaf de commando prompt"
 
-#: rapid/rapid.py:3880
+#: rapid/rapid.py:3951
 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:3882
+#: rapid/rapid.py:3953
 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:3884
+#: rapid/rapid.py:3955
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+"detecteer automatisch apparaten om van te downloaden, overschrijf daarbij de "
+"programma voorkeuren"
+
+#: rapid/rapid.py:3956
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+"specificeer manueel het PAD van het apparaat om van te downloaden, "
+"overschrijf daarbij de programma voorkeuren"
+
+#: rapid/rapid.py:3957
 msgid "reset all program settings and preferences and exit"
-msgstr "reset alle programma instellingen en verlaat het programma"
+msgstr "herstel alle programma instellingen en verlaat het programma"
+
+#: rapid/rapid.py:3970
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+"Fout: Specificeer auto-detectie apparaat of geef manueel het pad op van waar "
+"gedownload moet worden, maar doe beiden niet samen."
 
-#: rapid/rapid.py:3902
+#: rapid/rapid.py:3991
 #, python-format
 msgid "and %s"
 msgstr "en %s"
 
-#: rapid/rapid.py:3910
+#: rapid/rapid.py:3999
 msgid "All settings and preferences have been reset"
-msgstr "Alle instellingen en voorkeuren werden gereset"
+msgstr "Alle instellingen en voorkeuren werden hersteld"
 
 #: rapid/backupfile.py:157 rapid/backupfile.py:180
 msgid "Backing up error"
@@ -455,7 +480,7 @@ msgid ""
 "Should this device or partition be used to download photos or videos from?"
 msgstr ""
 "Moet dit apparaat of deze partitie gebruikt worden om foto's of video's van "
-"te halen?"
+"te downloaden?"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#usedeviceprompt
 #: rapid/device.py:108
@@ -468,7 +493,7 @@ msgstr "MB/s"
 
 #: rapid/generatenameconfig.py:151
 msgid "Date time"
-msgstr "Datum/tijd"
+msgstr "Datum tijd"
 
 #: rapid/generatenameconfig.py:152
 msgid "Text"
@@ -493,11 +518,11 @@ msgstr "Job code"
 
 #: rapid/generatenameconfig.py:158
 msgid "Image date"
-msgstr "Afbeeldingsgegevens"
+msgstr "Afbeeldingsdatum"
 
 #: rapid/generatenameconfig.py:159
 msgid "Video date"
-msgstr "Video datum"
+msgstr "Videodatum"
 
 #: rapid/generatenameconfig.py:160
 msgid "Today"
@@ -530,11 +555,11 @@ msgstr "Extentie"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
 #: rapid/generatenameconfig.py:171
 msgid "Image number"
-msgstr "Afbeelding nummer"
+msgstr "Afbeeldingsnummer"
 
 #: rapid/generatenameconfig.py:172
 msgid "Video number"
-msgstr "Video nummer"
+msgstr "Videonummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:174
@@ -559,22 +584,22 @@ msgstr "Brandpuntsafstand"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:182
 msgid "Camera make"
-msgstr "Camera merk"
+msgstr "Cameramerk"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:184
 msgid "Camera model"
-msgstr "Camera model"
+msgstr "Cameramodel"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:186
 msgid "Short camera model"
-msgstr "Camera model (kort)"
+msgstr "Cameramodel (kort)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:188
 msgid "Hyphenated short camera model"
-msgstr "Camera model (kort na koppelteken)"
+msgstr "Cameramodel (kort na koppelteken)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:190
@@ -584,7 +609,7 @@ msgstr "Serienummer"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:192
 msgid "Shutter count"
-msgstr "Sluiter teller"
+msgstr "Sluiterteller"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
 #: rapid/generatenameconfig.py:194
@@ -647,7 +672,7 @@ msgstr "Sessienummer"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:213
 msgid "Subfolder number"
-msgstr "Nummer Submap"
+msgstr "Submapnummer"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
 #: rapid/generatenameconfig.py:215
@@ -657,7 +682,7 @@ msgstr "Opgeslagen nummer"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
 #: rapid/generatenameconfig.py:217
 msgid "Sequence letter"
-msgstr "Vervolg letter"
+msgstr "Vervolgletter"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
 #: rapid/generatenameconfig.py:219
@@ -805,7 +830,7 @@ msgstr "Maand (volledig)"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:272
 msgid "Month (abbreviated)"
-msgstr "Maand (Afgekort)"
+msgstr "Maand (kort)"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
 #: rapid/generatenameconfig.py:274
@@ -845,17 +870,17 @@ msgstr "SS"
 #: rapid/preferencesdialog.py:374
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
-msgstr "Submap voorkeuren mogen niet starten met een %s"
+msgstr "Submapvoorkeuren mogen niet starten met een %s"
 
 #: rapid/preferencesdialog.py:376
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
-msgstr "Submap voorkeuren mogen niet eindigen op een %s"
+msgstr "Submapvoorkeuren mogen niet eindigen op een %s"
 
 #: rapid/preferencesdialog.py:380
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Submap voorkeuren mogen geen twee opeenvolgende %s bevatten"
+msgstr "Submapvoorkeuren mogen geen twee opeenvolgende %s bevatten"
 
 #: rapid/preferencesdialog.py:439 rapid/preferencesdialog.py:700
 msgid "Remove all Job Codes?"
@@ -895,7 +920,7 @@ msgstr "Fout in de voorkeuren van Foto Download Submappen"
 
 #: rapid/preferencesdialog.py:683
 msgid "Error in Video Download Subfolders preferences"
-msgstr "Fout in de voorkeuren Video Download Subfolders"
+msgstr "Fout in de voorkeuren Video Download Submappen"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#jobcode
 #: rapid/preferencesdialog.py:742
@@ -938,7 +963,7 @@ msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
 
 #: rapid/preferencesdialog.py:1366
 msgid "Select a folder in which to backup videos"
-msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
+msgstr "Selecteer een map waar video'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:1461
@@ -954,8 +979,8 @@ msgid ""
 "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 "subfolders. Please use other subfolder naming options.</i>"
 msgstr ""
-"<i><b>Opgepast:</b> Er is onvoldoende metadata om volledige subfolders aan "
-"te maken. Kies andere subfolder benoemings opties.</i>"
+"<i><b>Opgepast:</b> Er is onvoldoende metadata om volledige submappen aan te "
+"maken. Kies andere submappen 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:1515
@@ -971,7 +996,7 @@ msgid ""
 "used.\n"
 "They will be reset to their default values."
 msgstr ""
-"De voorkeuren voor de %(filetype)s subfolder zijn ongeldig en kunnen niet "
+"De voorkeuren voor de %(filetype)s submap zijn ongeldig en kunnen niet "
 "gebruikt worden.\n"
 "Ze zullen naar de standaard waardes worden teruggezet."
 
@@ -1086,7 +1111,7 @@ msgstr "Stockholm"
 #. components
 #: rapid/problemnotification.py:27 rapid/subfolderfile.py:358
 msgid "subfolder"
-msgstr "subfolder"
+msgstr "submap"
 
 #: rapid/problemnotification.py:28 rapid/subfolderfile.py:356
 msgid "filename"
@@ -1095,7 +1120,7 @@ msgstr "bestandsnaam"
 #: rapid/problemnotification.py:81
 #, python-format
 msgid "Date time value %s appears invalid."
-msgstr "Datum / tijd waarde %s blijkt ongeldig te zijn."
+msgstr "Datum tijd waarde %s blijkt ongeldig te zijn."
 
 #: rapid/problemnotification.py:82
 msgid "Filename does not have an extension."
@@ -1148,7 +1173,7 @@ msgid ""
 "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 omOm %(image2_time)s."
+"op %(image2_date)s om %(image2_time)s."
 
 #: rapid/problemnotification.py:104
 #, python-format
@@ -1182,7 +1207,7 @@ msgstr "Fout: %(errorno)s %(strerror)s"
 
 #: rapid/problemnotification.py:202
 msgid "The metadata might be corrupt."
-msgstr "De metadata kan foutief zijn."
+msgstr "De metadata kan beschadigd zijn."
 
 #: rapid/problemnotification.py:205
 msgid ""
@@ -1219,8 +1244,8 @@ msgid ""
 "Photos detected with the same filenames, but taken at different times: "
 "%(details)s"
 msgstr ""
-"Afbeeldingen ontdekt met dezelfde bestandsnamen maar genomen op "
-"verschillende tijden: %(details)s"
+"Foto's ontdekt met dezelfde bestandsnamen maar genomen op verschillende "
+"tijden: %(details)s"
 
 #: rapid/problemnotification.py:258
 #, python-format
@@ -1290,7 +1315,7 @@ msgstr ""
 #: rapid/problemnotification.py:323
 #, python-format
 msgid "%(previousproblem)s Additionally, %(newproblem)s"
-msgstr "%(previousproblem)s Daarbovenop, %(newproblem)s"
+msgstr "%(previousproblem)s Bovenop, %(newproblem)s"
 
 #: rapid/problemnotification.py:331
 #, python-format
@@ -1332,7 +1357,7 @@ msgstr "Problemen bij het aanmaken van %s"
 #: rapid/problemnotification.py:371
 #, python-format
 msgid "Problem in %s generation"
-msgstr "Probleen bij het aanmaken van %s"
+msgstr "Probleem bij het aanmaken van %s"
 
 #: rapid/problemnotification.py:380
 #, python-format
@@ -1377,11 +1402,16 @@ msgstr "Er was een fout tijdens het backuppen"
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, en %(backinguperror)s"
 
-#: rapid/rpdfile.py:142
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr "aan het scannen (vond %(photos)s foto's en  %(videos)s video's)..."
+
 #: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
@@ -1398,7 +1428,7 @@ msgstr "Bron: %(source)s"
 
 #: rapid/subfolderfile.py:354
 msgid "subfolder and filename"
-msgstr "subfolder en bestandsnaam"
+msgstr "submap en bestandsnaam"
 
 #: rapid/subfolderfile.py:393
 msgid "Failed to create download subfolder"
@@ -1495,7 +1525,7 @@ msgstr "<b>Download Submappen</b>"
 
 #: rapid/glade3/prefs.ui.h:5
 msgid "Download folder:"
-msgstr "Download map:"
+msgstr "Downloadmap:"
 
 #: rapid/glade3/prefs.ui.h:6
 msgid ""
@@ -1507,11 +1537,11 @@ msgstr ""
 
 #: rapid/glade3/prefs.ui.h:7
 msgid "<b>Download Folder</b>"
-msgstr "<b>Download Map</b>"
+msgstr "<b>DownloadMap</b>"
 
 #: rapid/glade3/prefs.ui.h:8
 msgid "Photo Folders"
-msgstr "Foto Mappen"
+msgstr "Fotomappen"
 
 #: rapid/glade3/prefs.ui.h:9
 msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
@@ -1543,7 +1573,7 @@ msgstr "Foto Hernoemen"
 
 #: rapid/glade3/prefs.ui.h:16
 msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Video Download Mappen</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Video Downloadmappen</span>"
 
 #: rapid/glade3/prefs.ui.h:17
 msgid ""
@@ -1551,7 +1581,7 @@ msgid ""
 "install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
 "for python, or <i>exiftool</i>."
 msgstr ""
-"Sorry, de video download functionaliteit is uitgezet. Om videos te "
+"Sorry, de video download functionaliteit is uitgezet. Om video's te "
 "downloaden moet je ofwel de  <i>hachoir metadata</i> en de <i>kaa "
 "metadata</i> paketten voor python, ofwel <i>exiftool</i> installeren."
 
@@ -1560,12 +1590,12 @@ msgid ""
 "Choose the download folder. Subfolders for the downloaded videos will be "
 "automatically created in this folder using the structure specified below."
 msgstr ""
-"Kies de download map. Submappen voor de gedownloadde video's zullen "
+"Kies de downloadmap. Submappen voor de gedownloadde video's zullen "
 "automatisch aangemaakt worden in deze map conform de onderstaande structuur."
 
 #: rapid/glade3/prefs.ui.h:19
 msgid "Video Folders"
-msgstr "Video Mappen"
+msgstr "Videomappen"
 
 #: rapid/glade3/prefs.ui.h:20
 msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
@@ -1589,7 +1619,7 @@ msgid ""
 "sequence number should be reset."
 msgstr ""
 "Specifieer de tijd in 24-uurs formaat waar het <i>Downloads vandaag</i> "
-"volgnummer aan gelijk gezet moet worden.."
+"volgnummer aan gelijk gezet moet worden."
 
 #: rapid/glade3/prefs.ui.h:25
 msgid "Day start:"
@@ -1676,11 +1706,11 @@ msgid ""
 "setting it to PTP mode. If that is not possible, a card reader must be "
 "used.</i>"
 msgstr ""
-"Met apparaten wordt bedoeld van waar je de foto's en video's dowloadt, zoals "
-"camera's, geheugenkaarten of Draagbare Opslag Media.\n"
+"Met apparaten wordt bedoeld waar je de foto's en video's van downloadt, "
+"zoals camera's, geheugenkaarten of Draagbare Opslagmedia.\n"
 "\n"
 "Er kan vanaf meerdere apparaten simultaan gedownload worden, of je kunt een "
-"plaats op je harde schijf aanduiden..\n"
+"plaats op je harde schijf aanduiden.\n"
 "\n"
 "<i>Rechtstreeks downloaden vanaf de camera is momenteel een experimentele "
 "optie. Indien rechtstreeks downloaden vanaf de camera niet of onvoldoende "
@@ -1703,12 +1733,12 @@ 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 ""
-"Als je de automatische herkenning van draagbare opslag media aanzet, zal het "
-"volledig apparaat gelezen worden. Bij grote apparaten kan dat een tijd "
+"Als je de automatische herkenning van draagbare opslagmedia aanzet, zal het "
+"volledig apparaat ingelezen worden. Bij grote apparaten kan dat een tijd "
 "duren.\n"
 "\n"
-"Als deze optie aanstaat en een mogelijks apparaat gedetecteerd wordt, zal je "
-"gevraagd worden om te bepalen of het al dan niet ingelezen kan worden."
+"Als deze optie aanstaat en een potentieel apparaat gedetecteerd wordt, zal "
+"je gevraagd worden om te bepalen of het al dan niet ingelezen moet worden."
 
 #: rapid/glade3/prefs.ui.h:53
 msgid "Location:"
@@ -1750,7 +1780,7 @@ msgid ""
 "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 "
+"Geef het gedeelte op aan het einde van een pad 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."
 
@@ -1790,7 +1820,7 @@ msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
-"Je kan je foto's en video's naar meerdere lokaties backuppen terwijl ze "
+"Je kan je foto's en video's naar meerdere locaties backuppen terwijl ze "
 "gedownload worden, bv. externe harde schijven."
 
 #: rapid/glade3/prefs.ui.h:69
@@ -1809,7 +1839,8 @@ msgstr ""
 "\n"
 "<i>Noot: dit zal ook gebruikt worden om na te gaan of het apparaat al dan "
 "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>"
+"wenst te gebruiken, moet er een map aangemaakt worden met één van de "
+"volgende namen.</i>"
 
 #: rapid/glade3/prefs.ui.h:73
 msgid "Photo backup location:"
@@ -1825,7 +1856,7 @@ msgstr "<i>Voorbeeld:</i>"
 
 #: rapid/glade3/prefs.ui.h:76
 msgid "<i>/media/externaldrive/Photos</i>"
-msgstr "<i>/media/externaldrive/Photos</i>"
+msgstr "<i>/media/externaldrive/Fotos</i>"
 
 #: rapid/glade3/prefs.ui.h:77
 msgid "Video backup folder name:"
@@ -1849,7 +1880,7 @@ msgstr "<b>Programma Automatisatie</b>"
 
 #: rapid/glade3/prefs.ui.h:82
 msgid "Unmount (\"eject\") device upon download completion"
-msgstr "Ontkoppen (\"eject\") apparaat na beëindigen van de download"
+msgstr "Ontkoppel (\"eject\") apparaat na beëindigen van de download"
 
 #: rapid/glade3/prefs.ui.h:83
 msgid "Start downloading at program startup"
@@ -1865,7 +1896,8 @@ msgstr "Beëindig programma als de download afgelopen is"
 
 #: rapid/glade3/prefs.ui.h:86
 msgid "Exit program even if download had warnings or errors"
-msgstr "Beëindig programma zelfs indien de download fouten of meldingen had"
+msgstr ""
+"Beëindig programma zelfs indien de download fouten of waarschuwingen had"
 
 #: rapid/glade3/prefs.ui.h:87
 msgid "Automatically rotate JPEG images"
@@ -1893,7 +1925,7 @@ msgstr "<b>Foto- en Videonaam conflict</b>"
 
 #: rapid/glade3/prefs.ui.h:93
 msgid "Add unique identifier"
-msgstr "Unieke identifier toevoegen"
+msgstr "Unieke identifieteken toevoegen"
 
 #: rapid/glade3/prefs.ui.h:94
 msgid "Skip download"
diff --git a/po/pl.po b/po/pl.po
index 942fc7a..1ef2f49 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: 2012-05-13 22:31-0500\n"
-"PO-Revision-Date: 2012-05-18 09:52+0000\n"
+"POT-Creation-Date: 2012-06-23 04:00-0500\n"
+"PO-Revision-Date: 2012-06-23 09:30+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: 2012-05-29 18:44+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-06-25 00:48+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
-#: rapid/rapid.py:110 rapid/rapid.py:1749 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
@@ -31,33 +31,33 @@ msgstr ""
 "%(date)s\n"
 "%(time)s"
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr "%(date)s %(time)s"
 
-#: rapid/rapid.py:120
+#: rapid/rapid.py:122
 #, 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:155
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr "Urządzenie"
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:173
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr "Rozmiar"
 
-#: rapid/rapid.py:176
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr "Postęp pobierania"
 
-#: rapid/rapid.py:322
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr "Nie odmontowano %(device)s"
@@ -66,22 +66,22 @@ 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:1189
+#: rapid/rapid.py:1216
 msgid "scanning..."
 msgstr "wyszukiwanie..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1747
+#: rapid/rapid.py:1782
 msgid "the root of the file system"
 msgstr "katalog główny systemu plików"
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr "Pobieranie z %(location)s."
 
-#: rapid/rapid.py:1752
+#: rapid/rapid.py:1787
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
@@ -89,15 +89,15 @@ msgstr ""
 "Naprawdę pobierać z tego miejsca? W niektórych systemach, skanowanie tego "
 "położenia może potrwać bardzo długo."
 
-#: rapid/rapid.py:2174
+#: rapid/rapid.py:2209
 msgid "Download"
 msgstr "Pobierz"
 
-#: rapid/rapid.py:2177
+#: rapid/rapid.py:2212
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: rapid/rapid.py:2282
+#: rapid/rapid.py:2317
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -108,7 +108,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: rapid/rapid.py:2285
+#: rapid/rapid.py:2320
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -117,177 +117,177 @@ msgstr ""
 "Nieprawidłowy katalog pobierania:\n"
 "%s"
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2321
 msgid "Download cannot proceed"
 msgstr "Pobieranie nie może się odbyć"
 
-#: rapid/rapid.py:2653
+#: rapid/rapid.py:2700
 msgid "About 1 second remaining"
 msgstr "Pozostała około sekunda"
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2702
 #, python-format
 msgid "About %i seconds remaining"
 msgstr "Pozostało około %i sekund"
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2704
 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:2662
+#: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
-#: rapid/rapid.py:2684 rapid/rpdfile.py:116
+#: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr "zdjęcia i filmy"
 
-#: rapid/rapid.py:2686 rapid/rpdfile.py:118
+#: rapid/rapid.py:2733 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr "zdjęcia lub filmy"
 
-#: rapid/rapid.py:2689 rapid/rapid.py:3502 rapid/rpdfile.py:121
+#: rapid/rapid.py:2736 rapid/rapid.py:3558 rapid/rpdfile.py:128
 msgid "videos"
 msgstr "filmy"
 
-#: rapid/rapid.py:2691 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:123
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr "film"
 
-#: rapid/rapid.py:2694 rapid/rapid.py:3500 rapid/rpdfile.py:126
+#: rapid/rapid.py:2741 rapid/rapid.py:3556 rapid/rpdfile.py:133
 msgid "photos"
 msgstr "zdjęcia"
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2696 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:128
-#: rapid/rpdfile.py:253
+#: rapid/rapid.py:2743 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr "zdjęcie"
 
-#: rapid/rapid.py:2723
+#: rapid/rapid.py:2770
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Pobrane pliki typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2774
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Nieudanych pobrań plików typu %(filetypes)s: %(noFiles)s"
 
-#: rapid/rapid.py:2730 rapid/rapid.py:2782
+#: rapid/rapid.py:2777 rapid/rapid.py:2829
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: rapid/rapid.py:2739
+#: rapid/rapid.py:2786
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#: rapid/rapid.py:2745 rapid/rapid.py:2754 rapid/rapid.py:2763
-#: rapid/rapid.py:2772 rapid/rapid.py:2780
+#: rapid/rapid.py:2792 rapid/rapid.py:2801 rapid/rapid.py:2810
+#: rapid/rapid.py:2819 rapid/rapid.py:2827
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: rapid/rapid.py:2747 rapid/rapid.py:2765
+#: rapid/rapid.py:2794 rapid/rapid.py:2812
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "Plik typu %(filetype)s został pobrany"
 
-#: rapid/rapid.py:2756 rapid/rapid.py:2774
+#: rapid/rapid.py:2803 rapid/rapid.py:2821
 #, 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:2813
+#: rapid/rapid.py:2860
 #, 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:2820
+#: rapid/rapid.py:2867
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
-#: rapid/rapid.py:3166
+#: rapid/rapid.py:3222
 msgid "From"
 msgstr "Źródło"
 
-#: rapid/rapid.py:3174
+#: rapid/rapid.py:3230
 msgid "Auto Detect"
 msgstr "Wykrywanie automatyczne"
 
-#: rapid/rapid.py:3178 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3234 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr "Wybór katalogu zawierającego %(file_types)s"
 
-#: rapid/rapid.py:3219
+#: rapid/rapid.py:3275
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: rapid/rapid.py:3232
+#: rapid/rapid.py:3288
 msgid "Move"
 msgstr "Przenieś"
 
-#: rapid/rapid.py:3254
+#: rapid/rapid.py:3310
 msgid "To"
 msgstr "Cel"
 
-#: rapid/rapid.py:3261 rapid/rapid.py:3897
+#: rapid/rapid.py:3317 rapid/rapid.py:3986
 msgid "Photos:"
 msgstr "Zdjęcia:"
 
-#: rapid/rapid.py:3264 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3320 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr "Wybór katalogu dla pobieranych zdjęć"
 
-#: rapid/rapid.py:3276 rapid/rapid.py:3897
+#: rapid/rapid.py:3332 rapid/rapid.py:3986
 msgid "Videos:"
 msgstr "Filmy:"
 
-#: rapid/rapid.py:3278 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3334 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr "Wybór katalogu dla pobieranych filmów"
 
-#: rapid/rapid.py:3470
+#: rapid/rapid.py:3526
 msgid "and"
 msgstr "oraz"
 
-#: rapid/rapid.py:3475
+#: rapid/rapid.py:3531
 msgid "Using backup devices"
 msgstr "Użycie urządzeń do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3477
+#: rapid/rapid.py:3533
 msgid "Using backup device"
 msgstr "Użycie urządzenia do zapisu kopii zapasowej"
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3535
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: rapid/rapid.py:3506
+#: rapid/rapid.py:3562
 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:3518
+#: rapid/rapid.py:3574
 #, 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:3522
+#: rapid/rapid.py:3578
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr "%(free)s %(file_type)s"
@@ -295,87 +295,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:3527
+#: rapid/rapid.py:3583
 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:3532
+#: rapid/rapid.py:3588
 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:3538
+#: rapid/rapid.py:3594
 #, 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:3546
+#: rapid/rapid.py:3602
 #, 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:3549
+#: rapid/rapid.py:3605
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr "Tworzenie kopii zapasowej w %(path)s"
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3552
+#: rapid/rapid.py:3608
 #, 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:3559
+#: rapid/rapid.py:3615
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr "%(freespace)s. %(backuppaths)s."
 
-#: rapid/rapid.py:3588
+#: rapid/rapid.py:3644
 msgid "Program preferences are invalid"
 msgstr "Preferencje programu są nieprawidłowe"
 
-#: rapid/rapid.py:3707 rapid/rpdfile.py:254
+#: rapid/rapid.py:3770 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: rapid/rapid.py:3709 rapid/rpdfile.py:273
+#: rapid/rapid.py:3772 rapid/rpdfile.py:292
 msgid "Video"
 msgstr "Film"
 
-#: rapid/rapid.py:3718
+#: rapid/rapid.py:3781
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr "katalog pobierania %(file_type)s nie istnieje"
 
-#: rapid/rapid.py:3720 rapid/rapid.py:3734 rapid/rapid.py:3747
+#: rapid/rapid.py:3783 rapid/rapid.py:3797 rapid/rapid.py:3810
 #, python-format
 msgid "Folder: %s"
 msgstr "Katalog: %s"
 
-#: rapid/rapid.py:3732
+#: rapid/rapid.py:3795
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr "katalog pobierania %(file_type)s jest nieprawidłowy"
 
-#: rapid/rapid.py:3745
+#: rapid/rapid.py:3808
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr "katalog pobierania %(file_type)s nie jest zapisywalny"
 
-#: rapid/rapid.py:3831
+#: rapid/rapid.py:3894
 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:3878
+#: rapid/rapid.py:3949
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
@@ -384,30 +384,55 @@ msgstr ""
 "wyświetl informacje programu w linii komend podczas działania programu "
 "(domyślnie: %default)"
 
-#: rapid/rapid.py:3879
+#: rapid/rapid.py:3950
 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:3880
+#: rapid/rapid.py:3951
 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:3882
+#: rapid/rapid.py:3953
 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:3884
+#: rapid/rapid.py:3955
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+"automatyczne wykrywaj urządzenia z których ma nastąpić pobieranie, "
+"nadpisując istniejące ustawienia programu"
+
+#: rapid/rapid.py:3956
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+"ręcznie określ ścieżkę dostępu do urządzenia z którego ma nastąpić "
+"pobieranie, nadpisując istniejące ustawienia programu"
+
+#: rapid/rapid.py:3957
 msgid "reset all program settings and preferences and exit"
 msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
 
-#: rapid/rapid.py:3902
+#: rapid/rapid.py:3970
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+"Błąd: określ automatyczne wykrywanie urządzeń lub określ ścieżkę dostępu do "
+"urządzenia z którego ma nastąpić pobieranie, ale nie obydwie rzeczy "
+"jednocześnie."
+
+#: rapid/rapid.py:3991
 #, python-format
 msgid "and %s"
 msgstr "oraz %s"
 
-#: rapid/rapid.py:3910
+#: rapid/rapid.py:3999
 msgid "All settings and preferences have been reset"
 msgstr "Wszystkie ustawienia oraz preferencje zostały zresetowane"
 
@@ -1376,11 +1401,18 @@ msgstr "Wystąpił błąd podczas tworzenia kopii zapasowej"
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr "%(previousproblem)s, oraz %(backinguperror)s"
 
-#: rapid/rpdfile.py:142
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+"wyszukiwanie (znalezionych zdjęć: %(photos)s znalezionych filmów: "
+"%(videos)s)..."
+
 #: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index dc70c72..d056e3a 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: 2012-05-13 22:31-0500\n"
+"POT-Creation-Date: 2012-06-23 03:53-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:110 rapid/rapid.py:1749 rapid/glade3/rapid.ui.h:1
+#: rapid/rapid.py:112 rapid/rapid.py:1779 rapid/glade3/rapid.ui.h:1
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: rapid/rapid.py:115
+#: rapid/rapid.py:117
 #, python-format
 msgid ""
 "%(date)s\n"
 "%(time)s"
 msgstr ""
 
-#: rapid/rapid.py:117
+#: rapid/rapid.py:119
 #, python-format
 msgid "%(date)s %(time)s"
 msgstr ""
 
-#: rapid/rapid.py:120
+#: rapid/rapid.py:122
 #, 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:155
+#: rapid/rapid.py:157
 msgid "Device"
 msgstr ""
 
 #. Size refers to the total size of images on the device, typically in
 #. MB or GB
-#: rapid/rapid.py:173
+#: rapid/rapid.py:175
 msgid "Size"
 msgstr ""
 
-#: rapid/rapid.py:176
+#: rapid/rapid.py:178
 msgid "Download Progress"
 msgstr ""
 
-#: rapid/rapid.py:322
+#: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
 msgstr ""
@@ -64,36 +64,36 @@ 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:1189
+#: rapid/rapid.py:1216
 msgid "scanning..."
 msgstr ""
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
-#: rapid/rapid.py:1747
+#: rapid/rapid.py:1777
 msgid "the root of the file system"
 msgstr ""
 
 #. message in dialog box which asks the user if they really want to be downloading from this location
-#: rapid/rapid.py:1751
+#: rapid/rapid.py:1781
 #, python-format
 msgid "Downloading from %(location)s."
 msgstr ""
 
-#: rapid/rapid.py:1752
+#: rapid/rapid.py:1782
 msgid ""
 "Do you really want to download from here? On some systems, scanning this "
 "location can take a very long time."
 msgstr ""
 
-#: rapid/rapid.py:2174
+#: rapid/rapid.py:2204
 msgid "Download"
 msgstr ""
 
-#: rapid/rapid.py:2177
+#: rapid/rapid.py:2207
 msgid "Pause"
 msgstr ""
 
-#: rapid/rapid.py:2282
+#: rapid/rapid.py:2312
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -101,183 +101,183 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: rapid/rapid.py:2285
+#: rapid/rapid.py:2315
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: rapid/rapid.py:2286
+#: rapid/rapid.py:2316
 msgid "Download cannot proceed"
 msgstr ""
 
-#: rapid/rapid.py:2653
+#: rapid/rapid.py:2695
 msgid "About 1 second remaining"
 msgstr ""
 
-#: rapid/rapid.py:2655
+#: rapid/rapid.py:2697
 #, python-format
 msgid "About %i seconds remaining"
 msgstr ""
 
-#: rapid/rapid.py:2657
+#: rapid/rapid.py:2699
 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:2662
+#: rapid/rapid.py:2704
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 msgstr ""
 
-#: rapid/rapid.py:2684 rapid/rpdfile.py:116
+#: rapid/rapid.py:2726 rapid/rpdfile.py:123
 msgid "photos and videos"
 msgstr ""
 
-#: rapid/rapid.py:2686 rapid/rpdfile.py:118
+#: rapid/rapid.py:2728 rapid/rpdfile.py:125
 msgid "photos or videos"
 msgstr ""
 
-#: rapid/rapid.py:2689 rapid/rapid.py:3502 rapid/rpdfile.py:121
+#: rapid/rapid.py:2731 rapid/rapid.py:3553 rapid/rpdfile.py:128
 msgid "videos"
 msgstr ""
 
-#: rapid/rapid.py:2691 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:123
-#: rapid/rpdfile.py:272
+#: rapid/rapid.py:2733 rapid/preferencesdialog.py:1620 rapid/rpdfile.py:130
+#: rapid/rpdfile.py:291
 msgid "video"
 msgstr ""
 
-#: rapid/rapid.py:2694 rapid/rapid.py:3500 rapid/rpdfile.py:126
+#: rapid/rapid.py:2736 rapid/rapid.py:3551 rapid/rpdfile.py:133
 msgid "photos"
 msgstr ""
 
 #. check subfolder preferences for bad values
-#: rapid/rapid.py:2696 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:128
-#: rapid/rpdfile.py:253
+#: rapid/rapid.py:2738 rapid/preferencesdialog.py:1619 rapid/rpdfile.py:135
+#: rapid/rpdfile.py:272
 msgid "photo"
 msgstr ""
 
-#: rapid/rapid.py:2723
+#: rapid/rapid.py:2765
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2727
+#: rapid/rapid.py:2769
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: rapid/rapid.py:2730 rapid/rapid.py:2782
+#: rapid/rapid.py:2772 rapid/rapid.py:2824
 msgid "warnings"
 msgstr ""
 
-#: rapid/rapid.py:2739
+#: rapid/rapid.py:2781
 msgid "All downloads complete"
 msgstr ""
 
-#: rapid/rapid.py:2745 rapid/rapid.py:2754 rapid/rapid.py:2763
-#: rapid/rapid.py:2772 rapid/rapid.py:2780
+#: rapid/rapid.py:2787 rapid/rapid.py:2796 rapid/rapid.py:2805
+#: rapid/rapid.py:2814 rapid/rapid.py:2822
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: rapid/rapid.py:2747 rapid/rapid.py:2765
+#: rapid/rapid.py:2789 rapid/rapid.py:2807
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: rapid/rapid.py:2756 rapid/rapid.py:2774
+#: rapid/rapid.py:2798 rapid/rapid.py:2816
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
 #. e.g.: 3 of 205 photos and videos (202 remaining)
-#: rapid/rapid.py:2813
+#: rapid/rapid.py:2855
 #, 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:2820
+#: rapid/rapid.py:2862
 #, python-format
 msgid "%(number)s of %(total)s %(filetypes)s"
 msgstr ""
 
-#: rapid/rapid.py:3166
+#: rapid/rapid.py:3217
 msgid "From"
 msgstr ""
 
-#: rapid/rapid.py:3174
+#: rapid/rapid.py:3225
 msgid "Auto Detect"
 msgstr ""
 
-#: rapid/rapid.py:3178 rapid/preferencesdialog.py:1327
+#: rapid/rapid.py:3229 rapid/preferencesdialog.py:1327
 #, python-format
 msgid "Select a folder containing %(file_types)s"
 msgstr ""
 
-#: rapid/rapid.py:3219
+#: rapid/rapid.py:3270
 msgid "Copy"
 msgstr ""
 
-#: rapid/rapid.py:3232
+#: rapid/rapid.py:3283
 msgid "Move"
 msgstr ""
 
-#: rapid/rapid.py:3254
+#: rapid/rapid.py:3305
 msgid "To"
 msgstr ""
 
-#: rapid/rapid.py:3261 rapid/rapid.py:3897
+#: rapid/rapid.py:3312 rapid/rapid.py:3981
 msgid "Photos:"
 msgstr ""
 
-#: rapid/rapid.py:3264 rapid/preferencesdialog.py:1164
+#: rapid/rapid.py:3315 rapid/preferencesdialog.py:1164
 msgid "Select a folder to download photos to"
 msgstr ""
 
-#: rapid/rapid.py:3276 rapid/rapid.py:3897
+#: rapid/rapid.py:3327 rapid/rapid.py:3981
 msgid "Videos:"
 msgstr ""
 
-#: rapid/rapid.py:3278 rapid/preferencesdialog.py:1182
+#: rapid/rapid.py:3329 rapid/preferencesdialog.py:1182
 msgid "Select a folder to download videos to"
 msgstr ""
 
-#: rapid/rapid.py:3470
+#: rapid/rapid.py:3521
 msgid "and"
 msgstr ""
 
-#: rapid/rapid.py:3475
+#: rapid/rapid.py:3526
 msgid "Using backup devices"
 msgstr ""
 
-#: rapid/rapid.py:3477
+#: rapid/rapid.py:3528
 msgid "Using backup device"
 msgstr ""
 
-#: rapid/rapid.py:3479
+#: rapid/rapid.py:3530
 msgid "No backup devices detected"
 msgstr ""
 
-#: rapid/rapid.py:3506
+#: rapid/rapid.py:3557
 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:3518
+#: rapid/rapid.py:3569
 #, 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:3522
+#: rapid/rapid.py:3573
 #, python-format
 msgid "%(free)s %(file_type)s"
 msgstr ""
@@ -285,116 +285,134 @@ 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:3527
+#: rapid/rapid.py:3578
 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:3532
+#: rapid/rapid.py:3583
 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:3538
+#: rapid/rapid.py:3589
 #, python-format
 msgid "%(free)s free"
 msgstr ""
 
 #. user manually specified the same location for photos and video backups
-#: rapid/rapid.py:3546
+#: rapid/rapid.py:3597
 #, python-format
 msgid "Backing up photos and videos to %(path)s"
 msgstr ""
 
 #. user manually specified backup location
-#: rapid/rapid.py:3549
+#: rapid/rapid.py:3600
 #, python-format
 msgid "Backing up to %(path)s"
 msgstr ""
 
 #. user manually specified different locations for photo and video backups
-#: rapid/rapid.py:3552
+#: rapid/rapid.py:3603
 #, python-format
 msgid "Backing up photos to %(path)s and videos to %(path2)s"
 msgstr ""
 
-#: rapid/rapid.py:3559
+#: rapid/rapid.py:3610
 #, python-format
 msgid "%(freespace)s. %(backuppaths)s."
 msgstr ""
 
-#: rapid/rapid.py:3588
+#: rapid/rapid.py:3639
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: rapid/rapid.py:3707 rapid/rpdfile.py:254
+#: rapid/rapid.py:3765 rapid/rpdfile.py:273
 msgid "Photo"
 msgstr ""
 
-#: rapid/rapid.py:3709 rapid/rpdfile.py:273
+#: rapid/rapid.py:3767 rapid/rpdfile.py:292
 msgid "Video"
 msgstr ""
 
-#: rapid/rapid.py:3718
+#: rapid/rapid.py:3776
 #, python-format
 msgid "%(file_type)s download folder does not exist"
 msgstr ""
 
-#: rapid/rapid.py:3720 rapid/rapid.py:3734 rapid/rapid.py:3747
+#: rapid/rapid.py:3778 rapid/rapid.py:3792 rapid/rapid.py:3805
 #, python-format
 msgid "Folder: %s"
 msgstr ""
 
-#: rapid/rapid.py:3732
+#: rapid/rapid.py:3790
 #, python-format
 msgid "%(file_type)s download folder is invalid"
 msgstr ""
 
-#: rapid/rapid.py:3745
+#: rapid/rapid.py:3803
 #, python-format
 msgid "%(file_type)s download folder is not writable"
 msgstr ""
 
-#: rapid/rapid.py:3831
+#: rapid/rapid.py:3889
 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:3878
+#: rapid/rapid.py:3944
 #, python-format
 msgid ""
 "display program information on the command line as the program runs "
 "(default: %default)"
 msgstr ""
 
-#: rapid/rapid.py:3879
+#: rapid/rapid.py:3945
 msgid "display debugging information when run from the command line"
 msgstr ""
 
-#: rapid/rapid.py:3880
+#: rapid/rapid.py:3946
 msgid "only output errors to the command line"
 msgstr ""
 
 #. image file extensions are recognized RAW files plus TIFF and JPG
-#: rapid/rapid.py:3882
+#: rapid/rapid.py:3948
 msgid "list photo and video file extensions the program recognizes and exit"
 msgstr ""
 
-#: rapid/rapid.py:3884
+#: rapid/rapid.py:3950
+msgid ""
+"automatically detect devices from which to download, overwriting existing "
+"program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3951
+msgid ""
+"manually specify the PATH of the device from which to download, overwriting "
+"existing program preferences"
+msgstr ""
+
+#: rapid/rapid.py:3952
 msgid "reset all program settings and preferences and exit"
 msgstr ""
 
-#: rapid/rapid.py:3902
+#: rapid/rapid.py:3965
+msgid ""
+"Error: specify device auto-detection or manually specify a device's path "
+"from which to download, but do not do both."
+msgstr ""
+
+#: rapid/rapid.py:3986
 #, python-format
 msgid "and %s"
 msgstr ""
 
-#: rapid/rapid.py:3910
+#: rapid/rapid.py:3994
 msgid "All settings and preferences have been reset"
 msgstr ""
 
@@ -1327,11 +1345,16 @@ msgstr ""
 msgid "%(previousproblem)s, and %(backinguperror)s"
 msgstr ""
 
-#: rapid/rpdfile.py:142
+#: rapid/rpdfile.py:153
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
+#: rapid/rpdfile.py:163
+#, python-format
+msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
+msgstr ""
+
 #: rapid/subfolderfile.py:80
 #, python-format
 msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
diff --git a/rapid/ChangeLog b/rapid/ChangeLog
index e2bd42f..6a28146 100644
--- a/rapid/ChangeLog
+++ b/rapid/ChangeLog
@@ -1,3 +1,40 @@
+Version 0.4.5
+-------------
+
+2012-06-24
+
+Updated Dutch, Estonian, German, Italian, Norwegian and Polish translations.
+
+Updated man page.
+
+
+Version 0.4.5 Beta 1
+--------------------
+
+2012-06-17
+
+To increase performance, thumbnails are now no longer displayed until all 
+devices have finished being scanned. To indicate the scan is occurring, the
+progress bar now pulses and it displays a running total of the number of photos 
+and videos found. If scanning a very large number of files from a fast device, 
+the progress bar may pause. If this happens, just wait for the scan to complete.
+
+Fixed bug #1014203: Very poor program performance after download device changed.
+The program now displays the results of scanning files much quicker if the
+program's download device preferences are changed and a scan begins of a new
+device. 
+
+You can now specify via the command line whether you would like to automatically
+detect devices from which to download, or manually specify the path of the 
+device. If specified, the option will overwrite the existing program 
+preferences.
+
+Added extra information to debugging output.
+
+Fixed bug #1014219: File Modify process crashes if program exits during 
+download. 
+
+
 Version 0.4.4
 -------------
 
diff --git a/rapid/config.py b/rapid/config.py
index 64228e8..d44c9bb 100644
--- a/rapid/config.py
+++ b/rapid/config.py
@@ -16,7 +16,7 @@
 ### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 ### USA
 
-version = '0.4.4'
+version = '0.4.5'
 
 GCONF_KEY="/apps/rapid-photo-downloader"
 
diff --git a/rapid/filemodify.py b/rapid/filemodify.py
index 8e5d8a3..98921ae 100644
--- a/rapid/filemodify.py
+++ b/rapid/filemodify.py
@@ -72,7 +72,11 @@ class FileModify(multiprocessing.Process):
         while not copy_finished:        
             logger.debug("Finished %s. Getting next task.", download_count)
             
-            rpd_file, download_count, temp_full_file_name, thumbnail_icon, thumbnail, copy_finished = self.results_pipe.recv()
+            data = self.results_pipe.recv()
+            if len(data) > 2:
+                rpd_file, download_count, temp_full_file_name, thumbnail_icon, thumbnail, copy_finished = data
+            else:
+                rpd_file, copy_finished = data
             if rpd_file is None:
                 # this is a termination signal
                 logger.info("Terminating file modify via pipe")
diff --git a/rapid/rapid.py b/rapid/rapid.py
index a060db3..fab5796 100755
--- a/rapid/rapid.py
+++ b/rapid/rapid.py
@@ -32,6 +32,8 @@ from optparse import OptionParser
 import gtk
 import gtk.gdk as gdk
 
+from gobject.constants import G_MAXINT
+
 import webbrowser
 
 import sys, time, types, os, datetime
@@ -135,9 +137,9 @@ class DeviceCollection(gtk.TreeView):
         self.parent_app = parent_app
         # device icon & name, size of images on the device (human readable), 
         # copy progress (%), copy text, eject button (None if irrelevant),
-        # process id
+        # process id, pulse
         self.liststore = gtk.ListStore(gtk.gdk.Pixbuf, str, str, float, str,
-                                       gtk.gdk.Pixbuf, int)
+                                       gtk.gdk.Pixbuf, int, int)
         self.map_process_to_row = {}
         self.devices_by_scan_pid = {}
 
@@ -176,7 +178,8 @@ class DeviceCollection(gtk.TreeView):
         column2 = gtk.TreeViewColumn(_("Download Progress"), 
                                     gtk.CellRendererProgress(),
                                     value=3,
-                                    text=4)
+                                    text=4,
+                                    pulse=7)
         self.append_column(column2)
         self.show_all()
         
@@ -211,7 +214,8 @@ class DeviceCollection(gtk.TreeView):
                                       progress,
                                       progress_bar_text,
                                       eject,
-                                      process_id))
+                                      process_id,
+                                      -1))
         
         self._set_process_map(process_id, iter)
         
@@ -275,7 +279,7 @@ class DeviceCollection(gtk.TreeView):
         else:
             return None
     
-    def update_progress(self, scan_pid, percent_complete, progress_bar_text, bytes_downloaded):
+    def update_progress(self, scan_pid, percent_complete, progress_bar_text, bytes_downloaded, pulse=None):
         
         iter = self._get_process_map(scan_pid)
         if iter:
@@ -283,9 +287,19 @@ class DeviceCollection(gtk.TreeView):
                 self.liststore.set_value(iter, 3, percent_complete)
             if progress_bar_text:
                 self.liststore.set_value(iter, 4, progress_bar_text)
-            if percent_complete or bytes_downloaded:
-                pass
-                #~ logger.info("Implement update overall progress")
+                
+            if pulse is not None:
+                if pulse:
+                    # Make the bar pulse
+                    self.liststore.set_value(iter, 7, self.liststore.get_value(iter, 7) + 1)
+                else:
+                    # Set to finished state
+                    self.liststore.set_value(iter, 7, G_MAXINT)
+            else:
+                # Reset to allow fraction to be set
+                self.liststore.set_value(iter, 7, -1)
+
+
 
     def button_clicked(self, widget, event):
         """
@@ -502,21 +516,9 @@ class ThumbnailDisplay(gtk.IconView):
         self.DOWNLOAD_STATUS_COL = 7
         self.STATUS_ICON_COL = 8
         
-        self.liststore = gtk.ListStore(
-             gobject.TYPE_PYOBJECT, # 0 PIL thumbnail
-             gobject.TYPE_BOOLEAN,  # 1 selected or not
-             str,                   # 2 unique id
-             str,                   # 3 file name
-             int,                   # 4 timestamp for sorting, converted float
-             int,                   # 5 file type i.e. photo or video
-             gobject.TYPE_BOOLEAN,  # 6 visibility of checkbutton
-             int,                   # 7 status of download
-             gtk.gdk.Pixbuf,        # 8 status icon
-             )
+        self._create_liststore()
 
         self.clear()
-        self.set_model(self.liststore)
-        
         
         checkbutton = gtk.CellRendererToggle()
         checkbutton.set_radio(False)
@@ -546,6 +548,22 @@ class ThumbnailDisplay(gtk.IconView):
         
         self.connect('item-activated', self.on_item_activated)
         
+    def _create_liststore(self):
+        """
+        Creates the default list store to hold the icons
+        """
+        self.liststore = gtk.ListStore(
+             gobject.TYPE_PYOBJECT, # 0 PIL thumbnail
+             gobject.TYPE_BOOLEAN,  # 1 selected or not
+             str,                   # 2 unique id
+             str,                   # 3 file name
+             int,                   # 4 timestamp for sorting, converted float
+             int,                   # 5 file type i.e. photo or video
+             gobject.TYPE_BOOLEAN,  # 6 visibility of checkbutton
+             int,                   # 7 status of download
+             gtk.gdk.Pixbuf,        # 8 status icon
+             )        
+        
     def _setup_icons(self):
         # icons to be displayed in status column
 
@@ -1018,7 +1036,13 @@ class ThumbnailDisplay(gtk.IconView):
         have been downloaded.
         """
         if scan_pid is None and not keep_downloaded_files:
-            self.liststore.clear()
+            
+            # Here it is critically important to create a brand new liststore,
+            # because the old one is set to be sorted, which is extremely slow.
+            logger.debug("Creating new thumbnails model")
+            self.set_model(None)
+            self._create_liststore()
+
             self.treerow_index = {}
             self.process_index = {}
             
@@ -1036,6 +1060,9 @@ class ThumbnailDisplay(gtk.IconView):
                         del self.rpd_files[rpd_file.unique_id]
                 if not keep_downloaded_files or not len(self.process_index[scan_pid]):
                     del self.process_index[scan_pid]
+                    
+    def display_thumbnails(self):
+        self.set_model(self.liststore)
     
 class TaskManager:
     def __init__(self, results_callback, batch_size):
@@ -1503,7 +1530,8 @@ class RapidApp(dbus.service.Object):
     processes.
     """
      
-    def __init__(self,  bus, path, name, taskserver=None, focal_length=None): 
+    def __init__(self,  bus, path, name, taskserver=None, focal_length=None,
+    auto_detect=None, device_location=None): 
         
         dbus.service.Object.__init__ (self, bus, path, name)
         self.running = False
@@ -1513,7 +1541,7 @@ class RapidApp(dbus.service.Object):
         self.focal_length = focal_length
         
         # Setup program preferences, and set callback for when they change
-        self._init_prefs()
+        self._init_prefs(auto_detect, device_location)
         
         # Initialize widgets in the main window, and variables that point to them
         self._init_widgets()
@@ -1696,12 +1724,14 @@ class RapidApp(dbus.service.Object):
         if self.preview_image.unique_id is not None:        
             self.thumbnails.show_prev_image(self.preview_image.unique_id)
         
-    def set_thumbnail_sort(self):
+    def display_scan_thumbnails(self):
         """
-        If all the scans are complete, sets the sort order
+        If all the scans are complete, sets the sort order and displays
+        thumbnails in the icon view
         """
         if self.scan_manager.no_tasks == 0:
             self.thumbnails.sort_by_timestamp()
+            self.thumbnails.display_thumbnails()
 
 
     # # #
@@ -1740,7 +1770,7 @@ class RapidApp(dbus.service.Object):
         user said no.
         """
         l = self.prefs.device_location
-        if l in ['/media', os.path.expanduser('~'), '/']:
+        if l in ['/media', '/run', os.path.expanduser('~'), '/']:
             logger.info("Prompting whether to download from %s", l)
             if l == '/':
                 #this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
@@ -2403,7 +2433,19 @@ class RapidApp(dbus.service.Object):
 
             if msg_type == rpdmp.MSG_TEMP_DIRS:
                 scan_pid, photo_temp_dir, video_temp_dir = data
-                self.temp_dirs_by_scan_pid[scan_pid] = (photo_temp_dir, video_temp_dir)                
+                self.temp_dirs_by_scan_pid[scan_pid] = (photo_temp_dir, video_temp_dir)
+                
+                # Report which temporary directories are being used for this
+                # download
+                if photo_temp_dir and video_temp_dir:
+                    logger.debug("Using temp dirs %s (photos) & %s (videos)",
+                                photo_temp_dir, video_temp_dir)
+                elif photo_temp_dir:
+                    logger.debug("Using temp dir %s (photos)",
+                                photo_temp_dir)
+                else:
+                    logger.debug("Using temp dir %s (videos)",
+                                video_temp_dir)                    
             elif msg_type == rpdmp.MSG_BYTES:
                 scan_pid, total_downloaded, chunk_downloaded = data
                 self.download_tracker.set_total_bytes_copied(scan_pid, 
@@ -2881,8 +2923,17 @@ class RapidApp(dbus.service.Object):
     # # #
         
         
-    def _init_prefs(self): 
+    def _init_prefs(self, auto_detect, device_location): 
         self.prefs = prefsrapid.RapidPreferences()
+        
+        # handle device preferences set from the command line
+        # do this before preference changes are handled with notify_add
+        if auto_detect:
+            self.prefs.device_autodetection = True
+        elif device_location:
+            self.prefs.device_location = device_location
+            self.prefs.device_autodetection = False
+                    
         self.prefs.notify_add(self.on_preference_changed)
         
         # flag to indicate whether the user changed some preferences that 
@@ -3006,7 +3057,7 @@ class RapidApp(dbus.service.Object):
     def post_preference_change(self):
         if self.rerun_setup_available_image_and_video_media:
 
-            logger.info("Download device settings preferences were changed.")
+            logger.info("Download device settings preferences were changed")
             
             self.thumbnails.clear_all()
             self.setup_devices(on_startup = False, on_preference_change = True, block_auto_start = True)
@@ -3658,12 +3709,19 @@ class RapidApp(dbus.service.Object):
                                                         is_photo_dir=True):
                 valid = False
                 invalid_dirs.append(self.prefs.download_folder)
+            else:
+                logger.debug("Photo download folder is valid: %s", 
+                        self.prefs.download_folder)
                 
         if need_video_folder:
             if not self.is_valid_download_dir(self.prefs.video_download_folder,
                                                         is_photo_dir=False):            
                 valid = False
                 invalid_dirs.append(self.prefs.video_download_folder)
+            else:
+                logger.debug("Video download folder is valid: %s", 
+                        self.prefs.video_download_folder)
+
                 
         return (valid, invalid_dirs)
 
@@ -3823,7 +3881,7 @@ class RapidApp(dbus.service.Object):
             logger.info('Found %s' % results_summary)
             logger.info('Files total %s' % size)
             self.device_collection.update_device(scan_pid, size)
-            self.device_collection.update_progress(scan_pid, 0.0, results_summary, 0)
+            self.device_collection.update_progress(scan_pid, 0.0, results_summary, 0, pulse=False)
             self.set_download_action_sensitivity()
                         
             if (not self.auto_start_is_on and
@@ -3836,16 +3894,24 @@ class RapidApp(dbus.service.Object):
                 else:
                     self.start_download(scan_pid=scan_pid)
 
-            self.set_thumbnail_sort()
+            logger.debug("Turning on display of thumbnails")
+            self.display_scan_thumbnails()
             self.download_button.grab_focus()
             
             # signal that no more data is coming, finishing io watch for this pipe
             return False
         else:
+            # partial results
             if len(data) > self.batch_size:
                 logger.critical("incoming pipe length is unexpectedly long: %s" % len(data))
             else:
-                for rpd_file in data:
+                size, file_type_counter, scan_pid, rpd_files = data
+                size = format_size_for_user(bytes=size)
+                scanning_progress = file_type_counter.running_file_count()
+                self.device_collection.update_device(scan_pid, size)
+                self.device_collection.update_progress(scan_pid, 0.0, scanning_progress, 0, pulse=True)
+                
+                for rpd_file in rpd_files:
                     self.thumbnails.add_file(rpd_file=rpd_file, 
                                         generate_thumbnail = not self.auto_start_is_on)
         
@@ -3880,7 +3946,9 @@ def start():
     parser.add_option("-q", "--quiet",  action="store_false", dest="verbose",  help=_("only output errors to the command line"))
     # image file extensions are recognized RAW files plus TIFF and JPG
     parser.add_option("-e",  "--extensions", action="store_true", dest="extensions", help=_("list photo and video file extensions the program recognizes and exit"))
-    parser.add_option("--focal-length", type=int, dest="focal_length", help="If an aperture value of 0.0 is encountered, the focal length metadata will be set to the number passed, and its aperture metadata to f8")
+    parser.add_option("--focal-length", type=int, dest="focal_length", help="If an aperture value of 0.0 is encountered, the focal length metadata will be set to the number passed, and its aperture metadata to f/8")
+    parser.add_option("-a", "--auto-detect", action="store_true", dest="auto_detect", help=_("automatically detect devices from which to download, overwriting existing program preferences"))
+    parser.add_option("-l", "--device-location", type="string", metavar="PATH", dest="device_location", help=_("manually specify the PATH of the device from which to download, overwriting existing program preferences"))
     parser.add_option("--reset-settings", action="store_true", dest="reset", help=_("reset all program settings and preferences and exit"))
     (options, args) = parser.parse_args()
     
@@ -3892,6 +3960,24 @@ def start():
         logging_level = logging.ERROR
     
     logger.setLevel(logging_level)
+    
+    if options.auto_detect and options.device_location:
+        logger.info(_("Error: specify device auto-detection or manually specify a device's path from which to download, but do not do both."))
+        sys.exit(1)
+        
+    if options.auto_detect:
+        auto_detect=True
+        logger.info("Device auto detection set from command line")
+    else:
+        auto_detect=None
+        
+    if options.device_location:
+        device_location=options.device_location
+        if device_location[-1]=='/':
+            device_location = device_location[:-1]
+        logger.info("Device location set from command line: %s", device_location)
+    else:
+        device_location=None
 
     if options.extensions:
         extensions = ((rpdfile.PHOTO_EXTENSIONS, _("Photos:")), (rpdfile.VIDEO_EXTENSIONS, _("Videos:")))
@@ -3932,7 +4018,8 @@ def start():
     bus = dbus.SessionBus ()
     request = bus.request_name (config.DBUS_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
     if request != dbus.bus.REQUEST_NAME_REPLY_EXISTS: 
-        app = RapidApp(bus, '/', config.DBUS_NAME, focal_length=focal_length)
+        app = RapidApp(bus, '/', config.DBUS_NAME, focal_length=focal_length,
+        auto_detect=auto_detect, device_location=device_location)
     else:
         # this application is already running
         print "Rapid Photo Downloader is already running"
diff --git a/rapid/rpdfile.py b/rapid/rpdfile.py
index 99f6aa5..cf38ebc 100644
--- a/rapid/rpdfile.py
+++ b/rapid/rpdfile.py
@@ -67,7 +67,6 @@ else:
 FILE_TYPE_PHOTO = 0
 FILE_TYPE_VIDEO = 1
 
-
 def file_type(file_extension):
     """
     Uses file extentsion to determine the type of file - photo or video.
@@ -102,6 +101,14 @@ class FileTypeCounter:
     def add(self, file_type):
         self._counter[file_type] = self._counter.setdefault(file_type, 0) + 1
         
+    def no_videos(self):
+        """Returns the number of videos"""
+        return self._counter.setdefault(FILE_TYPE_VIDEO, 0)
+        
+    def no_photos(self):
+        """Returns the number of photos"""
+        return self._counter.setdefault(FILE_TYPE_PHOTO, 0)
+        
     def file_types_present(self):
         """ 
         returns a string to be displayed to the user that can be used
@@ -109,8 +116,8 @@ class FileTypeCounter:
         of each
         """
         
-        no_videos = self._counter.setdefault(FILE_TYPE_VIDEO, 0)
-        no_images = self._counter.setdefault(FILE_TYPE_PHOTO, 0)
+        no_videos = self.no_videos()
+        no_images = self.no_photos()
         
         if (no_videos > 0) and (no_images > 0):
             v = _('photos and videos')
@@ -135,6 +142,10 @@ class FileTypeCounter:
         return i
         
     def summarize_file_count(self):
+        """
+        Summarizes the total number of photos and/or videos that can be
+        downloaded. Displayed after a scan is finished.
+        """
         #Number of files, e.g. "433 photos and videos" or "23 videos".
         #Displayed in the progress bar at the top of the main application
         #window.
@@ -144,6 +155,14 @@ class FileTypeCounter:
                                'filetypes': file_types_present} 
         return (file_count_summary, file_types_present)
         
+    def running_file_count(self):
+        """
+        Displays raw numbers of photos and videos. Displayed as a scan is 
+        occurring. 
+        """
+        return _("scanning (found %(photos)s photos and %(videos)s videos)...") % ({'photos': self.no_photos(),
+                'videos': self.no_videos()})
+        
 class RPDFile:
     """
     Base class for photo or video file, with metadata
diff --git a/rapid/scan.py b/rapid/scan.py
index c6ccaf8..637031a 100755
--- a/rapid/scan.py
+++ b/rapid/scan.py
@@ -104,6 +104,7 @@ class Scan(multiprocessing.Process):
         self.run_event = run_event
         self.batch_size = batch_size
         self.counter = 0
+        self.files_scanned = 0
         self.files = []
         self.file_type_counter = rpdfile.FileTypeCounter()
         
@@ -139,6 +140,11 @@ class Scan(multiprocessing.Process):
                         return None
 
                 elif file_type == gio.FILE_TYPE_REGULAR:
+                    
+                    self.files_scanned += 1
+                    if self.files_scanned % 100 == 0:
+                        logger.debug("Scanned %s files", self.files_scanned)
+                        
                     base_name, ext = os.path.splitext(name)
                     ext = ext.lower()[1:]
                     
@@ -174,15 +180,17 @@ class Scan(multiprocessing.Process):
                                              file_type)
                                          
                             self.files.append(scanned_file)
-                        
+                            file_size_sum += size
+                                                    
                             if self.counter == self.batch_size:
                                 # send batch of results
                                 self.results_pipe.send((rpdmp.CONN_PARTIAL, 
-                                                        self.files))
+                                                        (file_size_sum, 
+                                                        self.file_type_counter,
+                                                        self.pid,
+                                                        self.files)))
                                 self.files = []
                                 self.counter = 0
-                            
-                            file_size_sum += size
 
         return file_size_sum
         
@@ -206,7 +214,11 @@ class Scan(multiprocessing.Process):
         if size is not None:
             if self.counter > 0:
                 # send any remaining results
-                self.results_pipe.send((rpdmp.CONN_PARTIAL, self.files))
+                self.results_pipe.send((rpdmp.CONN_PARTIAL, (size, 
+                    self.file_type_counter,
+                    self.pid,
+                    self.files)))
+                    
             self.results_pipe.send((rpdmp.CONN_COMPLETE, (size, 
                                     self.file_type_counter, self.pid)))
             self.results_pipe.close()
author	Julien Valroff <julien@kirya.net>	2012-06-26 20:47:28 +0200
committer	Julien Valroff <julien@kirya.net>	2012-06-26 20:47:28 +0200
commit	70572245101637651d6e88fc323171205d6a7306 (patch)
tree	ef64c3789f70ff4b93a186beb766c94cba1cac7f
parent	78bd370ebdbd4b69e25edb5825628d5b00865699 (diff)
parent	2a794565f77005a753930023e41c7b696eaed6ac (diff)